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 0000000..0f80cfb Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/block/deepslate_stupidium_ore.png differ diff --git a/src/main/resources/assets/gameritems/textures/block/stupidium_block.png b/src/main/resources/assets/gameritems/textures/block/stupidium_block.png new file mode 100644 index 0000000..2154885 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/block/stupidium_block.png differ diff --git a/src/main/resources/assets/gameritems/textures/block/stupidium_ore.png b/src/main/resources/assets/gameritems/textures/block/stupidium_ore.png new file mode 100644 index 0000000..1c6d0c8 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/block/stupidium_ore.png differ 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 0000000..584abd4 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/dipstick.png differ diff --git a/src/main/resources/assets/gameritems/textures/item/raw_stupidium.png b/src/main/resources/assets/gameritems/textures/item/raw_stupidium.png new file mode 100644 index 0000000..033aad6 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/raw_stupidium.png differ diff --git a/src/main/resources/assets/gameritems/textures/item/stupidium_axe.png b/src/main/resources/assets/gameritems/textures/item/stupidium_axe.png new file mode 100644 index 0000000..aad77d0 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/stupidium_axe.png differ diff --git a/src/main/resources/assets/gameritems/textures/item/stupidium_boots.png b/src/main/resources/assets/gameritems/textures/item/stupidium_boots.png new file mode 100644 index 0000000..8d6585c Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/stupidium_boots.png differ 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 0000000..8b29f15 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/stupidium_chestplate.png differ diff --git a/src/main/resources/assets/gameritems/textures/item/stupidium_helmet.png b/src/main/resources/assets/gameritems/textures/item/stupidium_helmet.png new file mode 100644 index 0000000..12b1af9 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/stupidium_helmet.png differ diff --git a/src/main/resources/assets/gameritems/textures/item/stupidium_hoe.png b/src/main/resources/assets/gameritems/textures/item/stupidium_hoe.png new file mode 100644 index 0000000..0460a6a Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/stupidium_hoe.png differ 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 0000000..2fcffec Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/stupidium_ingot.png differ 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 0000000..4e70958 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/stupidium_leggings.png differ diff --git a/src/main/resources/assets/gameritems/textures/item/stupidium_pickaxe.png b/src/main/resources/assets/gameritems/textures/item/stupidium_pickaxe.png new file mode 100644 index 0000000..73c54b6 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/stupidium_pickaxe.png differ diff --git a/src/main/resources/assets/gameritems/textures/item/stupidium_shovel.png b/src/main/resources/assets/gameritems/textures/item/stupidium_shovel.png new file mode 100644 index 0000000..677bb88 Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/stupidium_shovel.png differ diff --git a/src/main/resources/assets/gameritems/textures/item/stupidium_sword.png b/src/main/resources/assets/gameritems/textures/item/stupidium_sword.png new file mode 100644 index 0000000..50faf6f Binary files /dev/null and b/src/main/resources/assets/gameritems/textures/item/stupidium_sword.png differ 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 0000000..e3ac3d8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/models/armor/stupidium_layer_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/stupidium_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/stupidium_layer_2.png new file mode 100644 index 0000000..003cbd9 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/models/armor/stupidium_layer_2.png differ diff --git a/src/main/resources/data/fabric/tags/items/axes.json b/src/main/resources/data/fabric/tags/items/axes.json index d8ffbad..23cacb5 100755 --- a/src/main/resources/data/fabric/tags/items/axes.json +++ b/src/main/resources/data/fabric/tags/items/axes.json @@ -3,6 +3,8 @@ "values": [ "gameritems:omnium_axe", "gameritems:orium_axe", - "gameritems:jeremium_axe" + "gameritems:jeremium_axe", + "gameritems:stupidium_axe", + "gameritems:not_axe" ] } \ No newline at end of file diff --git a/src/main/resources/data/fabric/tags/items/hoes.json b/src/main/resources/data/fabric/tags/items/hoes.json index c47e4a3..4f222f7 100755 --- a/src/main/resources/data/fabric/tags/items/hoes.json +++ b/src/main/resources/data/fabric/tags/items/hoes.json @@ -3,6 +3,8 @@ "values": [ "gameritems:omnium_hoe", "gameritems:orium_hoe", - "gameritems:jeremium_hoe" + "gameritems:jeremium_hoe", + "gameritems:stupidium_hoe", + "gameritems:not_hoe" ] } \ No newline at end of file diff --git a/src/main/resources/data/fabric/tags/items/pickaxes.json b/src/main/resources/data/fabric/tags/items/pickaxes.json index 34f9016..96c0acc 100755 --- a/src/main/resources/data/fabric/tags/items/pickaxes.json +++ b/src/main/resources/data/fabric/tags/items/pickaxes.json @@ -3,6 +3,8 @@ "values": [ "gameritems:omnium_pickaxe", "gameritems:orium_pickaxe", - "gameritems:jeremium_pickaxe" + "gameritems:jeremium_pickaxe", + "gameritems:stupidium_pickaxe", + "gameritems:not_pickaxe" ] } \ No newline at end of file diff --git a/src/main/resources/data/fabric/tags/items/shovels.json b/src/main/resources/data/fabric/tags/items/shovels.json index 188bf2d..3df69ea 100755 --- a/src/main/resources/data/fabric/tags/items/shovels.json +++ b/src/main/resources/data/fabric/tags/items/shovels.json @@ -3,6 +3,8 @@ "values": [ "gameritems:omnium_shovel", "gameritems:orium_shovel", - "gameritems:jeremium_shovel" + "gameritems:jeremium_shovel", + "gameritems:stupidium_shovel", + "gameritems:not_shovel" ] } \ No newline at end of file diff --git a/src/main/resources/data/fabric/tags/items/swords.json b/src/main/resources/data/fabric/tags/items/swords.json index 34c4028..5c86cce 100755 --- a/src/main/resources/data/fabric/tags/items/swords.json +++ b/src/main/resources/data/fabric/tags/items/swords.json @@ -3,6 +3,8 @@ "values": [ "gameritems:omnium_sword", "gameritems:orium_sword", - "gameritems:jeremium_sword" + "gameritems:jeremium_sword", + "gameritems:stupidium_sword", + "gameritems:not_sword" ] } \ No newline at end of file diff --git a/src/main/resources/data/gameritems/loot_tables/blocks/deepslate_stupidium_ore.json b/src/main/resources/data/gameritems/loot_tables/blocks/deepslate_stupidium_ore.json new file mode 100755 index 0000000..3687b84 --- /dev/null +++ b/src/main/resources/data/gameritems/loot_tables/blocks/deepslate_stupidium_ore.json @@ -0,0 +1,49 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "gameritems:deepslate_stupidium_ore", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:item", + "name": "gameritems:raw_stupidium", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] + } + ] +} diff --git a/src/main/resources/data/gameritems/loot_tables/blocks/stupidium_block.json b/src/main/resources/data/gameritems/loot_tables/blocks/stupidium_block.json new file mode 100755 index 0000000..59525b6 --- /dev/null +++ b/src/main/resources/data/gameritems/loot_tables/blocks/stupidium_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "gameritems:stupidium_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } \ No newline at end of file diff --git a/src/main/resources/data/gameritems/loot_tables/blocks/stupidium_ore.json b/src/main/resources/data/gameritems/loot_tables/blocks/stupidium_ore.json new file mode 100755 index 0000000..ffd9eaf --- /dev/null +++ b/src/main/resources/data/gameritems/loot_tables/blocks/stupidium_ore.json @@ -0,0 +1,49 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "gameritems:stupidium_ore", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:item", + "name": "gameritems:raw_stupidium", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] + } + ] +} diff --git a/src/main/resources/data/gameritems/loot_tables/blocks/weem_haybale.json b/src/main/resources/data/gameritems/loot_tables/blocks/weem_haybale.json index 5b60e63..744a1d8 100755 --- a/src/main/resources/data/gameritems/loot_tables/blocks/weem_haybale.json +++ b/src/main/resources/data/gameritems/loot_tables/blocks/weem_haybale.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "gameritems:weem_hay_block" + "name": "gameritems:weem_haybale" } ], "conditions": [ diff --git a/src/main/resources/data/gameritems/recipes/stupidium_axe.json b/src/main/resources/data/gameritems/recipes/stupidium_axe.json new file mode 100755 index 0000000..b46e42d --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/stupidium_axe.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##", + "W#", + "W " + ], + "key": { + "#": { + "item": "gameritems:stupidium_ingot" + }, + "W": { + "item": "gameritems:dipstick" + } + }, + "result": { + "item": "gameritems:stupidium_axe", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/stupidium_block.json b/src/main/resources/data/gameritems/recipes/stupidium_block.json new file mode 100755 index 0000000..844a8dc --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/stupidium_block.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "FFF", + "FFF", + "FFF" + ], + "key": { + "F": { + "item": "gameritems:stupidium_ingot" + } + }, + "result": { + "item": "gameritems:stupidium_block", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/stupidium_boots.json b/src/main/resources/data/gameritems/recipes/stupidium_boots.json new file mode 100755 index 0000000..604b497 --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/stupidium_boots.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "FUF", + "F F" + ], + "key": { + "F": { + "item": "gameritems:stupidium_ingot" + }, + "U": { + "item": "minecraft:netherite_ingot" + } + }, + "result": { + "item": "gameritems:stupidium_boots", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/stupidium_chestplate.json b/src/main/resources/data/gameritems/recipes/stupidium_chestplate.json new file mode 100755 index 0000000..add13d6 --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/stupidium_chestplate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "FUF", + "FFF", + "FFF" + ], + "key": { + "F": { + "item": "gameritems:stupidium_ingot" + }, + "U": { + "item": "minecraft:netherite_ingot" + } + }, + "result": { + "item": "gameritems:stupidium_chestplate", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/stupidium_helmet.json b/src/main/resources/data/gameritems/recipes/stupidium_helmet.json new file mode 100755 index 0000000..35e80ce --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/stupidium_helmet.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "FFF", + "FUF" + ], + "key": { + "F": { + "item": "gameritems:stupidium_ingot" + }, + "U": { + "item": "minecraft:netherite_ingot" + } + }, + "result": { + "item": "gameritems:stupidium_helmet", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/stupidium_hoe.json b/src/main/resources/data/gameritems/recipes/stupidium_hoe.json new file mode 100755 index 0000000..6396706 --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/stupidium_hoe.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##", + "W ", + "W " + ], + "key": { + "#": { + "item": "gameritems:stupidium_ingot" + }, + "W": { + "item": "gameritems:dipstick" + } + }, + "result": { + "item": "gameritems:stupidium_hoe", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/stupidium_ingot.json b/src/main/resources/data/gameritems/recipes/stupidium_ingot.json new file mode 100755 index 0000000..319cdd2 --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/stupidium_ingot.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "gameritems:stupidium_block" + } + ], + "result": { + "item": "gameritems:stupidium_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/stupidium_ingot_blast.json b/src/main/resources/data/gameritems/recipes/stupidium_ingot_blast.json new file mode 100644 index 0000000..b803764 --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/stupidium_ingot_blast.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "gameritems:raw_stupidium" + }, + "result": "gameritems:stupidium_ingot", + "experience": 1.9, + "cookingtime": 100 + } \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/stupidium_ingot_furnace.json b/src/main/resources/data/gameritems/recipes/stupidium_ingot_furnace.json new file mode 100644 index 0000000..5ad9aa9 --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/stupidium_ingot_furnace.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "gameritems:raw_stupidium" + }, + "result": "gameritems:stupidium_ingot", + "experience": 0.7, + "cookingtime": 200 + } \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/stupidium_leggings.json b/src/main/resources/data/gameritems/recipes/stupidium_leggings.json new file mode 100755 index 0000000..66a7bf4 --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/stupidium_leggings.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "FFF", + "FUF", + "F F" + ], + "key": { + "F": { + "item": "gameritems:stupidium_ingot" + }, + "U": { + "item": "minecraft:netherite_ingot" + } + }, + "result": { + "item": "gameritems:stupidium_leggings", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/stupidium_pickaxe.json b/src/main/resources/data/gameritems/recipes/stupidium_pickaxe.json new file mode 100755 index 0000000..69fc656 --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/stupidium_pickaxe.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + " W ", + " W " + ], + "key": { + "#": { + "item": "gameritems:stupidium_ingot" + }, + "W": { + "item": "gameritems:dipstick" + } + }, + "result": { + "item": "gameritems:stupidium_pickaxe", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/stupidium_shovel.json b/src/main/resources/data/gameritems/recipes/stupidium_shovel.json new file mode 100755 index 0000000..347c1e8 --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/stupidium_shovel.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "#", + "W", + "W" + ], + "key": { + "#": { + "item": "gameritems:stupidium_ingot" + }, + "W": { + "item": "gameritems:dipstick" + } + }, + "result": { + "item": "gameritems:stupidium_shovel", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/stupidium_sword.json b/src/main/resources/data/gameritems/recipes/stupidium_sword.json new file mode 100755 index 0000000..e0d05dc --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/stupidium_sword.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "#", + "#", + "W" + ], + "key": { + "#": { + "item": "gameritems:stupidium_ingot" + }, + "W": { + "item": "gameritems:dipstick" + } + }, + "result": { + "item": "gameritems:stupidium_sword", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/weem.json b/src/main/resources/data/gameritems/recipes/weem.json old mode 100644 new mode 100755 index 952cdd4..e6b3d07 --- a/src/main/resources/data/gameritems/recipes/weem.json +++ b/src/main/resources/data/gameritems/recipes/weem.json @@ -1,12 +1,12 @@ -{ - "type": "minecraft:crafting_shaped", - "ingredients": [ - { - "item": "gameritems:weem_hay_block" - } - ], - "result": { - "item": "gameritems:weem", - "count": 9 - } +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "gameritems:weem_haybale" + } + ], + "result": { + "item": "gameritems:weem", + "count": 9 + } } \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/weem_haybale.json b/src/main/resources/data/gameritems/recipes/weem_haybale.json index e03f2f6..c14e865 100644 --- a/src/main/resources/data/gameritems/recipes/weem_haybale.json +++ b/src/main/resources/data/gameritems/recipes/weem_haybale.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "gameritems:weem_hay_block", + "item": "gameritems:weem_haybale", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gameritems/tags/blocks/ores.json b/src/main/resources/data/gameritems/tags/blocks/ores.json index d3c52d3..d29dc1a 100755 --- a/src/main/resources/data/gameritems/tags/blocks/ores.json +++ b/src/main/resources/data/gameritems/tags/blocks/ores.json @@ -2,10 +2,12 @@ "replace": false, "values": [ "gameritems:omnium_ore", - "gameritems:orium_ore", + "gameritems:deepslate_omnium_ore", "gameritems:jeremium_ore", "gameritems:deepslate_jeremium_ore", - "gameritems:deepslate_omnium_ore", - "gameritems:deepslate_orium_ore" + "gameritems:orium_ore", + "gameritems:deepslate_orium_ore", + "gameritems:stupidium_ore", + "gameritems:deepslate_stupidium_ore" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 5a94bbc..a7fb181 100755 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -9,6 +9,9 @@ "gameritems:deepslate_jeremium_ore", "gameritems:jeremium_block", "gameritems:deepslate_omnium_ore", - "gameritems:deepslate_orium_ore" + "gameritems:deepslate_orium_ore", + "gameritems:stupidium_ore", + "gameritems:deepslate_stupidium_ore", + "gameritems:stupidium_block" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json index 5a94bbc..a7fb181 100755 --- a/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json +++ b/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json @@ -9,6 +9,9 @@ "gameritems:deepslate_jeremium_ore", "gameritems:jeremium_block", "gameritems:deepslate_omnium_ore", - "gameritems:deepslate_orium_ore" + "gameritems:deepslate_orium_ore", + "gameritems:stupidium_ore", + "gameritems:deepslate_stupidium_ore", + "gameritems:stupidium_block" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_netherite_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_netherite_tool.json index 5a94bbc..a7fb181 100755 --- a/src/main/resources/data/minecraft/tags/blocks/needs_netherite_tool.json +++ b/src/main/resources/data/minecraft/tags/blocks/needs_netherite_tool.json @@ -9,6 +9,9 @@ "gameritems:deepslate_jeremium_ore", "gameritems:jeremium_block", "gameritems:deepslate_omnium_ore", - "gameritems:deepslate_orium_ore" + "gameritems:deepslate_orium_ore", + "gameritems:stupidium_ore", + "gameritems:deepslate_stupidium_ore", + "gameritems:stupidium_block" ] } \ No newline at end of file