diff --git a/HEADER.txt b/HEADER.txt index d9f458d..ab41b5e 100644 --- a/HEADER.txt +++ b/HEADER.txt @@ -1,4 +1,4 @@ -GamerMod, for gamers, by gæmer +GamerItems, for gamers, by gæmer Copyright (C) RyanTLG Copyright (C) ARCMods team and contributors diff --git a/LICENSE b/LICENSE index 0480f91..f025498 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,8 @@ ========================== - GamerMod License + GamerItems License ========================== - GamerMod as a whole in lisenced under: + GamerItems as a whole in lisenced under: GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/README.md b/README.md index 7a39e61..c8144db 100755 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@ -# GamerMod +# GamerItems

- epicgaming - epicgaming + epicgaming + epicgaming

- epicgaming + epicgaming

epicgaming

-GamerMod is a simple mod that adds a few ores and a few other items to minecraft via the Fabric modloader and Fabric API +GamerItems is a simple mod that adds a few ores and a few other items to minecraft via the Fabric modloader and Fabric API ### Modpack usage @@ -22,8 +22,8 @@ You want to use it in a modpack? Sure! Just remember to credit me or the ARCMods ### Issues -If you find an issue or bug in the mod or just have a general suggestion you can write it [here](https://github.com/RyanTLG/GamerMod/issues) +If you find an issue or bug in the mod or just have a general suggestion you can write it [here](https://github.com/RyanTLG/GamerItems/issues) ### AAAAAAAAAAAAAAAa -[aaaaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA](https://github.com/RyanTLG/GamerMod/blob/1-18-1/unstable/AAAAAAAAAAAAAAAa) \ No newline at end of file +[aaaaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA](https://github.com/RyanTLG/GamerItems/blob/1-18-1/unstable/AAAAAAAAAAAAAAAa) \ No newline at end of file diff --git a/build.gradle b/build.gradle index 0a36434..95cdf47 100755 --- a/build.gradle +++ b/build.gradle @@ -71,7 +71,7 @@ publishing { repositories { maven { name = "GitHubPackages" - url = "https://maven.pkg.github.com/RyanTLG/gamermod" + url = "https://maven.pkg.github.com/RyanTLG/gameritems" credentials { username = System.getenv("UNAME") password = System.getenv("TOKEN") diff --git a/gradle.properties b/gradle.properties index 0347219..c03d2aa 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx6G +org.gradle.jvmargs=-Xmx4G # Fabric Properties # check these on https://fabricmc.net/develop @@ -9,8 +9,8 @@ org.gradle.jvmargs=-Xmx6G # Mod Properties mod_version = 1.18.1-1.1.0-stable - maven_group = ryantlg.GamerMod.mod - archives_base_name = GamerMod + maven_group = ryantlg.GamerItems.mod + archives_base_name = GamerItems # Dependencies fabric_version=0.46.0+1.18 diff --git a/src/main/java/net/arcmods/ryantlg/BlockTags.java b/src/main/java/net/arcmods/ryantlg/BlockTags.java index fff290b..01a9282 100755 --- a/src/main/java/net/arcmods/ryantlg/BlockTags.java +++ b/src/main/java/net/arcmods/ryantlg/BlockTags.java @@ -6,5 +6,5 @@ import net.minecraft.tag.Tag; import net.minecraft.util.Identifier; public class BlockTags { - public static final Tag ORES = TagFactory.BLOCK.create(new Identifier("gamermod", "ores")); + public static final Tag ORES = TagFactory.BLOCK.create(new Identifier("gameritems", "ores")); } \ No newline at end of file diff --git a/src/main/java/net/arcmods/ryantlg/blockClasses/jeremiumBlock.java b/src/main/java/net/arcmods/ryantlg/blockClasses/jeremiumBlock.java index 5386e48..0d0f912 100644 --- a/src/main/java/net/arcmods/ryantlg/blockClasses/jeremiumBlock.java +++ b/src/main/java/net/arcmods/ryantlg/blockClasses/jeremiumBlock.java @@ -17,8 +17,8 @@ public class jeremiumBlock extends Block{ } @Override public void appendTooltip(ItemStack itemStack, BlockView world, List tooltip, TooltipContext tooltipContext) { - tooltip.add( new TranslatableText("block.gamermod.jeremium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); - tooltip.add( new TranslatableText("all.gamermod.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); + tooltip.add( new TranslatableText("block.gameritems.jeremium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); + tooltip.add( new TranslatableText("all.gameritems.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); } } diff --git a/src/main/java/net/arcmods/ryantlg/blockClasses/oriumBlock.java b/src/main/java/net/arcmods/ryantlg/blockClasses/oriumBlock.java index 5e5adf4..c3d76ee 100644 --- a/src/main/java/net/arcmods/ryantlg/blockClasses/oriumBlock.java +++ b/src/main/java/net/arcmods/ryantlg/blockClasses/oriumBlock.java @@ -17,6 +17,6 @@ public class oriumBlock extends Block{ } @Override public void appendTooltip(ItemStack itemStack, BlockView world, List tooltip, TooltipContext tooltipContext) { - tooltip.add( new TranslatableText("block.gamermod.orium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); + tooltip.add( new TranslatableText("block.gameritems.orium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); } } diff --git a/src/main/java/net/arcmods/ryantlg/blocks/CropBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/CropBlocks.java index b533763..cdd144c 100755 --- a/src/main/java/net/arcmods/ryantlg/blocks/CropBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/CropBlocks.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.blocks; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.blockClasses.WeemCropBlock; import net.minecraft.block.AbstractBlock; import net.minecraft.block.CropBlock; @@ -14,8 +14,8 @@ public class CropBlocks { public static void register() { - Registry.register(Registry.BLOCK, new Identifier("gamermod","weem_crop_block"), WEEM_CROP_BLOCK); + Registry.register(Registry.BLOCK, new Identifier("gameritems","weem_crop_block"), WEEM_CROP_BLOCK); - gamermod.LOGGER.info("CropBlocks loaded"); + gameritems.LOGGER.info("CropBlocks loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/blocks/FunnyBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/FunnyBlocks.java index 51e26c0..f3afd74 100755 --- a/src/main/java/net/arcmods/ryantlg/blocks/FunnyBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/FunnyBlocks.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.blocks; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.blockClasses.Damon; import net.arcmods.ryantlg.blockClasses.elon; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; @@ -17,12 +17,12 @@ public class FunnyBlocks { public static void register() { - Registry.register(Registry.BLOCK, new Identifier("gamermod", "matt_damon"), MATT_DAMON); - Registry.register(Registry.ITEM, new Identifier("gamermod", "matt_damon"), new BlockItem(MATT_DAMON, new FabricItemSettings().group(gamermod.FNUTS))); + Registry.register(Registry.BLOCK, new Identifier("gameritems", "matt_damon"), MATT_DAMON); + Registry.register(Registry.ITEM, new Identifier("gameritems", "matt_damon"), new BlockItem(MATT_DAMON, new FabricItemSettings().group(gameritems.FNUTS))); - Registry.register(Registry.BLOCK, new Identifier("gamermod", "elon_musk"), ELON_MUSK); - Registry.register(Registry.ITEM, new Identifier("gamermod", "elon_musk"), new BlockItem(ELON_MUSK, new FabricItemSettings().group(gamermod.FNUTS))); + Registry.register(Registry.BLOCK, new Identifier("gameritems", "elon_musk"), ELON_MUSK); + Registry.register(Registry.ITEM, new Identifier("gameritems", "elon_musk"), new BlockItem(ELON_MUSK, new FabricItemSettings().group(gameritems.FNUTS))); - gamermod.LOGGER.info("FunnyBlocks loaded"); + gameritems.LOGGER.info("FunnyBlocks loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java index 9e116f6..112af47 100644 --- a/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/jeremiumBlocks.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.blocks; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.blockClasses.jeremiumBlock; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; @@ -18,16 +18,16 @@ public class jeremiumBlocks { public static final Block DEEPSLATE_JEREMIUM_ORE = new jeremiumBlock(FabricBlockSettings.of(Material.STONE).strength(4.0f).requiresTool().luminance(5).sounds(BlockSoundGroup.DEEPSLATE)); public static void register() { - Registry.register(Registry.BLOCK, new Identifier("gamermod", "jeremium_ore"), JEREMIUM_ORE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_ore"), new BlockItem(JEREMIUM_ORE, new FabricItemSettings().group(gamermod.CHING).fireproof().maxCount(56))); + Registry.register(Registry.BLOCK, new Identifier("gameritems", "jeremium_ore"), JEREMIUM_ORE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "jeremium_ore"), new BlockItem(JEREMIUM_ORE, new FabricItemSettings().group(gameritems.CHING).fireproof().maxCount(56))); - Registry.register(Registry.BLOCK, new Identifier("gamermod", "deepslate_jeremium_ore"), DEEPSLATE_JEREMIUM_ORE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "deepslate_jeremium_ore"), new BlockItem(DEEPSLATE_JEREMIUM_ORE, new FabricItemSettings().group(gamermod.CHING).fireproof().maxCount(56))); + Registry.register(Registry.BLOCK, new Identifier("gameritems", "deepslate_jeremium_ore"), DEEPSLATE_JEREMIUM_ORE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "deepslate_jeremium_ore"), new BlockItem(DEEPSLATE_JEREMIUM_ORE, new FabricItemSettings().group(gameritems.CHING).fireproof().maxCount(56))); - Registry.register(Registry.BLOCK, new Identifier("gamermod", "jeremium_block"), JEREMIUM_BLOCK); - Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_block"), new BlockItem(JEREMIUM_BLOCK, new FabricItemSettings().group(gamermod.CHING).fireproof().maxCount(56))); + Registry.register(Registry.BLOCK, new Identifier("gameritems", "jeremium_block"), JEREMIUM_BLOCK); + Registry.register(Registry.ITEM, new Identifier("gameritems", "jeremium_block"), new BlockItem(JEREMIUM_BLOCK, new FabricItemSettings().group(gameritems.CHING).fireproof().maxCount(56))); - gamermod.LOGGER.info("jeremiumBlocks loaded"); + gameritems.LOGGER.info("jeremiumBlocks loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java index d7a9f1d..edcca57 100755 --- a/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/omniumBlocks.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.blocks; -import net.arcmods.ryantlg.gamermod; +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; @@ -17,13 +17,13 @@ public class omniumBlocks { public static void register() { - Registry.register(Registry.BLOCK, new Identifier("gamermod", "omnium_ore"), OMNIUM_ORE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_ore"), new BlockItem(OMNIUM_ORE, new FabricItemSettings().group(gamermod.CHING))); - Registry.register(Registry.BLOCK, new Identifier("gamermod", "deepslate_omnium_ore"), DEEPSLATE_OMNIUM_ORE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "deepslate_omnium_ore"), new BlockItem(DEEPSLATE_OMNIUM_ORE, new FabricItemSettings().group(gamermod.CHING))); - Registry.register(Registry.BLOCK, new Identifier("gamermod", "omnium_block"), OMNIUM_BLOCK); - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_block"), new BlockItem(OMNIUM_BLOCK, new FabricItemSettings().group(gamermod.CHING))); + Registry.register(Registry.BLOCK, new Identifier("gameritems", "omnium_ore"), OMNIUM_ORE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "omnium_ore"), new BlockItem(OMNIUM_ORE, new FabricItemSettings().group(gameritems.CHING))); + Registry.register(Registry.BLOCK, new Identifier("gameritems", "deepslate_omnium_ore"), DEEPSLATE_OMNIUM_ORE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "deepslate_omnium_ore"), new BlockItem(DEEPSLATE_OMNIUM_ORE, new FabricItemSettings().group(gameritems.CHING))); + Registry.register(Registry.BLOCK, new Identifier("gameritems", "omnium_block"), OMNIUM_BLOCK); + Registry.register(Registry.ITEM, new Identifier("gameritems", "omnium_block"), new BlockItem(OMNIUM_BLOCK, new FabricItemSettings().group(gameritems.CHING))); - gamermod.LOGGER.info("omniumBlocks loaded"); + gameritems.LOGGER.info("omniumBlocks loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java b/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java index d166a90..aa2ea5f 100644 --- a/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java +++ b/src/main/java/net/arcmods/ryantlg/blocks/oriumBlocks.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.blocks; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.blockClasses.oriumBlock; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; @@ -19,14 +19,14 @@ public class oriumBlocks { public static void register() { - Registry.register(Registry.BLOCK, new Identifier("gamermod", "orium_ore"), ORIUM_ORE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_ore"), new BlockItem(ORIUM_ORE, new FabricItemSettings().group(gamermod.CHING).rarity(Rarity.UNCOMMON))); - Registry.register(Registry.BLOCK, new Identifier("gamermod", "deepslate_orium_ore"), DEEPSLATE_ORIUM_ORE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "deepslate_orium_ore"), new BlockItem(DEEPSLATE_ORIUM_ORE, new FabricItemSettings().group(gamermod.CHING).rarity(Rarity.UNCOMMON))); - Registry.register(Registry.BLOCK, new Identifier("gamermod", "orium_block"), ORIUM_BLOCK); - Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_block"), new BlockItem(ORIUM_BLOCK, new FabricItemSettings().group(gamermod.CHING).rarity(Rarity.UNCOMMON))); + Registry.register(Registry.BLOCK, new Identifier("gameritems", "orium_ore"), ORIUM_ORE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "orium_ore"), new BlockItem(ORIUM_ORE, new FabricItemSettings().group(gameritems.CHING).rarity(Rarity.UNCOMMON))); + Registry.register(Registry.BLOCK, new Identifier("gameritems", "deepslate_orium_ore"), DEEPSLATE_ORIUM_ORE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "deepslate_orium_ore"), new BlockItem(DEEPSLATE_ORIUM_ORE, new FabricItemSettings().group(gameritems.CHING).rarity(Rarity.UNCOMMON))); + Registry.register(Registry.BLOCK, new Identifier("gameritems", "orium_block"), ORIUM_BLOCK); + Registry.register(Registry.ITEM, new Identifier("gameritems", "orium_block"), new BlockItem(ORIUM_BLOCK, new FabricItemSettings().group(gameritems.CHING).rarity(Rarity.UNCOMMON))); - gamermod.LOGGER.info("oriumBlocks loaded"); + gameritems.LOGGER.info("oriumBlocks 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 f90f0fb..866394c 100755 --- a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/jeremium/JeremiumSwordItem.java +++ b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/jeremium/JeremiumSwordItem.java @@ -21,7 +21,7 @@ public class JeremiumSwordItem extends SwordItem { } @Override public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { - tooltip.add( new TranslatableText("item.gamermod.jeremium_sword.tooltip").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC) ); + tooltip.add( new TranslatableText("item.gameritems.jeremium_sword.tooltip").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC) ); } @Override diff --git a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/omnium/OmniumSwordItem.java b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/omnium/OmniumSwordItem.java index 2ec6359..2b7f539 100755 --- a/src/main/java/net/arcmods/ryantlg/customToolItemClasses/omnium/OmniumSwordItem.java +++ b/src/main/java/net/arcmods/ryantlg/customToolItemClasses/omnium/OmniumSwordItem.java @@ -17,6 +17,6 @@ public class OmniumSwordItem extends SwordItem { } @Override public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { - tooltip.add( new TranslatableText("item.gamermod.omnium_sword.tooltip").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC) ); + tooltip.add( new TranslatableText("item.gameritems.omnium_sword.tooltip").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC) ); } } diff --git a/src/main/java/net/arcmods/ryantlg/gamermod.java b/src/main/java/net/arcmods/ryantlg/gameritems.java similarity index 94% rename from src/main/java/net/arcmods/ryantlg/gamermod.java rename to src/main/java/net/arcmods/ryantlg/gameritems.java index 46fd737..1f4a1d4 100755 --- a/src/main/java/net/arcmods/ryantlg/gamermod.java +++ b/src/main/java/net/arcmods/ryantlg/gameritems.java @@ -38,23 +38,23 @@ import net.minecraft.util.Identifier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public class gamermod implements ModInitializer { +public class gameritems implements ModInitializer { - public static final Logger LOGGER = LogManager.getLogger("gamermod"); + public static final Logger LOGGER = LogManager.getLogger("gameritems"); public static final ItemGroup FNUTS = FabricItemGroupBuilder.build( - new Identifier("gamermod", "chins"), + new Identifier("gameritems", "chins"), () -> new ItemStack(Items.NETHERITE_INGOT) ); public static final ItemGroup CHING = FabricItemGroupBuilder.create( - new Identifier("gamermod", "things")) + new Identifier("gameritems", "things")) .icon(() -> new ItemStack(FunnyItems.DEEZ_NUTS_ON_CHIN)) .build(); public static final ItemGroup THING = FabricItemGroupBuilder.create( - new Identifier("gamermod", "armour_and_tools")) + new Identifier("gameritems", "armour_and_tools")) .icon(() -> new ItemStack(omniumMetals.OMNIUM)) .build(); diff --git a/src/main/java/net/arcmods/ryantlg/gamermodClient.java b/src/main/java/net/arcmods/ryantlg/gameritemsClient.java similarity index 83% rename from src/main/java/net/arcmods/ryantlg/gamermodClient.java rename to src/main/java/net/arcmods/ryantlg/gameritemsClient.java index bedba38..e6df13e 100644 --- a/src/main/java/net/arcmods/ryantlg/gamermodClient.java +++ b/src/main/java/net/arcmods/ryantlg/gameritemsClient.java @@ -9,7 +9,7 @@ import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.minecraft.client.render.RenderLayer; @Environment(EnvType.CLIENT) -public class gamermodClient implements ClientModInitializer{ +public class gameritemsClient implements ClientModInitializer{ @Override public void onInitializeClient() { @@ -17,7 +17,7 @@ public class gamermodClient implements ClientModInitializer{ bowModelPredicateProvider.registerBowModels(); - gamermod.LOGGER.info("Client only objects loaded"); + gameritems.LOGGER.info("Client only objects loaded"); } diff --git a/src/main/java/net/arcmods/ryantlg/itemClasses/BreemItem.java b/src/main/java/net/arcmods/ryantlg/itemClasses/BreemItem.java index 5a6438c..4f309d2 100755 --- a/src/main/java/net/arcmods/ryantlg/itemClasses/BreemItem.java +++ b/src/main/java/net/arcmods/ryantlg/itemClasses/BreemItem.java @@ -19,6 +19,6 @@ public class BreemItem extends Item { @Override public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { - tooltip.add( new TranslatableText("item.gamermod.breem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); + tooltip.add( new TranslatableText("item.gameritems.breem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); } } diff --git a/src/main/java/net/arcmods/ryantlg/itemClasses/FabricReality.java b/src/main/java/net/arcmods/ryantlg/itemClasses/FabricReality.java index 3c13dde..de80255 100644 --- a/src/main/java/net/arcmods/ryantlg/itemClasses/FabricReality.java +++ b/src/main/java/net/arcmods/ryantlg/itemClasses/FabricReality.java @@ -19,7 +19,7 @@ public class FabricReality extends Item{ @Override public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { - tooltip.add( new TranslatableText("item.gamermod.fabric_of_reality.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); + tooltip.add( new TranslatableText("item.gameritems.fabric_of_reality.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); } } diff --git a/src/main/java/net/arcmods/ryantlg/itemClasses/WeemItem.java b/src/main/java/net/arcmods/ryantlg/itemClasses/WeemItem.java index 00e470b..cc276fc 100755 --- a/src/main/java/net/arcmods/ryantlg/itemClasses/WeemItem.java +++ b/src/main/java/net/arcmods/ryantlg/itemClasses/WeemItem.java @@ -19,6 +19,6 @@ public class WeemItem extends Item { @Override public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { - tooltip.add( new TranslatableText("item.gamermod.weem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); + tooltip.add( new TranslatableText("item.gameritems.weem.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); } } diff --git a/src/main/java/net/arcmods/ryantlg/itemClasses/jeremiumItem.java b/src/main/java/net/arcmods/ryantlg/itemClasses/jeremiumItem.java index 3f6886d..7436199 100644 --- a/src/main/java/net/arcmods/ryantlg/itemClasses/jeremiumItem.java +++ b/src/main/java/net/arcmods/ryantlg/itemClasses/jeremiumItem.java @@ -19,7 +19,7 @@ public class jeremiumItem extends Item{ @Override public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { - tooltip.add( new TranslatableText("all.gamermod.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); + tooltip.add( new TranslatableText("all.gameritems.jeremium.tooltiptwo").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); } diff --git a/src/main/java/net/arcmods/ryantlg/itemClasses/oriumItem.java b/src/main/java/net/arcmods/ryantlg/itemClasses/oriumItem.java index c2393ff..7eb09f8 100644 --- a/src/main/java/net/arcmods/ryantlg/itemClasses/oriumItem.java +++ b/src/main/java/net/arcmods/ryantlg/itemClasses/oriumItem.java @@ -19,7 +19,7 @@ public class oriumItem extends Item{ @Override public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { - tooltip.add( new TranslatableText("item.gamermod.orium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); + tooltip.add( new TranslatableText("item.gameritems.orium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) ); } } diff --git a/src/main/java/net/arcmods/ryantlg/items/armour/jeremiumArmour.java b/src/main/java/net/arcmods/ryantlg/items/armour/jeremiumArmour.java index 49fea53..68c630f 100644 --- a/src/main/java/net/arcmods/ryantlg/items/armour/jeremiumArmour.java +++ b/src/main/java/net/arcmods/ryantlg/items/armour/jeremiumArmour.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.items.armour; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.armourMaterials.JeremiumArmorMaterial; import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.ArmorItem; @@ -13,19 +13,19 @@ import net.minecraft.util.registry.Registry; public class jeremiumArmour { public static final ArmorMaterial JEREMIUM_ARMOR_MATERIAL = new JeremiumArmorMaterial(); - public static final Item JEREMIUM_HELMET = new ArmorItem(JEREMIUM_ARMOR_MATERIAL, EquipmentSlot.HEAD, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); - public static final Item JEREMIUM_CHESTPLATE = new ArmorItem(JEREMIUM_ARMOR_MATERIAL, EquipmentSlot.CHEST, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); - public static final Item JEREMIUM_LEGGINGS = new ArmorItem(JEREMIUM_ARMOR_MATERIAL, EquipmentSlot.LEGS, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); - public static final Item JEREMIUM_BOOTS = new ArmorItem(JEREMIUM_ARMOR_MATERIAL, EquipmentSlot.FEET, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item JEREMIUM_HELMET = new ArmorItem(JEREMIUM_ARMOR_MATERIAL, EquipmentSlot.HEAD, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item JEREMIUM_CHESTPLATE = new ArmorItem(JEREMIUM_ARMOR_MATERIAL, EquipmentSlot.CHEST, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item JEREMIUM_LEGGINGS = new ArmorItem(JEREMIUM_ARMOR_MATERIAL, EquipmentSlot.LEGS, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item JEREMIUM_BOOTS = new ArmorItem(JEREMIUM_ARMOR_MATERIAL, EquipmentSlot.FEET, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.EPIC)); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_helmet"), JEREMIUM_HELMET); - Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_chestplate"), JEREMIUM_CHESTPLATE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_leggings"), JEREMIUM_LEGGINGS); - Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_boots"), JEREMIUM_BOOTS); + Registry.register(Registry.ITEM, new Identifier("gameritems", "jeremium_helmet"), JEREMIUM_HELMET); + Registry.register(Registry.ITEM, new Identifier("gameritems", "jeremium_chestplate"), JEREMIUM_CHESTPLATE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "jeremium_leggings"), JEREMIUM_LEGGINGS); + Registry.register(Registry.ITEM, new Identifier("gameritems", "jeremium_boots"), JEREMIUM_BOOTS); - gamermod.LOGGER.info("jeremiumArmour loaded"); + gameritems.LOGGER.info("jeremiumArmour loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/items/armour/notArmour.java b/src/main/java/net/arcmods/ryantlg/items/armour/notArmour.java index cddaf16..5cb3889 100644 --- a/src/main/java/net/arcmods/ryantlg/items/armour/notArmour.java +++ b/src/main/java/net/arcmods/ryantlg/items/armour/notArmour.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.items.armour; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.armourMaterials.notArmorMaterial; import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.ArmorItem; @@ -13,19 +13,19 @@ import net.minecraft.util.registry.Registry; public class notArmour { public static final ArmorMaterial OMNIUM_ARMOR_MATERIAL = new notArmorMaterial(); - public static final Item NOT_HELMET = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.HEAD, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); - public static final Item NOT_CHESTPLATE = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.CHEST, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); - public static final Item NOT_LEGGINGS = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.LEGS, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); - public static final Item NOT_BOOTS = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.FEET, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item NOT_HELMET = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.HEAD, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item NOT_CHESTPLATE = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.CHEST, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item NOT_LEGGINGS = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.LEGS, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item NOT_BOOTS = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.FEET, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.EPIC)); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "not_helmet"), NOT_HELMET); - Registry.register(Registry.ITEM, new Identifier("gamermod", "not_chestplate"), NOT_CHESTPLATE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "not_leggings"), NOT_LEGGINGS); - Registry.register(Registry.ITEM, new Identifier("gamermod", "not_boots"), NOT_BOOTS); + Registry.register(Registry.ITEM, new Identifier("gameritems", "not_helmet"), NOT_HELMET); + Registry.register(Registry.ITEM, new Identifier("gameritems", "not_chestplate"), NOT_CHESTPLATE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "not_leggings"), NOT_LEGGINGS); + Registry.register(Registry.ITEM, new Identifier("gameritems", "not_boots"), NOT_BOOTS); - gamermod.LOGGER.info("notArmour loaded"); + gameritems.LOGGER.info("notArmour loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/items/armour/omniumArmour.java b/src/main/java/net/arcmods/ryantlg/items/armour/omniumArmour.java index f6f94ee..fe82b9d 100755 --- a/src/main/java/net/arcmods/ryantlg/items/armour/omniumArmour.java +++ b/src/main/java/net/arcmods/ryantlg/items/armour/omniumArmour.java @@ -1,7 +1,7 @@ package net.arcmods.ryantlg.items.armour; import net.minecraft.util.registry.Registry; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.armourMaterials.OmniumArmorMaterial; import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.ArmorItem; @@ -13,19 +13,19 @@ import net.minecraft.util.Rarity; public class omniumArmour { public static final ArmorMaterial OMNIUM_ARMOR_MATERIAL = new OmniumArmorMaterial(); - public static final Item OMNIUM_HELMET = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.HEAD, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); - public static final Item OMNIUM_CHESTPLATE = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.CHEST, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); - public static final Item OMNIUM_LEGGINGS = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.LEGS, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); - public static final Item OMNIUM_BOOTS = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.FEET, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item OMNIUM_HELMET = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.HEAD, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item OMNIUM_CHESTPLATE = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.CHEST, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item OMNIUM_LEGGINGS = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.LEGS, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.EPIC)); + public static final Item OMNIUM_BOOTS = new ArmorItem(OMNIUM_ARMOR_MATERIAL, EquipmentSlot.FEET, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.EPIC)); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_helmet"), OMNIUM_HELMET); - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_chestplate"), OMNIUM_CHESTPLATE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_leggings"), OMNIUM_LEGGINGS); - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_boots"), OMNIUM_BOOTS); + Registry.register(Registry.ITEM, new Identifier("gameritems", "omnium_helmet"), OMNIUM_HELMET); + Registry.register(Registry.ITEM, new Identifier("gameritems", "omnium_chestplate"), OMNIUM_CHESTPLATE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "omnium_leggings"), OMNIUM_LEGGINGS); + Registry.register(Registry.ITEM, new Identifier("gameritems", "omnium_boots"), OMNIUM_BOOTS); - gamermod.LOGGER.info("omniumArmour loaded"); + gameritems.LOGGER.info("omniumArmour loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/items/armour/oriumArmour.java b/src/main/java/net/arcmods/ryantlg/items/armour/oriumArmour.java index 81675f6..900c286 100644 --- a/src/main/java/net/arcmods/ryantlg/items/armour/oriumArmour.java +++ b/src/main/java/net/arcmods/ryantlg/items/armour/oriumArmour.java @@ -1,7 +1,7 @@ package net.arcmods.ryantlg.items.armour; import net.minecraft.util.registry.Registry; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.armourMaterials.OriumArmorMaterial; import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.ArmorItem; @@ -12,18 +12,18 @@ import net.minecraft.util.Rarity; public class oriumArmour { public static final ArmorMaterial ORIUM_ARMOR_MATERIAL = new OriumArmorMaterial(); - public static final Item ORIUM_HELMET = new ArmorItem(ORIUM_ARMOR_MATERIAL, EquipmentSlot.HEAD, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.RARE)); - public static final Item ORIUM_CHESTPLATE = new ArmorItem(ORIUM_ARMOR_MATERIAL, EquipmentSlot.CHEST, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.RARE)); - public static final Item ORIUM_LEGGINGS = new ArmorItem(ORIUM_ARMOR_MATERIAL, EquipmentSlot.LEGS, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.RARE)); - public static final Item ORIUM_BOOTS = new ArmorItem(ORIUM_ARMOR_MATERIAL, EquipmentSlot.FEET, new Item.Settings().group(gamermod.THING).fireproof().rarity(Rarity.RARE)); + public static final Item ORIUM_HELMET = new ArmorItem(ORIUM_ARMOR_MATERIAL, EquipmentSlot.HEAD, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.RARE)); + public static final Item ORIUM_CHESTPLATE = new ArmorItem(ORIUM_ARMOR_MATERIAL, EquipmentSlot.CHEST, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.RARE)); + public static final Item ORIUM_LEGGINGS = new ArmorItem(ORIUM_ARMOR_MATERIAL, EquipmentSlot.LEGS, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.RARE)); + public static final Item ORIUM_BOOTS = new ArmorItem(ORIUM_ARMOR_MATERIAL, EquipmentSlot.FEET, new Item.Settings().group(gameritems.THING).fireproof().rarity(Rarity.RARE)); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_helmet"), ORIUM_HELMET); - Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_chestplate"), ORIUM_CHESTPLATE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_leggings"), ORIUM_LEGGINGS); - Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_boots"), ORIUM_BOOTS); + Registry.register(Registry.ITEM, new Identifier("gameritems", "orium_helmet"), ORIUM_HELMET); + Registry.register(Registry.ITEM, new Identifier("gameritems", "orium_chestplate"), ORIUM_CHESTPLATE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "orium_leggings"), ORIUM_LEGGINGS); + Registry.register(Registry.ITEM, new Identifier("gameritems", "orium_boots"), ORIUM_BOOTS); - gamermod.LOGGER.info("oriumArmour loaded"); + gameritems.LOGGER.info("oriumArmour loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/items/bows/gamerBow.java b/src/main/java/net/arcmods/ryantlg/items/bows/gamerBow.java index 56d72c3..5b121ba 100644 --- a/src/main/java/net/arcmods/ryantlg/items/bows/gamerBow.java +++ b/src/main/java/net/arcmods/ryantlg/items/bows/gamerBow.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.items.bows; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.BowItem; import net.minecraft.item.Item; @@ -9,10 +9,10 @@ import net.minecraft.util.registry.Registry; public class gamerBow { - public static final Item GAMER_BOW = new BowItem(new FabricItemSettings().group(gamermod.CHING).maxCount(1).fireproof().maxDamage(458)); + public static final Item GAMER_BOW = new BowItem(new FabricItemSettings().group(gameritems.CHING).maxCount(1).fireproof().maxDamage(458)); public static void register(){ - Registry.register(Registry.ITEM, new Identifier("gamermod", "gamer_bow"), GAMER_BOW); + Registry.register(Registry.ITEM, new Identifier("gameritems", "gamer_bow"), GAMER_BOW); } diff --git a/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java b/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java index f88ef4a..b44d3c3 100755 --- a/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java +++ b/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.items.itemsByCrop; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.blocks.CropBlocks; import net.arcmods.ryantlg.itemClasses.BreemItem; import net.arcmods.ryantlg.itemClasses.WeemItem; @@ -18,11 +18,11 @@ public class weemItems { //main items //================================================================================================================ - public static final Item WEEM = new Item(new Item.Settings().group(gamermod.CHING).maxCount(128)); + public static final Item WEEM = new Item(new Item.Settings().group(gameritems.CHING).maxCount(128)); // foods //================================================================================================================ - public static final Item BREEM = new BreemItem(new FabricItemSettings().group(gamermod.CHING) + public static final Item BREEM = new BreemItem(new FabricItemSettings().group(gameritems.CHING) .food( new FoodComponent .Builder() @@ -36,7 +36,7 @@ public class weemItems { .build() )); - public static final Item WEEM_APPLE = new WeemItem(new FabricItemSettings().group(gamermod.CHING) + public static final Item WEEM_APPLE = new WeemItem(new FabricItemSettings().group(gameritems.CHING) .food( new FoodComponent .Builder() @@ -56,18 +56,18 @@ public class weemItems { //seeds //================================================================================================================ - public static final Item WEEM_SEEDS = new AliasedBlockItem(CropBlocks.WEEM_CROP_BLOCK, new Item.Settings().group(gamermod.CHING)); + public static final Item WEEM_SEEDS = new AliasedBlockItem(CropBlocks.WEEM_CROP_BLOCK, new Item.Settings().group(gameritems.CHING)); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "breem"), BREEM); - Registry.register(Registry.ITEM, new Identifier("gamermod", "weem_apple"), WEEM_APPLE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "breem"), BREEM); + Registry.register(Registry.ITEM, new Identifier("gameritems", "weem_apple"), WEEM_APPLE); - Registry.register(Registry.ITEM, new Identifier("gamermod","weem_seeds"), WEEM_SEEDS); - Registry.register(Registry.ITEM, new Identifier("gamermod", "weem"), WEEM); + Registry.register(Registry.ITEM, new Identifier("gameritems","weem_seeds"), WEEM_SEEDS); + Registry.register(Registry.ITEM, new Identifier("gameritems", "weem"), WEEM); - gamermod.LOGGER.info("weemItems loaded"); + gameritems.LOGGER.info("weemItems loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/items/metalItems/jeremiumMetals.java b/src/main/java/net/arcmods/ryantlg/items/metalItems/jeremiumMetals.java index 40001f4..c063224 100644 --- a/src/main/java/net/arcmods/ryantlg/items/metalItems/jeremiumMetals.java +++ b/src/main/java/net/arcmods/ryantlg/items/metalItems/jeremiumMetals.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.items.metalItems; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.itemClasses.jeremiumItem; import net.minecraft.item.Item; import net.minecraft.util.Identifier; @@ -9,14 +9,14 @@ import net.minecraft.util.registry.Registry; public class jeremiumMetals { - public static final Item JEREMIUM = new jeremiumItem(new Item.Settings().fireproof().group(gamermod.CHING).maxCount(56).rarity(Rarity.UNCOMMON)); - public static final Item RAW_JEREMIUM = new jeremiumItem(new Item.Settings().fireproof().group(gamermod.CHING).maxCount(56).rarity(Rarity.UNCOMMON)); + public static final Item JEREMIUM = new jeremiumItem(new Item.Settings().fireproof().group(gameritems.CHING).maxCount(56).rarity(Rarity.UNCOMMON)); + public static final Item RAW_JEREMIUM = new jeremiumItem(new Item.Settings().fireproof().group(gameritems.CHING).maxCount(56).rarity(Rarity.UNCOMMON)); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_ingot"), JEREMIUM); - Registry.register(Registry.ITEM, new Identifier("gamermod", "raw_jeremium"), RAW_JEREMIUM); + Registry.register(Registry.ITEM, new Identifier("gameritems", "jeremium_ingot"), JEREMIUM); + Registry.register(Registry.ITEM, new Identifier("gameritems", "raw_jeremium"), RAW_JEREMIUM); - gamermod.LOGGER.info("jeremiumMetals loaded"); + gameritems.LOGGER.info("jeremiumMetals loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/items/metalItems/omniumMetals.java b/src/main/java/net/arcmods/ryantlg/items/metalItems/omniumMetals.java index a0f4679..7bc355c 100755 --- a/src/main/java/net/arcmods/ryantlg/items/metalItems/omniumMetals.java +++ b/src/main/java/net/arcmods/ryantlg/items/metalItems/omniumMetals.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.items.metalItems; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.minecraft.item.Item; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; @@ -8,13 +8,13 @@ import net.minecraft.util.registry.Registry; public class omniumMetals { - public static final Item OMNIUM = new Item(new Item.Settings().group(gamermod.CHING).maxCount(64).fireproof().rarity(Rarity.RARE)); - public static final Item RAW_OMNIUM = new Item(new Item.Settings().group(gamermod.CHING).maxCount(64).fireproof().rarity(Rarity.RARE)); + public static final Item OMNIUM = new Item(new Item.Settings().group(gameritems.CHING).maxCount(64).fireproof().rarity(Rarity.RARE)); + public static final Item RAW_OMNIUM = new Item(new Item.Settings().group(gameritems.CHING).maxCount(64).fireproof().rarity(Rarity.RARE)); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_ingot"), OMNIUM); - Registry.register(Registry.ITEM, new Identifier("gamermod", "raw_omnium"), RAW_OMNIUM); + Registry.register(Registry.ITEM, new Identifier("gameritems", "omnium_ingot"), OMNIUM); + Registry.register(Registry.ITEM, new Identifier("gameritems", "raw_omnium"), RAW_OMNIUM); - gamermod.LOGGER.info("omniumMetals loaded"); + gameritems.LOGGER.info("omniumMetals loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/items/metalItems/oriumMetals.java b/src/main/java/net/arcmods/ryantlg/items/metalItems/oriumMetals.java index e39824f..9922d1b 100644 --- a/src/main/java/net/arcmods/ryantlg/items/metalItems/oriumMetals.java +++ b/src/main/java/net/arcmods/ryantlg/items/metalItems/oriumMetals.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.items.metalItems; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.itemClasses.oriumItem; import net.minecraft.item.Item; import net.minecraft.util.Identifier; @@ -9,13 +9,13 @@ import net.minecraft.util.registry.Registry; public class oriumMetals { - public static final Item ORIUM = new oriumItem(new Item.Settings().group(gamermod.CHING).maxCount(64).fireproof().rarity(Rarity.UNCOMMON)); - public static final Item RAW_ORIUM = new oriumItem(new Item.Settings().group(gamermod.CHING).maxCount(64).fireproof().rarity(Rarity.UNCOMMON)); + public static final Item ORIUM = new oriumItem(new Item.Settings().group(gameritems.CHING).maxCount(64).fireproof().rarity(Rarity.UNCOMMON)); + public static final Item RAW_ORIUM = new oriumItem(new Item.Settings().group(gameritems.CHING).maxCount(64).fireproof().rarity(Rarity.UNCOMMON)); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_ingot"), ORIUM); - Registry.register(Registry.ITEM, new Identifier("gamermod", "raw_orium"), RAW_ORIUM); + Registry.register(Registry.ITEM, new Identifier("gameritems", "orium_ingot"), ORIUM); + Registry.register(Registry.ITEM, new Identifier("gameritems", "raw_orium"), RAW_ORIUM); - gamermod.LOGGER.info("oriumMetals loaded"); + gameritems.LOGGER.info("oriumMetals loaded"); } } \ No newline at end of file diff --git a/src/main/java/net/arcmods/ryantlg/items/miscItems/FunnyItems.java b/src/main/java/net/arcmods/ryantlg/items/miscItems/FunnyItems.java index ed9f68f..2a931d3 100755 --- a/src/main/java/net/arcmods/ryantlg/items/miscItems/FunnyItems.java +++ b/src/main/java/net/arcmods/ryantlg/items/miscItems/FunnyItems.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.items.miscItems; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.toolMaterials.deezToolMaterial; import net.arcmods.ryantlg.toolMaterials.dragchinToolMaterial; import net.minecraft.item.Item; @@ -10,27 +10,27 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class FunnyItems { - public static final Item CHIN = new Item(new Item.Settings().group(gamermod.FNUTS).maxCount(4)); - public static final Item NUTS = new Item(new Item.Settings().group(gamermod.FNUTS).maxCount(4)); - public static final Item DEEZ = new Item(new Item.Settings().group(gamermod.FNUTS).maxCount(4)); - public static final Item DEEZ_NUTS = new Item(new Item.Settings().group(gamermod.FNUTS).maxCount(4)); - public static ToolItem DEEZ_NUTS_ON_CHIN = new SwordItem(deezToolMaterial.INSTANCE, 1, -1.0F, new Item.Settings().group(gamermod.FNUTS)); - public static final Item DRAG = new Item(new Item.Settings().group(gamermod.FNUTS).maxCount(4)); - public static ToolItem DRAG_DEEZ_NUTS_ON_CHIN = new SwordItem(dragchinToolMaterial.INSTANCE, 1, -1.0F, new Item.Settings().group(gamermod.FNUTS)); - public static final Item YOUR_MOTHER = new Item(new Item.Settings().group(gamermod.FNUTS).maxCount(1)); + public static final Item CHIN = new Item(new Item.Settings().group(gameritems.FNUTS).maxCount(4)); + public static final Item NUTS = new Item(new Item.Settings().group(gameritems.FNUTS).maxCount(4)); + public static final Item DEEZ = new Item(new Item.Settings().group(gameritems.FNUTS).maxCount(4)); + public static final Item DEEZ_NUTS = new Item(new Item.Settings().group(gameritems.FNUTS).maxCount(4)); + public static ToolItem DEEZ_NUTS_ON_CHIN = new SwordItem(deezToolMaterial.INSTANCE, 1, -1.0F, new Item.Settings().group(gameritems.FNUTS)); + public static final Item DRAG = new Item(new Item.Settings().group(gameritems.FNUTS).maxCount(4)); + public static ToolItem DRAG_DEEZ_NUTS_ON_CHIN = new SwordItem(dragchinToolMaterial.INSTANCE, 1, -1.0F, new Item.Settings().group(gameritems.FNUTS)); + public static final Item YOUR_MOTHER = new Item(new Item.Settings().group(gameritems.FNUTS).maxCount(1)); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "chin"), CHIN); - Registry.register(Registry.ITEM, new Identifier("gamermod", "nuts"), NUTS); - Registry.register(Registry.ITEM, new Identifier("gamermod", "deez"), DEEZ); - Registry.register(Registry.ITEM, new Identifier("gamermod", "deez_nuts"), DEEZ_NUTS); - Registry.register(Registry.ITEM, new Identifier("gamermod", "deez_nuts_on_your_chin"), DEEZ_NUTS_ON_CHIN); - Registry.register(Registry.ITEM, new Identifier("gamermod", "drag"), DRAG); - Registry.register(Registry.ITEM, new Identifier("gamermod", "drag_deez_nuts_on_your_chin"), DRAG_DEEZ_NUTS_ON_CHIN); - Registry.register(Registry.ITEM, new Identifier("gamermod", "your_mother"), YOUR_MOTHER); + Registry.register(Registry.ITEM, new Identifier("gameritems", "chin"), CHIN); + Registry.register(Registry.ITEM, new Identifier("gameritems", "nuts"), NUTS); + Registry.register(Registry.ITEM, new Identifier("gameritems", "deez"), DEEZ); + Registry.register(Registry.ITEM, new Identifier("gameritems", "deez_nuts"), DEEZ_NUTS); + Registry.register(Registry.ITEM, new Identifier("gameritems", "deez_nuts_on_your_chin"), DEEZ_NUTS_ON_CHIN); + Registry.register(Registry.ITEM, new Identifier("gameritems", "drag"), DRAG); + Registry.register(Registry.ITEM, new Identifier("gameritems", "drag_deez_nuts_on_your_chin"), DRAG_DEEZ_NUTS_ON_CHIN); + Registry.register(Registry.ITEM, new Identifier("gameritems", "your_mother"), YOUR_MOTHER); - gamermod.LOGGER.info("FunnyItems loaded"); + gameritems.LOGGER.info("FunnyItems 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 9d44924..1397bfb 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,6 @@ package net.arcmods.ryantlg.items.miscItems; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.minecraft.item.Item; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; @@ -8,12 +8,12 @@ import net.minecraft.util.registry.Registry; public class OtherItems { - public static final Item NETHERITE_STICK = new Item(new Item.Settings().group(gamermod.CHING).maxCount(64).fireproof().rarity(Rarity.EPIC)); + public static final Item NETHERITE_STICK = new Item(new Item.Settings().group(gameritems.CHING).maxCount(64).fireproof().rarity(Rarity.EPIC)); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "netherite_stick"), NETHERITE_STICK); + Registry.register(Registry.ITEM, new Identifier("gameritems", "netherite_stick"), NETHERITE_STICK); - gamermod.LOGGER.info("OtherItems loaded"); + gameritems.LOGGER.info("OtherItems loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/items/miscItems/fabricOfReality.java b/src/main/java/net/arcmods/ryantlg/items/miscItems/fabricOfReality.java index 8755ad4..a69e0a0 100644 --- a/src/main/java/net/arcmods/ryantlg/items/miscItems/fabricOfReality.java +++ b/src/main/java/net/arcmods/ryantlg/items/miscItems/fabricOfReality.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.items.miscItems; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.itemClasses.FabricReality; import net.minecraft.item.Item; import net.minecraft.util.Identifier; @@ -11,9 +11,9 @@ public class fabricOfReality { public static final Item FABRIC_OF_REALITY = new FabricReality(new Item.Settings().fireproof()); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "fabric_of_reality"), FABRIC_OF_REALITY); + Registry.register(Registry.ITEM, new Identifier("gameritems", "fabric_of_reality"), FABRIC_OF_REALITY); - gamermod.LOGGER.info("fabricOfReality loaded"); + gameritems.LOGGER.info("fabricOfReality loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/items/tools/jeremiumTools.java b/src/main/java/net/arcmods/ryantlg/items/tools/jeremiumTools.java index 19f885f..1e450e6 100644 --- a/src/main/java/net/arcmods/ryantlg/items/tools/jeremiumTools.java +++ b/src/main/java/net/arcmods/ryantlg/items/tools/jeremiumTools.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.items.tools; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.customToolItemClasses.jeremium.JeremiumAxeItem; import net.arcmods.ryantlg.customToolItemClasses.jeremium.JeremiumHoeItem; import net.arcmods.ryantlg.customToolItemClasses.jeremium.JeremiumPickaxeItem; @@ -15,21 +15,21 @@ import net.minecraft.util.registry.Registry; public class jeremiumTools { - public static ToolItem JEREMIUM_SWORD = new JeremiumSwordItem(jeremiumToolMaterial.INSTANCE, 3, -2.9F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.EPIC)); - public static ToolItem JEREMIUM_PICKAXE = new JeremiumPickaxeItem(jeremiumToolMaterial.INSTANCE, -10, -3.0F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.EPIC)); - public static ToolItem JEREMIUM_SHOVEL = new JeremiumShovelItem(jeremiumToolMaterial.INSTANCE, -11, -3.0F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.EPIC)); - public static ToolItem JEREMIUM_AXE = new JeremiumAxeItem(jeremiumToolMaterial.INSTANCE, 5, -3.0F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.EPIC)); - public static ToolItem JEREMIUM_HOE = new JeremiumHoeItem(jeremiumToolMaterial.INSTANCE, -12, -3.0F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.EPIC)); + public static ToolItem JEREMIUM_SWORD = new JeremiumSwordItem(jeremiumToolMaterial.INSTANCE, 3, -2.9F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); + public static ToolItem JEREMIUM_PICKAXE = new JeremiumPickaxeItem(jeremiumToolMaterial.INSTANCE, -10, -3.0F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); + public static ToolItem JEREMIUM_SHOVEL = new JeremiumShovelItem(jeremiumToolMaterial.INSTANCE, -11, -3.0F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); + public static ToolItem JEREMIUM_AXE = new JeremiumAxeItem(jeremiumToolMaterial.INSTANCE, 5, -3.0F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); + public static ToolItem JEREMIUM_HOE = new JeremiumHoeItem(jeremiumToolMaterial.INSTANCE, -12, -3.0F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_sword"), JEREMIUM_SWORD); - Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_pickaxe"), JEREMIUM_PICKAXE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_shovel"), JEREMIUM_SHOVEL); - Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_axe"), JEREMIUM_AXE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "jeremium_hoe"), JEREMIUM_HOE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "jeremium_sword"), JEREMIUM_SWORD); + Registry.register(Registry.ITEM, new Identifier("gameritems", "jeremium_pickaxe"), JEREMIUM_PICKAXE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "jeremium_shovel"), JEREMIUM_SHOVEL); + Registry.register(Registry.ITEM, new Identifier("gameritems", "jeremium_axe"), JEREMIUM_AXE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "jeremium_hoe"), JEREMIUM_HOE); - gamermod.LOGGER.info("jeremiumTools loaded"); + gameritems.LOGGER.info("jeremiumTools loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/items/tools/omniumTools.java b/src/main/java/net/arcmods/ryantlg/items/tools/omniumTools.java index 75456f6..97966f0 100755 --- a/src/main/java/net/arcmods/ryantlg/items/tools/omniumTools.java +++ b/src/main/java/net/arcmods/ryantlg/items/tools/omniumTools.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.items.tools; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.customToolItemClasses.omnium.OmniumAxeItem; import net.arcmods.ryantlg.customToolItemClasses.omnium.OmniumHoeItem; import net.arcmods.ryantlg.customToolItemClasses.omnium.OmniumPickaxeItem; @@ -15,20 +15,20 @@ import net.minecraft.util.registry.Registry; public class omniumTools { - public static ToolItem OMNIUM_SWORD = new OmniumSwordItem(omniumToolMaterial.INSTANCE, 3, -1.0F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.EPIC)); - public static ToolItem OMNIUM_PICKAXE = new OmniumPickaxeItem(omniumToolMaterial.INSTANCE, -9, -2.8F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.EPIC)); - public static ToolItem OMNIUM_SHOVEL = new OmniumShovelItem(omniumToolMaterial.INSTANCE, -10, -3.0F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.EPIC)); - public static ToolItem OMNIUM_AXE = new OmniumAxeItem(omniumToolMaterial.INSTANCE, 6, -1.9F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.EPIC)); - public static ToolItem OMNIUM_HOE = new OmniumHoeItem(omniumToolMaterial.INSTANCE, -11, -3.2F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.EPIC)); + public static ToolItem OMNIUM_SWORD = new OmniumSwordItem(omniumToolMaterial.INSTANCE, 3, -1.0F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); + public static ToolItem OMNIUM_PICKAXE = new OmniumPickaxeItem(omniumToolMaterial.INSTANCE, -9, -2.8F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); + public static ToolItem OMNIUM_SHOVEL = new OmniumShovelItem(omniumToolMaterial.INSTANCE, -10, -3.0F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); + public static ToolItem OMNIUM_AXE = new OmniumAxeItem(omniumToolMaterial.INSTANCE, 6, -1.9F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); + public static ToolItem OMNIUM_HOE = new OmniumHoeItem(omniumToolMaterial.INSTANCE, -11, -3.2F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.EPIC)); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_sword"), OMNIUM_SWORD); - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_pickaxe"), OMNIUM_PICKAXE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_shovel"), OMNIUM_SHOVEL); - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_axe"), OMNIUM_AXE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "omnium_hoe"), OMNIUM_HOE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "omnium_sword"), OMNIUM_SWORD); + Registry.register(Registry.ITEM, new Identifier("gameritems", "omnium_pickaxe"), OMNIUM_PICKAXE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "omnium_shovel"), OMNIUM_SHOVEL); + Registry.register(Registry.ITEM, new Identifier("gameritems", "omnium_axe"), OMNIUM_AXE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "omnium_hoe"), OMNIUM_HOE); - gamermod.LOGGER.info("omniumTools loaded"); + gameritems.LOGGER.info("omniumTools loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/items/tools/oriumTools.java b/src/main/java/net/arcmods/ryantlg/items/tools/oriumTools.java index 25a6536..b826bee 100755 --- a/src/main/java/net/arcmods/ryantlg/items/tools/oriumTools.java +++ b/src/main/java/net/arcmods/ryantlg/items/tools/oriumTools.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.items.tools; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.customToolItemClasses.orium.OriumAxeItem; import net.arcmods.ryantlg.customToolItemClasses.orium.OriumHoeItem; import net.arcmods.ryantlg.customToolItemClasses.orium.OriumPickaxeItem; @@ -15,20 +15,20 @@ import net.minecraft.util.registry.Registry; public class oriumTools { - public static ToolItem ORIUM_SWORD = new OriumSwordItem(oriumToolMaterial.INSTANCE, 2, -2.2F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.RARE)); - public static ToolItem ORIUM_PICKAXE = new OriumPickaxeItem(oriumToolMaterial.INSTANCE, -3, -2.8F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.RARE)); - public static ToolItem ORIUM_SHOVEL = new OriumShovelItem(oriumToolMaterial.INSTANCE, -2.5F, -3.0F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.RARE)); - public static ToolItem ORIUM_AXE = new OriumAxeItem(oriumToolMaterial.INSTANCE, 4, -1.9F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.RARE)); - public static ToolItem ORIUM_HOE = new OriumHoeItem(oriumToolMaterial.INSTANCE, -8, -3.2F, new Item.Settings().fireproof().group(gamermod.THING).rarity(Rarity.RARE)); + public static ToolItem ORIUM_SWORD = new OriumSwordItem(oriumToolMaterial.INSTANCE, 2, -2.2F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE)); + public static ToolItem ORIUM_PICKAXE = new OriumPickaxeItem(oriumToolMaterial.INSTANCE, -3, -2.8F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE)); + public static ToolItem ORIUM_SHOVEL = new OriumShovelItem(oriumToolMaterial.INSTANCE, -2.5F, -3.0F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE)); + public static ToolItem ORIUM_AXE = new OriumAxeItem(oriumToolMaterial.INSTANCE, 4, -1.9F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE)); + public static ToolItem ORIUM_HOE = new OriumHoeItem(oriumToolMaterial.INSTANCE, -8, -3.2F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE)); public static void register() { - Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_sword"), ORIUM_SWORD); - Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_pickaxe"), ORIUM_PICKAXE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_shovel"), ORIUM_SHOVEL); - Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_axe"), ORIUM_AXE); - Registry.register(Registry.ITEM, new Identifier("gamermod", "orium_hoe"), ORIUM_HOE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "orium_sword"), ORIUM_SWORD); + Registry.register(Registry.ITEM, new Identifier("gameritems", "orium_pickaxe"), ORIUM_PICKAXE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "orium_shovel"), ORIUM_SHOVEL); + Registry.register(Registry.ITEM, new Identifier("gameritems", "orium_axe"), ORIUM_AXE); + Registry.register(Registry.ITEM, new Identifier("gameritems", "orium_hoe"), ORIUM_HOE); - gamermod.LOGGER.info("oriumTools loaded"); + gameritems.LOGGER.info("oriumTools loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java b/src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java index 3f4ab91..c6ab689 100755 --- a/src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java +++ b/src/main/java/net/arcmods/ryantlg/lootTables/grassVanillaWeem.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.lootTables; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.items.itemsByCrop.weemItems; import net.fabricmc.fabric.api.loot.v1.FabricLootPoolBuilder; import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback; @@ -33,6 +33,6 @@ public class grassVanillaWeem { public static void register() { modifyLootTables(); - gamermod.LOGGER.info("grassVanillaWeem loaded"); + gameritems.LOGGER.info("grassVanillaWeem loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/mixin/GamerMixin.java b/src/main/java/net/arcmods/ryantlg/mixin/GamerMixin.java index 8469402..b072159 100755 --- a/src/main/java/net/arcmods/ryantlg/mixin/GamerMixin.java +++ b/src/main/java/net/arcmods/ryantlg/mixin/GamerMixin.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.mixin; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.minecraft.client.gui.screen.TitleScreen; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -11,6 +11,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class GamerMixin { @Inject(at = @At("HEAD"), method = "init()V") private void init(CallbackInfo info) { - gamermod.LOGGER.info("what a gamer"); + gameritems.LOGGER.info("what a gamer"); } } diff --git a/src/main/java/net/arcmods/ryantlg/sounds.java b/src/main/java/net/arcmods/ryantlg/sounds.java index dd5402e..9c074bf 100755 --- a/src/main/java/net/arcmods/ryantlg/sounds.java +++ b/src/main/java/net/arcmods/ryantlg/sounds.java @@ -6,15 +6,15 @@ import net.minecraft.util.registry.Registry; public class sounds { - public static final Identifier SNIFF = new Identifier("gamermod:sniff"); + public static final Identifier SNIFF = new Identifier("gameritems:sniff"); public static SoundEvent SNIFF_SOUND_EVENT = new SoundEvent(SNIFF); - public static final Identifier MATT = new Identifier("gamermod:matt"); + public static final Identifier MATT = new Identifier("gameritems:matt"); public static SoundEvent MATT_SOUND_EVENT = new SoundEvent(MATT); - public static final Identifier ELON = new Identifier("gamermod:elon"); + public static final Identifier ELON = new Identifier("gameritems:elon"); public static SoundEvent ELON_SOUND_EVENT = new SoundEvent(ELON); public static void register() { - gamermod.LOGGER.info("Sounds Loaded"); + gameritems.LOGGER.info("Sounds Loaded"); Registry.register(Registry.SOUND_EVENT, sounds.SNIFF, SNIFF_SOUND_EVENT); Registry.register(Registry.SOUND_EVENT, sounds.MATT, MATT_SOUND_EVENT); diff --git a/src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java b/src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java index d82db80..6fe7b96 100644 --- a/src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java +++ b/src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.statusEffects; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.statusEffects.effectClasses.highStatusEffect; import net.arcmods.ryantlg.statusEffects.effectClasses.jeremydStatusEffect; import net.minecraft.entity.effect.StatusEffect; @@ -14,11 +14,11 @@ public class GamerEffects { public static final StatusEffect JEREMYD = new jeremydStatusEffect(); public static void register() { - Registry.register(Registry.STATUS_EFFECT, new Identifier("gamermod", "high"), HIGH); + Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "high"), HIGH); - Registry.register(Registry.STATUS_EFFECT, new Identifier("gamermod", "jeremyd"), JEREMYD); + Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "jeremyd"), JEREMYD); - gamermod.LOGGER.info("statusEffects Loaded"); + gameritems.LOGGER.info("statusEffects Loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOmniumOreGen.java b/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOmniumOreGen.java index 5a83c79..a76d9b6 100644 --- a/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOmniumOreGen.java +++ b/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOmniumOreGen.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.worldGeneration; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.blocks.omniumBlocks; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; @@ -36,13 +36,13 @@ public class DeepslateOmniumOreGen { public static void register() { Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, - new Identifier("gamermod", "deepslate_omnium_ore"), ORE_CONFIGURED_FEATURE); - Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gamermod", "deepslate_omnium_ore"), + new Identifier("gameritems", "deepslate_omnium_ore"), ORE_CONFIGURED_FEATURE); + Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "deepslate_omnium_ore"), ORE_PLACED_FEATURE); BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.PLACED_FEATURE_KEY, - new Identifier("gamermod", "deepslate_omnium_ore"))); + new Identifier("gameritems", "deepslate_omnium_ore"))); - gamermod.LOGGER.info("DeepslateOmniumOreGen loaded"); + gameritems.LOGGER.info("DeepslateOmniumOreGen loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOriumOreGen.java b/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOriumOreGen.java index 4bcfe49..9cc7b2c 100644 --- a/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOriumOreGen.java +++ b/src/main/java/net/arcmods/ryantlg/worldGeneration/DeepslateOriumOreGen.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.worldGeneration; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.blocks.oriumBlocks; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; @@ -36,13 +36,13 @@ public class DeepslateOriumOreGen { public static void register() { Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, - new Identifier("gamermod", "deepslate_orium_ore"), ORE_CONFIGURED_FEATURE); - Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gamermod", "deepslate_orium_ore"), + new Identifier("gameritems", "deepslate_orium_ore"), ORE_CONFIGURED_FEATURE); + Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "deepslate_orium_ore"), ORE_PLACED_FEATURE); BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.PLACED_FEATURE_KEY, - new Identifier("gamermod", "deepslate_orium_ore"))); + new Identifier("gameritems", "deepslate_orium_ore"))); - gamermod.LOGGER.info("DeepslateOriumOreGen loaded"); + gameritems.LOGGER.info("DeepslateOriumOreGen loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/worldGeneration/JeremiumOreGen.java b/src/main/java/net/arcmods/ryantlg/worldGeneration/JeremiumOreGen.java index b2ba246..67038ad 100644 --- a/src/main/java/net/arcmods/ryantlg/worldGeneration/JeremiumOreGen.java +++ b/src/main/java/net/arcmods/ryantlg/worldGeneration/JeremiumOreGen.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.worldGeneration; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.blocks.jeremiumBlocks; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; @@ -37,13 +37,13 @@ public class JeremiumOreGen { Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, - new Identifier("gamermod", "deepslate_jeremium_ore"), ORE_CONFIGURED_FEATURE); - Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gamermod", "deepslate_jeremium_ore"), + new Identifier("gameritems", "deepslate_jeremium_ore"), ORE_CONFIGURED_FEATURE); + Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "deepslate_jeremium_ore"), ORE_PLACED_FEATURE); BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.PLACED_FEATURE_KEY, - new Identifier("gamermod", "deepslate_jeremium_ore"))); + new Identifier("gameritems", "deepslate_jeremium_ore"))); - gamermod.LOGGER.info("JeremiumOreGen loaded"); + gameritems.LOGGER.info("JeremiumOreGen loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/worldGeneration/OmniumOreGen.java b/src/main/java/net/arcmods/ryantlg/worldGeneration/OmniumOreGen.java index 8b928dd..65d0db1 100755 --- a/src/main/java/net/arcmods/ryantlg/worldGeneration/OmniumOreGen.java +++ b/src/main/java/net/arcmods/ryantlg/worldGeneration/OmniumOreGen.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.worldGeneration; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.blocks.omniumBlocks; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; @@ -36,13 +36,13 @@ public class OmniumOreGen { public static void register() { Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, - new Identifier("gamermod", "omnium_ore"), OMNIUM_ORE_CONFIGURED_FEATURE); - Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gamermod", "omnium_ore"), + new Identifier("gameritems", "omnium_ore"), OMNIUM_ORE_CONFIGURED_FEATURE); + Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "omnium_ore"), OMNIUM_ORE_PLACED_FEATURE); BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.PLACED_FEATURE_KEY, - new Identifier("gamermod", "omnium_ore"))); + new Identifier("gameritems", "omnium_ore"))); - gamermod.LOGGER.info("OmniumOreGen loaded"); + gameritems.LOGGER.info("OmniumOreGen loaded"); } } diff --git a/src/main/java/net/arcmods/ryantlg/worldGeneration/OriumOreGen.java b/src/main/java/net/arcmods/ryantlg/worldGeneration/OriumOreGen.java index 483fd24..2eac47c 100755 --- a/src/main/java/net/arcmods/ryantlg/worldGeneration/OriumOreGen.java +++ b/src/main/java/net/arcmods/ryantlg/worldGeneration/OriumOreGen.java @@ -1,6 +1,6 @@ package net.arcmods.ryantlg.worldGeneration; -import net.arcmods.ryantlg.gamermod; +import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.blocks.oriumBlocks; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; @@ -36,13 +36,13 @@ public class OriumOreGen { public static void register() { Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, - new Identifier("gamermod", "orium_ore"), ORIUM_ORE_CONFIGURED_FEATURE); - Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gamermod", "orium_ore"), + new Identifier("gameritems", "orium_ore"), ORIUM_ORE_CONFIGURED_FEATURE); + Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("gameritems", "orium_ore"), ORIUM_ORE_PLACED_FEATURE); BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.PLACED_FEATURE_KEY, - new Identifier("gamermod", "orium_ore"))); + new Identifier("gameritems", "orium_ore"))); - gamermod.LOGGER.info("OriumOreGen loaded"); + gameritems.LOGGER.info("OriumOreGen loaded"); } } diff --git a/src/main/resources/assets/gameritems/blockstates/deepslate_jeremium_ore.json b/src/main/resources/assets/gameritems/blockstates/deepslate_jeremium_ore.json new file mode 100644 index 0000000..dd271af --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/deepslate_jeremium_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/deepslate_jeremium_ore" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/deepslate_omnium_ore.json b/src/main/resources/assets/gameritems/blockstates/deepslate_omnium_ore.json new file mode 100644 index 0000000..cce0426 --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/deepslate_omnium_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/deepslate_omnium_ore" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/deepslate_orium_ore.json b/src/main/resources/assets/gameritems/blockstates/deepslate_orium_ore.json new file mode 100644 index 0000000..2c0fdfd --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/deepslate_orium_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/deepslate_orium_ore" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/elon_musk.json b/src/main/resources/assets/gameritems/blockstates/elon_musk.json new file mode 100755 index 0000000..c188d99 --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/elon_musk.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/elon_musk" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/jeremium_block.json b/src/main/resources/assets/gameritems/blockstates/jeremium_block.json new file mode 100644 index 0000000..ece68d1 --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/jeremium_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/jeremium_block" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/jeremium_ore.json b/src/main/resources/assets/gameritems/blockstates/jeremium_ore.json new file mode 100644 index 0000000..b066b02 --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/jeremium_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/jeremium_ore" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/matt_damon.json b/src/main/resources/assets/gameritems/blockstates/matt_damon.json new file mode 100755 index 0000000..e2062cc --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/matt_damon.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/matt_damon" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/omnium_block.json b/src/main/resources/assets/gameritems/blockstates/omnium_block.json new file mode 100755 index 0000000..90bc8e5 --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/omnium_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/omnium_block" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/omnium_ore.json b/src/main/resources/assets/gameritems/blockstates/omnium_ore.json new file mode 100755 index 0000000..6dc2b81 --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/omnium_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/omnium_ore" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/orium_block.json b/src/main/resources/assets/gameritems/blockstates/orium_block.json new file mode 100644 index 0000000..db17f55 --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/orium_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/orium_block" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/orium_ore.json b/src/main/resources/assets/gameritems/blockstates/orium_ore.json new file mode 100644 index 0000000..cd6e0aa --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/orium_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "gameritems:block/orium_ore" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/blockstates/weem_crop_block.json b/src/main/resources/assets/gameritems/blockstates/weem_crop_block.json new file mode 100755 index 0000000..355b6ce --- /dev/null +++ b/src/main/resources/assets/gameritems/blockstates/weem_crop_block.json @@ -0,0 +1,28 @@ +{ + "variants": { + "age=0": { + "model": "gameritems:block/weem_crop_stage0" + }, + "age=1": { + "model": "gameritems:block/weem_crop_stage1" + }, + "age=2": { + "model": "gameritems:block/weem_crop_stage2" + }, + "age=3": { + "model": "gameritems:block/weem_crop_stage3" + }, + "age=4": { + "model": "gameritems:block/weem_crop_stage4" + }, + "age=5": { + "model": "gameritems:block/weem_crop_stage5" + }, + "age=6": { + "model": "gameritems:block/weem_crop_stage6" + }, + "age=7": { + "model": "gameritems:block/weem_crop_stage7" + } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/icon.png b/src/main/resources/assets/gameritems/icon.png similarity index 100% rename from src/main/resources/assets/gamermod/icon.png rename to src/main/resources/assets/gameritems/icon.png diff --git a/src/main/resources/assets/gameritems/lang/en_us.json b/src/main/resources/assets/gameritems/lang/en_us.json new file mode 100755 index 0000000..df21cd2 --- /dev/null +++ b/src/main/resources/assets/gameritems/lang/en_us.json @@ -0,0 +1,74 @@ +{ + "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.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", + "item.gameritems.omnium_chestplate": "Omnium Chestplate", + "item.gameritems.omnium_leggings": "Omnium Leggings", + "item.gameritems.omnium_boots": "Omnium Boots", + "item.gameritems.omnium_shovel": "Omnium Shovel", + "item.gameritems.omnium_axe": "Omnium Axe", + "item.gameritems.omnium_hoe": "Omnium Hoe", + "item.gameritems.netherite_stick": "Netherite Stick", + "itemGroup.gameritems.things": "ueh, stuff", + "itemGroup.gameritems.armour_and_tools": "Armour, Weapons, and Tools", + "item.gameritems.omnium_sword.tooltip": "Surprisingly lightweight!", + "item.gameritems.weem": "Weem", + "item.gameritems.weem_seeds": "Weem Seeds", + "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", + "item.gameritems.orium.tooltip": "hahaha ore-ium", + "block.gameritems.orium.tooltip": "hahaha ore-ium", + "item.gameritems.raw_orium": "Raw Orium", + "item.gameritems.orium_ingot": "Orium Ingot", + "block.gameritems.orium_ore": "Orium Ore", + "block.gameritems.orium_block": "Orium Block", + "item.gameritems.orium_helmet": "Orium Helmet", + "item.gameritems.orium_chestplate": "Orium Chestplate", + "item.gameritems.orium_leggings": "Orium Leggings", + "item.gameritems.orium_boots": "Orium Boots", + "item.gameritems.orium_shovel": "Orium Shovel", + "item.gameritems.orium_axe": "Orium Axe", + "item.gameritems.orium_hoe": "Orium Hoe", + "item.gameritems.orium_sword": "Orium Sword", + "item.gameritems.orium_pickaxe": "Orium Pickaxe", + "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", + "item.gameritems.jeremium_ingot": "Jeremium Ingot", + "item.gameritems.raw_jeremium": "Raw Jeremium", + "block.gameritems.jeremium_ore": "Jeremium Ore", + "block.gameritems.jeremium_block": "Jeremium Block", + "item.gameritems.jeremium_helmet": "Jeremium Helmet", + "item.gameritems.jeremium_chestplate": "Jeremium Chestplate", + "item.gameritems.jeremium_leggings": "Jeremium Leggings", + "item.gameritems.jeremium_boots": "Jeremium Boots", + "block.gameritems.jeremium.tooltip": "Heavy, but emits light.", + "all.gameritems.jeremium.tooltiptwo": "Less able to fit in a stack because it's heavy", + "item.gameritems.jeremium_sword": "Jeremium Sword", + "item.gameritems.jeremium_axe": "Jeremium Axe", + "item.gameritems.jeremium_hoe": "Jeremium Hoe", + "item.gameritems.jeremium_shovel": "Jeremium Shovel", + "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" + +} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/deepslate_jeremium_ore.json b/src/main/resources/assets/gameritems/models/block/deepslate_jeremium_ore.json similarity index 52% rename from src/main/resources/assets/gamermod/models/block/deepslate_jeremium_ore.json rename to src/main/resources/assets/gameritems/models/block/deepslate_jeremium_ore.json index 977a6b9..9c84096 100644 --- a/src/main/resources/assets/gamermod/models/block/deepslate_jeremium_ore.json +++ b/src/main/resources/assets/gameritems/models/block/deepslate_jeremium_ore.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "gamermod:block/deepslate_jeremium_ore" + "all": "gameritems:block/deepslate_jeremium_ore" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/deepslate_omnium_ore.json b/src/main/resources/assets/gameritems/models/block/deepslate_omnium_ore.json similarity index 53% rename from src/main/resources/assets/gamermod/models/block/deepslate_omnium_ore.json rename to src/main/resources/assets/gameritems/models/block/deepslate_omnium_ore.json index 4b99ddf..8d63cdf 100644 --- a/src/main/resources/assets/gamermod/models/block/deepslate_omnium_ore.json +++ b/src/main/resources/assets/gameritems/models/block/deepslate_omnium_ore.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "gamermod:block/deepslate_omnium_ore" + "all": "gameritems:block/deepslate_omnium_ore" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/deepslate_orium_ore.json b/src/main/resources/assets/gameritems/models/block/deepslate_orium_ore.json similarity index 53% rename from src/main/resources/assets/gamermod/models/block/deepslate_orium_ore.json rename to src/main/resources/assets/gameritems/models/block/deepslate_orium_ore.json index 3f5c69b..8e94b39 100644 --- a/src/main/resources/assets/gamermod/models/block/deepslate_orium_ore.json +++ b/src/main/resources/assets/gameritems/models/block/deepslate_orium_ore.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "gamermod:block/deepslate_orium_ore" + "all": "gameritems:block/deepslate_orium_ore" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/elon_musk.json b/src/main/resources/assets/gameritems/models/block/elon_musk.json similarity index 56% rename from src/main/resources/assets/gamermod/models/block/elon_musk.json rename to src/main/resources/assets/gameritems/models/block/elon_musk.json index 541e63b..5f657c2 100755 --- a/src/main/resources/assets/gamermod/models/block/elon_musk.json +++ b/src/main/resources/assets/gameritems/models/block/elon_musk.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "gamermod:block/elon_musk" + "all": "gameritems:block/elon_musk" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/jeremium_block.json b/src/main/resources/assets/gameritems/models/block/jeremium_block.json similarity index 56% rename from src/main/resources/assets/gamermod/models/block/jeremium_block.json rename to src/main/resources/assets/gameritems/models/block/jeremium_block.json index c7b26bf..9c989d6 100644 --- a/src/main/resources/assets/gamermod/models/block/jeremium_block.json +++ b/src/main/resources/assets/gameritems/models/block/jeremium_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "gamermod:block/jeremium_block" + "all": "gameritems:block/jeremium_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/jeremium_ore.json b/src/main/resources/assets/gameritems/models/block/jeremium_ore.json similarity index 57% rename from src/main/resources/assets/gamermod/models/block/jeremium_ore.json rename to src/main/resources/assets/gameritems/models/block/jeremium_ore.json index 9a82cdf..d98b056 100644 --- a/src/main/resources/assets/gamermod/models/block/jeremium_ore.json +++ b/src/main/resources/assets/gameritems/models/block/jeremium_ore.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "gamermod:block/jeremium_ore" + "all": "gameritems:block/jeremium_ore" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/matt_damon.json b/src/main/resources/assets/gameritems/models/block/matt_damon.json similarity index 55% rename from src/main/resources/assets/gamermod/models/block/matt_damon.json rename to src/main/resources/assets/gameritems/models/block/matt_damon.json index f863d13..941f3dd 100755 --- a/src/main/resources/assets/gamermod/models/block/matt_damon.json +++ b/src/main/resources/assets/gameritems/models/block/matt_damon.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "gamermod:block/matt_damon" + "all": "gameritems:block/matt_damon" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/omnium_block.json b/src/main/resources/assets/gameritems/models/block/omnium_block.json similarity index 54% rename from src/main/resources/assets/gamermod/models/block/omnium_block.json rename to src/main/resources/assets/gameritems/models/block/omnium_block.json index 0e884ac..72846e1 100755 --- a/src/main/resources/assets/gamermod/models/block/omnium_block.json +++ b/src/main/resources/assets/gameritems/models/block/omnium_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "gamermod:block/omnium_block" + "all": "gameritems:block/omnium_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/omnium_ore.json b/src/main/resources/assets/gameritems/models/block/omnium_ore.json similarity index 55% rename from src/main/resources/assets/gamermod/models/block/omnium_ore.json rename to src/main/resources/assets/gameritems/models/block/omnium_ore.json index 677fcda..c3498e3 100755 --- a/src/main/resources/assets/gamermod/models/block/omnium_ore.json +++ b/src/main/resources/assets/gameritems/models/block/omnium_ore.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "gamermod:block/omnium_ore" + "all": "gameritems:block/omnium_ore" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/orium_block.json b/src/main/resources/assets/gameritems/models/block/orium_block.json similarity index 58% rename from src/main/resources/assets/gamermod/models/block/orium_block.json rename to src/main/resources/assets/gameritems/models/block/orium_block.json index 3836daf..f5f22ec 100644 --- a/src/main/resources/assets/gamermod/models/block/orium_block.json +++ b/src/main/resources/assets/gameritems/models/block/orium_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "gamermod:block/orium_block" + "all": "gameritems:block/orium_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/orium_ore.json b/src/main/resources/assets/gameritems/models/block/orium_ore.json similarity index 59% rename from src/main/resources/assets/gamermod/models/block/orium_ore.json rename to src/main/resources/assets/gameritems/models/block/orium_ore.json index f9717f4..b4ebcec 100644 --- a/src/main/resources/assets/gamermod/models/block/orium_ore.json +++ b/src/main/resources/assets/gameritems/models/block/orium_ore.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "gamermod:block/orium_ore" + "all": "gameritems:block/orium_ore" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/weem_crop_stage0.json b/src/main/resources/assets/gameritems/models/block/weem_crop_stage0.json similarity index 57% rename from src/main/resources/assets/gamermod/models/block/weem_crop_stage0.json rename to src/main/resources/assets/gameritems/models/block/weem_crop_stage0.json index d220f24..7ee2646 100755 --- a/src/main/resources/assets/gamermod/models/block/weem_crop_stage0.json +++ b/src/main/resources/assets/gameritems/models/block/weem_crop_stage0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "gamermod:block/weem_stage0" + "crop": "gameritems:block/weem_stage0" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/weem_crop_stage1.json b/src/main/resources/assets/gameritems/models/block/weem_crop_stage1.json similarity index 57% rename from src/main/resources/assets/gamermod/models/block/weem_crop_stage1.json rename to src/main/resources/assets/gameritems/models/block/weem_crop_stage1.json index fd620a6..b6343b5 100755 --- a/src/main/resources/assets/gamermod/models/block/weem_crop_stage1.json +++ b/src/main/resources/assets/gameritems/models/block/weem_crop_stage1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "gamermod:block/weem_stage1" + "crop": "gameritems:block/weem_stage1" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/weem_crop_stage2.json b/src/main/resources/assets/gameritems/models/block/weem_crop_stage2.json similarity index 57% rename from src/main/resources/assets/gamermod/models/block/weem_crop_stage2.json rename to src/main/resources/assets/gameritems/models/block/weem_crop_stage2.json index e767694..23447d5 100755 --- a/src/main/resources/assets/gamermod/models/block/weem_crop_stage2.json +++ b/src/main/resources/assets/gameritems/models/block/weem_crop_stage2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "gamermod:block/weem_stage2" + "crop": "gameritems:block/weem_stage2" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/weem_crop_stage3.json b/src/main/resources/assets/gameritems/models/block/weem_crop_stage3.json similarity index 57% rename from src/main/resources/assets/gamermod/models/block/weem_crop_stage3.json rename to src/main/resources/assets/gameritems/models/block/weem_crop_stage3.json index bbc6c1f..5f849da 100755 --- a/src/main/resources/assets/gamermod/models/block/weem_crop_stage3.json +++ b/src/main/resources/assets/gameritems/models/block/weem_crop_stage3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "gamermod:block/weem_stage3" + "crop": "gameritems:block/weem_stage3" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/weem_crop_stage4.json b/src/main/resources/assets/gameritems/models/block/weem_crop_stage4.json similarity index 57% rename from src/main/resources/assets/gamermod/models/block/weem_crop_stage4.json rename to src/main/resources/assets/gameritems/models/block/weem_crop_stage4.json index f36eced..a2b9eb5 100755 --- a/src/main/resources/assets/gamermod/models/block/weem_crop_stage4.json +++ b/src/main/resources/assets/gameritems/models/block/weem_crop_stage4.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "gamermod:block/weem_stage4" + "crop": "gameritems:block/weem_stage4" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/weem_crop_stage5.json b/src/main/resources/assets/gameritems/models/block/weem_crop_stage5.json similarity index 57% rename from src/main/resources/assets/gamermod/models/block/weem_crop_stage5.json rename to src/main/resources/assets/gameritems/models/block/weem_crop_stage5.json index 4fdd02d..7242495 100755 --- a/src/main/resources/assets/gamermod/models/block/weem_crop_stage5.json +++ b/src/main/resources/assets/gameritems/models/block/weem_crop_stage5.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "gamermod:block/weem_stage5" + "crop": "gameritems:block/weem_stage5" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/weem_crop_stage6.json b/src/main/resources/assets/gameritems/models/block/weem_crop_stage6.json similarity index 57% rename from src/main/resources/assets/gamermod/models/block/weem_crop_stage6.json rename to src/main/resources/assets/gameritems/models/block/weem_crop_stage6.json index 4cfd414..712983f 100755 --- a/src/main/resources/assets/gamermod/models/block/weem_crop_stage6.json +++ b/src/main/resources/assets/gameritems/models/block/weem_crop_stage6.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "gamermod:block/weem_stage6" + "crop": "gameritems:block/weem_stage6" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/block/weem_crop_stage7.json b/src/main/resources/assets/gameritems/models/block/weem_crop_stage7.json similarity index 57% rename from src/main/resources/assets/gamermod/models/block/weem_crop_stage7.json rename to src/main/resources/assets/gameritems/models/block/weem_crop_stage7.json index 5c1771e..ab5033d 100755 --- a/src/main/resources/assets/gamermod/models/block/weem_crop_stage7.json +++ b/src/main/resources/assets/gameritems/models/block/weem_crop_stage7.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "gamermod:block/weem_stage7" + "crop": "gameritems:block/weem_stage7" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/breem.json b/src/main/resources/assets/gameritems/models/item/breem.json similarity index 56% rename from src/main/resources/assets/gamermod/models/item/breem.json rename to src/main/resources/assets/gameritems/models/item/breem.json index 6d1dd2c..a811070 100755 --- a/src/main/resources/assets/gamermod/models/item/breem.json +++ b/src/main/resources/assets/gameritems/models/item/breem.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/breem" + "layer0": "gameritems:item/breem" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/chin.json b/src/main/resources/assets/gameritems/models/item/chin.json similarity index 57% rename from src/main/resources/assets/gamermod/models/item/chin.json rename to src/main/resources/assets/gameritems/models/item/chin.json index bbaf592..c571a40 100755 --- a/src/main/resources/assets/gamermod/models/item/chin.json +++ b/src/main/resources/assets/gameritems/models/item/chin.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/chin" + "layer0": "gameritems:item/chin" } } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/deepslate_jeremium_ore.json b/src/main/resources/assets/gameritems/models/item/deepslate_jeremium_ore.json new file mode 100644 index 0000000..88f9774 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/deepslate_jeremium_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/deepslate_jeremium_ore" + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/deepslate_omnium_ore.json b/src/main/resources/assets/gameritems/models/item/deepslate_omnium_ore.json new file mode 100644 index 0000000..4fcc3b4 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/deepslate_omnium_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/deepslate_omnium_ore" + } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/deepslate_orium_ore.json b/src/main/resources/assets/gameritems/models/item/deepslate_orium_ore.json new file mode 100644 index 0000000..3a5ce28 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/deepslate_orium_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/deepslate_orium_ore" + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/deez.json b/src/main/resources/assets/gameritems/models/item/deez.json similarity index 57% rename from src/main/resources/assets/gamermod/models/item/deez.json rename to src/main/resources/assets/gameritems/models/item/deez.json index 7db600e..1a2a986 100755 --- a/src/main/resources/assets/gamermod/models/item/deez.json +++ b/src/main/resources/assets/gameritems/models/item/deez.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/deez" + "layer0": "gameritems:item/deez" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/deez_nuts.json b/src/main/resources/assets/gameritems/models/item/deez_nuts.json similarity index 54% rename from src/main/resources/assets/gamermod/models/item/deez_nuts.json rename to src/main/resources/assets/gameritems/models/item/deez_nuts.json index 7a49067..c451e2e 100755 --- a/src/main/resources/assets/gamermod/models/item/deez_nuts.json +++ b/src/main/resources/assets/gameritems/models/item/deez_nuts.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/deez_nuts" + "layer0": "gameritems:item/deez_nuts" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/deez_nuts_on_your_chin.json b/src/main/resources/assets/gameritems/models/item/deez_nuts_on_your_chin.json similarity index 50% rename from src/main/resources/assets/gamermod/models/item/deez_nuts_on_your_chin.json rename to src/main/resources/assets/gameritems/models/item/deez_nuts_on_your_chin.json index 3bcf13c..0ea13fe 100755 --- a/src/main/resources/assets/gamermod/models/item/deez_nuts_on_your_chin.json +++ b/src/main/resources/assets/gameritems/models/item/deez_nuts_on_your_chin.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/deez_nuts_on_chin" + "layer0": "gameritems:item/deez_nuts_on_chin" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/drag.json b/src/main/resources/assets/gameritems/models/item/drag.json similarity index 57% rename from src/main/resources/assets/gamermod/models/item/drag.json rename to src/main/resources/assets/gameritems/models/item/drag.json index 65d80df..47701fd 100755 --- a/src/main/resources/assets/gamermod/models/item/drag.json +++ b/src/main/resources/assets/gameritems/models/item/drag.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/drag" + "layer0": "gameritems:item/drag" } } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/drag_deez_nuts_on_your_chin.json b/src/main/resources/assets/gameritems/models/item/drag_deez_nuts_on_your_chin.json new file mode 100755 index 0000000..fef4459 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/drag_deez_nuts_on_your_chin.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gameritems:item/drag_deez_nuts_on_your_chin" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/elon_musk.json b/src/main/resources/assets/gameritems/models/item/elon_musk.json new file mode 100755 index 0000000..bc53a81 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/elon_musk.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/elon_musk" + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/fabric_of_reality.json b/src/main/resources/assets/gameritems/models/item/fabric_of_reality.json similarity index 53% rename from src/main/resources/assets/gamermod/models/item/fabric_of_reality.json rename to src/main/resources/assets/gameritems/models/item/fabric_of_reality.json index 72f90f3..ca0ace5 100644 --- a/src/main/resources/assets/gamermod/models/item/fabric_of_reality.json +++ b/src/main/resources/assets/gameritems/models/item/fabric_of_reality.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/fabric_of_reality" + "layer0": "gameritems:item/fabric_of_reality" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/gamer_bow.json b/src/main/resources/assets/gameritems/models/item/gamer_bow.json similarity index 89% rename from src/main/resources/assets/gamermod/models/item/gamer_bow.json rename to src/main/resources/assets/gameritems/models/item/gamer_bow.json index 6a40404..f791848 100644 --- a/src/main/resources/assets/gamermod/models/item/gamer_bow.json +++ b/src/main/resources/assets/gameritems/models/item/gamer_bow.json @@ -71,28 +71,28 @@ } }, "textures": { - "layer0": "gamermod:item/gamer_bow" + "layer0": "gameritems:item/gamer_bow" }, "overrides": [ { "predicate": { "minecraft:pulling": 1 }, - "model": "gamermod:item/gamer_bow_pulling_0" + "model": "gameritems:item/gamer_bow_pulling_0" }, { "predicate": { "minecraft:pulling": 1, "minecraft:pull": 0.65 }, - "model": "gamermod:item/gamer_bow_pulling_1" + "model": "gameritems:item/gamer_bow_pulling_1" }, { "predicate": { "minecraft:pulling": 1, "minecraft:pull": 0.9 }, - "model": "gamermod:item/gamer_bow_pulling_2" + "model": "gameritems:item/gamer_bow_pulling_2" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/gamer_bow_pulling_0.json b/src/main/resources/assets/gameritems/models/item/gamer_bow_pulling_0.json new file mode 100644 index 0000000..12b5710 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/gamer_bow_pulling_0.json @@ -0,0 +1,6 @@ +{ + "parent": "gameritems:item/gamer_bow", + "textures": { + "layer0": "gameritems:item/gamer_bow_pulling_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/gamer_bow_pulling_1.json b/src/main/resources/assets/gameritems/models/item/gamer_bow_pulling_1.json new file mode 100644 index 0000000..314ceba --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/gamer_bow_pulling_1.json @@ -0,0 +1,6 @@ +{ + "parent": "gameritems:item/gamer_bow", + "textures": { + "layer0": "gameritems:item/gamer_bow_pulling_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/gamer_bow_pulling_2.json b/src/main/resources/assets/gameritems/models/item/gamer_bow_pulling_2.json new file mode 100644 index 0000000..c68998c --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/gamer_bow_pulling_2.json @@ -0,0 +1,6 @@ +{ + "parent": "gameritems:item/gamer_bow", + "textures": { + "layer0": "gameritems:item/gamer_bow_pulling_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/jeremium_axe.json b/src/main/resources/assets/gameritems/models/item/jeremium_axe.json similarity index 52% rename from src/main/resources/assets/gamermod/models/item/jeremium_axe.json rename to src/main/resources/assets/gameritems/models/item/jeremium_axe.json index 67d9cf0..1e853c0 100755 --- a/src/main/resources/assets/gamermod/models/item/jeremium_axe.json +++ b/src/main/resources/assets/gameritems/models/item/jeremium_axe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/jeremium_axe" + "layer0": "gameritems:item/jeremium_axe" } } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/jeremium_block.json b/src/main/resources/assets/gameritems/models/item/jeremium_block.json new file mode 100644 index 0000000..45d1c96 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/jeremium_block.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/jeremium_block" + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/jeremium_boots.json b/src/main/resources/assets/gameritems/models/item/jeremium_boots.json similarity index 50% rename from src/main/resources/assets/gamermod/models/item/jeremium_boots.json rename to src/main/resources/assets/gameritems/models/item/jeremium_boots.json index 22f78bf..0217e2c 100755 --- a/src/main/resources/assets/gamermod/models/item/jeremium_boots.json +++ b/src/main/resources/assets/gameritems/models/item/jeremium_boots.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/jeremium_boots" + "layer0": "gameritems:item/jeremium_boots" } } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/jeremium_chestplate.json b/src/main/resources/assets/gameritems/models/item/jeremium_chestplate.json new file mode 100755 index 0000000..7a4f333 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/jeremium_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gameritems:item/jeremium_chestplate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/jeremium_helmet.json b/src/main/resources/assets/gameritems/models/item/jeremium_helmet.json new file mode 100755 index 0000000..722b953 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/jeremium_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gameritems:item/jeremium_helmet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/jeremium_hoe.json b/src/main/resources/assets/gameritems/models/item/jeremium_hoe.json similarity index 52% rename from src/main/resources/assets/gamermod/models/item/jeremium_hoe.json rename to src/main/resources/assets/gameritems/models/item/jeremium_hoe.json index bb317e0..b77bd4a 100755 --- a/src/main/resources/assets/gamermod/models/item/jeremium_hoe.json +++ b/src/main/resources/assets/gameritems/models/item/jeremium_hoe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/jeremium_hoe" + "layer0": "gameritems:item/jeremium_hoe" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/jeremium_ingot.json b/src/main/resources/assets/gameritems/models/item/jeremium_ingot.json similarity index 52% rename from src/main/resources/assets/gamermod/models/item/jeremium_ingot.json rename to src/main/resources/assets/gameritems/models/item/jeremium_ingot.json index 0738c0e..4d091b8 100755 --- a/src/main/resources/assets/gamermod/models/item/jeremium_ingot.json +++ b/src/main/resources/assets/gameritems/models/item/jeremium_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/jeremium_ingot" + "layer0": "gameritems:item/jeremium_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/jeremium_leggings.json b/src/main/resources/assets/gameritems/models/item/jeremium_leggings.json new file mode 100755 index 0000000..e2f4670 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/jeremium_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gameritems:item/jeremium_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/jeremium_ore.json b/src/main/resources/assets/gameritems/models/item/jeremium_ore.json new file mode 100644 index 0000000..673de25 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/jeremium_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/jeremium_ore" + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/jeremium_pickaxe.json b/src/main/resources/assets/gameritems/models/item/jeremium_pickaxe.json similarity index 50% rename from src/main/resources/assets/gamermod/models/item/jeremium_pickaxe.json rename to src/main/resources/assets/gameritems/models/item/jeremium_pickaxe.json index 09665f7..621aec2 100755 --- a/src/main/resources/assets/gamermod/models/item/jeremium_pickaxe.json +++ b/src/main/resources/assets/gameritems/models/item/jeremium_pickaxe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/jeremium_pickaxe" + "layer0": "gameritems:item/jeremium_pickaxe" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/jeremium_shovel.json b/src/main/resources/assets/gameritems/models/item/jeremium_shovel.json similarity index 51% rename from src/main/resources/assets/gamermod/models/item/jeremium_shovel.json rename to src/main/resources/assets/gameritems/models/item/jeremium_shovel.json index 1b58749..c07214c 100755 --- a/src/main/resources/assets/gamermod/models/item/jeremium_shovel.json +++ b/src/main/resources/assets/gameritems/models/item/jeremium_shovel.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/jeremium_shovel" + "layer0": "gameritems:item/jeremium_shovel" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/jeremium_sword.json b/src/main/resources/assets/gameritems/models/item/jeremium_sword.json similarity index 51% rename from src/main/resources/assets/gamermod/models/item/jeremium_sword.json rename to src/main/resources/assets/gameritems/models/item/jeremium_sword.json index 57cca46..b9099a4 100755 --- a/src/main/resources/assets/gamermod/models/item/jeremium_sword.json +++ b/src/main/resources/assets/gameritems/models/item/jeremium_sword.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/jeremium_sword" + "layer0": "gameritems:item/jeremium_sword" } } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/matt_damon.json b/src/main/resources/assets/gameritems/models/item/matt_damon.json new file mode 100755 index 0000000..51b1869 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/matt_damon.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/matt_damon" + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/netherite_stick.json b/src/main/resources/assets/gameritems/models/item/netherite_stick.json similarity index 51% rename from src/main/resources/assets/gamermod/models/item/netherite_stick.json rename to src/main/resources/assets/gameritems/models/item/netherite_stick.json index 5ee4c4b..cab915e 100755 --- a/src/main/resources/assets/gamermod/models/item/netherite_stick.json +++ b/src/main/resources/assets/gameritems/models/item/netherite_stick.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/netherite_stick" + "layer0": "gameritems:item/netherite_stick" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/not_boots.json b/src/main/resources/assets/gameritems/models/item/not_boots.json similarity index 62% rename from src/main/resources/assets/gamermod/models/item/not_boots.json rename to src/main/resources/assets/gameritems/models/item/not_boots.json index 94eaa02..2815865 100644 --- a/src/main/resources/assets/gamermod/models/item/not_boots.json +++ b/src/main/resources/assets/gameritems/models/item/not_boots.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/" + "layer0": "gameritems:item/" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/not_chestplate.json b/src/main/resources/assets/gameritems/models/item/not_chestplate.json similarity index 62% rename from src/main/resources/assets/gamermod/models/item/not_chestplate.json rename to src/main/resources/assets/gameritems/models/item/not_chestplate.json index 94eaa02..2815865 100644 --- a/src/main/resources/assets/gamermod/models/item/not_chestplate.json +++ b/src/main/resources/assets/gameritems/models/item/not_chestplate.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/" + "layer0": "gameritems:item/" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/not_helmet.json b/src/main/resources/assets/gameritems/models/item/not_helmet.json similarity index 62% rename from src/main/resources/assets/gamermod/models/item/not_helmet.json rename to src/main/resources/assets/gameritems/models/item/not_helmet.json index 94eaa02..2815865 100644 --- a/src/main/resources/assets/gamermod/models/item/not_helmet.json +++ b/src/main/resources/assets/gameritems/models/item/not_helmet.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/" + "layer0": "gameritems:item/" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/not_leggings.json b/src/main/resources/assets/gameritems/models/item/not_leggings.json similarity index 62% rename from src/main/resources/assets/gamermod/models/item/not_leggings.json rename to src/main/resources/assets/gameritems/models/item/not_leggings.json index 94eaa02..2815865 100644 --- a/src/main/resources/assets/gamermod/models/item/not_leggings.json +++ b/src/main/resources/assets/gameritems/models/item/not_leggings.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/" + "layer0": "gameritems:item/" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/nuts.json b/src/main/resources/assets/gameritems/models/item/nuts.json similarity index 57% rename from src/main/resources/assets/gamermod/models/item/nuts.json rename to src/main/resources/assets/gameritems/models/item/nuts.json index 0b0bee5..b882a8e 100755 --- a/src/main/resources/assets/gamermod/models/item/nuts.json +++ b/src/main/resources/assets/gameritems/models/item/nuts.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/nuts" + "layer0": "gameritems:item/nuts" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/omnium_axe.json b/src/main/resources/assets/gameritems/models/item/omnium_axe.json similarity index 53% rename from src/main/resources/assets/gamermod/models/item/omnium_axe.json rename to src/main/resources/assets/gameritems/models/item/omnium_axe.json index 8461415..b680da9 100755 --- a/src/main/resources/assets/gamermod/models/item/omnium_axe.json +++ b/src/main/resources/assets/gameritems/models/item/omnium_axe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/omnium_axe" + "layer0": "gameritems:item/omnium_axe" } } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/omnium_block.json b/src/main/resources/assets/gameritems/models/item/omnium_block.json new file mode 100755 index 0000000..807be1b --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/omnium_block.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/omnium_block" + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/omnium_boots.json b/src/main/resources/assets/gameritems/models/item/omnium_boots.json similarity index 51% rename from src/main/resources/assets/gamermod/models/item/omnium_boots.json rename to src/main/resources/assets/gameritems/models/item/omnium_boots.json index 7c4bc3d..705d2fb 100755 --- a/src/main/resources/assets/gamermod/models/item/omnium_boots.json +++ b/src/main/resources/assets/gameritems/models/item/omnium_boots.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/omnium_boots" + "layer0": "gameritems:item/omnium_boots" } } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/omnium_chestplate.json b/src/main/resources/assets/gameritems/models/item/omnium_chestplate.json new file mode 100755 index 0000000..023054c --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/omnium_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gameritems:item/omnium_chestplate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/omnium_helmet.json b/src/main/resources/assets/gameritems/models/item/omnium_helmet.json similarity index 50% rename from src/main/resources/assets/gamermod/models/item/omnium_helmet.json rename to src/main/resources/assets/gameritems/models/item/omnium_helmet.json index a96d0a2..0aebd37 100755 --- a/src/main/resources/assets/gamermod/models/item/omnium_helmet.json +++ b/src/main/resources/assets/gameritems/models/item/omnium_helmet.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/omnium_helmet" + "layer0": "gameritems:item/omnium_helmet" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/omnium_hoe.json b/src/main/resources/assets/gameritems/models/item/omnium_hoe.json similarity index 53% rename from src/main/resources/assets/gamermod/models/item/omnium_hoe.json rename to src/main/resources/assets/gameritems/models/item/omnium_hoe.json index 588db37..478196f 100755 --- a/src/main/resources/assets/gamermod/models/item/omnium_hoe.json +++ b/src/main/resources/assets/gameritems/models/item/omnium_hoe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/omnium_hoe" + "layer0": "gameritems:item/omnium_hoe" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/omnium_ingot.json b/src/main/resources/assets/gameritems/models/item/omnium_ingot.json similarity index 56% rename from src/main/resources/assets/gamermod/models/item/omnium_ingot.json rename to src/main/resources/assets/gameritems/models/item/omnium_ingot.json index 7a73840..dc19b4b 100755 --- a/src/main/resources/assets/gamermod/models/item/omnium_ingot.json +++ b/src/main/resources/assets/gameritems/models/item/omnium_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/omnium" + "layer0": "gameritems:item/omnium" } } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/omnium_leggings.json b/src/main/resources/assets/gameritems/models/item/omnium_leggings.json new file mode 100755 index 0000000..1bf6ae4 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/omnium_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gameritems:item/omnium_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/omnium_ore.json b/src/main/resources/assets/gameritems/models/item/omnium_ore.json new file mode 100755 index 0000000..ce18732 --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/omnium_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/omnium_ore" + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/omnium_pickaxe.json b/src/main/resources/assets/gameritems/models/item/omnium_pickaxe.json similarity index 51% rename from src/main/resources/assets/gamermod/models/item/omnium_pickaxe.json rename to src/main/resources/assets/gameritems/models/item/omnium_pickaxe.json index 015ed7b..bf93fe6 100755 --- a/src/main/resources/assets/gamermod/models/item/omnium_pickaxe.json +++ b/src/main/resources/assets/gameritems/models/item/omnium_pickaxe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/omnium_pickaxe" + "layer0": "gameritems:item/omnium_pickaxe" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/omnium_shovel.json b/src/main/resources/assets/gameritems/models/item/omnium_shovel.json similarity index 52% rename from src/main/resources/assets/gamermod/models/item/omnium_shovel.json rename to src/main/resources/assets/gameritems/models/item/omnium_shovel.json index f26643f..0b28c7a 100755 --- a/src/main/resources/assets/gamermod/models/item/omnium_shovel.json +++ b/src/main/resources/assets/gameritems/models/item/omnium_shovel.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/omnium_shovel" + "layer0": "gameritems:item/omnium_shovel" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/omnium_sword.json b/src/main/resources/assets/gameritems/models/item/omnium_sword.json similarity index 50% rename from src/main/resources/assets/gamermod/models/item/omnium_sword.json rename to src/main/resources/assets/gameritems/models/item/omnium_sword.json index 3f5d06c..9067bb9 100755 --- a/src/main/resources/assets/gamermod/models/item/omnium_sword.json +++ b/src/main/resources/assets/gameritems/models/item/omnium_sword.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/omnium_sword" + "layer0": "gameritems:item/omnium_sword" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/orium_axe.json b/src/main/resources/assets/gameritems/models/item/orium_axe.json similarity index 54% rename from src/main/resources/assets/gamermod/models/item/orium_axe.json rename to src/main/resources/assets/gameritems/models/item/orium_axe.json index 87cd740..2287118 100755 --- a/src/main/resources/assets/gamermod/models/item/orium_axe.json +++ b/src/main/resources/assets/gameritems/models/item/orium_axe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/orium_axe" + "layer0": "gameritems:item/orium_axe" } } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/orium_block.json b/src/main/resources/assets/gameritems/models/item/orium_block.json new file mode 100644 index 0000000..6817a7b --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/orium_block.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/orium_block" + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/orium_boots.json b/src/main/resources/assets/gameritems/models/item/orium_boots.json similarity index 54% rename from src/main/resources/assets/gamermod/models/item/orium_boots.json rename to src/main/resources/assets/gameritems/models/item/orium_boots.json index db8e680..c8eb9ff 100644 --- a/src/main/resources/assets/gamermod/models/item/orium_boots.json +++ b/src/main/resources/assets/gameritems/models/item/orium_boots.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/orium_boots" + "layer0": "gameritems:item/orium_boots" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/orium_chestplate.json b/src/main/resources/assets/gameritems/models/item/orium_chestplate.json similarity index 51% rename from src/main/resources/assets/gamermod/models/item/orium_chestplate.json rename to src/main/resources/assets/gameritems/models/item/orium_chestplate.json index b8e167d..367e113 100644 --- a/src/main/resources/assets/gamermod/models/item/orium_chestplate.json +++ b/src/main/resources/assets/gameritems/models/item/orium_chestplate.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/orium_chestplate" + "layer0": "gameritems:item/orium_chestplate" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/orium_helmet.json b/src/main/resources/assets/gameritems/models/item/orium_helmet.json similarity index 53% rename from src/main/resources/assets/gamermod/models/item/orium_helmet.json rename to src/main/resources/assets/gameritems/models/item/orium_helmet.json index 7c19cf0..6a517af 100644 --- a/src/main/resources/assets/gamermod/models/item/orium_helmet.json +++ b/src/main/resources/assets/gameritems/models/item/orium_helmet.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/orium_helmet" + "layer0": "gameritems:item/orium_helmet" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/orium_hoe.json b/src/main/resources/assets/gameritems/models/item/orium_hoe.json similarity index 54% rename from src/main/resources/assets/gamermod/models/item/orium_hoe.json rename to src/main/resources/assets/gameritems/models/item/orium_hoe.json index 38c086e..1a6b93f 100755 --- a/src/main/resources/assets/gamermod/models/item/orium_hoe.json +++ b/src/main/resources/assets/gameritems/models/item/orium_hoe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/orium_hoe" + "layer0": "gameritems:item/orium_hoe" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/orium_ingot.json b/src/main/resources/assets/gameritems/models/item/orium_ingot.json similarity index 56% rename from src/main/resources/assets/gamermod/models/item/orium_ingot.json rename to src/main/resources/assets/gameritems/models/item/orium_ingot.json index 29a30b4..48cd76a 100644 --- a/src/main/resources/assets/gamermod/models/item/orium_ingot.json +++ b/src/main/resources/assets/gameritems/models/item/orium_ingot.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/orium_ingot" + "layer0": "gameritems:item/orium_ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/orium_leggings.json b/src/main/resources/assets/gameritems/models/item/orium_leggings.json similarity index 52% rename from src/main/resources/assets/gamermod/models/item/orium_leggings.json rename to src/main/resources/assets/gameritems/models/item/orium_leggings.json index 60bb3ee..8b81710 100644 --- a/src/main/resources/assets/gamermod/models/item/orium_leggings.json +++ b/src/main/resources/assets/gameritems/models/item/orium_leggings.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/orium_leggings" + "layer0": "gameritems:item/orium_leggings" } } \ No newline at end of file diff --git a/src/main/resources/assets/gameritems/models/item/orium_ore.json b/src/main/resources/assets/gameritems/models/item/orium_ore.json new file mode 100644 index 0000000..87aa8cc --- /dev/null +++ b/src/main/resources/assets/gameritems/models/item/orium_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "gameritems:block/orium_ore" + } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/orium_pickaxe.json b/src/main/resources/assets/gameritems/models/item/orium_pickaxe.json similarity index 52% rename from src/main/resources/assets/gamermod/models/item/orium_pickaxe.json rename to src/main/resources/assets/gameritems/models/item/orium_pickaxe.json index 21cd7e5..25d78b1 100755 --- a/src/main/resources/assets/gamermod/models/item/orium_pickaxe.json +++ b/src/main/resources/assets/gameritems/models/item/orium_pickaxe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/orium_pickaxe" + "layer0": "gameritems:item/orium_pickaxe" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/orium_shovel.json b/src/main/resources/assets/gameritems/models/item/orium_shovel.json similarity index 52% rename from src/main/resources/assets/gamermod/models/item/orium_shovel.json rename to src/main/resources/assets/gameritems/models/item/orium_shovel.json index fbca3a5..9d20f30 100755 --- a/src/main/resources/assets/gamermod/models/item/orium_shovel.json +++ b/src/main/resources/assets/gameritems/models/item/orium_shovel.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/orium_shovel" + "layer0": "gameritems:item/orium_shovel" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/orium_sword.json b/src/main/resources/assets/gameritems/models/item/orium_sword.json similarity index 51% rename from src/main/resources/assets/gamermod/models/item/orium_sword.json rename to src/main/resources/assets/gameritems/models/item/orium_sword.json index 1c04dd3..939bd19 100755 --- a/src/main/resources/assets/gamermod/models/item/orium_sword.json +++ b/src/main/resources/assets/gameritems/models/item/orium_sword.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "gamermod:item/orium_sword" + "layer0": "gameritems:item/orium_sword" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/raw_jeremium.json b/src/main/resources/assets/gameritems/models/item/raw_jeremium.json similarity index 53% rename from src/main/resources/assets/gamermod/models/item/raw_jeremium.json rename to src/main/resources/assets/gameritems/models/item/raw_jeremium.json index 462f599..d2d4e05 100755 --- a/src/main/resources/assets/gamermod/models/item/raw_jeremium.json +++ b/src/main/resources/assets/gameritems/models/item/raw_jeremium.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/raw_jeremium" + "layer0": "gameritems:item/raw_jeremium" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/raw_omnium.json b/src/main/resources/assets/gameritems/models/item/raw_omnium.json similarity index 54% rename from src/main/resources/assets/gamermod/models/item/raw_omnium.json rename to src/main/resources/assets/gameritems/models/item/raw_omnium.json index deed2d0..21359a3 100755 --- a/src/main/resources/assets/gamermod/models/item/raw_omnium.json +++ b/src/main/resources/assets/gameritems/models/item/raw_omnium.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/raw_omnium" + "layer0": "gameritems:item/raw_omnium" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/raw_orium.json b/src/main/resources/assets/gameritems/models/item/raw_orium.json similarity index 57% rename from src/main/resources/assets/gamermod/models/item/raw_orium.json rename to src/main/resources/assets/gameritems/models/item/raw_orium.json index fd01e66..6903d2e 100644 --- a/src/main/resources/assets/gamermod/models/item/raw_orium.json +++ b/src/main/resources/assets/gameritems/models/item/raw_orium.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/raw_orium" + "layer0": "gameritems:item/raw_orium" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/weem.json b/src/main/resources/assets/gameritems/models/item/weem.json similarity index 57% rename from src/main/resources/assets/gamermod/models/item/weem.json rename to src/main/resources/assets/gameritems/models/item/weem.json index 8cc8f0a..6052ad4 100755 --- a/src/main/resources/assets/gamermod/models/item/weem.json +++ b/src/main/resources/assets/gameritems/models/item/weem.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/weem" + "layer0": "gameritems:item/weem" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/weem_apple.json b/src/main/resources/assets/gameritems/models/item/weem_apple.json similarity index 54% rename from src/main/resources/assets/gamermod/models/item/weem_apple.json rename to src/main/resources/assets/gameritems/models/item/weem_apple.json index f122073..a6ab749 100755 --- a/src/main/resources/assets/gamermod/models/item/weem_apple.json +++ b/src/main/resources/assets/gameritems/models/item/weem_apple.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/weem_apple" + "layer0": "gameritems:item/weem_apple" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/weem_seeds.json b/src/main/resources/assets/gameritems/models/item/weem_seeds.json similarity index 54% rename from src/main/resources/assets/gamermod/models/item/weem_seeds.json rename to src/main/resources/assets/gameritems/models/item/weem_seeds.json index 792367c..eea3874 100755 --- a/src/main/resources/assets/gamermod/models/item/weem_seeds.json +++ b/src/main/resources/assets/gameritems/models/item/weem_seeds.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/weem_seeds" + "layer0": "gameritems:item/weem_seeds" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/your_mother.json b/src/main/resources/assets/gameritems/models/item/your_mother.json similarity index 53% rename from src/main/resources/assets/gamermod/models/item/your_mother.json rename to src/main/resources/assets/gameritems/models/item/your_mother.json index b86907f..2f9926f 100755 --- a/src/main/resources/assets/gamermod/models/item/your_mother.json +++ b/src/main/resources/assets/gameritems/models/item/your_mother.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gamermod:item/your_mother" + "layer0": "gameritems:item/your_mother" } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/sounds.json b/src/main/resources/assets/gameritems/sounds.json similarity index 60% rename from src/main/resources/assets/gamermod/sounds.json rename to src/main/resources/assets/gameritems/sounds.json index f6b2dea..11c73ce 100755 --- a/src/main/resources/assets/gamermod/sounds.json +++ b/src/main/resources/assets/gameritems/sounds.json @@ -1,17 +1,17 @@ { "sniff": { "sounds": [ - "gamermod:sniff" + "gameritems:sniff" ] }, "matt": { "sounds": [ - "gamermod:damon" + "gameritems:damon" ] }, "elon": { "sounds": [ - "gamermod:elon" + "gameritems:elon" ] } } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/sounds/damon.ogg b/src/main/resources/assets/gameritems/sounds/damon.ogg similarity index 100% rename from src/main/resources/assets/gamermod/sounds/damon.ogg rename to src/main/resources/assets/gameritems/sounds/damon.ogg diff --git a/src/main/resources/assets/gamermod/sounds/elon.ogg b/src/main/resources/assets/gameritems/sounds/elon.ogg similarity index 100% rename from src/main/resources/assets/gamermod/sounds/elon.ogg rename to src/main/resources/assets/gameritems/sounds/elon.ogg diff --git a/src/main/resources/assets/gamermod/sounds/sniff.ogg b/src/main/resources/assets/gameritems/sounds/sniff.ogg similarity index 100% rename from src/main/resources/assets/gamermod/sounds/sniff.ogg rename to src/main/resources/assets/gameritems/sounds/sniff.ogg diff --git a/src/main/resources/assets/gamermod/textures/block/deepslate_jeremium_ore.png b/src/main/resources/assets/gameritems/textures/block/deepslate_jeremium_ore.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/deepslate_jeremium_ore.png rename to src/main/resources/assets/gameritems/textures/block/deepslate_jeremium_ore.png diff --git a/src/main/resources/assets/gamermod/textures/block/deepslate_omnium_ore.png b/src/main/resources/assets/gameritems/textures/block/deepslate_omnium_ore.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/deepslate_omnium_ore.png rename to src/main/resources/assets/gameritems/textures/block/deepslate_omnium_ore.png diff --git a/src/main/resources/assets/gamermod/textures/block/deepslate_orium_ore.png b/src/main/resources/assets/gameritems/textures/block/deepslate_orium_ore.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/deepslate_orium_ore.png rename to src/main/resources/assets/gameritems/textures/block/deepslate_orium_ore.png diff --git a/src/main/resources/assets/gamermod/textures/block/elon_musk.png b/src/main/resources/assets/gameritems/textures/block/elon_musk.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/elon_musk.png rename to src/main/resources/assets/gameritems/textures/block/elon_musk.png diff --git a/src/main/resources/assets/gamermod/textures/block/jeremium_block.png b/src/main/resources/assets/gameritems/textures/block/jeremium_block.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/jeremium_block.png rename to src/main/resources/assets/gameritems/textures/block/jeremium_block.png diff --git a/src/main/resources/assets/gamermod/textures/block/jeremium_ore.png b/src/main/resources/assets/gameritems/textures/block/jeremium_ore.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/jeremium_ore.png rename to src/main/resources/assets/gameritems/textures/block/jeremium_ore.png diff --git a/src/main/resources/assets/gamermod/textures/block/matt_damon.png b/src/main/resources/assets/gameritems/textures/block/matt_damon.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/matt_damon.png rename to src/main/resources/assets/gameritems/textures/block/matt_damon.png diff --git a/src/main/resources/assets/gamermod/textures/block/omnium_block.png b/src/main/resources/assets/gameritems/textures/block/omnium_block.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/omnium_block.png rename to src/main/resources/assets/gameritems/textures/block/omnium_block.png diff --git a/src/main/resources/assets/gamermod/textures/block/omnium_ore.png b/src/main/resources/assets/gameritems/textures/block/omnium_ore.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/omnium_ore.png rename to src/main/resources/assets/gameritems/textures/block/omnium_ore.png diff --git a/src/main/resources/assets/gamermod/textures/block/orium_block.png b/src/main/resources/assets/gameritems/textures/block/orium_block.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/orium_block.png rename to src/main/resources/assets/gameritems/textures/block/orium_block.png diff --git a/src/main/resources/assets/gamermod/textures/block/orium_ore.png b/src/main/resources/assets/gameritems/textures/block/orium_ore.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/orium_ore.png rename to src/main/resources/assets/gameritems/textures/block/orium_ore.png diff --git a/src/main/resources/assets/gamermod/textures/block/weem_stage0.png b/src/main/resources/assets/gameritems/textures/block/weem_stage0.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/weem_stage0.png rename to src/main/resources/assets/gameritems/textures/block/weem_stage0.png diff --git a/src/main/resources/assets/gamermod/textures/block/weem_stage1.png b/src/main/resources/assets/gameritems/textures/block/weem_stage1.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/weem_stage1.png rename to src/main/resources/assets/gameritems/textures/block/weem_stage1.png diff --git a/src/main/resources/assets/gamermod/textures/block/weem_stage2.png b/src/main/resources/assets/gameritems/textures/block/weem_stage2.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/weem_stage2.png rename to src/main/resources/assets/gameritems/textures/block/weem_stage2.png diff --git a/src/main/resources/assets/gamermod/textures/block/weem_stage3.png b/src/main/resources/assets/gameritems/textures/block/weem_stage3.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/weem_stage3.png rename to src/main/resources/assets/gameritems/textures/block/weem_stage3.png diff --git a/src/main/resources/assets/gamermod/textures/block/weem_stage4.png b/src/main/resources/assets/gameritems/textures/block/weem_stage4.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/weem_stage4.png rename to src/main/resources/assets/gameritems/textures/block/weem_stage4.png diff --git a/src/main/resources/assets/gamermod/textures/block/weem_stage5.png b/src/main/resources/assets/gameritems/textures/block/weem_stage5.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/weem_stage5.png rename to src/main/resources/assets/gameritems/textures/block/weem_stage5.png diff --git a/src/main/resources/assets/gamermod/textures/block/weem_stage6.png b/src/main/resources/assets/gameritems/textures/block/weem_stage6.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/weem_stage6.png rename to src/main/resources/assets/gameritems/textures/block/weem_stage6.png diff --git a/src/main/resources/assets/gamermod/textures/block/weem_stage7.png b/src/main/resources/assets/gameritems/textures/block/weem_stage7.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/block/weem_stage7.png rename to src/main/resources/assets/gameritems/textures/block/weem_stage7.png diff --git a/src/main/resources/assets/gamermod/textures/item/breem.png b/src/main/resources/assets/gameritems/textures/item/breem.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/breem.png rename to src/main/resources/assets/gameritems/textures/item/breem.png diff --git a/src/main/resources/assets/gamermod/textures/item/chin.png b/src/main/resources/assets/gameritems/textures/item/chin.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/chin.png rename to src/main/resources/assets/gameritems/textures/item/chin.png diff --git a/src/main/resources/assets/gamermod/textures/item/deez.png b/src/main/resources/assets/gameritems/textures/item/deez.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/deez.png rename to src/main/resources/assets/gameritems/textures/item/deez.png diff --git a/src/main/resources/assets/gamermod/textures/item/deez_nuts.png b/src/main/resources/assets/gameritems/textures/item/deez_nuts.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/deez_nuts.png rename to src/main/resources/assets/gameritems/textures/item/deez_nuts.png diff --git a/src/main/resources/assets/gamermod/textures/item/deez_nuts_on_chin.png b/src/main/resources/assets/gameritems/textures/item/deez_nuts_on_chin.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/deez_nuts_on_chin.png rename to src/main/resources/assets/gameritems/textures/item/deez_nuts_on_chin.png diff --git a/src/main/resources/assets/gamermod/textures/item/drag.png b/src/main/resources/assets/gameritems/textures/item/drag.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/drag.png rename to src/main/resources/assets/gameritems/textures/item/drag.png diff --git a/src/main/resources/assets/gamermod/textures/item/drag_deez_nuts_on_your_chin.png b/src/main/resources/assets/gameritems/textures/item/drag_deez_nuts_on_your_chin.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/drag_deez_nuts_on_your_chin.png rename to src/main/resources/assets/gameritems/textures/item/drag_deez_nuts_on_your_chin.png diff --git a/src/main/resources/assets/gamermod/textures/item/fabric_of_reality.png b/src/main/resources/assets/gameritems/textures/item/fabric_of_reality.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/fabric_of_reality.png rename to src/main/resources/assets/gameritems/textures/item/fabric_of_reality.png diff --git a/src/main/resources/assets/gamermod/textures/item/gamer_bow.png b/src/main/resources/assets/gameritems/textures/item/gamer_bow.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/gamer_bow.png rename to src/main/resources/assets/gameritems/textures/item/gamer_bow.png diff --git a/src/main/resources/assets/gamermod/textures/item/gamer_bow_pulling_0.png b/src/main/resources/assets/gameritems/textures/item/gamer_bow_pulling_0.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/gamer_bow_pulling_0.png rename to src/main/resources/assets/gameritems/textures/item/gamer_bow_pulling_0.png diff --git a/src/main/resources/assets/gamermod/textures/item/gamer_bow_pulling_1.png b/src/main/resources/assets/gameritems/textures/item/gamer_bow_pulling_1.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/gamer_bow_pulling_1.png rename to src/main/resources/assets/gameritems/textures/item/gamer_bow_pulling_1.png diff --git a/src/main/resources/assets/gamermod/textures/item/gamer_bow_pulling_2.png b/src/main/resources/assets/gameritems/textures/item/gamer_bow_pulling_2.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/gamer_bow_pulling_2.png rename to src/main/resources/assets/gameritems/textures/item/gamer_bow_pulling_2.png diff --git a/src/main/resources/assets/gamermod/textures/item/jeremium_axe.png b/src/main/resources/assets/gameritems/textures/item/jeremium_axe.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/jeremium_axe.png rename to src/main/resources/assets/gameritems/textures/item/jeremium_axe.png diff --git a/src/main/resources/assets/gamermod/textures/item/jeremium_boots.png b/src/main/resources/assets/gameritems/textures/item/jeremium_boots.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/jeremium_boots.png rename to src/main/resources/assets/gameritems/textures/item/jeremium_boots.png diff --git a/src/main/resources/assets/gamermod/textures/item/jeremium_chestplate.png b/src/main/resources/assets/gameritems/textures/item/jeremium_chestplate.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/jeremium_chestplate.png rename to src/main/resources/assets/gameritems/textures/item/jeremium_chestplate.png diff --git a/src/main/resources/assets/gamermod/textures/item/jeremium_helmet.png b/src/main/resources/assets/gameritems/textures/item/jeremium_helmet.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/jeremium_helmet.png rename to src/main/resources/assets/gameritems/textures/item/jeremium_helmet.png diff --git a/src/main/resources/assets/gamermod/textures/item/jeremium_hoe.png b/src/main/resources/assets/gameritems/textures/item/jeremium_hoe.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/jeremium_hoe.png rename to src/main/resources/assets/gameritems/textures/item/jeremium_hoe.png diff --git a/src/main/resources/assets/gamermod/textures/item/jeremium_ingot.png b/src/main/resources/assets/gameritems/textures/item/jeremium_ingot.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/jeremium_ingot.png rename to src/main/resources/assets/gameritems/textures/item/jeremium_ingot.png diff --git a/src/main/resources/assets/gamermod/textures/item/jeremium_leggings.png b/src/main/resources/assets/gameritems/textures/item/jeremium_leggings.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/jeremium_leggings.png rename to src/main/resources/assets/gameritems/textures/item/jeremium_leggings.png diff --git a/src/main/resources/assets/gamermod/textures/item/jeremium_pickaxe.png b/src/main/resources/assets/gameritems/textures/item/jeremium_pickaxe.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/jeremium_pickaxe.png rename to src/main/resources/assets/gameritems/textures/item/jeremium_pickaxe.png diff --git a/src/main/resources/assets/gamermod/textures/item/jeremium_shovel.png b/src/main/resources/assets/gameritems/textures/item/jeremium_shovel.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/jeremium_shovel.png rename to src/main/resources/assets/gameritems/textures/item/jeremium_shovel.png diff --git a/src/main/resources/assets/gamermod/textures/item/jeremium_sword.png b/src/main/resources/assets/gameritems/textures/item/jeremium_sword.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/jeremium_sword.png rename to src/main/resources/assets/gameritems/textures/item/jeremium_sword.png diff --git a/src/main/resources/assets/gamermod/textures/item/netherite_stick.png b/src/main/resources/assets/gameritems/textures/item/netherite_stick.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/netherite_stick.png rename to src/main/resources/assets/gameritems/textures/item/netherite_stick.png diff --git a/src/main/resources/assets/gamermod/textures/item/nuts.png b/src/main/resources/assets/gameritems/textures/item/nuts.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/nuts.png rename to src/main/resources/assets/gameritems/textures/item/nuts.png diff --git a/src/main/resources/assets/gamermod/textures/item/omnium.png b/src/main/resources/assets/gameritems/textures/item/omnium.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/omnium.png rename to src/main/resources/assets/gameritems/textures/item/omnium.png diff --git a/src/main/resources/assets/gamermod/textures/item/omnium_axe.png b/src/main/resources/assets/gameritems/textures/item/omnium_axe.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/omnium_axe.png rename to src/main/resources/assets/gameritems/textures/item/omnium_axe.png diff --git a/src/main/resources/assets/gamermod/textures/item/omnium_boots.png b/src/main/resources/assets/gameritems/textures/item/omnium_boots.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/omnium_boots.png rename to src/main/resources/assets/gameritems/textures/item/omnium_boots.png diff --git a/src/main/resources/assets/gamermod/textures/item/omnium_chestplate.png b/src/main/resources/assets/gameritems/textures/item/omnium_chestplate.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/omnium_chestplate.png rename to src/main/resources/assets/gameritems/textures/item/omnium_chestplate.png diff --git a/src/main/resources/assets/gamermod/textures/item/omnium_helmet.png b/src/main/resources/assets/gameritems/textures/item/omnium_helmet.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/omnium_helmet.png rename to src/main/resources/assets/gameritems/textures/item/omnium_helmet.png diff --git a/src/main/resources/assets/gamermod/textures/item/omnium_hoe.png b/src/main/resources/assets/gameritems/textures/item/omnium_hoe.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/omnium_hoe.png rename to src/main/resources/assets/gameritems/textures/item/omnium_hoe.png diff --git a/src/main/resources/assets/gamermod/textures/item/omnium_leggings.png b/src/main/resources/assets/gameritems/textures/item/omnium_leggings.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/omnium_leggings.png rename to src/main/resources/assets/gameritems/textures/item/omnium_leggings.png diff --git a/src/main/resources/assets/gamermod/textures/item/omnium_pickaxe.png b/src/main/resources/assets/gameritems/textures/item/omnium_pickaxe.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/omnium_pickaxe.png rename to src/main/resources/assets/gameritems/textures/item/omnium_pickaxe.png diff --git a/src/main/resources/assets/gamermod/textures/item/omnium_shovel.png b/src/main/resources/assets/gameritems/textures/item/omnium_shovel.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/omnium_shovel.png rename to src/main/resources/assets/gameritems/textures/item/omnium_shovel.png diff --git a/src/main/resources/assets/gamermod/textures/item/omnium_sword.png b/src/main/resources/assets/gameritems/textures/item/omnium_sword.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/omnium_sword.png rename to src/main/resources/assets/gameritems/textures/item/omnium_sword.png diff --git a/src/main/resources/assets/gamermod/textures/item/orium_axe.png b/src/main/resources/assets/gameritems/textures/item/orium_axe.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/orium_axe.png rename to src/main/resources/assets/gameritems/textures/item/orium_axe.png diff --git a/src/main/resources/assets/gamermod/textures/item/orium_boots.png b/src/main/resources/assets/gameritems/textures/item/orium_boots.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/orium_boots.png rename to src/main/resources/assets/gameritems/textures/item/orium_boots.png diff --git a/src/main/resources/assets/gamermod/textures/item/orium_chestplate.png b/src/main/resources/assets/gameritems/textures/item/orium_chestplate.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/orium_chestplate.png rename to src/main/resources/assets/gameritems/textures/item/orium_chestplate.png diff --git a/src/main/resources/assets/gamermod/textures/item/orium_helmet.png b/src/main/resources/assets/gameritems/textures/item/orium_helmet.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/orium_helmet.png rename to src/main/resources/assets/gameritems/textures/item/orium_helmet.png diff --git a/src/main/resources/assets/gamermod/textures/item/orium_hoe.png b/src/main/resources/assets/gameritems/textures/item/orium_hoe.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/orium_hoe.png rename to src/main/resources/assets/gameritems/textures/item/orium_hoe.png diff --git a/src/main/resources/assets/gamermod/textures/item/orium_ingot.png b/src/main/resources/assets/gameritems/textures/item/orium_ingot.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/orium_ingot.png rename to src/main/resources/assets/gameritems/textures/item/orium_ingot.png diff --git a/src/main/resources/assets/gamermod/textures/item/orium_leggings.png b/src/main/resources/assets/gameritems/textures/item/orium_leggings.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/orium_leggings.png rename to src/main/resources/assets/gameritems/textures/item/orium_leggings.png diff --git a/src/main/resources/assets/gamermod/textures/item/orium_pickaxe.png b/src/main/resources/assets/gameritems/textures/item/orium_pickaxe.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/orium_pickaxe.png rename to src/main/resources/assets/gameritems/textures/item/orium_pickaxe.png diff --git a/src/main/resources/assets/gamermod/textures/item/orium_shovel.png b/src/main/resources/assets/gameritems/textures/item/orium_shovel.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/orium_shovel.png rename to src/main/resources/assets/gameritems/textures/item/orium_shovel.png diff --git a/src/main/resources/assets/gamermod/textures/item/orium_sword.png b/src/main/resources/assets/gameritems/textures/item/orium_sword.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/orium_sword.png rename to src/main/resources/assets/gameritems/textures/item/orium_sword.png diff --git a/src/main/resources/assets/gamermod/textures/item/raw_jeremium.png b/src/main/resources/assets/gameritems/textures/item/raw_jeremium.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/raw_jeremium.png rename to src/main/resources/assets/gameritems/textures/item/raw_jeremium.png diff --git a/src/main/resources/assets/gamermod/textures/item/raw_omnium.png b/src/main/resources/assets/gameritems/textures/item/raw_omnium.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/raw_omnium.png rename to src/main/resources/assets/gameritems/textures/item/raw_omnium.png diff --git a/src/main/resources/assets/gamermod/textures/item/raw_orium.png b/src/main/resources/assets/gameritems/textures/item/raw_orium.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/raw_orium.png rename to src/main/resources/assets/gameritems/textures/item/raw_orium.png diff --git a/src/main/resources/assets/gamermod/textures/item/weem.png b/src/main/resources/assets/gameritems/textures/item/weem.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/weem.png rename to src/main/resources/assets/gameritems/textures/item/weem.png diff --git a/src/main/resources/assets/gamermod/textures/item/weem_apple.png b/src/main/resources/assets/gameritems/textures/item/weem_apple.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/weem_apple.png rename to src/main/resources/assets/gameritems/textures/item/weem_apple.png diff --git a/src/main/resources/assets/gamermod/textures/item/weem_seeds.png b/src/main/resources/assets/gameritems/textures/item/weem_seeds.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/weem_seeds.png rename to src/main/resources/assets/gameritems/textures/item/weem_seeds.png diff --git a/src/main/resources/assets/gamermod/textures/item/your_mother.png b/src/main/resources/assets/gameritems/textures/item/your_mother.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/item/your_mother.png rename to src/main/resources/assets/gameritems/textures/item/your_mother.png diff --git a/src/main/resources/assets/gamermod/textures/mob_effect/high.png b/src/main/resources/assets/gameritems/textures/mob_effect/high.png similarity index 100% rename from src/main/resources/assets/gamermod/textures/mob_effect/high.png rename to src/main/resources/assets/gameritems/textures/mob_effect/high.png diff --git a/src/main/resources/assets/gamermod/blockstates/deepslate_jeremium_ore.json b/src/main/resources/assets/gamermod/blockstates/deepslate_jeremium_ore.json deleted file mode 100644 index 72fafaf..0000000 --- a/src/main/resources/assets/gamermod/blockstates/deepslate_jeremium_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "gamermod:block/deepslate_jeremium_ore" } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/blockstates/deepslate_omnium_ore.json b/src/main/resources/assets/gamermod/blockstates/deepslate_omnium_ore.json deleted file mode 100644 index 9dee53e..0000000 --- a/src/main/resources/assets/gamermod/blockstates/deepslate_omnium_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "gamermod:block/deepslate_omnium_ore" } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/blockstates/deepslate_orium_ore.json b/src/main/resources/assets/gamermod/blockstates/deepslate_orium_ore.json deleted file mode 100644 index 5922088..0000000 --- a/src/main/resources/assets/gamermod/blockstates/deepslate_orium_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "gamermod:block/deepslate_orium_ore" } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/blockstates/elon_musk.json b/src/main/resources/assets/gamermod/blockstates/elon_musk.json deleted file mode 100755 index 7232adc..0000000 --- a/src/main/resources/assets/gamermod/blockstates/elon_musk.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "gamermod:block/elon_musk" } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/blockstates/jeremium_block.json b/src/main/resources/assets/gamermod/blockstates/jeremium_block.json deleted file mode 100644 index ac34968..0000000 --- a/src/main/resources/assets/gamermod/blockstates/jeremium_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "gamermod:block/jeremium_block" } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/blockstates/jeremium_ore.json b/src/main/resources/assets/gamermod/blockstates/jeremium_ore.json deleted file mode 100644 index 6ce7528..0000000 --- a/src/main/resources/assets/gamermod/blockstates/jeremium_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "gamermod:block/jeremium_ore" } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/blockstates/matt_damon.json b/src/main/resources/assets/gamermod/blockstates/matt_damon.json deleted file mode 100755 index b7f345e..0000000 --- a/src/main/resources/assets/gamermod/blockstates/matt_damon.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "gamermod:block/matt_damon" } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/blockstates/omnium_block.json b/src/main/resources/assets/gamermod/blockstates/omnium_block.json deleted file mode 100755 index e2c0ce7..0000000 --- a/src/main/resources/assets/gamermod/blockstates/omnium_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "gamermod:block/omnium_block" } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/blockstates/omnium_ore.json b/src/main/resources/assets/gamermod/blockstates/omnium_ore.json deleted file mode 100755 index 8355abf..0000000 --- a/src/main/resources/assets/gamermod/blockstates/omnium_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "gamermod:block/omnium_ore" } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/blockstates/orium_block.json b/src/main/resources/assets/gamermod/blockstates/orium_block.json deleted file mode 100644 index 1b23dc2..0000000 --- a/src/main/resources/assets/gamermod/blockstates/orium_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "gamermod:block/orium_block" } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/blockstates/orium_ore.json b/src/main/resources/assets/gamermod/blockstates/orium_ore.json deleted file mode 100644 index 8fd9655..0000000 --- a/src/main/resources/assets/gamermod/blockstates/orium_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "gamermod:block/orium_ore" } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/blockstates/weem_crop_block.json b/src/main/resources/assets/gamermod/blockstates/weem_crop_block.json deleted file mode 100755 index db9a58c..0000000 --- a/src/main/resources/assets/gamermod/blockstates/weem_crop_block.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "age=0": { - "model": "gamermod:block/weem_crop_stage0" - }, - "age=1": { - "model": "gamermod:block/weem_crop_stage1" - }, - "age=2": { - "model": "gamermod:block/weem_crop_stage2" - }, - "age=3": { - "model": "gamermod:block/weem_crop_stage3" - }, - "age=4": { - "model": "gamermod:block/weem_crop_stage4" - }, - "age=5": { - "model": "gamermod:block/weem_crop_stage5" - }, - "age=6": { - "model": "gamermod:block/weem_crop_stage6" - }, - "age=7": { - "model": "gamermod:block/weem_crop_stage7" - } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/lang/en_us.json b/src/main/resources/assets/gamermod/lang/en_us.json deleted file mode 100755 index 2c4344e..0000000 --- a/src/main/resources/assets/gamermod/lang/en_us.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "item.gamermod.chin": "your chin", - "itemGroup.gamermod.chins": "funny stuff", - "item.gamermod.nuts": "nuts", - "item.gamermod.deez": "deez", - "item.gamermod.deez_nuts": "deez nuts", - "item.gamermod.deez_nuts_on_your_chin": "deez nuts on your chin", - "item.gamermod.drag": "drag", - "item.gamermod.drag_deez_nuts_on_your_chin": "drag deez nuts on our chin", - "item.gamermod.omnium_ingot": "Omnium Ingot", - "block.gamermod.omnium_ore": "Omnium Ore", - "block.gamermod.omnium_block": "Omnium Block", - "item.gamermod.raw_omnium": "Raw Omnium", - "item.gamermod.your_mother": "your mother", - "block.gamermod.matt_damon": "matt damon", - "item.gamermod.omnium_sword": "Omnium Sword", - "item.gamermod.omnium_pickaxe": "Omnium Pickaxe", - "item.gamermod.omnium_helmet": "Omnium Helmet", - "item.gamermod.omnium_chestplate": "Omnium Chestplate", - "item.gamermod.omnium_leggings": "Omnium Leggings", - "item.gamermod.omnium_boots": "Omnium Boots", - "item.gamermod.omnium_shovel": "Omnium Shovel", - "item.gamermod.omnium_axe": "Omnium Axe", - "item.gamermod.omnium_hoe": "Omnium Hoe", - "item.gamermod.netherite_stick": "Netherite Stick", - "itemGroup.gamermod.things": "ueh, stuff", - "itemGroup.gamermod.armour_and_tools": "Armour, Weapons, and Tools", - "item.gamermod.omnium_sword.tooltip": "Surprisingly lightweight!", - "item.gamermod.weem": "Weem", - "item.gamermod.weem_seeds": "Weem Seeds", - "item.gamermod.breem": "Breem", - "item.gamermod.breem.tooltip": "High as a kite!", - "item.gamermod.weem.tooltip": "Higher than a kite!", - "item.gamermod.weem_apple": "Weem Apple", - "item.gamermod.orium.tooltip": "hahaha ore-ium", - "block.gamermod.orium.tooltip": "hahaha ore-ium", - "item.gamermod.raw_orium": "Raw Orium", - "item.gamermod.orium_ingot": "Orium Ingot", - "block.gamermod.orium_ore": "Orium Ore", - "block.gamermod.orium_block": "Orium Block", - "item.gamermod.orium_helmet": "Orium Helmet", - "item.gamermod.orium_chestplate": "Orium Chestplate", - "item.gamermod.orium_leggings": "Orium Leggings", - "item.gamermod.orium_boots": "Orium Boots", - "item.gamermod.orium_shovel": "Orium Shovel", - "item.gamermod.orium_axe": "Orium Axe", - "item.gamermod.orium_hoe": "Orium Hoe", - "item.gamermod.orium_sword": "Orium Sword", - "item.gamermod.orium_pickaxe": "Orium Pickaxe", - "item.gamermod.fabric_of_reality.tooltip": "Warning: has a chance to get §o§l§4RIPPED§r.", - "item.gamermod.fabric_of_reality": "Fabric of Reality", - "effect.gamermod.high": "High", - "item.gamermod.jeremium_ingot": "Jeremium Ingot", - "item.gamermod.raw_jeremium": "Raw Jeremium", - "block.gamermod.jeremium_ore": "Jeremium Ore", - "block.gamermod.jeremium_block": "Jeremium Block", - "item.gamermod.jeremium_helmet": "Jeremium Helmet", - "item.gamermod.jeremium_chestplate": "Jeremium Chestplate", - "item.gamermod.jeremium_leggings": "Jeremium Leggings", - "item.gamermod.jeremium_boots": "Jeremium Boots", - "block.gamermod.jeremium.tooltip": "Heavy, but emits light.", - "all.gamermod.jeremium.tooltiptwo": "Less able to fit in a stack because it's heavy", - "item.gamermod.jeremium_sword": "Jeremium Sword", - "item.gamermod.jeremium_axe": "Jeremium Axe", - "item.gamermod.jeremium_hoe": "Jeremium Hoe", - "item.gamermod.jeremium_shovel": "Jeremium Shovel", - "item.gamermod.jeremium_pickaxe": "Jeremium Pickaxe", - "item.gamermod.jeremium_sword.tooltip": "Kinda heavy", - "block.gamermod.deepslate_jeremium_ore": "Deepslate Jeremium Ore", - "block.gamermod.deepslate_omnium_ore": "Deepslate Omnium Ore", - "block.gamermod.deepslate_orium_ore": "Deepslate Orium Ore", - "item.gamermod.gamer_bow": "Gamer Bow" - -} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/deepslate_jeremium_ore.json b/src/main/resources/assets/gamermod/models/item/deepslate_jeremium_ore.json deleted file mode 100644 index 5b4dfe1..0000000 --- a/src/main/resources/assets/gamermod/models/item/deepslate_jeremium_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "gamermod:block/deepslate_jeremium_ore" - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/deepslate_omnium_ore.json b/src/main/resources/assets/gamermod/models/item/deepslate_omnium_ore.json deleted file mode 100644 index dadf116..0000000 --- a/src/main/resources/assets/gamermod/models/item/deepslate_omnium_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "gamermod:block/deepslate_omnium_ore" - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/deepslate_orium_ore.json b/src/main/resources/assets/gamermod/models/item/deepslate_orium_ore.json deleted file mode 100644 index 745fbb8..0000000 --- a/src/main/resources/assets/gamermod/models/item/deepslate_orium_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "gamermod:block/deepslate_orium_ore" - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/drag_deez_nuts_on_your_chin.json b/src/main/resources/assets/gamermod/models/item/drag_deez_nuts_on_your_chin.json deleted file mode 100755 index b3c4cad..0000000 --- a/src/main/resources/assets/gamermod/models/item/drag_deez_nuts_on_your_chin.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gamermod:item/drag_deez_nuts_on_your_chin" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/elon_musk.json b/src/main/resources/assets/gamermod/models/item/elon_musk.json deleted file mode 100755 index bb30e5b..0000000 --- a/src/main/resources/assets/gamermod/models/item/elon_musk.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "gamermod:block/elon_musk" - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/gamer_bow_pulling_0.json b/src/main/resources/assets/gamermod/models/item/gamer_bow_pulling_0.json deleted file mode 100644 index dd6a16d..0000000 --- a/src/main/resources/assets/gamermod/models/item/gamer_bow_pulling_0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "gamermod:item/gamer_bow", - "textures": { - "layer0": "gamermod:item/gamer_bow_pulling_0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/gamer_bow_pulling_1.json b/src/main/resources/assets/gamermod/models/item/gamer_bow_pulling_1.json deleted file mode 100644 index eb30386..0000000 --- a/src/main/resources/assets/gamermod/models/item/gamer_bow_pulling_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "gamermod:item/gamer_bow", - "textures": { - "layer0": "gamermod:item/gamer_bow_pulling_1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/gamer_bow_pulling_2.json b/src/main/resources/assets/gamermod/models/item/gamer_bow_pulling_2.json deleted file mode 100644 index 19c5704..0000000 --- a/src/main/resources/assets/gamermod/models/item/gamer_bow_pulling_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "gamermod:item/gamer_bow", - "textures": { - "layer0": "gamermod:item/gamer_bow_pulling_2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/jeremium_block.json b/src/main/resources/assets/gamermod/models/item/jeremium_block.json deleted file mode 100644 index 9711b28..0000000 --- a/src/main/resources/assets/gamermod/models/item/jeremium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "gamermod:block/jeremium_block" - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/jeremium_chestplate.json b/src/main/resources/assets/gamermod/models/item/jeremium_chestplate.json deleted file mode 100755 index e943e47..0000000 --- a/src/main/resources/assets/gamermod/models/item/jeremium_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gamermod:item/jeremium_chestplate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/jeremium_helmet.json b/src/main/resources/assets/gamermod/models/item/jeremium_helmet.json deleted file mode 100755 index 0305a93..0000000 --- a/src/main/resources/assets/gamermod/models/item/jeremium_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gamermod:item/jeremium_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/jeremium_leggings.json b/src/main/resources/assets/gamermod/models/item/jeremium_leggings.json deleted file mode 100755 index aa3cb72..0000000 --- a/src/main/resources/assets/gamermod/models/item/jeremium_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gamermod:item/jeremium_leggings" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/jeremium_ore.json b/src/main/resources/assets/gamermod/models/item/jeremium_ore.json deleted file mode 100644 index 645501a..0000000 --- a/src/main/resources/assets/gamermod/models/item/jeremium_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "gamermod:block/jeremium_ore" - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/matt_damon.json b/src/main/resources/assets/gamermod/models/item/matt_damon.json deleted file mode 100755 index 2b1af03..0000000 --- a/src/main/resources/assets/gamermod/models/item/matt_damon.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "gamermod:block/matt_damon" - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/omnium_block.json b/src/main/resources/assets/gamermod/models/item/omnium_block.json deleted file mode 100755 index 89a2662..0000000 --- a/src/main/resources/assets/gamermod/models/item/omnium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "gamermod:block/omnium_block" - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/omnium_chestplate.json b/src/main/resources/assets/gamermod/models/item/omnium_chestplate.json deleted file mode 100755 index 71fcba4..0000000 --- a/src/main/resources/assets/gamermod/models/item/omnium_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gamermod:item/omnium_chestplate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/omnium_leggings.json b/src/main/resources/assets/gamermod/models/item/omnium_leggings.json deleted file mode 100755 index ebce18e..0000000 --- a/src/main/resources/assets/gamermod/models/item/omnium_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gamermod:item/omnium_leggings" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/omnium_ore.json b/src/main/resources/assets/gamermod/models/item/omnium_ore.json deleted file mode 100755 index 21c08a5..0000000 --- a/src/main/resources/assets/gamermod/models/item/omnium_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "gamermod:block/omnium_ore" - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/orium_block.json b/src/main/resources/assets/gamermod/models/item/orium_block.json deleted file mode 100644 index 20548b3..0000000 --- a/src/main/resources/assets/gamermod/models/item/orium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "gamermod:block/orium_block" - } \ No newline at end of file diff --git a/src/main/resources/assets/gamermod/models/item/orium_ore.json b/src/main/resources/assets/gamermod/models/item/orium_ore.json deleted file mode 100644 index 5482eee..0000000 --- a/src/main/resources/assets/gamermod/models/item/orium_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "gamermod:block/orium_ore" - } \ No newline at end of file diff --git a/src/main/resources/data/fabric/tags/items/axes.json b/src/main/resources/data/fabric/tags/items/axes.json index 71a51cd..d8ffbad 100755 --- a/src/main/resources/data/fabric/tags/items/axes.json +++ b/src/main/resources/data/fabric/tags/items/axes.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "gamermod:omnium_axe", - "gamermod:orium_axe", - "gamermod:jeremium_axe" + "gameritems:omnium_axe", + "gameritems:orium_axe", + "gameritems:jeremium_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 1eba777..c47e4a3 100755 --- a/src/main/resources/data/fabric/tags/items/hoes.json +++ b/src/main/resources/data/fabric/tags/items/hoes.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "gamermod:omnium_hoe", - "gamermod:orium_hoe", - "gamermod:jeremium_hoe" + "gameritems:omnium_hoe", + "gameritems:orium_hoe", + "gameritems:jeremium_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 90284c6..34f9016 100755 --- a/src/main/resources/data/fabric/tags/items/pickaxes.json +++ b/src/main/resources/data/fabric/tags/items/pickaxes.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "gamermod:omnium_pickaxe", - "gamermod:orium_pickaxe", - "gamermod:jeremium_pickaxe" + "gameritems:omnium_pickaxe", + "gameritems:orium_pickaxe", + "gameritems:jeremium_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 2eb84e3..188bf2d 100755 --- a/src/main/resources/data/fabric/tags/items/shovels.json +++ b/src/main/resources/data/fabric/tags/items/shovels.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "gamermod:omnium_shovel", - "gamermod:orium_shovel", - "gamermod:jeremium_shovel" + "gameritems:omnium_shovel", + "gameritems:orium_shovel", + "gameritems:jeremium_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 72064f1..34c4028 100755 --- a/src/main/resources/data/fabric/tags/items/swords.json +++ b/src/main/resources/data/fabric/tags/items/swords.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "gamermod:omnium_sword", - "gamermod:orium_sword", - "gamermod:jeremium_sword" + "gameritems:omnium_sword", + "gameritems:orium_sword", + "gameritems:jeremium_sword" ] } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/advancements/gamermod.json b/src/main/resources/data/gameritems/advancements/gameritems.json similarity index 71% rename from src/main/resources/data/gamermod/advancements/gamermod.json rename to src/main/resources/data/gameritems/advancements/gameritems.json index b6b03e2..a858dd6 100755 --- a/src/main/resources/data/gamermod/advancements/gamermod.json +++ b/src/main/resources/data/gameritems/advancements/gameritems.json @@ -1,14 +1,14 @@ { "display": { "icon": { - "item": "gamermod:netherite_stick" + "item": "gameritems:netherite_stick" }, "title": "GAMING", "description": "OH no im too lazy to actually make these", "frame": "task", "show_toast": true, "announce_to_chat": false, - "background": "gamermod:textures/block/omnium_ore.png" + "background": "gameritems:textures/block/omnium_ore.png" }, "criteria": { "requirement": { diff --git a/src/main/resources/data/gamermod/advancements/raw_omnium.json b/src/main/resources/data/gameritems/advancements/raw_omnium.json similarity index 75% rename from src/main/resources/data/gamermod/advancements/raw_omnium.json rename to src/main/resources/data/gameritems/advancements/raw_omnium.json index c513c71..a80cf0c 100755 --- a/src/main/resources/data/gamermod/advancements/raw_omnium.json +++ b/src/main/resources/data/gameritems/advancements/raw_omnium.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "gamermod:raw_omnium" + "item": "gameritems:raw_omnium" }, "title": "greEN?", "description": "Get a piece of raw Omnium", @@ -9,7 +9,7 @@ "show_toast": true, "announce_to_chat": true }, - "parent": "gamermod:gamermod", + "parent": "gameritems:gameritems", "criteria": { "requirement": { "trigger": "minecraft:inventory_changed", @@ -17,7 +17,7 @@ "items": [ { "items": [ - "gamermod:raw_omnium" + "gameritems:raw_omnium" ] } ] diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_jeremium_ore.json b/src/main/resources/data/gameritems/loot_tables/blocks/deepslate_jeremium_ore.json similarity index 88% rename from src/main/resources/data/gamermod/loot_tables/blocks/deepslate_jeremium_ore.json rename to src/main/resources/data/gameritems/loot_tables/blocks/deepslate_jeremium_ore.json index c5f2f65..b16bf8b 100755 --- a/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_jeremium_ore.json +++ b/src/main/resources/data/gameritems/loot_tables/blocks/deepslate_jeremium_ore.json @@ -10,7 +10,7 @@ "children": [ { "type": "minecraft:item", - "name": "gamermod:deepslate_jeremium_ore", + "name": "gameritems:deepslate_jeremium_ore", "conditions": [ { "condition": "minecraft:match_tool", @@ -29,7 +29,7 @@ }, { "type": "minecraft:item", - "name": "gamermod:raw_jeremium", + "name": "gameritems:raw_jeremium", "functions": [ { "function": "minecraft:apply_bonus", diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_omnium_ore.json b/src/main/resources/data/gameritems/loot_tables/blocks/deepslate_omnium_ore.json similarity index 88% rename from src/main/resources/data/gamermod/loot_tables/blocks/deepslate_omnium_ore.json rename to src/main/resources/data/gameritems/loot_tables/blocks/deepslate_omnium_ore.json index ab93702..fe67d0f 100755 --- a/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_omnium_ore.json +++ b/src/main/resources/data/gameritems/loot_tables/blocks/deepslate_omnium_ore.json @@ -10,7 +10,7 @@ "children": [ { "type": "minecraft:item", - "name": "gamermod:deepslate_omnium_ore", + "name": "gameritems:deepslate_omnium_ore", "conditions": [ { "condition": "minecraft:match_tool", @@ -29,7 +29,7 @@ }, { "type": "minecraft:item", - "name": "gamermod:raw_omnium", + "name": "gameritems:raw_omnium", "functions": [ { "function": "minecraft:apply_bonus", diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_orium_ore.json b/src/main/resources/data/gameritems/loot_tables/blocks/deepslate_orium_ore.json similarity index 88% rename from src/main/resources/data/gamermod/loot_tables/blocks/deepslate_orium_ore.json rename to src/main/resources/data/gameritems/loot_tables/blocks/deepslate_orium_ore.json index c360405..591c7eb 100755 --- a/src/main/resources/data/gamermod/loot_tables/blocks/deepslate_orium_ore.json +++ b/src/main/resources/data/gameritems/loot_tables/blocks/deepslate_orium_ore.json @@ -10,7 +10,7 @@ "children": [ { "type": "minecraft:item", - "name": "gamermod:deepslate_orium_ore", + "name": "gameritems:deepslate_orium_ore", "conditions": [ { "condition": "minecraft:match_tool", @@ -29,7 +29,7 @@ }, { "type": "minecraft:item", - "name": "gamermod:raw_orium", + "name": "gameritems:raw_orium", "functions": [ { "function": "minecraft:apply_bonus", diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/jeremium_ore.json b/src/main/resources/data/gameritems/loot_tables/blocks/jeremium_ore.json similarity index 88% rename from src/main/resources/data/gamermod/loot_tables/blocks/jeremium_ore.json rename to src/main/resources/data/gameritems/loot_tables/blocks/jeremium_ore.json index 4b8d5e6..7121345 100755 --- a/src/main/resources/data/gamermod/loot_tables/blocks/jeremium_ore.json +++ b/src/main/resources/data/gameritems/loot_tables/blocks/jeremium_ore.json @@ -10,7 +10,7 @@ "children": [ { "type": "minecraft:item", - "name": "gamermod:jeremium_ore", + "name": "gameritems:jeremium_ore", "conditions": [ { "condition": "minecraft:match_tool", @@ -29,7 +29,7 @@ }, { "type": "minecraft:item", - "name": "gamermod:raw_jeremium", + "name": "gameritems:raw_jeremium", "functions": [ { "function": "minecraft:apply_bonus", diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/matt_damon.json b/src/main/resources/data/gameritems/loot_tables/blocks/matt_damon.json similarity index 82% rename from src/main/resources/data/gamermod/loot_tables/blocks/matt_damon.json rename to src/main/resources/data/gameritems/loot_tables/blocks/matt_damon.json index 1001011..36a1cf5 100755 --- a/src/main/resources/data/gamermod/loot_tables/blocks/matt_damon.json +++ b/src/main/resources/data/gameritems/loot_tables/blocks/matt_damon.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "gamermod:matt_damon" + "name": "gameritems:matt_damon" } ], "conditions": [ diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/omnium_block.json b/src/main/resources/data/gameritems/loot_tables/blocks/omnium_block.json similarity index 82% rename from src/main/resources/data/gamermod/loot_tables/blocks/omnium_block.json rename to src/main/resources/data/gameritems/loot_tables/blocks/omnium_block.json index 951944a..12a29e4 100755 --- a/src/main/resources/data/gamermod/loot_tables/blocks/omnium_block.json +++ b/src/main/resources/data/gameritems/loot_tables/blocks/omnium_block.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "gamermod:omnium_block" + "name": "gameritems:omnium_block" } ], "conditions": [ diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/omnium_ore.json b/src/main/resources/data/gameritems/loot_tables/blocks/omnium_ore.json similarity index 89% rename from src/main/resources/data/gamermod/loot_tables/blocks/omnium_ore.json rename to src/main/resources/data/gameritems/loot_tables/blocks/omnium_ore.json index 02d35fa..a059ff4 100755 --- a/src/main/resources/data/gamermod/loot_tables/blocks/omnium_ore.json +++ b/src/main/resources/data/gameritems/loot_tables/blocks/omnium_ore.json @@ -10,7 +10,7 @@ "children": [ { "type": "minecraft:item", - "name": "gamermod:omnium_ore", + "name": "gameritems:omnium_ore", "conditions": [ { "condition": "minecraft:match_tool", @@ -29,7 +29,7 @@ }, { "type": "minecraft:item", - "name": "gamermod:raw_omnium", + "name": "gameritems:raw_omnium", "functions": [ { "function": "minecraft:apply_bonus", diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/orium_block.json b/src/main/resources/data/gameritems/loot_tables/blocks/orium_block.json similarity index 82% rename from src/main/resources/data/gamermod/loot_tables/blocks/orium_block.json rename to src/main/resources/data/gameritems/loot_tables/blocks/orium_block.json index 51429ea..a309c78 100755 --- a/src/main/resources/data/gamermod/loot_tables/blocks/orium_block.json +++ b/src/main/resources/data/gameritems/loot_tables/blocks/orium_block.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "gamermod:orium_block" + "name": "gameritems:orium_block" } ], "conditions": [ diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/orium_ore.json b/src/main/resources/data/gameritems/loot_tables/blocks/orium_ore.json similarity index 89% rename from src/main/resources/data/gamermod/loot_tables/blocks/orium_ore.json rename to src/main/resources/data/gameritems/loot_tables/blocks/orium_ore.json index 160b816..1c0493e 100755 --- a/src/main/resources/data/gamermod/loot_tables/blocks/orium_ore.json +++ b/src/main/resources/data/gameritems/loot_tables/blocks/orium_ore.json @@ -10,7 +10,7 @@ "children": [ { "type": "minecraft:item", - "name": "gamermod:orium_ore", + "name": "gameritems:orium_ore", "conditions": [ { "condition": "minecraft:match_tool", @@ -29,7 +29,7 @@ }, { "type": "minecraft:item", - "name": "gamermod:raw_orium", + "name": "gameritems:raw_orium", "functions": [ { "function": "minecraft:apply_bonus", diff --git a/src/main/resources/data/gamermod/loot_tables/blocks/weem_crop_block.json b/src/main/resources/data/gameritems/loot_tables/blocks/weem_crop_block.json similarity index 81% rename from src/main/resources/data/gamermod/loot_tables/blocks/weem_crop_block.json rename to src/main/resources/data/gameritems/loot_tables/blocks/weem_crop_block.json index afafb4b..48041cd 100755 --- a/src/main/resources/data/gamermod/loot_tables/blocks/weem_crop_block.json +++ b/src/main/resources/data/gameritems/loot_tables/blocks/weem_crop_block.json @@ -10,11 +10,11 @@ "children": [ { "type": "minecraft:item", - "name": "gamermod:weem", + "name": "gameritems:weem", "conditions": [ { "condition": "minecraft:block_state_property", - "block": "gamermod:weem_crop_block", + "block": "gameritems:weem_crop_block", "properties": { "age": "7" } @@ -23,7 +23,7 @@ }, { "type": "minecraft:item", - "name": "gamermod:weem_seeds" + "name": "gameritems:weem_seeds" } ] } @@ -35,7 +35,7 @@ "entries": [ { "type": "minecraft:item", - "name": "gamermod:weem_seeds", + "name": "gameritems:weem_seeds", "functions": [ { "function": "minecraft:apply_bonus", @@ -52,7 +52,7 @@ "conditions": [ { "condition": "minecraft:block_state_property", - "block": "gamermod:weem_crop_block", + "block": "gameritems:weem_crop_block", "properties": { "age": "7" } diff --git a/src/main/resources/data/gamermod/recipes/breem.json b/src/main/resources/data/gameritems/recipes/breem.json similarity index 65% rename from src/main/resources/data/gamermod/recipes/breem.json rename to src/main/resources/data/gameritems/recipes/breem.json index cc28a8a..cb38a1f 100755 --- a/src/main/resources/data/gamermod/recipes/breem.json +++ b/src/main/resources/data/gameritems/recipes/breem.json @@ -5,11 +5,11 @@ ], "key": { "F": { - "item": "gamermod:weem" + "item": "gameritems:weem" } }, "result": { - "item": "gamermod:breem", + "item": "gameritems:breem", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/deez_nuts.json b/src/main/resources/data/gameritems/recipes/deez_nuts.json similarity index 54% rename from src/main/resources/data/gamermod/recipes/deez_nuts.json rename to src/main/resources/data/gameritems/recipes/deez_nuts.json index 4e20047..8586059 100755 --- a/src/main/resources/data/gamermod/recipes/deez_nuts.json +++ b/src/main/resources/data/gameritems/recipes/deez_nuts.json @@ -2,14 +2,14 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "gamermod:nuts" + "item": "gameritems:nuts" }, { - "item": "gamermod:deez" + "item": "gameritems:deez" } ], "result": { - "item": "gamermod:deez_nuts", + "item": "gameritems:deez_nuts", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/deez_nuts_on_your_chin.json b/src/main/resources/data/gameritems/recipes/deez_nuts_on_your_chin.json similarity index 51% rename from src/main/resources/data/gamermod/recipes/deez_nuts_on_your_chin.json rename to src/main/resources/data/gameritems/recipes/deez_nuts_on_your_chin.json index 7ee0606..94128a2 100755 --- a/src/main/resources/data/gamermod/recipes/deez_nuts_on_your_chin.json +++ b/src/main/resources/data/gameritems/recipes/deez_nuts_on_your_chin.json @@ -2,14 +2,14 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "gamermod:chin" + "item": "gameritems:chin" }, { - "item": "gamermod:deez_nuts" + "item": "gameritems:deez_nuts" } ], "result": { - "item": "gamermod:deez_nuts_on_your_chin", + "item": "gameritems:deez_nuts_on_your_chin", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gameritems/recipes/drag_deez_nuts_on_your_chin.json b/src/main/resources/data/gameritems/recipes/drag_deez_nuts_on_your_chin.json new file mode 100755 index 0000000..35393fa --- /dev/null +++ b/src/main/resources/data/gameritems/recipes/drag_deez_nuts_on_your_chin.json @@ -0,0 +1,15 @@ + { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "gameritems:drag" + }, + { + "item": "gameritems:deez_nuts_on_your_chin" + } + ], + "result": { + "item": "gameritems:drag_deez_nuts_on_your_chin", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/gamer_bow.json b/src/main/resources/data/gameritems/recipes/gamer_bow.json similarity index 89% rename from src/main/resources/data/gamermod/recipes/gamer_bow.json rename to src/main/resources/data/gameritems/recipes/gamer_bow.json index 7d0e4c4..07071ec 100644 --- a/src/main/resources/data/gamermod/recipes/gamer_bow.json +++ b/src/main/resources/data/gameritems/recipes/gamer_bow.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "gamermod:gamer_bow" + "item": "gameritems:gamer_bow" } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_axe.json b/src/main/resources/data/gameritems/recipes/jeremium_axe.json similarity index 58% rename from src/main/resources/data/gamermod/recipes/jeremium_axe.json rename to src/main/resources/data/gameritems/recipes/jeremium_axe.json index b67eae2..9ec9d10 100755 --- a/src/main/resources/data/gamermod/recipes/jeremium_axe.json +++ b/src/main/resources/data/gameritems/recipes/jeremium_axe.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:jeremium_ingot" + "item": "gameritems:jeremium_ingot" }, "W": { - "item": "gamermod:netherite_stick" + "item": "gameritems:netherite_stick" } }, "result": { - "item": "gamermod:jeremium_axe", + "item": "gameritems:jeremium_axe", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_block.json b/src/main/resources/data/gameritems/recipes/jeremium_block.json similarity index 64% rename from src/main/resources/data/gamermod/recipes/jeremium_block.json rename to src/main/resources/data/gameritems/recipes/jeremium_block.json index 825e2d4..ee62bfe 100755 --- a/src/main/resources/data/gamermod/recipes/jeremium_block.json +++ b/src/main/resources/data/gameritems/recipes/jeremium_block.json @@ -7,11 +7,11 @@ ], "key": { "F": { - "item": "gamermod:jeremium_ingot" + "item": "gameritems:jeremium_ingot" } }, "result": { - "item": "gamermod:jeremium_block", + "item": "gameritems:jeremium_block", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_boots.json b/src/main/resources/data/gameritems/recipes/jeremium_boots.json similarity index 69% rename from src/main/resources/data/gamermod/recipes/jeremium_boots.json rename to src/main/resources/data/gameritems/recipes/jeremium_boots.json index 02cb6d7..115b272 100755 --- a/src/main/resources/data/gamermod/recipes/jeremium_boots.json +++ b/src/main/resources/data/gameritems/recipes/jeremium_boots.json @@ -6,14 +6,14 @@ ], "key": { "F": { - "item": "gamermod:jeremium_ingot" + "item": "gameritems:jeremium_ingot" }, "E": { "item": "minecraft:netherite_ingot" } }, "result": { - "item": "gamermod:jeremium_boots", + "item": "gameritems:jeremium_boots", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_chestplate.json b/src/main/resources/data/gameritems/recipes/jeremium_chestplate.json similarity index 69% rename from src/main/resources/data/gamermod/recipes/jeremium_chestplate.json rename to src/main/resources/data/gameritems/recipes/jeremium_chestplate.json index 9891981..ed19a06 100755 --- a/src/main/resources/data/gamermod/recipes/jeremium_chestplate.json +++ b/src/main/resources/data/gameritems/recipes/jeremium_chestplate.json @@ -7,14 +7,14 @@ ], "key": { "F": { - "item": "gamermod:jeremium_ingot" + "item": "gameritems:jeremium_ingot" }, "E": { "item": "minecraft:netherite_ingot" } }, "result": { - "item": "gamermod:jeremium_chestplate", + "item": "gameritems:jeremium_chestplate", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_helmet.json b/src/main/resources/data/gameritems/recipes/jeremium_helmet.json similarity index 69% rename from src/main/resources/data/gamermod/recipes/jeremium_helmet.json rename to src/main/resources/data/gameritems/recipes/jeremium_helmet.json index c921e84..e16e018 100755 --- a/src/main/resources/data/gamermod/recipes/jeremium_helmet.json +++ b/src/main/resources/data/gameritems/recipes/jeremium_helmet.json @@ -6,14 +6,14 @@ ], "key": { "F": { - "item": "gamermod:jeremium_ingot" + "item": "gameritems:jeremium_ingot" }, "E": { "item": "minecraft:netherite_ingot" } }, "result": { - "item": "gamermod:jeremium_helmet", + "item": "gameritems:jeremium_helmet", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_hoe.json b/src/main/resources/data/gameritems/recipes/jeremium_hoe.json similarity index 58% rename from src/main/resources/data/gamermod/recipes/jeremium_hoe.json rename to src/main/resources/data/gameritems/recipes/jeremium_hoe.json index b4a2c0e..6c0795d 100755 --- a/src/main/resources/data/gamermod/recipes/jeremium_hoe.json +++ b/src/main/resources/data/gameritems/recipes/jeremium_hoe.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:jeremium_ingot" + "item": "gameritems:jeremium_ingot" }, "W": { - "item": "gamermod:netherite_stick" + "item": "gameritems:netherite_stick" } }, "result": { - "item": "gamermod:jeremium_hoe", + "item": "gameritems:jeremium_hoe", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_ingot.json b/src/main/resources/data/gameritems/recipes/jeremium_ingot.json similarity index 56% rename from src/main/resources/data/gamermod/recipes/jeremium_ingot.json rename to src/main/resources/data/gameritems/recipes/jeremium_ingot.json index ce2f0b3..6891312 100755 --- a/src/main/resources/data/gamermod/recipes/jeremium_ingot.json +++ b/src/main/resources/data/gameritems/recipes/jeremium_ingot.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "gamermod:jeremium_block" + "item": "gameritems:jeremium_block" } ], "result": { - "item": "gamermod:jeremium_ingot", + "item": "gameritems:jeremium_ingot", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_ingot_blast.json b/src/main/resources/data/gameritems/recipes/jeremium_ingot_blast.json similarity index 54% rename from src/main/resources/data/gamermod/recipes/jeremium_ingot_blast.json rename to src/main/resources/data/gameritems/recipes/jeremium_ingot_blast.json index 3b1a9de..ff9b30a 100755 --- a/src/main/resources/data/gamermod/recipes/jeremium_ingot_blast.json +++ b/src/main/resources/data/gameritems/recipes/jeremium_ingot_blast.json @@ -1,9 +1,9 @@ { "type": "minecraft:blasting", "ingredient": { - "item": "gamermod:raw_jeremium" + "item": "gameritems:raw_jeremium" }, - "result": "gamermod:jeremium_ingot", + "result": "gameritems:jeremium_ingot", "experience": 1.0, "cookingtime": 100 } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_ingot_furnace.json b/src/main/resources/data/gameritems/recipes/jeremium_ingot_furnace.json similarity index 53% rename from src/main/resources/data/gamermod/recipes/jeremium_ingot_furnace.json rename to src/main/resources/data/gameritems/recipes/jeremium_ingot_furnace.json index 72e8002..92f936b 100755 --- a/src/main/resources/data/gamermod/recipes/jeremium_ingot_furnace.json +++ b/src/main/resources/data/gameritems/recipes/jeremium_ingot_furnace.json @@ -1,9 +1,9 @@ { "type": "minecraft:smelting", "ingredient": { - "item": "gamermod:raw_jeremium" + "item": "gameritems:raw_jeremium" }, - "result": "gamermod:jeremium_ingot", + "result": "gameritems:jeremium_ingot", "experience": 1, "cookingtime": 250 } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_leggings.json b/src/main/resources/data/gameritems/recipes/jeremium_leggings.json similarity index 70% rename from src/main/resources/data/gamermod/recipes/jeremium_leggings.json rename to src/main/resources/data/gameritems/recipes/jeremium_leggings.json index 4d0cdc3..3834b35 100755 --- a/src/main/resources/data/gamermod/recipes/jeremium_leggings.json +++ b/src/main/resources/data/gameritems/recipes/jeremium_leggings.json @@ -7,14 +7,14 @@ ], "key": { "F": { - "item": "gamermod:jeremium_ingot" + "item": "gameritems:jeremium_ingot" }, "E": { "item": "minecraft:netherite_ingot" } }, "result": { - "item": "gamermod:jeremium_leggings", + "item": "gameritems:jeremium_leggings", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_pickaxe.json b/src/main/resources/data/gameritems/recipes/jeremium_pickaxe.json similarity index 57% rename from src/main/resources/data/gamermod/recipes/jeremium_pickaxe.json rename to src/main/resources/data/gameritems/recipes/jeremium_pickaxe.json index d7535bc..6baf285 100755 --- a/src/main/resources/data/gamermod/recipes/jeremium_pickaxe.json +++ b/src/main/resources/data/gameritems/recipes/jeremium_pickaxe.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:jeremium_ingot" + "item": "gameritems:jeremium_ingot" }, "W": { - "item": "gamermod:netherite_stick" + "item": "gameritems:netherite_stick" } }, "result": { - "item": "gamermod:jeremium_pickaxe", + "item": "gameritems:jeremium_pickaxe", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_shovel.json b/src/main/resources/data/gameritems/recipes/jeremium_shovel.json similarity index 57% rename from src/main/resources/data/gamermod/recipes/jeremium_shovel.json rename to src/main/resources/data/gameritems/recipes/jeremium_shovel.json index 63045e2..dd366b5 100755 --- a/src/main/resources/data/gamermod/recipes/jeremium_shovel.json +++ b/src/main/resources/data/gameritems/recipes/jeremium_shovel.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:jeremium_ingot" + "item": "gameritems:jeremium_ingot" }, "W": { - "item": "gamermod:netherite_stick" + "item": "gameritems:netherite_stick" } }, "result": { - "item": "gamermod:jeremium_shovel", + "item": "gameritems:jeremium_shovel", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/jeremium_sword.json b/src/main/resources/data/gameritems/recipes/jeremium_sword.json similarity index 57% rename from src/main/resources/data/gamermod/recipes/jeremium_sword.json rename to src/main/resources/data/gameritems/recipes/jeremium_sword.json index 3e0b6e3..9a1b3fa 100755 --- a/src/main/resources/data/gamermod/recipes/jeremium_sword.json +++ b/src/main/resources/data/gameritems/recipes/jeremium_sword.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:jeremium_ingot" + "item": "gameritems:jeremium_ingot" }, "W": { - "item": "gamermod:netherite_stick" + "item": "gameritems:netherite_stick" } }, "result": { - "item": "gamermod:jeremium_sword", + "item": "gameritems:jeremium_sword", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/netherite_stick.json b/src/main/resources/data/gameritems/recipes/netherite_stick.json similarity index 84% rename from src/main/resources/data/gamermod/recipes/netherite_stick.json rename to src/main/resources/data/gameritems/recipes/netherite_stick.json index 6b53ab9..dc6a1ef 100755 --- a/src/main/resources/data/gamermod/recipes/netherite_stick.json +++ b/src/main/resources/data/gameritems/recipes/netherite_stick.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "gamermod:netherite_stick", + "item": "gameritems:netherite_stick", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/omnium_axe.json b/src/main/resources/data/gameritems/recipes/omnium_axe.json similarity index 58% rename from src/main/resources/data/gamermod/recipes/omnium_axe.json rename to src/main/resources/data/gameritems/recipes/omnium_axe.json index 3f9eb99..2d0c2f4 100755 --- a/src/main/resources/data/gamermod/recipes/omnium_axe.json +++ b/src/main/resources/data/gameritems/recipes/omnium_axe.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:omnium_ingot" + "item": "gameritems:omnium_ingot" }, "W": { - "item": "gamermod:netherite_stick" + "item": "gameritems:netherite_stick" } }, "result": { - "item": "gamermod:omnium_axe", + "item": "gameritems:omnium_axe", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/omnium_block.json b/src/main/resources/data/gameritems/recipes/omnium_block.json similarity index 65% rename from src/main/resources/data/gamermod/recipes/omnium_block.json rename to src/main/resources/data/gameritems/recipes/omnium_block.json index 6390a60..18b0434 100755 --- a/src/main/resources/data/gamermod/recipes/omnium_block.json +++ b/src/main/resources/data/gameritems/recipes/omnium_block.json @@ -7,11 +7,11 @@ ], "key": { "F": { - "item": "gamermod:omnium_ingot" + "item": "gameritems:omnium_ingot" } }, "result": { - "item": "gamermod:omnium_block", + "item": "gameritems:omnium_block", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/omnium_boots.json b/src/main/resources/data/gameritems/recipes/omnium_boots.json similarity index 70% rename from src/main/resources/data/gamermod/recipes/omnium_boots.json rename to src/main/resources/data/gameritems/recipes/omnium_boots.json index ab70b28..3caf096 100755 --- a/src/main/resources/data/gamermod/recipes/omnium_boots.json +++ b/src/main/resources/data/gameritems/recipes/omnium_boots.json @@ -6,14 +6,14 @@ ], "key": { "F": { - "item": "gamermod:omnium_ingot" + "item": "gameritems:omnium_ingot" }, "E": { "item": "minecraft:netherite_ingot" } }, "result": { - "item": "gamermod:omnium_boots", + "item": "gameritems:omnium_boots", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/omnium_chestplate.json b/src/main/resources/data/gameritems/recipes/omnium_chestplate.json similarity index 70% rename from src/main/resources/data/gamermod/recipes/omnium_chestplate.json rename to src/main/resources/data/gameritems/recipes/omnium_chestplate.json index cb78615..b12b823 100755 --- a/src/main/resources/data/gamermod/recipes/omnium_chestplate.json +++ b/src/main/resources/data/gameritems/recipes/omnium_chestplate.json @@ -7,14 +7,14 @@ ], "key": { "F": { - "item": "gamermod:omnium_ingot" + "item": "gameritems:omnium_ingot" }, "E": { "item": "minecraft:netherite_ingot" } }, "result": { - "item": "gamermod:omnium_chestplate", + "item": "gameritems:omnium_chestplate", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/omnium_helmet.json b/src/main/resources/data/gameritems/recipes/omnium_helmet.json similarity index 70% rename from src/main/resources/data/gamermod/recipes/omnium_helmet.json rename to src/main/resources/data/gameritems/recipes/omnium_helmet.json index 203c092..facc995 100755 --- a/src/main/resources/data/gamermod/recipes/omnium_helmet.json +++ b/src/main/resources/data/gameritems/recipes/omnium_helmet.json @@ -6,14 +6,14 @@ ], "key": { "F": { - "item": "gamermod:omnium_ingot" + "item": "gameritems:omnium_ingot" }, "E": { "item": "minecraft:netherite_ingot" } }, "result": { - "item": "gamermod:omnium_helmet", + "item": "gameritems:omnium_helmet", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/omnium_hoe.json b/src/main/resources/data/gameritems/recipes/omnium_hoe.json similarity index 58% rename from src/main/resources/data/gamermod/recipes/omnium_hoe.json rename to src/main/resources/data/gameritems/recipes/omnium_hoe.json index 0f552ed..2e5f1dc 100755 --- a/src/main/resources/data/gamermod/recipes/omnium_hoe.json +++ b/src/main/resources/data/gameritems/recipes/omnium_hoe.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:omnium_ingot" + "item": "gameritems:omnium_ingot" }, "W": { - "item": "gamermod:netherite_stick" + "item": "gameritems:netherite_stick" } }, "result": { - "item": "gamermod:omnium_hoe", + "item": "gameritems:omnium_hoe", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/omnium_ingot.json b/src/main/resources/data/gameritems/recipes/omnium_ingot.json similarity index 57% rename from src/main/resources/data/gamermod/recipes/omnium_ingot.json rename to src/main/resources/data/gameritems/recipes/omnium_ingot.json index e24c34c..a660efe 100755 --- a/src/main/resources/data/gamermod/recipes/omnium_ingot.json +++ b/src/main/resources/data/gameritems/recipes/omnium_ingot.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "gamermod:omnium_block" + "item": "gameritems:omnium_block" } ], "result": { - "item": "gamermod:omnium_ingot", + "item": "gameritems:omnium_ingot", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/omnium_ingot_blast.json b/src/main/resources/data/gameritems/recipes/omnium_ingot_blast.json similarity index 55% rename from src/main/resources/data/gamermod/recipes/omnium_ingot_blast.json rename to src/main/resources/data/gameritems/recipes/omnium_ingot_blast.json index d711cf7..b0f3a7f 100755 --- a/src/main/resources/data/gamermod/recipes/omnium_ingot_blast.json +++ b/src/main/resources/data/gameritems/recipes/omnium_ingot_blast.json @@ -1,9 +1,9 @@ { "type": "minecraft:blasting", "ingredient": { - "item": "gamermod:raw_omnium" + "item": "gameritems:raw_omnium" }, - "result": "gamermod:omnium_ingot", + "result": "gameritems:omnium_ingot", "experience": 1.0, "cookingtime": 70 } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/omnium_ingot_furnace.json b/src/main/resources/data/gameritems/recipes/omnium_ingot_furnace.json similarity index 54% rename from src/main/resources/data/gamermod/recipes/omnium_ingot_furnace.json rename to src/main/resources/data/gameritems/recipes/omnium_ingot_furnace.json index 47fee17..1437993 100755 --- a/src/main/resources/data/gamermod/recipes/omnium_ingot_furnace.json +++ b/src/main/resources/data/gameritems/recipes/omnium_ingot_furnace.json @@ -1,9 +1,9 @@ { "type": "minecraft:smelting", "ingredient": { - "item": "gamermod:raw_omnium" + "item": "gameritems:raw_omnium" }, - "result": "gamermod:omnium_ingot", + "result": "gameritems:omnium_ingot", "experience": 1, "cookingtime": 200 } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/omnium_leggings.json b/src/main/resources/data/gameritems/recipes/omnium_leggings.json similarity index 71% rename from src/main/resources/data/gamermod/recipes/omnium_leggings.json rename to src/main/resources/data/gameritems/recipes/omnium_leggings.json index f7673d6..8fe58bd 100755 --- a/src/main/resources/data/gamermod/recipes/omnium_leggings.json +++ b/src/main/resources/data/gameritems/recipes/omnium_leggings.json @@ -7,14 +7,14 @@ ], "key": { "F": { - "item": "gamermod:omnium_ingot" + "item": "gameritems:omnium_ingot" }, "E": { "item": "minecraft:netherite_ingot" } }, "result": { - "item": "gamermod:omnium_leggings", + "item": "gameritems:omnium_leggings", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/omnium_pickaxe.json b/src/main/resources/data/gameritems/recipes/omnium_pickaxe.json similarity index 58% rename from src/main/resources/data/gamermod/recipes/omnium_pickaxe.json rename to src/main/resources/data/gameritems/recipes/omnium_pickaxe.json index ddb165c..ce14609 100755 --- a/src/main/resources/data/gamermod/recipes/omnium_pickaxe.json +++ b/src/main/resources/data/gameritems/recipes/omnium_pickaxe.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:omnium_ingot" + "item": "gameritems:omnium_ingot" }, "W": { - "item": "gamermod:netherite_stick" + "item": "gameritems:netherite_stick" } }, "result": { - "item": "gamermod:omnium_pickaxe", + "item": "gameritems:omnium_pickaxe", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/omnium_shovel.json b/src/main/resources/data/gameritems/recipes/omnium_shovel.json similarity index 57% rename from src/main/resources/data/gamermod/recipes/omnium_shovel.json rename to src/main/resources/data/gameritems/recipes/omnium_shovel.json index cbe8664..9f09b90 100755 --- a/src/main/resources/data/gamermod/recipes/omnium_shovel.json +++ b/src/main/resources/data/gameritems/recipes/omnium_shovel.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:omnium_ingot" + "item": "gameritems:omnium_ingot" }, "W": { - "item": "gamermod:netherite_stick" + "item": "gameritems:netherite_stick" } }, "result": { - "item": "gamermod:omnium_shovel", + "item": "gameritems:omnium_shovel", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/omnium_sword.json b/src/main/resources/data/gameritems/recipes/omnium_sword.json similarity index 58% rename from src/main/resources/data/gamermod/recipes/omnium_sword.json rename to src/main/resources/data/gameritems/recipes/omnium_sword.json index 3e52c7a..825fcbd 100755 --- a/src/main/resources/data/gamermod/recipes/omnium_sword.json +++ b/src/main/resources/data/gameritems/recipes/omnium_sword.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:omnium_ingot" + "item": "gameritems:omnium_ingot" }, "W": { - "item": "gamermod:netherite_stick" + "item": "gameritems:netherite_stick" } }, "result": { - "item": "gamermod:omnium_sword", + "item": "gameritems:omnium_sword", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/orium_axe.json b/src/main/resources/data/gameritems/recipes/orium_axe.json similarity index 71% rename from src/main/resources/data/gamermod/recipes/orium_axe.json rename to src/main/resources/data/gameritems/recipes/orium_axe.json index 45c44ab..bc831b1 100755 --- a/src/main/resources/data/gamermod/recipes/orium_axe.json +++ b/src/main/resources/data/gameritems/recipes/orium_axe.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:orium_ingot" + "item": "gameritems:orium_ingot" }, "W": { "item": "minecraft:stick" } }, "result": { - "item": "gamermod:orium_axe", + "item": "gameritems:orium_axe", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/orium_block.json b/src/main/resources/data/gameritems/recipes/orium_block.json similarity index 65% rename from src/main/resources/data/gamermod/recipes/orium_block.json rename to src/main/resources/data/gameritems/recipes/orium_block.json index 634a5f1..d154327 100755 --- a/src/main/resources/data/gamermod/recipes/orium_block.json +++ b/src/main/resources/data/gameritems/recipes/orium_block.json @@ -7,11 +7,11 @@ ], "key": { "F": { - "item": "gamermod:orium_ingot" + "item": "gameritems:orium_ingot" } }, "result": { - "item": "gamermod:orium_block", + "item": "gameritems:orium_block", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/orium_boots.json b/src/main/resources/data/gameritems/recipes/orium_boots.json similarity index 64% rename from src/main/resources/data/gamermod/recipes/orium_boots.json rename to src/main/resources/data/gameritems/recipes/orium_boots.json index 2497606..ac2f64c 100755 --- a/src/main/resources/data/gamermod/recipes/orium_boots.json +++ b/src/main/resources/data/gameritems/recipes/orium_boots.json @@ -6,11 +6,11 @@ ], "key": { "F": { - "item": "gamermod:orium_ingot" + "item": "gameritems:orium_ingot" } }, "result": { - "item": "gamermod:orium_boots", + "item": "gameritems:orium_boots", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/orium_chestplate.json b/src/main/resources/data/gameritems/recipes/orium_chestplate.json similarity index 64% rename from src/main/resources/data/gamermod/recipes/orium_chestplate.json rename to src/main/resources/data/gameritems/recipes/orium_chestplate.json index d87463c..d6d08d0 100755 --- a/src/main/resources/data/gamermod/recipes/orium_chestplate.json +++ b/src/main/resources/data/gameritems/recipes/orium_chestplate.json @@ -7,11 +7,11 @@ ], "key": { "F": { - "item": "gamermod:orium_ingot" + "item": "gameritems:orium_ingot" } }, "result": { - "item": "gamermod:orium_chestplate", + "item": "gameritems:orium_chestplate", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/orium_helmet.json b/src/main/resources/data/gameritems/recipes/orium_helmet.json similarity index 63% rename from src/main/resources/data/gamermod/recipes/orium_helmet.json rename to src/main/resources/data/gameritems/recipes/orium_helmet.json index dc4b951..bcd859b 100755 --- a/src/main/resources/data/gamermod/recipes/orium_helmet.json +++ b/src/main/resources/data/gameritems/recipes/orium_helmet.json @@ -6,11 +6,11 @@ ], "key": { "F": { - "item": "gamermod:orium_ingot" + "item": "gameritems:orium_ingot" } }, "result": { - "item": "gamermod:orium_helmet", + "item": "gameritems:orium_helmet", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/orium_hoe.json b/src/main/resources/data/gameritems/recipes/orium_hoe.json similarity index 71% rename from src/main/resources/data/gamermod/recipes/orium_hoe.json rename to src/main/resources/data/gameritems/recipes/orium_hoe.json index bc79025..b04bbb1 100755 --- a/src/main/resources/data/gamermod/recipes/orium_hoe.json +++ b/src/main/resources/data/gameritems/recipes/orium_hoe.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:orium_ingot" + "item": "gameritems:orium_ingot" }, "W": { "item": "minecraft:stick" } }, "result": { - "item": "gamermod:orium_hoe", + "item": "gameritems:orium_hoe", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/orium_ingot.json b/src/main/resources/data/gameritems/recipes/orium_ingot.json similarity index 58% rename from src/main/resources/data/gamermod/recipes/orium_ingot.json rename to src/main/resources/data/gameritems/recipes/orium_ingot.json index ea05da0..afc0daf 100755 --- a/src/main/resources/data/gamermod/recipes/orium_ingot.json +++ b/src/main/resources/data/gameritems/recipes/orium_ingot.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "gamermod:orium_block" + "item": "gameritems:orium_block" } ], "result": { - "item": "gamermod:orium_ingot", + "item": "gameritems:orium_ingot", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/orium_ingot_blast.json b/src/main/resources/data/gameritems/recipes/orium_ingot_blast.json similarity index 55% rename from src/main/resources/data/gamermod/recipes/orium_ingot_blast.json rename to src/main/resources/data/gameritems/recipes/orium_ingot_blast.json index 6a06ee4..9386f62 100755 --- a/src/main/resources/data/gamermod/recipes/orium_ingot_blast.json +++ b/src/main/resources/data/gameritems/recipes/orium_ingot_blast.json @@ -1,9 +1,9 @@ { "type": "minecraft:blasting", "ingredient": { - "item": "gamermod:raw_orium" + "item": "gameritems:raw_orium" }, - "result": "gamermod:orium_ingot", + "result": "gameritems:orium_ingot", "experience": 1.0, "cookingtime": 70 } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/orium_ingot_furnace.json b/src/main/resources/data/gameritems/recipes/orium_ingot_furnace.json similarity index 55% rename from src/main/resources/data/gamermod/recipes/orium_ingot_furnace.json rename to src/main/resources/data/gameritems/recipes/orium_ingot_furnace.json index faeec39..9fdb80c 100755 --- a/src/main/resources/data/gamermod/recipes/orium_ingot_furnace.json +++ b/src/main/resources/data/gameritems/recipes/orium_ingot_furnace.json @@ -1,9 +1,9 @@ { "type": "minecraft:smelting", "ingredient": { - "item": "gamermod:raw_orium" + "item": "gameritems:raw_orium" }, - "result": "gamermod:orium_ingot", + "result": "gameritems:orium_ingot", "experience": 1, "cookingtime": 200 } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/orium_leggings.json b/src/main/resources/data/gameritems/recipes/orium_leggings.json similarity index 65% rename from src/main/resources/data/gamermod/recipes/orium_leggings.json rename to src/main/resources/data/gameritems/recipes/orium_leggings.json index 4aa3792..68abc3f 100755 --- a/src/main/resources/data/gamermod/recipes/orium_leggings.json +++ b/src/main/resources/data/gameritems/recipes/orium_leggings.json @@ -7,11 +7,11 @@ ], "key": { "F": { - "item": "gamermod:orium_ingot" + "item": "gameritems:orium_ingot" } }, "result": { - "item": "gamermod:orium_leggings", + "item": "gameritems:orium_leggings", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/orium_pickaxe.json b/src/main/resources/data/gameritems/recipes/orium_pickaxe.json similarity index 70% rename from src/main/resources/data/gamermod/recipes/orium_pickaxe.json rename to src/main/resources/data/gameritems/recipes/orium_pickaxe.json index 32b1d5b..f875324 100755 --- a/src/main/resources/data/gamermod/recipes/orium_pickaxe.json +++ b/src/main/resources/data/gameritems/recipes/orium_pickaxe.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:orium_ingot" + "item": "gameritems:orium_ingot" }, "W": { "item": "minecraft:stick" } }, "result": { - "item": "gamermod:orium_pickaxe", + "item": "gameritems:orium_pickaxe", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/orium_shovel.json b/src/main/resources/data/gameritems/recipes/orium_shovel.json similarity index 70% rename from src/main/resources/data/gamermod/recipes/orium_shovel.json rename to src/main/resources/data/gameritems/recipes/orium_shovel.json index 617c119..6182e28 100755 --- a/src/main/resources/data/gamermod/recipes/orium_shovel.json +++ b/src/main/resources/data/gameritems/recipes/orium_shovel.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:orium_ingot" + "item": "gameritems:orium_ingot" }, "W": { "item": "minecraft:stick" } }, "result": { - "item": "gamermod:orium_shovel", + "item": "gameritems:orium_shovel", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/orium_sword.json b/src/main/resources/data/gameritems/recipes/orium_sword.json similarity index 71% rename from src/main/resources/data/gamermod/recipes/orium_sword.json rename to src/main/resources/data/gameritems/recipes/orium_sword.json index 9e1a024..28c50f2 100755 --- a/src/main/resources/data/gamermod/recipes/orium_sword.json +++ b/src/main/resources/data/gameritems/recipes/orium_sword.json @@ -7,14 +7,14 @@ ], "key": { "#": { - "item": "gamermod:orium_ingot" + "item": "gameritems:orium_ingot" }, "W": { "item": "minecraft:stick" } }, "result": { - "item": "gamermod:orium_sword", + "item": "gameritems:orium_sword", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/weem_apple.json b/src/main/resources/data/gameritems/recipes/weem_apple.json similarity index 73% rename from src/main/resources/data/gamermod/recipes/weem_apple.json rename to src/main/resources/data/gameritems/recipes/weem_apple.json index e72d196..0e811e4 100755 --- a/src/main/resources/data/gamermod/recipes/weem_apple.json +++ b/src/main/resources/data/gameritems/recipes/weem_apple.json @@ -10,11 +10,11 @@ "item": "minecraft:golden_apple" }, "W": { - "item": "gamermod:weem" + "item": "gameritems:weem" } }, "result": { - "item": "gamermod:weem_apple", + "item": "gameritems:weem_apple", "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 new file mode 100755 index 0000000..d3c52d3 --- /dev/null +++ b/src/main/resources/data/gameritems/tags/blocks/ores.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "gameritems:omnium_ore", + "gameritems:orium_ore", + "gameritems:jeremium_ore", + "gameritems:deepslate_jeremium_ore", + "gameritems:deepslate_omnium_ore", + "gameritems:deepslate_orium_ore" + ] + } \ No newline at end of file diff --git a/src/main/resources/data/gamermod/recipes/drag_deez_nuts_on_your_chin.json b/src/main/resources/data/gamermod/recipes/drag_deez_nuts_on_your_chin.json deleted file mode 100755 index a67894e..0000000 --- a/src/main/resources/data/gamermod/recipes/drag_deez_nuts_on_your_chin.json +++ /dev/null @@ -1,15 +0,0 @@ - { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "gamermod:drag" - }, - { - "item": "gamermod:deez_nuts_on_your_chin" - } - ], - "result": { - "item": "gamermod:drag_deez_nuts_on_your_chin", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/gamermod/tags/blocks/ores.json b/src/main/resources/data/gamermod/tags/blocks/ores.json deleted file mode 100755 index 7022232..0000000 --- a/src/main/resources/data/gamermod/tags/blocks/ores.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "gamermod:omnium_ore", - "gamermod:orium_ore", - "gamermod:jeremium_ore", - "gamermod:deepslate_jeremium_ore", - "gamermod:deepslate_omnium_ore", - "gamermod:deepslate_orium_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 83c8438..5a94bbc 100755 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,14 +1,14 @@ { "replace": false, "values": [ - "gamermod:omnium_block", - "gamermod:omnium_ore", - "gamermod:orium_block", - "gamermod:orium_ore", - "gamermod:jeremium_ore", - "gamermod:deepslate_jeremium_ore", - "gamermod:jeremium_block", - "gamermod:deepslate_omnium_ore", - "gamermod:deepslate_orium_ore" + "gameritems:omnium_block", + "gameritems:omnium_ore", + "gameritems:orium_block", + "gameritems:orium_ore", + "gameritems:jeremium_ore", + "gameritems:deepslate_jeremium_ore", + "gameritems:jeremium_block", + "gameritems:deepslate_omnium_ore", + "gameritems:deepslate_orium_ore" ] } \ 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 83c8438..5a94bbc 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 @@ -1,14 +1,14 @@ { "replace": false, "values": [ - "gamermod:omnium_block", - "gamermod:omnium_ore", - "gamermod:orium_block", - "gamermod:orium_ore", - "gamermod:jeremium_ore", - "gamermod:deepslate_jeremium_ore", - "gamermod:jeremium_block", - "gamermod:deepslate_omnium_ore", - "gamermod:deepslate_orium_ore" + "gameritems:omnium_block", + "gameritems:omnium_ore", + "gameritems:orium_block", + "gameritems:orium_ore", + "gameritems:jeremium_ore", + "gameritems:deepslate_jeremium_ore", + "gameritems:jeremium_block", + "gameritems:deepslate_omnium_ore", + "gameritems:deepslate_orium_ore" ] } \ 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 83c8438..5a94bbc 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 @@ -1,14 +1,14 @@ { "replace": false, "values": [ - "gamermod:omnium_block", - "gamermod:omnium_ore", - "gamermod:orium_block", - "gamermod:orium_ore", - "gamermod:jeremium_ore", - "gamermod:deepslate_jeremium_ore", - "gamermod:jeremium_block", - "gamermod:deepslate_omnium_ore", - "gamermod:deepslate_orium_ore" + "gameritems:omnium_block", + "gameritems:omnium_ore", + "gameritems:orium_block", + "gameritems:orium_ore", + "gameritems:jeremium_ore", + "gameritems:deepslate_jeremium_ore", + "gameritems:jeremium_block", + "gameritems:deepslate_omnium_ore", + "gameritems:deepslate_orium_ore" ] } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0f20a28..31d8a7e 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,33 +1,33 @@ { "schemaVersion": 1, - "id": "gamermod", + "id": "gameritems", "version": "${version}", - "name": "GamerMod", + "name": "GamerItems", "description": "for gamers, by gæmer", "authors": [ "RyanTLG" ], "contact": { - "issues": "https://github.com/RyanTLG/GamerMod/issues", - "sources": "https://github.com/RyanTLG/GamerMod" + "issues": "https://github.com/RyanTLG/GamerItems/issues", + "sources": "https://github.com/RyanTLG/GamerItems" }, "license": "GPL3", - "icon": "assets/gamermod/icon.png", + "icon": "assets/gameritems/icon.png", "environment": "*", "entrypoints": { "main": [ - "net.arcmods.ryantlg.gamermod" + "net.arcmods.ryantlg.gameritems" ], "client": [ - "net.arcmods.ryantlg.gamermodClient" + "net.arcmods.ryantlg.gameritemsClient" ] }, "mixins": [ - "gamermod.mixins.json" + "gameritems.mixins.json" ], "depends": { diff --git a/src/main/resources/gamermod.mixins.json b/src/main/resources/gameritems.mixins.json similarity index 100% rename from src/main/resources/gamermod.mixins.json rename to src/main/resources/gameritems.mixins.json