From a66c27ddce0bbefa388ce3d344d015bef4648e97 Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Sat, 19 Nov 2022 16:08:10 +0200 Subject: [PATCH] release 1.19-1.0.2-unstable --- CHANGELOG | 7 +- build.gradle | 4 +- gradle.properties | 6 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../stupidiumArmorMaterial.java | 2 +- .../ryantlg/blocks/cropBlocks/weemCrop.java | 8 +- .../blocks/metalBlocks/stupidiumBlocks.java | 32 ++++++++ .../jeremium/JeremiumSwordItem.java | 2 +- .../stupidium/StupidiumSwordItem.java | 2 +- .../java/net/arcmods/ryantlg/gameritems.java | 9 +++ .../ryantlg/itemClasses/dipstickItem.java | 24 ++++++ .../ryantlg/items/armour/stupidiumArmour.java | 29 +++++++ .../ryantlg/items/miscItems/OtherItems.java | 3 + .../effectClasses/stupidStatusEffect.java | 2 +- src/main/java/net/arcmods/ryantlg/todo.txt | 2 - .../blockstates/deepslate_stupidium_ore.json | 5 ++ .../blockstates/stupidium_block.json | 5 ++ .../gameritems/blockstates/stupidium_ore.json | 5 ++ ...{weem_hay_block.json => weem_haybale.json} | 6 +- .../assets/gameritems/lang/en_us.json | 73 ++++++++++++++---- .../models/block/deepslate_stupidium_ore.json | 6 ++ .../models/block/stupidium_block.json | 6 ++ .../models/block/stupidium_ore.json | 6 ++ ...{weem_hay_block.json => weem_haybale.json} | 0 ...ntal.json => weem_haybale_horizontal.json} | 0 .../models/item/deepslate_stupidium_ore.json | 3 + .../gameritems/models/item/dipstick.json | 6 ++ .../gameritems/models/item/raw_stupidium.json | 6 ++ .../gameritems/models/item/stupidium_axe.json | 6 ++ .../models/item/stupidium_block.json | 3 + .../models/item/stupidium_boots.json | 6 ++ .../models/item/stupidium_chestplate.json | 6 ++ .../models/item/stupidium_helmet.json | 6 ++ .../gameritems/models/item/stupidium_hoe.json | 6 ++ .../models/item/stupidium_ingot.json | 6 ++ .../models/item/stupidium_leggings.json | 6 ++ .../gameritems/models/item/stupidium_ore.json | 3 + .../models/item/stupidium_pickaxe.json | 6 ++ .../models/item/stupidium_shovel.json | 6 ++ .../models/item/stupidium_sword.json | 6 ++ .../models/item/weem_hay_block.json | 3 - .../gameritems/models/item/weem_haybale.json | 3 + .../block/deepslate_stupidium_ore.png | Bin 0 -> 1117 bytes .../textures/block/stupidium_block.png | Bin 0 -> 774 bytes .../textures/block/stupidium_ore.png | Bin 0 -> 986 bytes .../gameritems/textures/item/dipstick.png | Bin 0 -> 272 bytes .../textures/item/raw_stupidium.png | Bin 0 -> 764 bytes .../textures/item/stupidium_axe.png | Bin 0 -> 436 bytes .../textures/item/stupidium_boots.png | Bin 0 -> 398 bytes .../textures/item/stupidium_chestplate.png | Bin 0 -> 457 bytes .../textures/item/stupidium_helmet.png | Bin 0 -> 348 bytes .../textures/item/stupidium_hoe.png | Bin 0 -> 429 bytes .../textures/item/stupidium_ingot.png | Bin 0 -> 387 bytes .../textures/item/stupidium_leggings.png | Bin 0 -> 316 bytes .../textures/item/stupidium_pickaxe.png | Bin 0 -> 461 bytes .../textures/item/stupidium_shovel.png | Bin 0 -> 395 bytes .../textures/item/stupidium_sword.png | Bin 0 -> 493 bytes .../models/armor/stupidium_layer_1.png | Bin 0 -> 1984 bytes .../models/armor/stupidium_layer_2.png | Bin 0 -> 1023 bytes .../data/fabric/tags/items/axes.json | 4 +- .../data/fabric/tags/items/hoes.json | 4 +- .../data/fabric/tags/items/pickaxes.json | 4 +- .../data/fabric/tags/items/shovels.json | 4 +- .../data/fabric/tags/items/swords.json | 4 +- .../blocks/deepslate_stupidium_ore.json | 49 ++++++++++++ .../loot_tables/blocks/stupidium_block.json | 19 +++++ .../loot_tables/blocks/stupidium_ore.json | 49 ++++++++++++ .../loot_tables/blocks/weem_haybale.json | 2 +- .../gameritems/recipes/stupidium_axe.json | 20 +++++ .../gameritems/recipes/stupidium_block.json | 17 ++++ .../gameritems/recipes/stupidium_boots.json | 19 +++++ .../recipes/stupidium_chestplate.json | 20 +++++ .../gameritems/recipes/stupidium_helmet.json | 19 +++++ .../gameritems/recipes/stupidium_hoe.json | 20 +++++ .../gameritems/recipes/stupidium_ingot.json | 12 +++ .../recipes/stupidium_ingot_blast.json | 9 +++ .../recipes/stupidium_ingot_furnace.json | 9 +++ .../recipes/stupidium_leggings.json | 20 +++++ .../gameritems/recipes/stupidium_pickaxe.json | 20 +++++ .../gameritems/recipes/stupidium_shovel.json | 20 +++++ .../gameritems/recipes/stupidium_sword.json | 20 +++++ .../data/gameritems/recipes/weem.json | 22 +++--- .../data/gameritems/recipes/weem_haybale.json | 2 +- .../data/gameritems/tags/blocks/ores.json | 8 +- .../tags/blocks/mineable/pickaxe.json | 5 +- .../tags/blocks/needs_diamond_tool.json | 5 +- .../tags/blocks/needs_netherite_tool.json | 5 +- 87 files changed, 683 insertions(+), 61 deletions(-) create mode 100644 src/main/java/net/arcmods/ryantlg/blocks/metalBlocks/stupidiumBlocks.java create mode 100644 src/main/java/net/arcmods/ryantlg/itemClasses/dipstickItem.java create mode 100644 src/main/java/net/arcmods/ryantlg/items/armour/stupidiumArmour.java create mode 100644 src/main/resources/assets/gameritems/blockstates/deepslate_stupidium_ore.json create mode 100644 src/main/resources/assets/gameritems/blockstates/stupidium_block.json create mode 100644 src/main/resources/assets/gameritems/blockstates/stupidium_ore.json rename src/main/resources/assets/gameritems/blockstates/{weem_hay_block.json => weem_haybale.json} (50%) create mode 100755 src/main/resources/assets/gameritems/models/block/deepslate_stupidium_ore.json create mode 100755 src/main/resources/assets/gameritems/models/block/stupidium_block.json create mode 100755 src/main/resources/assets/gameritems/models/block/stupidium_ore.json rename src/main/resources/assets/gameritems/models/block/{weem_hay_block.json => weem_haybale.json} (100%) rename src/main/resources/assets/gameritems/models/block/{weem_hay_block_horizontal.json => weem_haybale_horizontal.json} (100%) create mode 100644 src/main/resources/assets/gameritems/models/item/deepslate_stupidium_ore.json create mode 100755 src/main/resources/assets/gameritems/models/item/dipstick.json create mode 100755 src/main/resources/assets/gameritems/models/item/raw_stupidium.json create mode 100755 src/main/resources/assets/gameritems/models/item/stupidium_axe.json create mode 100644 src/main/resources/assets/gameritems/models/item/stupidium_block.json create mode 100755 src/main/resources/assets/gameritems/models/item/stupidium_boots.json create mode 100755 src/main/resources/assets/gameritems/models/item/stupidium_chestplate.json create mode 100755 src/main/resources/assets/gameritems/models/item/stupidium_helmet.json create mode 100755 src/main/resources/assets/gameritems/models/item/stupidium_hoe.json create mode 100755 src/main/resources/assets/gameritems/models/item/stupidium_ingot.json create mode 100755 src/main/resources/assets/gameritems/models/item/stupidium_leggings.json create mode 100644 src/main/resources/assets/gameritems/models/item/stupidium_ore.json create mode 100755 src/main/resources/assets/gameritems/models/item/stupidium_pickaxe.json create mode 100755 src/main/resources/assets/gameritems/models/item/stupidium_shovel.json create mode 100755 src/main/resources/assets/gameritems/models/item/stupidium_sword.json delete mode 100644 src/main/resources/assets/gameritems/models/item/weem_hay_block.json create mode 100644 src/main/resources/assets/gameritems/models/item/weem_haybale.json create mode 100644 src/main/resources/assets/gameritems/textures/block/deepslate_stupidium_ore.png create mode 100644 src/main/resources/assets/gameritems/textures/block/stupidium_block.png create mode 100644 src/main/resources/assets/gameritems/textures/block/stupidium_ore.png create mode 100644 src/main/resources/assets/gameritems/textures/item/dipstick.png create mode 100644 src/main/resources/assets/gameritems/textures/item/raw_stupidium.png create mode 100644 src/main/resources/assets/gameritems/textures/item/stupidium_axe.png create mode 100644 src/main/resources/assets/gameritems/textures/item/stupidium_boots.png create mode 100644 src/main/resources/assets/gameritems/textures/item/stupidium_chestplate.png create mode 100644 src/main/resources/assets/gameritems/textures/item/stupidium_helmet.png create mode 100644 src/main/resources/assets/gameritems/textures/item/stupidium_hoe.png create mode 100644 src/main/resources/assets/gameritems/textures/item/stupidium_ingot.png create mode 100644 src/main/resources/assets/gameritems/textures/item/stupidium_leggings.png create mode 100644 src/main/resources/assets/gameritems/textures/item/stupidium_pickaxe.png create mode 100644 src/main/resources/assets/gameritems/textures/item/stupidium_shovel.png create mode 100644 src/main/resources/assets/gameritems/textures/item/stupidium_sword.png create mode 100644 src/main/resources/assets/minecraft/textures/models/armor/stupidium_layer_1.png create mode 100644 src/main/resources/assets/minecraft/textures/models/armor/stupidium_layer_2.png create mode 100755 src/main/resources/data/gameritems/loot_tables/blocks/deepslate_stupidium_ore.json create mode 100755 src/main/resources/data/gameritems/loot_tables/blocks/stupidium_block.json create mode 100755 src/main/resources/data/gameritems/loot_tables/blocks/stupidium_ore.json create mode 100755 src/main/resources/data/gameritems/recipes/stupidium_axe.json create mode 100755 src/main/resources/data/gameritems/recipes/stupidium_block.json create mode 100755 src/main/resources/data/gameritems/recipes/stupidium_boots.json create mode 100755 src/main/resources/data/gameritems/recipes/stupidium_chestplate.json create mode 100755 src/main/resources/data/gameritems/recipes/stupidium_helmet.json create mode 100755 src/main/resources/data/gameritems/recipes/stupidium_hoe.json create mode 100755 src/main/resources/data/gameritems/recipes/stupidium_ingot.json create mode 100644 src/main/resources/data/gameritems/recipes/stupidium_ingot_blast.json create mode 100644 src/main/resources/data/gameritems/recipes/stupidium_ingot_furnace.json create mode 100755 src/main/resources/data/gameritems/recipes/stupidium_leggings.json create mode 100755 src/main/resources/data/gameritems/recipes/stupidium_pickaxe.json create mode 100755 src/main/resources/data/gameritems/recipes/stupidium_shovel.json create mode 100755 src/main/resources/data/gameritems/recipes/stupidium_sword.json mode change 100644 => 100755 src/main/resources/data/gameritems/recipes/weem.json diff --git a/CHANGELOG b/CHANGELOG index c5bd2c3..c23ca8e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,4 +7,9 @@ - added not armour - added stupid/dumb damage source - added stupid status effect -- added stupid tools \ No newline at end of file +- added stupid tools + +## 1.19-1.0.2-unstable +- added stupidium armour +- added textures for stupidium stuff +- fixed weem haybale \ No newline at end of file diff --git a/build.gradle b/build.gradle index 050a121..66eb9d2 100755 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.11-SNAPSHOT' + id 'fabric-loom' version '0.12-SNAPSHOT' id 'maven-publish' } @@ -72,7 +72,7 @@ publishing { repositories { maven { name = "GitHubPackages" - url = "https://maven.pkg.github.com/RyanTLG/gameritems" + url = "https://maven.pkg.github.com/BigGaemer/gameritems" credentials { username = System.getenv("UNAME") password = System.getenv("TOKEN") diff --git a/gradle.properties b/gradle.properties index cf91990..2668e0a 100755 --- a/gradle.properties +++ b/gradle.properties @@ -5,12 +5,12 @@ org.gradle.jvmargs=-Xmx6G # check these on https://fabricmc.net/develop minecraft_version=1.19 yarn_mappings=1.19+build.4 - loader_version=0.14.8 + loader_version=0.14.10 # Mod Properties - mod_version = 1.19-1.0.1-unstable + mod_version = 1.19-1.0.2-unstable maven_group = ryantlg.GamerItems.mod archives_base_name = GamerItems # Dependencies - fabric_version=0.57.0+1.19 + fabric_version=0.58.0+1.19 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fc..ae04661 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/net/arcmods/ryantlg/armourMaterials/stupidiumArmorMaterial.java b/src/main/java/net/arcmods/ryantlg/armourMaterials/stupidiumArmorMaterial.java index 7c56d98..5d66efb 100644 --- a/src/main/java/net/arcmods/ryantlg/armourMaterials/stupidiumArmorMaterial.java +++ b/src/main/java/net/arcmods/ryantlg/armourMaterials/stupidiumArmorMaterial.java @@ -44,7 +44,7 @@ public class stupidiumArmorMaterial implements ArmorMaterial { @Override public String getName() { // Must be all lowercase - return "orium"; + return "stupidium"; } @Override diff --git a/src/main/java/net/arcmods/ryantlg/blocks/cropBlocks/weemCrop.java b/src/main/java/net/arcmods/ryantlg/blocks/cropBlocks/weemCrop.java index 8c5f951..44078e3 100755 --- a/src/main/java/net/arcmods/ryantlg/blocks/cropBlocks/weemCrop.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/cropBlocks/weemCrop.java @@ -17,14 +17,14 @@ import net.minecraft.util.registry.Registry; public class weemCrop { public static final CropBlock WEEM_CROP_BLOCK = new WeemCropBlock(AbstractBlock.Settings.of(Material.PLANT).nonOpaque().noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)); - public static final Block WEEM_HAY_BLOCK = new PillarBlock(FabricBlockSettings.of(Material.SOLID_ORGANIC).nonOpaque().strength(1, 1).sounds(BlockSoundGroup.GRASS)); + public static final Block WEEM_HAYBALE = new PillarBlock(FabricBlockSettings.of(Material.SOLID_ORGANIC).nonOpaque().strength(1, 1).sounds(BlockSoundGroup.GRASS)); public static void register() { Registry.register(Registry.BLOCK, new Identifier("gameritems","weem_crop_block"), WEEM_CROP_BLOCK); - Registry.register(Registry.BLOCK, new Identifier("gameritems", "weem_hay_block"), WEEM_HAY_BLOCK); - Registry.register(Registry.ITEM, new Identifier("gameritems", "weem_hay_block"), new BlockItem(WEEM_HAY_BLOCK, new FabricItemSettings().group(gameritems.CHING))); - FlammableBlockRegistry.getDefaultInstance().add(WEEM_HAY_BLOCK, 60, 20); + Registry.register(Registry.BLOCK, new Identifier("gameritems", "weem_haybale"), WEEM_HAYBALE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "weem_haybale"), new BlockItem(WEEM_HAYBALE, new FabricItemSettings().group(gameritems.CHING))); + FlammableBlockRegistry.getDefaultInstance().add(WEEM_HAYBALE, 60, 20); gameritems.LOGGER.info("CropBlocks loaded"); } diff --git a/src/main/java/net/arcmods/ryantlg/blocks/metalBlocks/stupidiumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/metalBlocks/stupidiumBlocks.java new file mode 100644 index 0000000..0b8ca3d --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/blocks/metalBlocks/stupidiumBlocks.java @@ -0,0 +1,32 @@ +package net.arcmods.ryantlg.blocks.metalBlocks; + +import net.arcmods.ryantlg.gameritems; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.Material; +import net.minecraft.item.BlockItem; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class stupidiumBlocks { + + public static final Block STUPIDIUM_BLOCK = new Block(FabricBlockSettings.of(Material.METAL).strength(6.9f, 8.3f).requiresTool()); + public static final Block STUPIDIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(6.5f, 6.0f).requiresTool()); + public static final Block DEEPSLATE_STUPIDIUM_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(7.2f, 7.2f).requiresTool().sounds(BlockSoundGroup.DEEPSLATE)); + + public static void register() { + Registry.register(Registry.BLOCK, new Identifier("gameritems", "stupidium_ore"), STUPIDIUM_ORE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_ore"), new BlockItem(STUPIDIUM_ORE, new FabricItemSettings().group(gameritems.CHING).fireproof().maxCount(56))); + + Registry.register(Registry.BLOCK, new Identifier("gameritems", "deepslate_stupidium_ore"), DEEPSLATE_STUPIDIUM_ORE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "deepslate_stupidium_ore"), new BlockItem(DEEPSLATE_STUPIDIUM_ORE, new FabricItemSettings().group(gameritems.CHING).fireproof().maxCount(56))); + + Registry.register(Registry.BLOCK, new Identifier("gameritems", "stupidium_block"), STUPIDIUM_BLOCK); + Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_block"), new BlockItem(STUPIDIUM_BLOCK, new FabricItemSettings().group(gameritems.CHING).fireproof().maxCount(56))); + + gameritems.LOGGER.info("stupidiumBlocks loaded"); + } + +} diff --git a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/jeremium/JeremiumSwordItem.java b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/jeremium/JeremiumSwordItem.java index 03b3ff9..c8bb870 100755 --- a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/jeremium/JeremiumSwordItem.java +++ b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/jeremium/JeremiumSwordItem.java @@ -20,7 +20,7 @@ public class JeremiumSwordItem extends SwordItem { } @Override public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { - tooltip.add(Text.translatable("item.gameritems.jeremium_sword.tooltip").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC) ); + tooltip.add(Text.translatable("item.gameritems.jeremium_sword.tooltip").formatted(Formatting.RED)); } @Override diff --git a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/stupidium/StupidiumSwordItem.java b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/stupidium/StupidiumSwordItem.java index fb62adc..737e9cf 100755 --- a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/stupidium/StupidiumSwordItem.java +++ b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/stupidium/StupidiumSwordItem.java @@ -19,7 +19,7 @@ public class StupidiumSwordItem extends SwordItem { } @Override public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { - tooltip.add(Text.translatable("item.gameritems.stupidium_tools.tooltip").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC) ); + tooltip.add(Text.translatable("item.gameritems.stupidium_sword.tooltip").formatted(Formatting.RED)); } @Override diff --git a/src/main/java/net/arcmods/ryantlg/gameritems.java b/src/main/java/net/arcmods/ryantlg/gameritems.java index eae1046..aec6f4c 100755 --- a/src/main/java/net/arcmods/ryantlg/gameritems.java +++ b/src/main/java/net/arcmods/ryantlg/gameritems.java @@ -4,18 +4,21 @@ import net.arcmods.ryantlg.blocks.cropBlocks.weemCrop; import net.arcmods.ryantlg.blocks.metalBlocks.jeremiumBlocks; import net.arcmods.ryantlg.blocks.metalBlocks.omniumBlocks; import net.arcmods.ryantlg.blocks.metalBlocks.oriumBlocks; +import net.arcmods.ryantlg.blocks.metalBlocks.stupidiumBlocks; import net.arcmods.ryantlg.blocks.otherBlocks.FunnyBlocks; import net.arcmods.ryantlg.enchantments.evadeEnchantment; import net.arcmods.ryantlg.items.armour.jeremiumArmour; import net.arcmods.ryantlg.items.armour.notArmour; import net.arcmods.ryantlg.items.armour.omniumArmour; import net.arcmods.ryantlg.items.armour.oriumArmour; +import net.arcmods.ryantlg.items.armour.stupidiumArmour; import net.arcmods.ryantlg.items.bows.gamerBow; // import net.arcmods.ryantlg.items.bows.stupidBow; import net.arcmods.ryantlg.items.itemsByCrop.weemItems; import net.arcmods.ryantlg.items.metalItems.jeremiumMetals; import net.arcmods.ryantlg.items.metalItems.omniumMetals; import net.arcmods.ryantlg.items.metalItems.oriumMetals; +import net.arcmods.ryantlg.items.metalItems.stupidiumMetals; import net.arcmods.ryantlg.items.miscItems.FunnyItems; import net.arcmods.ryantlg.items.miscItems.OtherItems; import net.arcmods.ryantlg.items.miscItems.fabricOfReality; @@ -23,6 +26,7 @@ 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.items.tools.stupidiumTools; import net.arcmods.ryantlg.lootTables.grassVanillaWeem; import net.arcmods.ryantlg.statusEffects.GamerEffects; import net.arcmods.ryantlg.worldGeneration.DeepslateOmniumOreGen; @@ -100,6 +104,11 @@ public class gameritems implements ModInitializer { jeremiumTools.register(); JeremiumOreGen.register(); + stupidiumMetals.register(); + stupidiumBlocks.register(); + stupidiumArmour.register(); + stupidiumTools.register(); + notArmour.register(); notTools.register(); gamerBow.register(); diff --git a/src/main/java/net/arcmods/ryantlg/itemClasses/dipstickItem.java b/src/main/java/net/arcmods/ryantlg/itemClasses/dipstickItem.java new file mode 100644 index 0000000..c8a406c --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/itemClasses/dipstickItem.java @@ -0,0 +1,24 @@ +package net.arcmods.ryantlg.itemClasses; + +import java.util.List; + +import net.minecraft.client.item.TooltipContext; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.world.World; + +public class dipstickItem extends Item{ + + public dipstickItem(Settings settings) { + super(settings); + } + @Override + public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { + + tooltip.add(Text.translatable("item.gameritems.dipstick.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); + + } + +} diff --git a/src/main/java/net/arcmods/ryantlg/items/armour/stupidiumArmour.java b/src/main/java/net/arcmods/ryantlg/items/armour/stupidiumArmour.java new file mode 100644 index 0000000..6ff3125 --- /dev/null +++ b/src/main/java/net/arcmods/ryantlg/items/armour/stupidiumArmour.java @@ -0,0 +1,29 @@ +package net.arcmods.ryantlg.items.armour; + +import net.arcmods.ryantlg.armourMaterials.stupidiumArmorMaterial; +import net.minecraft.util.registry.Registry; +import net.arcmods.ryantlg.gameritems; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.item.ArmorItem; +import net.minecraft.item.ArmorMaterial; +import net.minecraft.item.Item; +import net.minecraft.util.Identifier; +import net.minecraft.util.Rarity; + +public class stupidiumArmour { + public static final ArmorMaterial STUPIDIUM_ARMOR_MATERIAL = new stupidiumArmorMaterial(); + public static final Item STUPIDIUM_HELMET = new ArmorItem(STUPIDIUM_ARMOR_MATERIAL, EquipmentSlot.HEAD, new Item.Settings().group(gameritems.THING).rarity(Rarity.RARE)); + public static final Item STUPIDIUM_CHESTPLATE = new ArmorItem(STUPIDIUM_ARMOR_MATERIAL, EquipmentSlot.CHEST, new Item.Settings().group(gameritems.THING).rarity(Rarity.RARE)); + public static final Item STUPIDIUM_LEGGINGS = new ArmorItem(STUPIDIUM_ARMOR_MATERIAL, EquipmentSlot.LEGS, new Item.Settings().group(gameritems.THING).rarity(Rarity.RARE)); + public static final Item STUPIDIUM_BOOTS = new ArmorItem(STUPIDIUM_ARMOR_MATERIAL, EquipmentSlot.FEET, new Item.Settings().group(gameritems.THING).rarity(Rarity.RARE)); + + public static void register() { + + Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_helmet"), STUPIDIUM_HELMET); + Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_chestplate"), STUPIDIUM_CHESTPLATE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_leggings"), STUPIDIUM_LEGGINGS); + Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_boots"), STUPIDIUM_BOOTS); + + gameritems.LOGGER.info("stupidiumArmour loaded"); + } +} diff --git a/src/main/java/net/arcmods/ryantlg/items/miscItems/OtherItems.java b/src/main/java/net/arcmods/ryantlg/items/miscItems/OtherItems.java index 1397bfb..2179b0b 100755 --- a/src/main/java/net/arcmods/ryantlg/items/miscItems/OtherItems.java +++ b/src/main/java/net/arcmods/ryantlg/items/miscItems/OtherItems.java @@ -1,6 +1,7 @@ package net.arcmods.ryantlg.items.miscItems; import net.arcmods.ryantlg.gameritems; +import net.arcmods.ryantlg.itemClasses.dipstickItem; import net.minecraft.item.Item; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; @@ -9,10 +10,12 @@ import net.minecraft.util.registry.Registry; public class OtherItems { public static final Item NETHERITE_STICK = new Item(new Item.Settings().group(gameritems.CHING).maxCount(64).fireproof().rarity(Rarity.EPIC)); + public static final Item DIPSTICK = new dipstickItem(new Item.Settings().group(gameritems.CHING)); public static void register() { Registry.register(Registry.ITEM, new Identifier("gameritems", "netherite_stick"), NETHERITE_STICK); + Registry.register(Registry.ITEM, new Identifier("gameritems", "dipstick"), DIPSTICK); gameritems.LOGGER.info("OtherItems loaded"); } diff --git a/src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/stupidStatusEffect.java b/src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/stupidStatusEffect.java index b4d06c6..dc9f078 100644 --- a/src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/stupidStatusEffect.java +++ b/src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/stupidStatusEffect.java @@ -9,7 +9,7 @@ public class stupidStatusEffect extends StatusEffect { public stupidStatusEffect() { super( StatusEffectCategory.HARMFUL, - 0x3be012 + 0x6b3f7f ); } diff --git a/src/main/java/net/arcmods/ryantlg/todo.txt b/src/main/java/net/arcmods/ryantlg/todo.txt index 54d35e2..bddbc4d 100755 --- a/src/main/java/net/arcmods/ryantlg/todo.txt +++ b/src/main/java/net/arcmods/ryantlg/todo.txt @@ -6,5 +6,3 @@ argentine geranine soulium floute - -port to 1.18.1 when busyn't \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/deepslate_stupidium_ore.json b/src/main/resources/assets/gameritems/blockstates/deepslate_stupidium_ore.json new file mode 100644 index 0000000..eb9c4b4 --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/deepslate_stupidium_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/deepslate_stupidium_ore" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/stupidium_block.json b/src/main/resources/assets/gameritems/blockstates/stupidium_block.json new file mode 100644 index 0000000..1de79d1 --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/stupidium_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/stupidium_block" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/stupidium_ore.json b/src/main/resources/assets/gameritems/blockstates/stupidium_ore.json new file mode 100644 index 0000000..ced048d --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/stupidium_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/stupidium_ore" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/weem_hay_block.json b/src/main/resources/assets/gameritems/blockstates/weem_haybale.json similarity index 50% rename from src/main/resources/assets/gameritems/blockstates/weem_hay_block.json rename to src/main/resources/assets/gameritems/blockstates/weem_haybale.json index 0cae05c..01e55ce 100644 --- a/src/main/resources/assets/gameritems/blockstates/weem_hay_block.json +++ b/src/main/resources/assets/gameritems/blockstates/weem_haybale.json @@ -1,14 +1,14 @@ { "variants": { "axis=y": { - "model": "gameritems:block/weem_hay_block" + "model": "gameritems:block/weem_haybale" }, "axis=z": { - "model": "gameritems:block/weem_hay_block", + "model": "gameritems:block/weem_haybale", "x": 90 }, "axis=x": { - "model": "gameritems:block/weem_hay_block", + "model": "gameritems:block/weem_haybale", "x": 90, "y": 90 } diff --git a/src/main/resources/assets/gameritems/lang/en_us.json b/src/main/resources/assets/gameritems/lang/en_us.json index 7ed7ff0..37834cc 100755 --- a/src/main/resources/assets/gameritems/lang/en_us.json +++ b/src/main/resources/assets/gameritems/lang/en_us.json @@ -1,18 +1,21 @@ { + // bullshit items "item.gameritems.chin": "your chin", - "itemGroup.gameritems.chins": "funny stuff", "item.gameritems.nuts": "nuts", "item.gameritems.deez": "deez", "item.gameritems.deez_nuts": "deez nuts", "item.gameritems.deez_nuts_on_your_chin": "deez nuts on your chin", "item.gameritems.drag": "drag", "item.gameritems.drag_deez_nuts_on_your_chin": "drag deez nuts on our chin", + "item.gameritems.your_mother": "your mother", + "block.gameritems.matt_damon": "matt damon", + + + // omnium "item.gameritems.omnium_ingot": "Omnium Ingot", "block.gameritems.omnium_ore": "Omnium Ore", "block.gameritems.omnium_block": "Omnium Block", "item.gameritems.raw_omnium": "Raw Omnium", - "item.gameritems.your_mother": "your mother", - "block.gameritems.matt_damon": "matt damon", "item.gameritems.omnium_sword": "Omnium Sword", "item.gameritems.omnium_pickaxe": "Omnium Pickaxe", "item.gameritems.omnium_helmet": "Omnium Helmet", @@ -22,16 +25,29 @@ "item.gameritems.omnium_shovel": "Omnium Shovel", "item.gameritems.omnium_axe": "Omnium Axe", "item.gameritems.omnium_hoe": "Omnium Hoe", + "block.gameritems.deepslate_omnium_ore": "Deepslate Omnium Ore", "item.gameritems.netherite_stick": "Netherite Stick", + "item.gameritems.omnium_sword.tooltip": "Surprisingly lightweight!", + + + // item groups "itemGroup.gameritems.things": "ueh, stuff", "itemGroup.gameritems.armour_and_tools": "Armour, Weapons, and Tools", - "item.gameritems.omnium_sword.tooltip": "Surprisingly lightweight!", + "itemGroup.gameritems.chins": "funny stuff", + + + // weem items "item.gameritems.weem": "Weem", "item.gameritems.weem_seeds": "Weem Seeds", + "item.gameritems.weem_apple": "Weem Apple", + "block.gameritems.weem_haybale": "Weem Hay Bale", "item.gameritems.breem": "Breem", "item.gameritems.breem.tooltip": "High as a kite!", "item.gameritems.weem.tooltip": "Higher than a kite!", - "item.gameritems.weem_apple": "Weem Apple", + + + // orium items + "block.gameritems.deepslate_orium_ore": "Deepslate Orium Ore", "item.gameritems.orium.tooltip": "hahaha ore-ium", "block.gameritems.orium.tooltip": "hahaha ore-ium", "item.gameritems.raw_orium": "Raw Orium", @@ -47,9 +63,19 @@ "item.gameritems.orium_hoe": "Orium Hoe", "item.gameritems.orium_sword": "Orium Sword", "item.gameritems.orium_pickaxe": "Orium Pickaxe", + + + // effects + "effect.gameritems.stupid": "Stupid", + "effect.gameritems.high": "High", + + + // fabric of reality "item.gameritems.fabric_of_reality.tooltip": "Warning: has a chance to get §o§l§4RIPPED§r.", "item.gameritems.fabric_of_reality": "Fabric of Reality", - "effect.gameritems.high": "High", + + + // jeremium items "item.gameritems.jeremium_ingot": "Jeremium Ingot", "item.gameritems.raw_jeremium": "Raw Jeremium", "block.gameritems.jeremium_ore": "Jeremium Ore", @@ -67,13 +93,32 @@ "item.gameritems.jeremium_pickaxe": "Jeremium Pickaxe", "item.gameritems.jeremium_sword.tooltip": "Kinda heavy", "block.gameritems.deepslate_jeremium_ore": "Deepslate Jeremium Ore", - "block.gameritems.deepslate_omnium_ore": "Deepslate Omnium Ore", - "block.gameritems.deepslate_orium_ore": "Deepslate Orium Ore", - "item.gameritems.gamer_bow": "Gamer Bow", - "enchantment.gameritems.evade": "Evade", - "block.gameritems.weem_hay_block": "Weem Hay Bale", - "item.gameritems.stupidium.tooltip": "No brain here.", - "death.attack.dumb": "%1$s choked on air.", - "effect.gameritems.stupid": "Stupid" + + // ETC + "item.gameritems.gamer_bow": "Gamer Bow", + + + // enchantments + "enchantment.gameritems.evade": "Evade", + + + // death messages + "death.attack.dumb": "%1$s choked on air.", + + + // stupidium items + "item.gameritems.stupidium.tooltip": "No brain here.", + "item.gameritems.dipstick": "Dipstick", + "block.gameritems.stupidium_ore": "Stupidium Ore", + "block.gameritems.deepslate_stupidium_ore": "Deepslate Stupidium Ore", + "block.gameritems.stupidium_block": "Stupidium Block", + "item.gameritems.stupidium_shovel": "Stupidium Shovel", + "item.gameritems.stupidium_sword": "Stupidium Sword", + "item.gameritems.stupidium_axe": "Stupidium Axe", + "item.gameritems.stupidium_hoe": "Stupidium Hoe", + "item.gameritems.stupidium_pickaxe": "Stupidium Pickaxe", + "item.gameritems.stupidium_sword.tooltip": "Inflicts Stupid on the victim.", + "item.gameritems.stupidium_ingot": "Stupidium Ingot", + "item.gameritems.raw_stupidium": "Raw Stupidium" } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/block/deepslate_stupidium_ore.json b/src/main/resources/assets/gameritems/models/block/deepslate_stupidium_ore.json new file mode 100755 index 0000000..837555a --- /dev/null +++ b/src/main/resources/assets/gameritems/models/block/deepslate_stupidium_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "gameritems:block/deepslate_stupidium_ore" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/block/stupidium_block.json b/src/main/resources/assets/gameritems/models/block/stupidium_block.json new file mode 100755 index 0000000..990d3b8 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/block/stupidium_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "gameritems:block/stupidium_block" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/block/stupidium_ore.json b/src/main/resources/assets/gameritems/models/block/stupidium_ore.json new file mode 100755 index 0000000..cd353c3 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/block/stupidium_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "gameritems:block/stupidium_ore" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/block/weem_hay_block.json b/src/main/resources/assets/gameritems/models/block/weem_haybale.json similarity index 100% rename from src/main/resources/assets/gameritems/models/block/weem_hay_block.json rename to src/main/resources/assets/gameritems/models/block/weem_haybale.json diff --git a/src/main/resources/assets/gameritems/models/block/weem_hay_block_horizontal.json b/src/main/resources/assets/gameritems/models/block/weem_haybale_horizontal.json similarity index 100% rename from src/main/resources/assets/gameritems/models/block/weem_hay_block_horizontal.json rename to src/main/resources/assets/gameritems/models/block/weem_haybale_horizontal.json diff --git a/src/main/resources/assets/gameritems/models/item/deepslate_stupidium_ore.json b/src/main/resources/assets/gameritems/models/item/deepslate_stupidium_ore.json new file mode 100644 index 0000000..73a2f66 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/deepslate_stupidium_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/deepslate_stupidium_ore" + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/dipstick.json b/src/main/resources/assets/gameritems/models/item/dipstick.json new file mode 100755 index 0000000..8e63d63 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/dipstick.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gameritems:item/dipstick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/raw_stupidium.json b/src/main/resources/assets/gameritems/models/item/raw_stupidium.json new file mode 100755 index 0000000..95d872b --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/raw_stupidium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gameritems:item/raw_stupidium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/stupidium_axe.json b/src/main/resources/assets/gameritems/models/item/stupidium_axe.json new file mode 100755 index 0000000..74e1198 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/stupidium_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gameritems:item/stupidium_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/stupidium_block.json b/src/main/resources/assets/gameritems/models/item/stupidium_block.json new file mode 100644 index 0000000..b592d39 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/stupidium_block.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/stupidium_block" + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/stupidium_boots.json b/src/main/resources/assets/gameritems/models/item/stupidium_boots.json new file mode 100755 index 0000000..2393d4f --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/stupidium_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gameritems:item/stupidium_boots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/stupidium_chestplate.json b/src/main/resources/assets/gameritems/models/item/stupidium_chestplate.json new file mode 100755 index 0000000..552be72 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/stupidium_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gameritems:item/stupidium_chestplate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/stupidium_helmet.json b/src/main/resources/assets/gameritems/models/item/stupidium_helmet.json new file mode 100755 index 0000000..466a267 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/stupidium_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gameritems:item/stupidium_helmet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/stupidium_hoe.json b/src/main/resources/assets/gameritems/models/item/stupidium_hoe.json new file mode 100755 index 0000000..f974509 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/stupidium_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gameritems:item/stupidium_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/stupidium_ingot.json b/src/main/resources/assets/gameritems/models/item/stupidium_ingot.json new file mode 100755 index 0000000..500ac4b --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/stupidium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gameritems:item/stupidium_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/stupidium_leggings.json b/src/main/resources/assets/gameritems/models/item/stupidium_leggings.json new file mode 100755 index 0000000..6100151 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/stupidium_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gameritems:item/stupidium_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/stupidium_ore.json b/src/main/resources/assets/gameritems/models/item/stupidium_ore.json new file mode 100644 index 0000000..1535c60 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/stupidium_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/stupidium_ore" + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/stupidium_pickaxe.json b/src/main/resources/assets/gameritems/models/item/stupidium_pickaxe.json new file mode 100755 index 0000000..d420e46 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/stupidium_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gameritems:item/stupidium_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/stupidium_shovel.json b/src/main/resources/assets/gameritems/models/item/stupidium_shovel.json new file mode 100755 index 0000000..7c48ca0 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/stupidium_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gameritems:item/stupidium_shovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/stupidium_sword.json b/src/main/resources/assets/gameritems/models/item/stupidium_sword.json new file mode 100755 index 0000000..098ec9a --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/stupidium_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gameritems:item/stupidium_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/weem_hay_block.json b/src/main/resources/assets/gameritems/models/item/weem_hay_block.json deleted file mode 100644 index e5f66da..0000000 --- a/src/main/resources/assets/gameritems/models/item/weem_hay_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "gameritems:block/weem_hay_block" -} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/weem_haybale.json b/src/main/resources/assets/gameritems/models/item/weem_haybale.json new file mode 100644 index 0000000..d5b4f4e --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/weem_haybale.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/weem_haybale" +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/textures/block/deepslate_stupidium_ore.png b/src/main/resources/assets/gameritems/textures/block/deepslate_stupidium_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..0f80cfbd6163dd363b5ed7120b8ed01a7c303b49 GIT binary patch literal 1117 zcmV-j1fu(iP)PfDhX^1ae;1NgT@6r{sVuae~g7OtXN5+3pdmtL=u#w)I?N> zNEzqc_B_tqdDXY+%$xV_J@@O}+iYWFBX6}@q1WpLtbV^ArlzLivpp2+%p zn4G+0@ALDsabF)Ghj*II$tZ)**npm_)9K`1IWFshAQi%I*nHNn z9!M$VWm<~EsXc;#7k77e&1#-&*XK-smW7b#BPfr~N}kD9R$k-~LU*Z>ltNm>Fwi1+ zqT4+P&0qJTQasdab$cIN4Z{4ZnXtY6*1SM{+4}l=&Y0sMEWzr&KCHwxpE--M^d3s~IAVH};m7pT)DAn_CrQcrS(^ zJDeyfuGebzKD&B9qF2{ZqFSyVg60N`4xDk~@fR+?p-)>Kb{rxX? zP7}3aYO$fE%8H>kv&F^d%ufTs9DpEZwF+hO;rDT4nC1Uly@_K3L8a=67y<~@kJVCeyS68DDUOzMQVF(sEgRlN0QLZena>b1!2ue; zP*KK&q+%*mw5aRW*|4tFTCZ3^P&pM-E|Q!wE+77gbRPjQTX});0!rlu1)_>sEw~R^ zMoMD{4rf?B5dbXLCX|ZT+S=;aeDl@vFGeLWBO);2!oq@~_C(_?U^C(QR2TJ`?twst zRz##?e{r0ttZ6M*x?C#;JdtYQm2LgolkhmW&x)sK>9AG;JDR`y6^hh=k z2G+zPO+y$!u?vzbv@CaaK9oSfqXvLbEjbD+uwcos{%etJ@D9R3`Qi8X^!EyT0tD8< z*4Ic#2o;q3h0s_TswDuS3AXp!-Y|{V*J#ijLCRTxr77@Ky zs?CXKSgyYPl4ocjKtvDla*7L-4T&7*l{-|KuOe1~&X261(nzLUK$mGRSL6UdB4Q%y zR5Y%N{5W43$vlUXwb)G1$uORA;k-`4-~k=yv{mCS7iWaX1AeB%L90_Ys-ex&edDHJ zDrE(+Rr^k9?bvu=G)hA$EKt(%17?Z+iu245t$%h&maWbQ9Lw<1EBVpB`O5GS{fOMM-JQ{iIBv~2xM>Ho~&Y-J=<5@M+_ zG3hpf(DI^UElr&%bly}iCMP04I{V>-K-eAe?uiV0{y!(rX=qC`p^jx5-xNQ@(i^pB jv%ziQR{UmzpJH5kYFP-PP(0Du^ z{C#Jj4E^@9x<1lHGVAa6&$RE)Wrdw7Kdfn4691LK&oWQX)f&p`em6(@O_!{_Uaw-n zwrxD+H|U%SS4NUiBJO-4w|Wnk(+R2&{Ny8|0Jzg$V)<0RRuD+zq)m%#x6*fCnamWIfGA$vKOJPfpx#NvIHbeApi6@JQh( z4^&qZfe-?5+4w+CF5FNCLlTU;kQfA26#&^3R0;%I1%g#UY=FVHtH2+Cq%*6EDC@g9 zz(hn<08;9)*18?eZb9hrB+-61{ItDGM4nzNZvh_e1+rM+DGzrlMqQW^QIz#Q#6A@w zh&+r;LUMM|P_dM@ag~G#0ND#c`_kxiyD)E`^jlgolJm~Sv^bvnsf5M7bAOxVec)$hF+~D%Q5!UNl@UyY#vcgjEnFB$E5=^&6&<+uKXVnf81%N}w*UYD07*qoM6N<$ Ef+4P)#?xc37D1wkDU-37#57~(2m zvQd+m)5&R0*R2lr=H_;~>v>L9-D)@-uES<^IvqUXn$2eM9Zy}0#Uj17TCITh`Fx)C z+U<70K9-*C^?FGzby0Q&19+I1DG~cr#69l}{-Yr$>*nC<`w<@i2f0zJGa|ls|lSJKjU2m{wveMS$U>Vp^`& zQ^<5WO@?UBy);@N{Ke2!o+j?NBs7gGX)PS?uAowVYX}~k3pu}$+Dk;@; zEmx~u3L6{5Z+|QDEk*nNegtKf0$Q)Y0pQeAC?!6k2Rp2+cS^U4SAobMkH;w}kc0a$ z?B|R0mj_)l=Km4)4_kDnKFp+nevp&=h%f6WRKqm{z4`w>A%^mE`)+I)ERB^d#w+8y_eavB}& z0ZP+|0UgP_is&^b+Xa;k`;1cWDI=9)Z*b5HYMf`Ndgird{LdPYRYHQ00zAIjI^Yc& zmb(ATqT*0Wi?u0fC!@jYEtFyc)^QFX*7nS(V!q6#Vms&2OFOEOQZ&q?E|ro&Y}MK+ zv#A&bgbN;^=;-Wjn~6q;c~$x(Xw4Z4-lC;HH z+oCO~-HC{XU~0kF%=O3HTzSgvHy_TFzA?Qv9_s+VjF?k;Oob(S+K<=L$Ey4J^$Dc7*ekb5Eo44^X~gVorA*%>V!Z07*qo IM6N<$g2z+Q-~a#s literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gameritems/textures/item/dipstick.png b/src/main/resources/assets/gameritems/textures/item/dipstick.png new file mode 100644 index 0000000000000000000000000000000000000000..584abd43b44e9ad62a1da8dd61f69d61fc28eaef GIT binary patch literal 272 zcmV+r0q_2aP)RfU1{h!52bav9AL#$Xe1*MW|F3EkD!9GBL|6U1P3d;NxnSJ`7 zfK9c&+i7o)yN{1nnSjL?^C_82N9X2B`_tj=!UKl5X*)9QO)tQQ+g}2k00)N!aB)aL z2reEFii-xs;9>!>xJW<>o*a;hCk060(E(C;RDdKN93YJc1t4&C019UXAaQR18vhxf zfqxCq!bbx%aVJ0<9}Sq5ljr8@Zm*~tl(UqsmUVxD81C*U+@ax^MwVWHDJ>UU= WzxzJdhL3_Gu~3J z$)J<;h{<@ohbIz%>u=x3FPGc+Lf5tuud2$Zgq736qQ|&absZCGC_G0znsNcK+pHrk zgApQ^i~%vfS9?V@`$RuyEP`ki3atPpG9Ux#stBhO>Pov=2~lINm~l7{U|9g0055x$ zVq8NYF%xPC4I(Pc>gXjY3ZMnL`bawi3jiY6!Mq~6$fkq681Fztp51u#Grqz&fuvjAR& z!#IYoyWQ)d#Y@G}%lOyRUS`A=SO5#54d+#k~dD+dV3t@o8&@@PUY=tsvi1l|Pz*ZqG1$Sr4Y^Fr^Fec+?j9-GhB(HGYB u)<-A(GfRV64|xWb&Fhra|4Xd11N;Gd>2}R3z@w`G0000&9zi@M9s!TQLac;^aAU;|ma+z?A+V0w(xi6>t%lR9Ctvw=Z|bR(s7r7o6H4asdUufufY~_Wl9)uMe%P zC;|wlgD0QYP*inTfrE`Bm1P;!b^YrNWsJd3xLyj=zl-P7ur0uIQKGpY*feh<5j;r~ z5JJG^(^vxyZ~J6VbVHtzQkvH!6e}|15E*fY_g!TD-z|65F^jby} zXu@gWutl7IS0GvoOmM0Y&55c180Xyr8{Bq*(Q_|>P;jpbgoO7N2o3Kg5CiTk5DV@k z5EE_{hz;))7y@n-7z*AhFeKb4kSxyWTdnI$#&y-&;#ybn_Ue|t(oNrSwnO_o_qq%E e0Bo_N3w!}*VOTILtjFvC0000y^wEa034QOIokGpKXEio<4%{uY%jOv_HElb2^e-F zfbWo^1H=NrAwu@63J^e+WiHF}(SCRY@48L}u-cmds;U};Bk(W`Qz;|`V(d)-s6R5I z;3TV70;|0lz&`;oJ)i+6fTY0xRsch&D2mwu$e+W=dJ6dHh9hYjE=I97f&pOxfDHlj zEb6*m+#%|P5_+y#0HkMLXzv6dWgat#P_|I!+=mYl1%S=JxR9>bg_Iv}U$@u&-n~4^ zq(P_vQU*LQvhm*nlp!GSErC#D@`jug;2DrZWQ&E2wZMLvI0*hh74DNOIBP=M=sT1$ smYU61MDw@$CR_{h*Z&D1DX_T$cO$r&FmbWs3;+NC07*qoM6N<$f=QgKNB{r; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gameritems/textures/item/stupidium_chestplate.png b/src/main/resources/assets/gameritems/textures/item/stupidium_chestplate.png new file mode 100644 index 0000000000000000000000000000000000000000..8b29f158de1c452c6f7fdd3c2856da6d5bdb31e7 GIT binary patch literal 457 zcmV;)0XF`LP)_UZnH@rN=8hK-r5dy^1J`VtFnj)0i1!T=0(peId$n-09ceop+Fe(qmt%--|fWIRbx6pMb-G$sVVjiCg-*na>d%oFhH$8j`W*NG5_ z&$7%UN#gBo6oAD+761g3u(ftc0?}!D+`?V}DGzsY1wcVuIK&05dN-#E05Jqm)vlM= z8-`)N3cfV!-JF{M+He8@79jYN?%kIw8o<3%N-nu26%qyD6W=RLKwbcBzP)@*X`0S& zfNLpPk8?4?Xlgut-<#X-_tN~UK?Deh00a*;5P+mNL+csrK@<-b7oT%W!Q=)Yc=dZ7 zAaPfibk(^Ih^ngQvoW?KuCD7<)x79nfEWl|S=+Y90b;9v3P4$wTRkT3UjUZ_PjMj6 zbMX&H>rQF(x-pw`fX1=!`yc_3IE`Ux3aX=+lG8}$Vm=ryN@v{MV+6IrFVv$eMd^CJ3>CDDv?C{Iz8xy}MwXuSfFxWC4V8f|06e8vXd_?f^nT zI04LXDW#Ba1F8#9N`2Wt04@XxkmtD$!SJDAsOg6zSyfd|3xfbQ^#Eb}Yg2z;3pEu^ z0Q`H-${#WS?_Cxq1F-4mOoKN-S(a8IZTo5w%OnvCW2;VP0KzfIH7zE@BmmrS1k1AQ z!x#Ym!$46K+;*Vra1H#_i0}}CJq{Xu2JVE>01$@l7`qwVsncz<+UbS>05GT%k#!v7 u-lxLR5JGT(NdO=1V`>9HFc1vPZr}+l+vXuTf1LjS0000|G98K@ml&(&z?cMEVUPSi=k z%n`0$!1a9q0o`zeeg_7thbrk==H0azI_)-mCdq;XYY!k?H=LMC*xEQ+3fC256DY&6 z;qZu>%FiZH1-BV=&J}QhJ6FIJ?j*nguPwj@uO+| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gameritems/textures/item/stupidium_ingot.png b/src/main/resources/assets/gameritems/textures/item/stupidium_ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..2fcffeca738027d86689365ff7d720fb86acb690 GIT binary patch literal 387 zcmV-}0et?6P)Nkl41NK^AfwZ{i8OnI^6^@gACZ8ig?FS1f^2I?$pUNlZvk-^bb?rR2v4{c)fC z0gJ7`cC%~n^`37BWy33gM-h(Wm~F4JEXnD*pX@jT#Ap;ngMAHv3NZ_yi;9z_LKp*V zqoxQYz%^=u7y*1obqEGnI;uiY#Mfy`>ZdmBEm=18o&|#-Romku>q_17#2m* zj$sf4B>c>$7{HVBJZGchdi2A1ugm>NyF1|&!WBT<1pBo7K$xF*CsQji2cV1gS90)U zBtw`2Y@(9@To4f|z}%=3ARB7!*9U;aC6w002ovPDHLkV1krvp^pFn literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gameritems/textures/item/stupidium_leggings.png b/src/main/resources/assets/gameritems/textures/item/stupidium_leggings.png new file mode 100644 index 0000000000000000000000000000000000000000..4e70958aa258150ae948f2e83a1322eb2383f65f GIT binary patch literal 316 zcmV-C0mJ@@P)KfeUDqXmZMR7CwO3{2%}l0AVZWnsTS+qjvDWV97KT^K1gx+<`aR8;>waY{$I- O0000DOVf;?M>KXMNJchfD{`|(CnI!A18P=4RjHa z-}B7)a|E>f6D{-MEx=lV&E!L6TfG1Id|4Zu%UC zA$%QoDcib$4j1BYd8O{%KnXU1GC0bh1e-t=9CyzqU;<|qz{N>IN}2W=cblDoZ27GZ zVOb^e;8q0|qq!RNJK&v{5Cj3}l_-K+6Cikekq}=cj5@1S0&}1YZbcvqkFN#VaM8>G?K&?7K&h@?;zNVk0|zn@33McHWqHDV58k8n`C1Ckt2t=naO1` z14|Z?@O|^o%sC0j^SC;_DJ3%S$p?HoooZxW6trHi$(sPfl~Sb2l5kDa)Q>9zh{_t{Fsf;*maG*yMXagTjpe=k9fi7_80$t%w1^U393G{_G3UIx?f4;Szk|A)T zKp2L)T$&_?!i@s)WJ0PcmrW8b;MN4fDB3FF3U1tlfFK17nS@KYRRH?{DX>JA=QN+q z^s=C(%C3gS(x=X1g=QN1>9N(ARtqa5=aL9yzk68Eo*F20(+sXqQ|eOmSHH| zngAX+-a9N07UzT{0OsLJ!k7TyyYrZmRMBGRjG{^+5Z^E^BpL-IJlQBpHU%B+UpSZ8 zDzFXy_O;T_UY=a*b&zQcN#dV?2`*7-c)2*gztAf8G$@z zd6v<~_fxgrziV!T_o;mKceDW4eB4BFd3|4cf$KU@FEpt0u8K^Xg#LE+B#w2H!SF61 jj~D)T-AHX_+Vsp1D^>qjzA#>`00000NkvXXu0mjfw-(;x literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/models/armor/stupidium_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/stupidium_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..e3ac3d8f7e85e4126c4b43cf6388715ba2c6b850 GIT binary patch literal 1984 zcmV;x2S50UP)ks~wVMg>^4|B}%^2v84N&zff?Kx*`(6T<@ZgtAW7yAwc3@%;Qeg1|c5y4C7V0BxDI0QUPJ zKsOw#1vL`@YXNt6cmHdE#sZNm7zC)sty{$|1kl!$CV`kU7^g&e((zwz(!!-w7LaStaVE9W49_dJgvAb}D9?N9AL(0(yy z83Z^IfXlfAwA7ifJk|o15{EGWz|HL)urmvm=jtOYz{_Du8O0)Ae?Wpk03pCq@S#8e zfO;SR0gXWLTmxqcAYf|rS^!BJj{v1EXb|9EtxhgrDFCPl1!5XE`QQTq2nGSrO(Fo7 z*S+9RR})LE4+)6!Y<~&(`h2wO=7T^i=V~rL7fCCyAOIC=7j>8);K;W3@mxNO76jkz zrjp!Z67Hi-(Pk7r!;>=zaIgRXB1+^$qtTm^c?5uOW}ucLKnkQBfOH3T^q0gHg8+sA zkqNC?veoABaCxEt} z)*zKy9-B~35#JO67&An%0`AwwG+P=dC$Z30J2v`Nrh&~_fU<6nQgf`-s*0~a`{58v z{r7$VJJtH_&!2CaWOh2N`niT6v>BXlKL2qdfJXxO;z0m^zXgbJ4FPF40(eQJL4e&( z_gmN%PYjw%=OMZifb(l6Vul5XS6eqj00n&z;54d=mfPtvS8oBn{o<#SAdns7W{+F9 z0QU5>9W0w5fbEoi9|VYx&qGhECxD&i*k##Ecd&Ju+ge{&Gd)?C&P+B3fvpOP2s9@u z%!*!)P^o#hXQ^!3xJG_zFG4guj%H0ZPrzW>({qnJ!c`D}`}%pdfSu*E$-aat0*Tw( zZ2cwjQ^(aHA7>!=dHVQqT5|TzRdAk<|F!)SpuxEY`EL!j>5A_M0mxw_*D%dl>kt>2M0vzqCjtBsm+*Qp@t=_hH z9RN|=b1p0AqOXPkkpe6MybY_g=(W?F}&pkKE!NXjB8={yUN3;rwtyuL7(vS|XO4yN=VK+41_0T?4h zK-lXFuq8lhbyVG3>F9-yyaP3mRVpJIEEjhHwsUrbGRjVk&Zu*IXK}PSbPf{D*+vB^ zA_R|?F~-o-PhOqY6G`0eX34b)0(b{gG$`cBrD$YXg;UvjZomUYr<6Y^J2 z0J~U`nsP+*)yRa>JVtYOnpK-BrQ!)-biV|k6oGOsqD21c36T2DAHD!W^WXNDL7=4Q zH-nf`P2ETR5(1P4fHnrm5x_I;7I^z?4KiDOaE@f>zCRrf)zh{5K#h34Acynx$cO8F z4?tc^9pq?@0X(av0o@?L0s>eNEdjg$E(Ksj0A7zWVWp!Y%EhaE$V$Zk(dcIocrzBj z8^I+bdT&&{79iIG@3sOs=u0>;%)yDu#E?74J1#6JhLIB9}+)U)xBg+tx z!MdkhykO-=7QmBZGkTjLfc2H=XeyPeX4F$42}CpQ$uFHoX$CBpw9$5znrAN^9g&F7 z$NjZ~KVhQEwXa&~O#myulmKXG2?=Vzr}ao}P4gCFO376kuUx9!OaSjaJ4*Z6Y6@PC9ocAEbJPouDqYGe=1jSn4nM%}X{m4bs>}k99UAFH5TF+;= z1mFnfh6;U^tUf#=-K%p%ftXyA-Q?FXEpR%E|5amEd)|)CelBVN(HLp S!XUZ;0000Gx>Eakt5%+dBchPMF9v9{M zqUGOI-m=~@-YV|le`(&SGG5i$k%u3s_Ze+z`s%Z+P&1I};|>Oow5kj0UpahMuATmo zpGm=zg~@?IMZWRLGjB!~hfjhYdHY1@C2+<4!SCzy)%QIrsrqN-d;X2h-@mFIVLXAC zE7=a@?Vs;!BgZGcOs?OZaYNGc^TIp7{$n^Wr~hVu^_$%y3rw57-@V6rAZ_!`qJL{R z(pi6eeqX-1|F>Mzo&4)1^E4e;8qU`J7G!wMwu1A(c71!l+i$-)F$!?89N0DY{#51) z1`B=x22X|+Ggk_1$m39pe||lyE`OCK!!_ob)`skha$mFmt2Z2DDq(C;t^Q*<$J@R* z;fYHKz5`qg?vL-QG8m{=Z+K9{Sg@SoOv;>eJBAJ!4psy8 zsHpYF}fr}G&T`1UO23g9!i_pzdRC)WzbfY}dC87g8I zT-!hCz(xa(hK-Ny|GYG2hZ`zPHsy%o;Pe&$2SRGDPp$b=Co9?e_9;vebeUfVlS5GqFI}5 zjY1i8SQyeD-cdcDpnp+y`RBh4%R)O{6c;T2e}2Q