diff --git a/CHANGELOG b/CHANGELOG index 76a3d12..c5bd2c3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ # Changes: ## 1.19-1.0.0-stable -- updating is despicable \ No newline at end of file +- updating is despicable + +## 1.19-1.0.1-unstable +- added not tools +- added not armour +- added stupid/dumb damage source +- added stupid status effect +- added stupid tools \ No newline at end of file diff --git a/README.md b/README.md index f9d3b59..b029da1 100755 --- a/README.md +++ b/README.md @@ -29,4 +29,4 @@ If you find an issue or bug in the mod or just have a general suggestion you can [aaaaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA](https://github.com/RyanTLG/GamerItems/blob/1-18-1/unstable/AAAAAAAAAAAAAAAa) ## NOTICE -due to my lack of an attention span, i will no longer be updating or maintaining 1.18 versions, this is a final decision. I will also not support any versions up from 1.19 (pre chat reporting and account banning). Anyone willing to update 1.18 branches or add branches for older/newer minecraft versions are welcome to ask me [here]() \ No newline at end of file +due to my lack of an attention span, i will no longer be updating or maintaining 1.18 versions, this is a final decision. I will also not support any versions up from 1.19 (pre chat reporting and account banning). Anyone willing to update 1.18 branches or add branches for older/newer minecraft versions are welcome to ask me [here](https://discord.gg/nsYbUnjBFJ) \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c1e9449..cf91990 100755 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx6G loader_version=0.14.8 # Mod Properties - mod_version = 1.19-1.0.0-stable + mod_version = 1.19-1.0.1-unstable maven_group = ryantlg.GamerItems.mod archives_base_name = GamerItems diff --git a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notAxeItem.java b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notAxeItem.java new file mode 100755 index 0000000..ac10899 --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notAxeItem.java @@ -0,0 +1,10 @@ +package net.arcmods.ryantlg.customToolItemClasses.not; + +import net.minecraft.item.AxeItem; +import net.minecraft.item.ToolMaterial; + +public class notAxeItem extends AxeItem { + public notAxeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { + super(material, attackDamage, attackSpeed, settings); + } +} \ No newline at end of file diff --git a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notHoeItem.java b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notHoeItem.java new file mode 100755 index 0000000..51541de --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notHoeItem.java @@ -0,0 +1,11 @@ +package net.arcmods.ryantlg.customToolItemClasses.not; + +import net.minecraft.item.HoeItem; + +import net.minecraft.item.ToolMaterial; + +public class notHoeItem extends HoeItem { + public notHoeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { + super(material, attackDamage, attackSpeed, settings); + } +} \ No newline at end of file diff --git a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notPickaxeItem.java b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notPickaxeItem.java new file mode 100755 index 0000000..d0193e7 --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notPickaxeItem.java @@ -0,0 +1,10 @@ +package net.arcmods.ryantlg.customToolItemClasses.not; + +import net.minecraft.item.PickaxeItem; +import net.minecraft.item.ToolMaterial; + +public class notPickaxeItem extends PickaxeItem { + public notPickaxeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { + super(material, attackDamage, attackSpeed, settings); + } +} \ No newline at end of file diff --git a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notShovelItem.java b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notShovelItem.java new file mode 100644 index 0000000..24b1bad --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notShovelItem.java @@ -0,0 +1,12 @@ +package net.arcmods.ryantlg.customToolItemClasses.not; + +import net.minecraft.item.ShovelItem; +import net.minecraft.item.ToolMaterial; + +public class notShovelItem extends ShovelItem{ + + public notShovelItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { + super(material, attackDamage, attackSpeed, settings); + } + +} diff --git a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notSwordItem.java b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notSwordItem.java new file mode 100644 index 0000000..6c5b23a --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/not/notSwordItem.java @@ -0,0 +1,12 @@ +package net.arcmods.ryantlg.customToolItemClasses.not; + +import net.minecraft.item.SwordItem; +import net.minecraft.item.ToolMaterial; + +public class notSwordItem extends SwordItem{ + + public notSwordItem(ToolMaterial toolMaterial, int attackDamage, float attackSpeed, Settings settings) { + super(toolMaterial, attackDamage, attackSpeed, settings); + } + +} diff --git a/src/main/java/net/arcmods/ryantlg/gameritems.java b/src/main/java/net/arcmods/ryantlg/gameritems.java index ffa665c..eae1046 100755 --- a/src/main/java/net/arcmods/ryantlg/gameritems.java +++ b/src/main/java/net/arcmods/ryantlg/gameritems.java @@ -20,6 +20,7 @@ import net.arcmods.ryantlg.items.miscItems.FunnyItems; import net.arcmods.ryantlg.items.miscItems.OtherItems; import net.arcmods.ryantlg.items.miscItems.fabricOfReality; import net.arcmods.ryantlg.items.tools.jeremiumTools; +import net.arcmods.ryantlg.items.tools.notTools; import net.arcmods.ryantlg.items.tools.omniumTools; import net.arcmods.ryantlg.items.tools.oriumTools; import net.arcmods.ryantlg.lootTables.grassVanillaWeem; @@ -100,6 +101,7 @@ public class gameritems implements ModInitializer { JeremiumOreGen.register(); notArmour.register(); + notTools.register(); gamerBow.register(); // stupidBow.register(); // incomplete: lazy diff --git a/src/main/java/net/arcmods/ryantlg/items/tools/notTools.java b/src/main/java/net/arcmods/ryantlg/items/tools/notTools.java new file mode 100644 index 0000000..6573090 --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/items/tools/notTools.java @@ -0,0 +1,34 @@ +package net.arcmods.ryantlg.items.tools; + +import net.arcmods.ryantlg.gameritems; +import net.arcmods.ryantlg.customToolItemClasses.not.notAxeItem; +import net.arcmods.ryantlg.customToolItemClasses.not.notHoeItem; +import net.arcmods.ryantlg.customToolItemClasses.not.notPickaxeItem; +import net.arcmods.ryantlg.customToolItemClasses.not.notShovelItem; +import net.arcmods.ryantlg.customToolItemClasses.not.notSwordItem; +import net.arcmods.ryantlg.toolMaterials.notToolMaterial; +import net.minecraft.item.Item; +import net.minecraft.item.ToolItem; +import net.minecraft.util.Identifier; +import net.minecraft.util.Rarity; +import net.minecraft.util.registry.Registry; + +public class notTools { + + public static ToolItem NOT_SWORD = new notSwordItem(notToolMaterial.INSTANCE, 6, -0.1F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); + public static ToolItem NOT_PICKAXE = new notPickaxeItem(notToolMaterial.INSTANCE, -48, -0.1F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); + public static ToolItem NOT_SHOVEL = new notShovelItem(notToolMaterial.INSTANCE, -40, -0.1F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); + public static ToolItem NOT_AXE = new notAxeItem(notToolMaterial.INSTANCE, 10, -0.1F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); + public static ToolItem NOT_HOE = new notHoeItem(notToolMaterial.INSTANCE, -49, -0.1F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); + + public static void register() { + + Registry.register(Registry.ITEM, new Identifier("gameritems", "not_sword"), NOT_SWORD); + Registry.register(Registry.ITEM, new Identifier("gameritems", "not_pickaxe"), NOT_PICKAXE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "not_shovel"), NOT_SHOVEL); + Registry.register(Registry.ITEM, new Identifier("gameritems", "not_axe"), NOT_AXE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "not_hoe"), NOT_HOE); + + gameritems.LOGGER.info("notTools loaded"); + } +} diff --git a/src/main/java/net/arcmods/ryantlg/toolMaterials/notToolMaterial.java b/src/main/java/net/arcmods/ryantlg/toolMaterials/notToolMaterial.java new file mode 100755 index 0000000..6a9f145 --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/toolMaterials/notToolMaterial.java @@ -0,0 +1,36 @@ +package net.arcmods.ryantlg.toolMaterials; + +import net.arcmods.ryantlg.items.miscItems.fabricOfReality; +import net.minecraft.item.ToolMaterial; +import net.minecraft.recipe.Ingredient; + +public class notToolMaterial implements ToolMaterial { + + public static final notToolMaterial INSTANCE = new notToolMaterial(); + + @Override + public int getDurability() { + return 50000; + } + @Override + public float getMiningSpeedMultiplier() { + return 50.0F; + } + @Override + public float getAttackDamage() { + return 50.0F; + } + @Override + public int getMiningLevel() { + return 4; + } + @Override + public int getEnchantability() { + return 50; + } + @Override + public Ingredient getRepairIngredient() { + return Ingredient.ofItems(fabricOfReality.FABRIC_OF_REALITY); + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/lang/en_us.json b/src/main/resources/assets/gameritems/lang/en_us.json index 5f3c18e..7ed7ff0 100755 --- a/src/main/resources/assets/gameritems/lang/en_us.json +++ b/src/main/resources/assets/gameritems/lang/en_us.json @@ -73,7 +73,7 @@ "enchantment.gameritems.evade": "Evade", "block.gameritems.weem_hay_block": "Weem Hay Bale", "item.gameritems.stupidium.tooltip": "No brain here.", - "death.attack.dumb": "%1$s didn't know how to breathe.", + "death.attack.dumb": "%1$s choked on air.", "effect.gameritems.stupid": "Stupid" } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/not_axe.json b/src/main/resources/assets/gameritems/models/item/not_axe.json new file mode 100755 index 0000000..20fef77 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/not_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gameritems:item/not_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/not_hoe.json b/src/main/resources/assets/gameritems/models/item/not_hoe.json new file mode 100755 index 0000000..82598b5 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/not_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gameritems:item/not_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/not_pickaxe.json b/src/main/resources/assets/gameritems/models/item/not_pickaxe.json new file mode 100755 index 0000000..26280f9 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/not_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gameritems:item/not_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/not_shovel.json b/src/main/resources/assets/gameritems/models/item/not_shovel.json new file mode 100755 index 0000000..32d8946 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/not_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gameritems:item/not_shovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/not_sword.json b/src/main/resources/assets/gameritems/models/item/not_sword.json new file mode 100755 index 0000000..a52cda7 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/not_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gameritems:item/not_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/textures/item/not_axe.png b/src/main/resources/assets/gameritems/textures/item/not_axe.png new file mode 100644 index 0000000..85a73b8 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/not_axe.png differ diff --git a/src/main/resources/assets/gameritems/textures/item/not_hoe.png b/src/main/resources/assets/gameritems/textures/item/not_hoe.png new file mode 100644 index 0000000..f47bbae Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/not_hoe.png differ diff --git a/src/main/resources/assets/gameritems/textures/item/not_pickaxe.png b/src/main/resources/assets/gameritems/textures/item/not_pickaxe.png new file mode 100644 index 0000000..4b59697 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/not_pickaxe.png differ diff --git a/src/main/resources/assets/gameritems/textures/item/not_shovel.png b/src/main/resources/assets/gameritems/textures/item/not_shovel.png new file mode 100644 index 0000000..399eb7c Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/not_shovel.png differ diff --git a/src/main/resources/assets/gameritems/textures/item/not_sword.png b/src/main/resources/assets/gameritems/textures/item/not_sword.png new file mode 100644 index 0000000..c7a549d Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/not_sword.png differ