From 921a997cef5548220a7f0cb12cc5f882320d4a82 Mon Sep 17 00:00:00 2001 From: Yavin7 Date: Mon, 1 Jul 2019 02:16:12 -0500 Subject: [PATCH] It compiles!!! All compasses work except the Nether Fortress Compass! TODO - Fix the Nether portal compass - Add igloo compass - Add temple compass - add witch hut compass --- build.gradle | 14 +- gradle/wrapper/gradle-wrapper.properties | 3 +- .../com/example/examplemod/ExampleMod.java | 84 ------------ .../findyourway/Client/AngleGetter.java | 121 ------------------ .../java/net/yseven/findyourway/Config.java | 6 +- .../net/yseven/findyourway/FindYourWay.java | 53 ++++++-- .../Network/MessageHandlerOnClient.java | 31 ----- .../Network/MessageHandlerOnServer.java | 49 ------- .../Network/MessageHandlerOnServerDummy.java | 12 -- .../findyourway/Network/MessageToClient.java | 63 --------- .../findyourway/Network/MessageToServer.java | 55 -------- .../Network/PacketGetCompassBlockPos.java | 42 ++++++ .../findyourway/Network/PacketHandler.java | 31 +++++ .../Network/PacketReturnCompassBlockPos.java | 40 ++++++ .../findyourway/item/ItemCompassBase.java | 102 +-------------- .../net/yseven/findyourway/item/ModItems.java | 69 ++++------ .../yseven/findyourway/setup/ClientProxy.java | 77 +---------- .../net/yseven/findyourway/setup/IProxy.java | 6 +- .../yseven/findyourway/setup/ModSetup.java | 18 --- .../yseven/findyourway/setup/ServerProxy.java | 70 +--------- src/main/resources/META-INF/mods.toml | 40 +++--- .../assets/findyourway/lang/en_US.json | 10 ++ .../assets/findyourway/lang/en_US.lang | 6 - ....ender_compass.json => ender_compass.json} | 2 +- ...ess_compass.json => fortress_compass.json} | 2 +- .../item.findyourway.ender_compass_00.json | 2 +- .../item.findyourway.ender_compass_01.json | 2 +- .../item.findyourway.ender_compass_02.json | 2 +- .../item.findyourway.ender_compass_03.json | 2 +- .../item.findyourway.ender_compass_04.json | 2 +- .../item.findyourway.ender_compass_05.json | 2 +- .../item.findyourway.ender_compass_06.json | 2 +- .../item.findyourway.ender_compass_07.json | 2 +- .../item.findyourway.ender_compass_08.json | 2 +- .../item.findyourway.ender_compass_09.json | 2 +- .../item.findyourway.ender_compass_10.json | 2 +- .../item.findyourway.ender_compass_11.json | 2 +- .../item.findyourway.ender_compass_12.json | 2 +- .../item.findyourway.ender_compass_13.json | 2 +- .../item.findyourway.ender_compass_14.json | 2 +- .../item.findyourway.ender_compass_15.json | 2 +- .../item.findyourway.ender_compass_16.json | 2 +- .../item.findyourway.ender_compass_17.json | 2 +- .../item.findyourway.ender_compass_18.json | 2 +- .../item.findyourway.ender_compass_19.json | 2 +- .../item.findyourway.ender_compass_20.json | 2 +- .../item.findyourway.ender_compass_21.json | 2 +- .../item.findyourway.ender_compass_22.json | 2 +- .../item.findyourway.ender_compass_23.json | 2 +- .../item.findyourway.ender_compass_24.json | 2 +- .../item.findyourway.ender_compass_25.json | 2 +- .../item.findyourway.ender_compass_26.json | 2 +- .../item.findyourway.ender_compass_27.json | 2 +- .../item.findyourway.ender_compass_28.json | 2 +- .../item.findyourway.ender_compass_29.json | 2 +- .../item.findyourway.ender_compass_30.json | 2 +- .../item.findyourway.ender_compass_31.json | 2 +- .../item.findyourway.fortress_compass_00.json | 2 +- .../item.findyourway.fortress_compass_01.json | 2 +- .../item.findyourway.fortress_compass_02.json | 2 +- .../item.findyourway.fortress_compass_03.json | 2 +- .../item.findyourway.fortress_compass_04.json | 2 +- .../item.findyourway.fortress_compass_05.json | 2 +- .../item.findyourway.fortress_compass_06.json | 2 +- .../item.findyourway.fortress_compass_07.json | 2 +- .../item.findyourway.fortress_compass_08.json | 2 +- .../item.findyourway.fortress_compass_09.json | 2 +- .../item.findyourway.fortress_compass_10.json | 2 +- .../item.findyourway.fortress_compass_11.json | 2 +- .../item.findyourway.fortress_compass_12.json | 2 +- .../item.findyourway.fortress_compass_13.json | 2 +- .../item.findyourway.fortress_compass_14.json | 2 +- .../item.findyourway.fortress_compass_15.json | 2 +- .../item.findyourway.fortress_compass_16.json | 2 +- .../item.findyourway.fortress_compass_17.json | 2 +- .../item.findyourway.fortress_compass_18.json | 2 +- .../item.findyourway.fortress_compass_19.json | 2 +- .../item.findyourway.fortress_compass_20.json | 2 +- .../item.findyourway.fortress_compass_21.json | 2 +- .../item.findyourway.fortress_compass_22.json | 2 +- .../item.findyourway.fortress_compass_23.json | 2 +- .../item.findyourway.fortress_compass_24.json | 2 +- .../item.findyourway.fortress_compass_25.json | 2 +- .../item.findyourway.fortress_compass_26.json | 2 +- .../item.findyourway.fortress_compass_27.json | 2 +- .../item.findyourway.fortress_compass_28.json | 2 +- .../item.findyourway.fortress_compass_29.json | 2 +- .../item.findyourway.fortress_compass_30.json | 2 +- .../item.findyourway.fortress_compass_31.json | 2 +- .../item.findyourway.mansion_compass_00.json | 2 +- .../item.findyourway.mansion_compass_01.json | 2 +- .../item.findyourway.mansion_compass_02.json | 2 +- .../item.findyourway.mansion_compass_03.json | 2 +- .../item.findyourway.mansion_compass_04.json | 2 +- .../item.findyourway.mansion_compass_05.json | 2 +- .../item.findyourway.mansion_compass_06.json | 2 +- .../item.findyourway.mansion_compass_07.json | 2 +- .../item.findyourway.mansion_compass_08.json | 2 +- .../item.findyourway.mansion_compass_09.json | 2 +- .../item.findyourway.mansion_compass_10.json | 2 +- .../item.findyourway.mansion_compass_11.json | 2 +- .../item.findyourway.mansion_compass_12.json | 2 +- .../item.findyourway.mansion_compass_13.json | 2 +- .../item.findyourway.mansion_compass_14.json | 2 +- .../item.findyourway.mansion_compass_15.json | 2 +- .../item.findyourway.mansion_compass_16.json | 2 +- .../item.findyourway.mansion_compass_17.json | 2 +- .../item.findyourway.mansion_compass_18.json | 2 +- .../item.findyourway.mansion_compass_19.json | 2 +- .../item.findyourway.mansion_compass_20.json | 2 +- .../item.findyourway.mansion_compass_21.json | 2 +- .../item.findyourway.mansion_compass_22.json | 2 +- .../item.findyourway.mansion_compass_23.json | 2 +- .../item.findyourway.mansion_compass_24.json | 2 +- .../item.findyourway.mansion_compass_25.json | 2 +- .../item.findyourway.mansion_compass_26.json | 2 +- .../item.findyourway.mansion_compass_27.json | 2 +- .../item.findyourway.mansion_compass_28.json | 2 +- .../item.findyourway.mansion_compass_29.json | 2 +- .../item.findyourway.mansion_compass_30.json | 2 +- .../item.findyourway.mansion_compass_31.json | 2 +- .../item.findyourway.monument_compass_00.json | 2 +- .../item.findyourway.monument_compass_01.json | 2 +- .../item.findyourway.monument_compass_02.json | 2 +- .../item.findyourway.monument_compass_03.json | 2 +- .../item.findyourway.monument_compass_04.json | 2 +- .../item.findyourway.monument_compass_05.json | 2 +- .../item.findyourway.monument_compass_06.json | 2 +- .../item.findyourway.monument_compass_07.json | 2 +- .../item.findyourway.monument_compass_08.json | 2 +- .../item.findyourway.monument_compass_09.json | 2 +- .../item.findyourway.monument_compass_10.json | 2 +- .../item.findyourway.monument_compass_11.json | 2 +- .../item.findyourway.monument_compass_12.json | 2 +- .../item.findyourway.monument_compass_13.json | 2 +- .../item.findyourway.monument_compass_14.json | 2 +- .../item.findyourway.monument_compass_15.json | 2 +- .../item.findyourway.monument_compass_16.json | 2 +- .../item.findyourway.monument_compass_17.json | 2 +- .../item.findyourway.monument_compass_18.json | 2 +- .../item.findyourway.monument_compass_19.json | 2 +- .../item.findyourway.monument_compass_20.json | 2 +- .../item.findyourway.monument_compass_21.json | 2 +- .../item.findyourway.monument_compass_22.json | 2 +- .../item.findyourway.monument_compass_23.json | 2 +- .../item.findyourway.monument_compass_24.json | 2 +- .../item.findyourway.monument_compass_25.json | 2 +- .../item.findyourway.monument_compass_26.json | 2 +- .../item.findyourway.monument_compass_27.json | 2 +- .../item.findyourway.monument_compass_28.json | 2 +- .../item.findyourway.monument_compass_29.json | 2 +- .../item.findyourway.monument_compass_30.json | 2 +- .../item.findyourway.monument_compass_31.json | 2 +- .../item.findyourway.village_compass_00.json | 2 +- .../item.findyourway.village_compass_01.json | 2 +- .../item.findyourway.village_compass_02.json | 2 +- .../item.findyourway.village_compass_03.json | 2 +- .../item.findyourway.village_compass_04.json | 2 +- .../item.findyourway.village_compass_05.json | 2 +- .../item.findyourway.village_compass_06.json | 2 +- .../item.findyourway.village_compass_07.json | 2 +- .../item.findyourway.village_compass_08.json | 2 +- .../item.findyourway.village_compass_09.json | 2 +- .../item.findyourway.village_compass_10.json | 2 +- .../item.findyourway.village_compass_11.json | 2 +- .../item.findyourway.village_compass_12.json | 2 +- .../item.findyourway.village_compass_13.json | 2 +- .../item.findyourway.village_compass_14.json | 2 +- .../item.findyourway.village_compass_15.json | 2 +- .../item.findyourway.village_compass_16.json | 2 +- .../item.findyourway.village_compass_17.json | 2 +- .../item.findyourway.village_compass_18.json | 2 +- .../item.findyourway.village_compass_19.json | 2 +- .../item.findyourway.village_compass_20.json | 2 +- .../item.findyourway.village_compass_21.json | 2 +- .../item.findyourway.village_compass_22.json | 2 +- .../item.findyourway.village_compass_23.json | 2 +- .../item.findyourway.village_compass_24.json | 2 +- .../item.findyourway.village_compass_25.json | 2 +- .../item.findyourway.village_compass_26.json | 2 +- .../item.findyourway.village_compass_27.json | 2 +- .../item.findyourway.village_compass_28.json | 2 +- .../item.findyourway.village_compass_29.json | 2 +- .../item.findyourway.village_compass_30.json | 2 +- .../item.findyourway.village_compass_31.json | 2 +- ...sion_compass.json => mansion_compass.json} | 2 +- ...ent_compass.json => monument_compass.json} | 2 +- ...lage_compass.json => village_compass.json} | 2 +- .../item.findyourway.ender_compass.json | 0 .../item.findyourway.fortress_compass.json | 2 +- .../item.findyourway.mansion_compass.json | 0 .../item.findyourway.monument_compass.json | 3 +- .../item.findyourway.village_compass.json | 0 src/main/resources/pack.mcmeta | 2 +- 194 files changed, 398 insertions(+), 941 deletions(-) delete mode 100644 src/main/java/com/example/examplemod/ExampleMod.java delete mode 100644 src/main/java/net/yseven/findyourway/Client/AngleGetter.java delete mode 100644 src/main/java/net/yseven/findyourway/Network/MessageHandlerOnClient.java delete mode 100644 src/main/java/net/yseven/findyourway/Network/MessageHandlerOnServer.java delete mode 100644 src/main/java/net/yseven/findyourway/Network/MessageHandlerOnServerDummy.java delete mode 100644 src/main/java/net/yseven/findyourway/Network/MessageToClient.java delete mode 100644 src/main/java/net/yseven/findyourway/Network/MessageToServer.java create mode 100644 src/main/java/net/yseven/findyourway/Network/PacketGetCompassBlockPos.java create mode 100644 src/main/java/net/yseven/findyourway/Network/PacketHandler.java create mode 100644 src/main/java/net/yseven/findyourway/Network/PacketReturnCompassBlockPos.java delete mode 100644 src/main/java/net/yseven/findyourway/setup/ModSetup.java create mode 100644 src/main/resources/assets/findyourway/lang/en_US.json delete mode 100644 src/main/resources/assets/findyourway/lang/en_US.lang rename src/main/resources/assets/findyourway/models/item/{item.findyourway.ender_compass.json => ender_compass.json} (99%) rename src/main/resources/assets/findyourway/models/item/{item.findyourway.fortress_compass.json => fortress_compass.json} (99%) rename src/main/resources/assets/findyourway/models/item/{item.findyourway.mansion_compass.json => mansion_compass.json} (99%) rename src/main/resources/assets/findyourway/models/item/{item.findyourway.monument_compass.json => monument_compass.json} (99%) rename src/main/resources/assets/findyourway/models/item/{item.findyourway.village_compass.json => village_compass.json} (99%) rename src/main/resources/{assets => data}/findyourway/recipes/item.findyourway.ender_compass.json (100%) rename src/main/resources/{assets => data}/findyourway/recipes/item.findyourway.fortress_compass.json (88%) rename src/main/resources/{assets => data}/findyourway/recipes/item.findyourway.mansion_compass.json (100%) rename src/main/resources/{assets => data}/findyourway/recipes/item.findyourway.monument_compass.json (85%) rename src/main/resources/{assets => data}/findyourway/recipes/item.findyourway.village_compass.json (100%) diff --git a/build.gradle b/build.gradle index abf7ba3..4508e77 100644 --- a/build.gradle +++ b/build.gradle @@ -13,9 +13,9 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '1.0' -group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = 'modid' +version = '2.0.0-beta' +group = 'net.yavin.findyourway' // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = 'findyourway' sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. @@ -97,12 +97,12 @@ dependencies { jar { manifest { attributes([ - "Specification-Title": "examplemod", - "Specification-Vendor": "examplemodsareus", - "Specification-Version": "1", // We are version 1 of ourselves + "Specification-Title": "findyourway", + "Specification-Vendor": "Yavin7", + "Specification-Version": "2.0.0-beta", "Implementation-Title": project.name, "Implementation-Version": "${version}", - "Implementation-Vendor" :"examplemodsareus", + "Implementation-Vendor" :"Yavin7", "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 949819d..29fe81d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Fri Jun 28 08:25:56 CDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip diff --git a/src/main/java/com/example/examplemod/ExampleMod.java b/src/main/java/com/example/examplemod/ExampleMod.java deleted file mode 100644 index a436462..0000000 --- a/src/main/java/com/example/examplemod/ExampleMod.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.example.examplemod; - -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.InterModComms; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; -import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; -import net.minecraftforge.fml.event.server.FMLServerStartingEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.util.stream.Collectors; - -// The value here should match an entry in the META-INF/mods.toml file -@Mod("examplemod") -public class ExampleMod -{ - // Directly reference a log4j logger. - private static final Logger LOGGER = LogManager.getLogger(); - - public ExampleMod() { - // Register the setup method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); - // Register the enqueueIMC method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC); - // Register the processIMC method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC); - // Register the doClientStuff method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff); - - // Register ourselves for server and other game events we are interested in - MinecraftForge.EVENT_BUS.register(this); - } - - private void setup(final FMLCommonSetupEvent event) - { - // some preinit code - LOGGER.info("HELLO FROM PREINIT"); - LOGGER.info("DIRT BLOCK >> {}", Blocks.DIRT.getRegistryName()); - } - - private void doClientStuff(final FMLClientSetupEvent event) { - // do something that can only be done on the client - LOGGER.info("Got game settings {}", event.getMinecraftSupplier().get().gameSettings); - } - - private void enqueueIMC(final InterModEnqueueEvent event) - { - // some example code to dispatch IMC to another mod - InterModComms.sendTo("examplemod", "helloworld", () -> { LOGGER.info("Hello world from the MDK"); return "Hello world";}); - } - - private void processIMC(final InterModProcessEvent event) - { - // some example code to receive and process InterModComms from other mods - LOGGER.info("Got IMC {}", event.getIMCStream(). - map(m->m.getMessageSupplier().get()). - collect(Collectors.toList())); - } - // You can use SubscribeEvent and let the Event Bus discover methods to call - @SubscribeEvent - public void onServerStarting(FMLServerStartingEvent event) { - // do something when the server starts - LOGGER.info("HELLO from server starting"); - } - - // You can use EventBusSubscriber to automatically subscribe events on the contained class (this is subscribing to the MOD - // Event bus for receiving Registry Events) - @Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD) - public static class RegistryEvents { - @SubscribeEvent - public static void onBlocksRegistry(final RegistryEvent.Register blockRegistryEvent) { - // register a new block here - LOGGER.info("HELLO from Register Block"); - } - } -} diff --git a/src/main/java/net/yseven/findyourway/Client/AngleGetter.java b/src/main/java/net/yseven/findyourway/Client/AngleGetter.java deleted file mode 100644 index 12c2e44..0000000 --- a/src/main/java/net/yseven/findyourway/Client/AngleGetter.java +++ /dev/null @@ -1,121 +0,0 @@ -package net.yseven.findyourway.Client; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItemFrame; -import net.minecraft.entity.passive.EntityChicken; -import net.minecraft.item.IItemPropertyGetter; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.yseven.findyourway.setup.ClientProxy; -import net.yseven.findyourway.setup.ServerProxy; - -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; - -public class AngleGetter implements IItemPropertyGetter { - @SideOnly(Side.CLIENT) - private double prevAngle = 0.0D; - @SideOnly(Side.CLIENT) - private double prevWobble = 0.0D; - @SideOnly(Side.CLIENT) - private long prevWorldTime = 0L; - @SideOnly(Side.CLIENT) - private BlockPos blockPos; - - @Override - @ParametersAreNonnullByDefault - @SideOnly(Side.CLIENT) - public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { - - boolean isLiving = entityIn != null; - Entity errorChicken = new EntityChicken(Minecraft.getMinecraft().world); - - Entity entity; - if(isLiving) { - entity = entityIn; - } else if(stack.getItemFrame() != null) { - entity = stack.getItemFrame(); - } else { - entity = errorChicken; - } - - if (worldIn == null) worldIn = entity.world; - - double angle; - setBlockPos(stack); - - if(blockPos != null) { - if (blockPos.getY() == 0) return 0.0F; - double entityAngle; - if(isLiving) { - entityAngle = entity.rotationYaw; - } else if(stack.getItemFrame() != null) { - entityAngle = getFrameAngle((EntityItemFrame) entity); - } else { - return 0.0F; - } - - entityAngle /= 360.0D; - entityAngle = MathHelper.positiveModulo(entityAngle, 1.0D); - double posAngle = getAngle(blockPos, entity); - posAngle /= Math.PI * 2D; - angle = 0.5D - (entityAngle - 0.25D - posAngle); - } else { - if(!ClientProxy.hasAngleErrrored()) { - System.out.println("Compass angle is random due to an unexpected error"); - ClientProxy.AngleHasErrored(); - } - angle = 0.0D; - } - - if(isLiving) { - angle = wobble(worldIn, angle); - } - - - return MathHelper.positiveModulo((float) angle, 1.0F); - } - - @SideOnly(Side.CLIENT) - private double wobble(World world, double angle) { - long worldTime = world.getTotalWorldTime(); - if (worldTime != prevWorldTime) { - prevWorldTime = worldTime; - double angleDifference = angle - prevAngle; - angleDifference = MathHelper.positiveModulo(angleDifference + 0.5D, 1.0D) - 0.5D; - prevWobble += angleDifference * 0.1D; - prevWobble *= 0.8D; - prevAngle = MathHelper.positiveModulo(prevAngle + prevWobble, 1.0D); - } - return prevAngle; - } - - @SideOnly(Side.CLIENT) - private void setBlockPos(ItemStack stack) { - for (int i = 0; i < ServerProxy.compassList.size(); i++) { - if (stack.getItem().getUnlocalizedName().equals(ServerProxy.compassList.get(i).getUnlocalizedName())) { - blockPos = ServerProxy.compassList.get(i).getStructurePos(); - } else { - if (!ClientProxy.hasAngleErrrored()) { - System.out.println("unable to get blockPos from compassList in AngleGetter class"); - } - } - } - } - - @SideOnly(Side.CLIENT) - private double getAngle(BlockPos pos, Entity ent) { - return MathHelper.atan2(pos.getZ() - ent.posZ, pos.getX() - ent.posX); - } - - @SideOnly(Side.CLIENT) - private double getFrameAngle(EntityItemFrame entity) { - return (double) MathHelper.wrapDegrees(180 + (entity.facingDirection.getHorizontalIndex() * 90)); - } -} diff --git a/src/main/java/net/yseven/findyourway/Config.java b/src/main/java/net/yseven/findyourway/Config.java index ee961b4..b6f0a04 100644 --- a/src/main/java/net/yseven/findyourway/Config.java +++ b/src/main/java/net/yseven/findyourway/Config.java @@ -1,9 +1,7 @@ package net.yseven.findyourway; -import net.minecraftforge.common.config.Configuration; -import net.yseven.findyourway.setup.ServerProxy; - public class Config { + /* private static final String CATEGORY_GENERAL = "ggeneral"; public static boolean useEnderCompass = true; @@ -34,4 +32,6 @@ public class Config { useMonumentCompass = cfg.getBoolean("monumentCompass", CATEGORY_GENERAL, useEnderCompass, "Leave as true to enable Monument Compass"); useVillageCompass = cfg.getBoolean("villageCompass", CATEGORY_GENERAL, useEnderCompass, "Leave as true to enable Village Compass"); } + + */ } diff --git a/src/main/java/net/yseven/findyourway/FindYourWay.java b/src/main/java/net/yseven/findyourway/FindYourWay.java index 56d2d34..8f8b8a8 100644 --- a/src/main/java/net/yseven/findyourway/FindYourWay.java +++ b/src/main/java/net/yseven/findyourway/FindYourWay.java @@ -2,42 +2,71 @@ package net.yseven.findyourway; import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.fml.network.simple.SimpleChannel; +import net.yseven.findyourway.item.ItemCompassBase; +import net.yseven.findyourway.item.ModItems; +import net.yseven.findyourway.network.PacketHandler; import net.yseven.findyourway.setup.ClientProxy; import net.yseven.findyourway.setup.IProxy; -import net.yseven.findyourway.setup.ModSetup; import net.yseven.findyourway.setup.ServerProxy; +import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.ArrayList; + @Mod("findyourway") +@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public class FindYourWay { - //TODO Fix the ServerProxy and ClientProxy and add both to the setup package - public static IProxy proxy = DistExecutor.runForDist(() -> () -> new ClientProxy(), () -> () -> new ServerProxy()) + public static final String MOD_NAME = "Find Your Way"; + public static final String MODID = "findyourway"; + public static final String VERSION = "2.0.0-beta"; + + public static IProxy proxy = DistExecutor.runForDist(() -> () -> new ClientProxy(), () -> () -> new ServerProxy()); public static final Logger LOGGER = LogManager.getLogger(); - public static ModSetup setup = new ModSetup(); + public static ItemGroup creativeTab = new ItemGroup("FindYourWay") { + @Override + public ItemStack createIcon() { + return new ItemStack(ModItems.ENDER_COMPASS); + } + }; + + public static ArrayList compassList = new ArrayList(); + + public static SimpleChannel networkHandler; public FindYourWay() { FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); + + MinecraftForge.EVENT_BUS.register(this); } private void setup(final FMLCommonSetupEvent event) { - setup.init(); - proxy.init(); + PacketHandler.registerMessages(FindYourWay.MODID); + proxy.init(event); } - @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) - public static class RegistryEvents { - @SubscribeEvent - public static void onItemsRegistry(final RegistryEvent.Register event) { - Item.Properties properties = new Item.Properties().group(setup.itemGroup); - } + @SubscribeEvent + public static void onItemsRegistry(final RegistryEvent.Register event) { + ModItems.init(); + + LOGGER.log(Level.INFO, "Registering items"); + + event.getRegistry().register(ModItems.ENDER_COMPASS); + event.getRegistry().register(ModItems.FORTRESS_COMPASS); + event.getRegistry().register(ModItems.MANSION_COMPASS); + event.getRegistry().register(ModItems.MONUMENT_COMPASS); + event.getRegistry().register(ModItems.VILLAGE_COMPASS); } } diff --git a/src/main/java/net/yseven/findyourway/Network/MessageHandlerOnClient.java b/src/main/java/net/yseven/findyourway/Network/MessageHandlerOnClient.java deleted file mode 100644 index 3dd4869..0000000 --- a/src/main/java/net/yseven/findyourway/Network/MessageHandlerOnClient.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.yseven.findyourway.Network; - -import net.minecraft.client.Minecraft; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.relauncher.Side; -import net.yseven.findyourway.item.ItemCompassBase; - -public class MessageHandlerOnClient implements IMessageHandler { - - public IMessage onMessage(final MessageToClient message, MessageContext ctx) { - if (ctx.side != Side.CLIENT) { - System.err.println("MessageToClient received on wrong side: " + ctx.side); - return null; - } - if(!message.isMessageIsValid()) { - System.err.println("MessageToClient is not valid: " + message.toString()); - return null; - } - - Minecraft minecraft = Minecraft.getMinecraft(); - minecraft.addScheduledTask(() -> processMessage(message.getCompass(), message.getStructurePos())); - return null; - } - - private void processMessage(ItemCompassBase compass, BlockPos pos) { - compass.setStructurePos(pos); - } -} \ No newline at end of file diff --git a/src/main/java/net/yseven/findyourway/Network/MessageHandlerOnServer.java b/src/main/java/net/yseven/findyourway/Network/MessageHandlerOnServer.java deleted file mode 100644 index e7983df..0000000 --- a/src/main/java/net/yseven/findyourway/Network/MessageHandlerOnServer.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.yseven.findyourway.Network; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldServer; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.relauncher.Side; -import net.yseven.findyourway.setup.ServerProxy; - -public class MessageHandlerOnServer implements IMessageHandler { - public IMessage onMessage(final MessageToServer message, MessageContext ctx) { - if(ctx.side != Side.SERVER) { - System.err.println("MessageToServer received on wrong side: " + ctx.side); - return null; - } - if(!message.isMessageIsValid()) { - System.err.println("MessageToServer is not valid: " + message.toString()); - } - - final EntityPlayerMP sendingPlayer = ctx.getServerHandler().player; - if(sendingPlayer == null) { - System.err.println("EntityPlayerMP was null MessageToServer was received!"); - return null; - } - final WorldServer playerWorldServer = sendingPlayer.getServerWorld(); - playerWorldServer.addScheduledTask(() -> processMessage(message, sendingPlayer)); - - return null; - } - - private void processMessage(MessageToServer message, EntityPlayerMP sendingPlayer) { - int dimension = sendingPlayer.dimension; - WorldServer world = (WorldServer)sendingPlayer.world; - BlockPos structurePos; - - if(world.getChunkProvider().getNearestStructurePos(world, message.getStructureType(), sendingPlayer.getPosition(), true) != null) { - structurePos = world.getChunkProvider().getNearestStructurePos(world, message.getStructureType(), sendingPlayer.getPosition(), true); - } else { - structurePos = new BlockPos(0, 0, 0); - } - - MessageToClient msg = new MessageToClient(structurePos, message.getCompass()); - if (dimension == sendingPlayer.dimension) { - ServerProxy.simpleNetworkWrapper.sendTo(msg, sendingPlayer); - } - } -} diff --git a/src/main/java/net/yseven/findyourway/Network/MessageHandlerOnServerDummy.java b/src/main/java/net/yseven/findyourway/Network/MessageHandlerOnServerDummy.java deleted file mode 100644 index d55eb4b..0000000 --- a/src/main/java/net/yseven/findyourway/Network/MessageHandlerOnServerDummy.java +++ /dev/null @@ -1,12 +0,0 @@ -package net.yseven.findyourway.Network; - -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; - -public class MessageHandlerOnServerDummy implements IMessageHandler { - public IMessage onMessage(final MessageToClient message, MessageContext ctx) { - System.err.println("TargetEffectMessageToClient received on wrong side:" + ctx.side); - return null; - } -} diff --git a/src/main/java/net/yseven/findyourway/Network/MessageToClient.java b/src/main/java/net/yseven/findyourway/Network/MessageToClient.java deleted file mode 100644 index 41fb971..0000000 --- a/src/main/java/net/yseven/findyourway/Network/MessageToClient.java +++ /dev/null @@ -1,63 +0,0 @@ -package net.yseven.findyourway.Network; - -import io.netty.buffer.ByteBuf; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.yseven.findyourway.item.ItemCompassBase; - -public class MessageToClient implements IMessage { - private ItemCompassBase compass; - private BlockPos structurePos; - private boolean messageIsValid; - - public boolean isMessageIsValid() { - return messageIsValid; - } - - public ItemCompassBase getCompass() { - return compass; - } - - public BlockPos getStructurePos() { - return structurePos; - } - - public MessageToClient() { - messageIsValid = false; - } - - public MessageToClient(BlockPos pos, ItemCompassBase compassBase) { - structurePos = pos; - compass = compassBase; - messageIsValid = true; - } - - @Override - public void fromBytes(ByteBuf buf) { - try { - double x = buf.readDouble(); - double y = buf.readDouble(); - double z = buf.readDouble(); - structurePos = new BlockPos(x, y, z); - compass = ItemCompassBase.fromBytes(buf); - } catch (IndexOutOfBoundsException ioe) { - System.err.println("Error while reading MessageToClient: " + ioe); - return; - } - messageIsValid = true; - } - - @Override - public void toBytes(ByteBuf buf) { - if(!isMessageIsValid()) return; - buf.writeDouble(structurePos.getX()); - buf.writeDouble(structurePos.getY()); - buf.writeDouble(structurePos.getZ()); - compass.toBytes(buf); - } - - @Override - public String toString() { - return "Structure Position is: " + structurePos.toString() + "!"; - } -} diff --git a/src/main/java/net/yseven/findyourway/Network/MessageToServer.java b/src/main/java/net/yseven/findyourway/Network/MessageToServer.java deleted file mode 100644 index 8807977..0000000 --- a/src/main/java/net/yseven/findyourway/Network/MessageToServer.java +++ /dev/null @@ -1,55 +0,0 @@ -package net.yseven.findyourway.Network; - -import io.netty.buffer.ByteBuf; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.yseven.findyourway.item.ItemCompassBase; - -public class MessageToServer implements IMessage { - private ItemCompassBase compass; - private String structureType; - private boolean messageIsValid; - - public MessageToServer(ItemCompassBase compassItem) { - compass = compassItem; - messageIsValid = true; - } - - public String getStructureType() { - return structureType; - } - - public ItemCompassBase getCompass() { - return compass; - } - - public boolean isMessageIsValid() { - return messageIsValid; - } - - public MessageToServer() { - messageIsValid = false; - } - - @Override - public void fromBytes(ByteBuf buf) { - try { - compass = ItemCompassBase.fromBytes(buf); - } catch (IndexOutOfBoundsException ioe) { - System.err.println("Exception while reading MessageToServer: " + ioe); - return; - } - structureType = compass.getStructureType(); - messageIsValid = true; - } - - @Override - public void toBytes(ByteBuf buf){ - if(!isMessageIsValid()) return; - compass.toBytes(buf); - } - - @Override - public String toString() { - return "MessageToServer[compass=" + String.valueOf(compass) + ", structurePos=]"; - } -} diff --git a/src/main/java/net/yseven/findyourway/Network/PacketGetCompassBlockPos.java b/src/main/java/net/yseven/findyourway/Network/PacketGetCompassBlockPos.java new file mode 100644 index 0000000..a399530 --- /dev/null +++ b/src/main/java/net/yseven/findyourway/Network/PacketGetCompassBlockPos.java @@ -0,0 +1,42 @@ +package net.yseven.findyourway.network; + +import io.netty.buffer.ByteBuf; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ServerWorld; +import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.fml.network.NetworkDirection; +import net.minecraftforge.fml.network.NetworkEvent; +import net.yseven.findyourway.item.ItemCompassBase; + +import java.util.function.Supplier; + +public class PacketGetCompassBlockPos { + private ItemCompassBase compass; + + public PacketGetCompassBlockPos() { + + } + + public PacketGetCompassBlockPos(ByteBuf buf) { + compass = ItemCompassBase.getCompassFromId(buf.readInt()); + } + + public void toBytes(ByteBuf buf) { + buf.writeInt(compass.getItemCompassID()); + } + + public PacketGetCompassBlockPos(ItemCompassBase compass) { + this.compass = compass; + } + + public void handle(Supplier ctx) { + ctx.get().enqueueWork(() -> { + ServerWorld world = DimensionManager.getWorld(ctx.get().getSender().server, compass.getStructureDimension(), true, false); + if(world.getDimension().getType() == compass.getStructureDimension()) { + BlockPos structurePos = world.getWorld().getChunkProvider().getChunkGenerator().findNearestStructure(world, compass.getStructureType(), ctx.get().getSender().getPosition(), 10000, true); + PacketHandler.INSTANCE.sendTo(new PacketReturnCompassBlockPos(structurePos, compass), ctx.get().getSender().connection.getNetworkManager(), NetworkDirection.PLAY_TO_CLIENT); + } + }); + ctx.get().setPacketHandled(true); + } +} diff --git a/src/main/java/net/yseven/findyourway/Network/PacketHandler.java b/src/main/java/net/yseven/findyourway/Network/PacketHandler.java new file mode 100644 index 0000000..8ec2655 --- /dev/null +++ b/src/main/java/net/yseven/findyourway/Network/PacketHandler.java @@ -0,0 +1,31 @@ +package net.yseven.findyourway.network; + +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.network.NetworkRegistry; +import net.minecraftforge.fml.network.simple.SimpleChannel; +import net.yseven.findyourway.FindYourWay; + +public class PacketHandler { + public static SimpleChannel INSTANCE; + private static int ID = 0; + + public static int nextPacketId() { + return ID++; + } + + public static void registerMessages(String channelName) { + INSTANCE = NetworkRegistry.newSimpleChannel(new ResourceLocation(FindYourWay.MODID, channelName), () -> "1.0", s -> true, s -> true); + + //Server Side + INSTANCE.registerMessage(nextPacketId(), PacketReturnCompassBlockPos.class, + PacketReturnCompassBlockPos::toBytes, + PacketReturnCompassBlockPos::new, + PacketReturnCompassBlockPos::handle); + + //Client Side + INSTANCE.registerMessage(nextPacketId(), PacketGetCompassBlockPos.class, + PacketGetCompassBlockPos::toBytes, + PacketGetCompassBlockPos::new, + PacketGetCompassBlockPos::handle); + } +} diff --git a/src/main/java/net/yseven/findyourway/Network/PacketReturnCompassBlockPos.java b/src/main/java/net/yseven/findyourway/Network/PacketReturnCompassBlockPos.java new file mode 100644 index 0000000..370d2f4 --- /dev/null +++ b/src/main/java/net/yseven/findyourway/Network/PacketReturnCompassBlockPos.java @@ -0,0 +1,40 @@ +package net.yseven.findyourway.network; + +import io.netty.buffer.ByteBuf; +import net.minecraft.util.math.BlockPos; +import net.minecraftforge.fml.network.NetworkEvent; +import net.yseven.findyourway.FindYourWay; +import net.yseven.findyourway.item.ItemCompassBase; + +import java.util.function.Supplier; + +public class PacketReturnCompassBlockPos { + private BlockPos pos; + private ItemCompassBase compass; + + public PacketReturnCompassBlockPos() { + + } + + public PacketReturnCompassBlockPos(BlockPos pos, ItemCompassBase compass) { + this.pos = pos; + this.compass = compass; + } + + public PacketReturnCompassBlockPos(ByteBuf buf) { + pos = BlockPos.fromLong(buf.readLong()); + compass = ItemCompassBase.getCompassFromId(buf.readInt()); + } + + public void toBytes(ByteBuf buf) { + buf.writeLong(pos.toLong()); + buf.writeInt(compass.getItemCompassID()); + } + + public void handle(Supplier ctx) { + ctx.get().enqueueWork(() -> { + compass.setStructurePos(pos); + }); + ctx.get().setPacketHandled(true); + } +} diff --git a/src/main/java/net/yseven/findyourway/item/ItemCompassBase.java b/src/main/java/net/yseven/findyourway/item/ItemCompassBase.java index 3077357..5bb7ce8 100644 --- a/src/main/java/net/yseven/findyourway/item/ItemCompassBase.java +++ b/src/main/java/net/yseven/findyourway/item/ItemCompassBase.java @@ -1,104 +1,4 @@ package net.yseven.findyourway.item; -import io.netty.buffer.ByteBuf; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.yseven.findyourway.Client.AngleGetter; -import net.yseven.findyourway.setup.ClientProxy; -import net.yseven.findyourway.setup.ServerProxy; -import net.yseven.findyourway.FindYourWay; - -import javax.annotation.Nonnull; - -public class ItemCompassBase extends Item { - private String structureType; - private BlockPos structurePos; - private World structureWorld; - private final int ItemCompassID; - - public ItemCompassBase(String name, String structureName) { - setUnlocalizedName(FindYourWay.modId + "." + name); - setRegistryName(name); - structureType = structureName; - setCreativeTab(CreativeTabs.TOOLS); - setMaxStackSize(1); - ServerProxy.compassList.add(this); - ItemCompassID = ServerProxy.compassList.indexOf(this); - } - - public String toString() { - return getUnlocalizedName(); - } - - //getters - - public String getStructureType() { - return structureType; - } - public BlockPos getStructurePos() { - return structurePos; - } - public World getStructureWorld() { - return structureWorld; - } - public int getCompassID() { - return ItemCompassID; - } - - //setters - - public void setStructureType(String type) { - structureType= type; - } - public void setStructurePos(BlockPos pos) { - structurePos = pos; - } - public void setStructureWorld(World world) { - structureWorld = world; - } - - //netcode implementation - - public void toBytes(ByteBuf buf) { - if(ServerProxy.compassList.contains(this)) { - buf.writeInt(ItemCompassID); - } - } - - public static ItemCompassBase fromBytes(ByteBuf buf) { - int ID = buf.readInt(); - for(int i = 0; i <= ServerProxy.compassList.size(); i++) { - if(ID == ServerProxy.compassList.get(i).getCompassID()) return ServerProxy.compassList.get(i); - } - return null; - } - - //Client Code (mostly registration) - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void registerItemModel() { - this.addPropertyOverride(new ResourceLocation("angle"), new AngleGetter()); - ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(FindYourWay.modId + ":" + this.getUnlocalizedName(), "inventory")); - } - - @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { - if (world.isRemote) { - ClientProxy.resetStructurePos(this); - } - return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand)); - } +public class ItemCompassBase { } diff --git a/src/main/java/net/yseven/findyourway/item/ModItems.java b/src/main/java/net/yseven/findyourway/item/ModItems.java index f54ea1e..4f8ad2d 100644 --- a/src/main/java/net/yseven/findyourway/item/ModItems.java +++ b/src/main/java/net/yseven/findyourway/item/ModItems.java @@ -1,74 +1,49 @@ package net.yseven.findyourway.item; import net.minecraft.item.Item; +import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.yseven.findyourway.Config; +import net.minecraftforge.registries.ObjectHolder; import net.yseven.findyourway.FindYourWay; +import org.apache.logging.log4j.Level; -import static net.yseven.findyourway.FindYourWay.modId; +import java.io.Console; public class ModItems { + @ObjectHolder("findyourway:ender_compass") public static ItemCompassBase ENDER_COMPASS; - public static ItemCompassBase VILLAGE_COMPASS; + @ObjectHolder("findyourway:fortress_compass") public static ItemCompassBase FORTRESS_COMPASS; + @ObjectHolder("findyourway:monument_compass") public static ItemCompassBase MONUMENT_COMPASS; + @ObjectHolder("findyourway:mansion_compass") public static ItemCompassBase MANSION_COMPASS; + @ObjectHolder("findyourway:village_compass") + public static ItemCompassBase VILLAGE_COMPASS; public static void init(){ + /* if(Config.useEnderCompass) { - ENDER_COMPASS = new ItemCompassBase("ender_compass", "Stronghold"); + ENDER_COMPASS = new ItemCompassBase("ender_compass", "Stronghold", DimensionType.OVERWORLD); } if(Config.useFortressCompass) { - FORTRESS_COMPASS = new ItemCompassBase("fortress_compass", "Fortress"); + FORTRESS_COMPASS = new ItemCompassBase("fortress_compass", "Fortress", DimensionType.NETHER); } if(Config.useMansionCompass) { - MANSION_COMPASS = new ItemCompassBase("mansion_compass", "Mansion"); + MANSION_COMPASS = new ItemCompassBase("mansion_compass", "Mansion", DimensionType.OVERWORLD); } if(Config.useMonumentCompass) { - MONUMENT_COMPASS = new ItemCompassBase("monument_compass", "Monument"); + MONUMENT_COMPASS = new ItemCompassBase("monument_compass", "Monument", DimensionType.OVERWORLD); } if(Config.useVillageCompass) { - VILLAGE_COMPASS = new ItemCompassBase("village_compass", "Village"); + VILLAGE_COMPASS = new ItemCompassBase("village_compass", "Village", DimensionType.OVERWORLD); } - } - @SideOnly(Side.CLIENT) - public static void registerModels() { - if(Config.useEnderCompass) { - ENDER_COMPASS.registerItemModel(); - } - if(Config.useFortressCompass) { - FORTRESS_COMPASS.registerItemModel(); - } - if(Config.useMansionCompass) { - MANSION_COMPASS.registerItemModel(); - } - if(Config.useMonumentCompass) { - MONUMENT_COMPASS.registerItemModel(); - } - if(Config.useVillageCompass) { - VILLAGE_COMPASS.registerItemModel(); - } - } - - public static void registerItems(RegistryEvent.Register event) { - if(Config.useEnderCompass) { - event.getRegistry().register(ENDER_COMPASS); - } - if(Config.useFortressCompass) { - event.getRegistry().register(FORTRESS_COMPASS); - } - if(Config.useMansionCompass) { - event.getRegistry().register(MANSION_COMPASS); - } - if(Config.useMonumentCompass) { - event.getRegistry().register(MONUMENT_COMPASS); - } - if(Config.useVillageCompass) { - event.getRegistry().register(VILLAGE_COMPASS); - } + */ + ENDER_COMPASS = new ItemCompassBase("ender_compass", "Stronghold", DimensionType.OVERWORLD); + FORTRESS_COMPASS = new ItemCompassBase("fortress_compass", "Fortress", DimensionType.NETHER); + MANSION_COMPASS = new ItemCompassBase("mansion_compass", "Mansion", DimensionType.OVERWORLD); + MONUMENT_COMPASS = new ItemCompassBase("monument_compass", "Monument", DimensionType.OVERWORLD); + VILLAGE_COMPASS = new ItemCompassBase("village_compass", "Village", DimensionType.OVERWORLD); } } \ No newline at end of file diff --git a/src/main/java/net/yseven/findyourway/setup/ClientProxy.java b/src/main/java/net/yseven/findyourway/setup/ClientProxy.java index e9af2e4..23cf02d 100644 --- a/src/main/java/net/yseven/findyourway/setup/ClientProxy.java +++ b/src/main/java/net/yseven/findyourway/setup/ClientProxy.java @@ -1,82 +1,14 @@ package net.yseven.findyourway.setup; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.client.FMLClientHandler; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.yseven.findyourway.setup.ServerProxy; -import net.yseven.findyourway.Network.MessageHandlerOnClient; -import net.yseven.findyourway.Network.MessageToClient; -import net.yseven.findyourway.Network.MessageToServer; -import net.yseven.findyourway.item.ItemCompassBase; -import net.yseven.findyourway.item.ModItems; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -@Mod.EventBusSubscriber(Side.CLIENT) -public class ClientProxy extends ServerProxy { - - //Get information about the player and world - public static Minecraft getMinecraft() { - return FMLClientHandler.instance().getClient(); - } - public static WorldClient getWorld() { - return getMinecraft().world; - } - public static EntityPlayerSP getPlayer() { - return getMinecraft().player; - } - private static boolean angleError = false; - - public static boolean hasAngleErrrored() { - return angleError; - } - - public static void AngleHasErrored() { - angleError = true; - } - - public static boolean hasCompass(ItemCompassBase compass) { - return getPlayer() != null && ServerProxy.containsCompass(getPlayer().inventory, compass); - } - - public static void resetStructurePos(ItemCompassBase compass) { - compass.setStructurePos(null); - compass.setStructureWorld(getWorld()); - ServerProxy.simpleNetworkWrapper.sendToServer(new MessageToServer(compass)); - } - - //Proxy Info +public class ClientProxy implements IProxy { @Override - public void preInit(FMLPreInitializationEvent event) { - super.preInit(event); + public void init(FMLCommonSetupEvent event) { MinecraftForge.EVENT_BUS.register(this); - ServerProxy.simpleNetworkWrapper.registerMessage(MessageHandlerOnClient.class, MessageToClient.class, ServerProxy.MESSAGE_TO_CLIENT_ID, Side.CLIENT); } - - @Override - public void init(FMLInitializationEvent event) { - super.init(event); - } - - @Override - public void postInit(FMLPostInitializationEvent event) { - super.postInit(event); - } - - @SubscribeEvent - public static void registerModels(ModelRegistryEvent event) { - ModItems.registerModels(); - } - + /* @SubscribeEvent public void onClientTick(TickEvent.ClientTickEvent event) { for(int i = 0; i < ServerProxy.compassList.size(); i++) { @@ -87,4 +19,5 @@ public class ClientProxy extends ServerProxy { } } } + */ } \ No newline at end of file diff --git a/src/main/java/net/yseven/findyourway/setup/IProxy.java b/src/main/java/net/yseven/findyourway/setup/IProxy.java index 785517e..47dc05d 100644 --- a/src/main/java/net/yseven/findyourway/setup/IProxy.java +++ b/src/main/java/net/yseven/findyourway/setup/IProxy.java @@ -1,9 +1,7 @@ package net.yseven.findyourway.setup; -import net.minecraft.world.World; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; public interface IProxy { - void init(); - - World getClientWorld(); + void init(FMLCommonSetupEvent event); } diff --git a/src/main/java/net/yseven/findyourway/setup/ModSetup.java b/src/main/java/net/yseven/findyourway/setup/ModSetup.java deleted file mode 100644 index 8f60250..0000000 --- a/src/main/java/net/yseven/findyourway/setup/ModSetup.java +++ /dev/null @@ -1,18 +0,0 @@ -package net.yseven.findyourway.setup; - -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.yseven.findyourway.item.ModItems; - -public class ModSetup { - public ItemGroup itemGroup = new ItemGroup("findyourway") { - @java.lang.Override - public ItemStack createIcon() { - return new ItemStack(ModItems.ENDER_COMPASS); - } - } - - public void init() { - - } -} diff --git a/src/main/java/net/yseven/findyourway/setup/ServerProxy.java b/src/main/java/net/yseven/findyourway/setup/ServerProxy.java index 9dd5fb8..e79b743 100644 --- a/src/main/java/net/yseven/findyourway/setup/ServerProxy.java +++ b/src/main/java/net/yseven/findyourway/setup/ServerProxy.java @@ -1,75 +1,13 @@ package net.yseven.findyourway.setup; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraftforge.fml.relauncher.Side; -import net.yseven.findyourway.Config; -import net.yseven.findyourway.FindYourWay; -import net.yseven.findyourway.Network.MessageHandlerOnServer; -import net.yseven.findyourway.Network.MessageHandlerOnServerDummy; -import net.yseven.findyourway.Network.MessageToClient; -import net.yseven.findyourway.Network.MessageToServer; -import net.yseven.findyourway.item.ItemCompassBase; -import net.yseven.findyourway.item.ModItems; - -import java.io.File; -import java.util.ArrayList; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; @Mod.EventBusSubscriber -public class ServerProxy { +public class ServerProxy implements IProxy { - public static ArrayList compassList = new ArrayList(); - public static SimpleNetworkWrapper simpleNetworkWrapper; - public static Configuration config; + @Override + public void init(FMLCommonSetupEvent event) { - public static final byte MESSAGE_TO_SERVER_ID = 71; - public static final byte MESSAGE_TO_CLIENT_ID = 72; - - public void preInit(FMLPreInitializationEvent event) { - File directory = event.getModConfigurationDirectory(); - config = new Configuration(new File(directory.getPath(), "findyourway.cfg")); - Config.readConfig(); - - ModItems.init(); - - simpleNetworkWrapper = NetworkRegistry.INSTANCE.newSimpleChannel(FindYourWay.modId); - simpleNetworkWrapper.registerMessage(MessageHandlerOnServer.class, MessageToServer.class, MESSAGE_TO_SERVER_ID, Side.SERVER); - simpleNetworkWrapper.registerMessage(MessageHandlerOnServerDummy.class, MessageToClient.class, MESSAGE_TO_CLIENT_ID, Side.SERVER); - } - - public void init(FMLInitializationEvent event) { - - } - - public void postInit(FMLPostInitializationEvent event) { - if(config.hasChanged()){ - config.save(); - } - - } - - @SubscribeEvent - public static void registerItems(RegistryEvent.Register event) { - ModItems.registerItems(event); - } - - public static boolean containsCompass(IInventory inventory, ItemCompassBase compass) { - for(int slot = 0; slot < inventory.getSizeInventory(); slot++) { - ItemStack stack = inventory.getStackInSlot(slot); - if(!stack.isEmpty() && stack.getItem() == compass) { - return true; - } - } - return false; } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 8b35f0c..744fa83 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -8,35 +8,42 @@ modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version loaderVersion="[26,)" #mandatory (26 is current forge version) # A URL to refer people to when problems occur with this mod -issueTrackerURL="http://my.issue.tracker/" #optional +#issueTrackerURL="http://my.issue.tracker/" #optional # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod -modId="examplemod" #mandatory +modId="findyourway" #mandatory # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it -version="${file.jarVersion}" #mandatory +version="2.0.0-beta" #mandatory # A display name for the mod -displayName="Example Mod" #mandatory +displayName="Find Your Way" #mandatory # A URL to query for updates for this mod. See the JSON update specification -updateJSONURL="http://myurl.me/" #optional +#updateJSONURL="http://myurl.me/" #optional # A URL for the "homepage" for this mod, displayed in the mod UI -displayURL="http://example.com/" #optional +displayURL="https://www.curseforge.com/minecraft/mc-mods/find-your-way" #optional # A file name (in the root of the mod JAR) containing a logo for display -logoFile="examplemod.png" #optional +logoFile="logo.png" #optional # A text field displayed in the mod UI -credits="Thanks for this example mod goes to Java" #optional +credits="Thank you Nightmali for your love and support" #optional # A text field displayed in the mod UI -authors="Love, Cheese and small house plants" #optional +authors="Yavin7" #optional # The description text for the mod (multi line!) (#mandatory) description=''' -This is a long form description of the mod. You can write whatever you want here +Find Your Way provides several compasses to structures generated by Minecraft. -Have some lorem ipsum. +Current compasses include: +- Ender Compass +- Fortress Compass +- Mansion Compass +- Monument Compass +- Village Compass -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magna. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed sagittis luctus odio eu tempus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque volutpat ligula eget lacus auctor sagittis. In hac habitasse platea dictumst. Nunc gravida elit vitae sem vehicula efficitur. Donec mattis ipsum et arcu lobortis, eleifend sagittis sem rutrum. Cras pharetra quam eget posuere fermentum. Sed id tincidunt justo. Lorem ipsum dolor sit amet, consectetur adipiscing elit. +The compasses automatically point to the nearest structure for the world you are in, and always point forwards if the structure does not exist in your world. You can right-click to re-scan for new structures, such as new Villages. + +The Stronghold Compass points to the same location as Ender Eyes, so you still need to explore the actual stronghold to find the End Portal. ''' # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies.examplemod]] #optional +[[dependencies.findyourway]] #optional # the modid of the dependency modId="forge" #mandatory # Does this dependency have to exist - if not, ordering below must be specified @@ -46,11 +53,4 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER - side="BOTH" -# Here's another dependency -[[dependencies.examplemod]] - modId="minecraft" - mandatory=true - versionRange="[1.14.2]" - ordering="NONE" side="BOTH" \ No newline at end of file diff --git a/src/main/resources/assets/findyourway/lang/en_US.json b/src/main/resources/assets/findyourway/lang/en_US.json new file mode 100644 index 0000000..bac5911 --- /dev/null +++ b/src/main/resources/assets/findyourway/lang/en_US.json @@ -0,0 +1,10 @@ +{ + "key.categories.findyourway": "Find Your Way", + "item.findyourway.ender_compass": "Ender Compass", + "item.findyourway.village_compass": "Village Compass", + "item.findyourway.fortress_compass": "Fortress Compass", + "item.findyourway.monument_compass": "Monument Compass", + "item.findyourway.mansion_compass": "Mansion Compass", + + "itemGroup.FindYourWay": "Find Your Way" +} \ No newline at end of file diff --git a/src/main/resources/assets/findyourway/lang/en_US.lang b/src/main/resources/assets/findyourway/lang/en_US.lang deleted file mode 100644 index c1d9fde..0000000 --- a/src/main/resources/assets/findyourway/lang/en_US.lang +++ /dev/null @@ -1,6 +0,0 @@ -# Items -item.findyourway.ender_compass.name=Ender Compass -item.findyourway.village_compass.name=Village Compass -item.findyourway.fortress_compass.name=Fortress Compass -item.findyourway.monument_compass.name=Monument Compass -item.findyourway.mansion_compass.name=Mansion Compass \ No newline at end of file diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass.json b/src/main/resources/assets/findyourway/models/item/ender_compass.json similarity index 99% rename from src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass.json rename to src/main/resources/assets/findyourway/models/item/ender_compass.json index ede5800..e2a9273 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass.json +++ b/src/main/resources/assets/findyourway/models/item/ender_compass.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_16" }, diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass.json b/src/main/resources/assets/findyourway/models/item/fortress_compass.json similarity index 99% rename from src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass.json rename to src/main/resources/assets/findyourway/models/item/fortress_compass.json index e63c5a0..a464a70 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass.json +++ b/src/main/resources/assets/findyourway/models/item/fortress_compass.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_16" }, diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_00.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_00.json index 0304d40..8a0b031 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_00.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_00.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_00" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_01.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_01.json index e01990a..ecb054a 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_01.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_01.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_01" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_02.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_02.json index 1206c53..3370e1e 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_02.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_02.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_02" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_03.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_03.json index 5b672cc..540100a 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_03.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_03.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_03" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_04.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_04.json index 5f9bc29..9261dad 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_04.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_04.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_04" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_05.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_05.json index 3e6d948..eae99ea 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_05.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_05.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_05" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_06.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_06.json index c0e2ae5..2fca78a 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_06.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_06.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_06" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_07.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_07.json index befb89a..a649646 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_07.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_07.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_07" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_08.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_08.json index d95dd3e..a5e5480 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_08.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_08.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_08" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_09.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_09.json index 1b28004..5d17310 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_09.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_09.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_09" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_10.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_10.json index 1f2fbc9..2de3022 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_10.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_10.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_10" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_11.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_11.json index 6951f24..1a7d410 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_11.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_11.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_11" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_12.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_12.json index ef28a95..3bd4f4b 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_12.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_12.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_12" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_13.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_13.json index d7fef17..3b1575a 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_13.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_13.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_13" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_14.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_14.json index e4bf8a0..06a4676 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_14.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_14.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_14" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_15.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_15.json index 921eb26..d56eb74 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_15.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_15.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_15" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_16.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_16.json index 516b702..93bf9b5 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_16.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_16.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_16" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_17.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_17.json index f50a8ad..45b2478 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_17.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_17.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_17" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_18.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_18.json index 8debafa..48efb6a 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_18.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_18.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_18" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_19.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_19.json index f045ade..933f866 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_19.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_19.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_19" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_20.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_20.json index 2c46c73..da7b92b 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_20.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_20.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_20" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_21.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_21.json index ab3ff37..30d624c 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_21.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_21.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_21" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_22.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_22.json index e313bbb..4817a37 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_22.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_22.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_22" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_23.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_23.json index 8d6cec1..2437fff 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_23.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_23.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_23" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_24.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_24.json index 0f223e9..28c33a8 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_24.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_24.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_24" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_25.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_25.json index 399d5e5..d932185 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_25.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_25.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_25" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_26.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_26.json index eddb7f0..494e5d8 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_26.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_26.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_26" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_27.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_27.json index b8475a2..ac6b1da 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_27.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_27.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_27" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_28.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_28.json index 7529dab..61f1297 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_28.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_28.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_28" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_29.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_29.json index 252cfec..be67575 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_29.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_29.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_29" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_30.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_30.json index 43d8ca9..0664e97 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_30.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_30.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_30" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_31.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_31.json index 1763319..7b095b9 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_31.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.ender_compass_31.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/ender_compass_31" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_00.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_00.json index 2c1bf1d..9377383 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_00.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_00.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_00" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_01.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_01.json index 7df92ce..045d2ed 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_01.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_01.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_01" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_02.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_02.json index e815a01..77f33c1 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_02.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_02.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_02" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_03.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_03.json index eb7c1fe..fb5e2cf 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_03.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_03.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_03" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_04.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_04.json index 614cdb3..c42e0df 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_04.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_04.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_04" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_05.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_05.json index a1689c4..f139663 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_05.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_05.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_05" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_06.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_06.json index dda10ab..a725746 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_06.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_06.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_06" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_07.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_07.json index 3482816..f6dd243 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_07.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_07.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_07" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_08.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_08.json index 35fb091..1467650 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_08.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_08.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_08" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_09.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_09.json index 7dd9bb9..320962a 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_09.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_09.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_09" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_10.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_10.json index 23fd78d..5dcbe15 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_10.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_10.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_10" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_11.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_11.json index b9019a6..0a51a64 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_11.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_11.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_11" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_12.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_12.json index a8c8ecb..e8157ad 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_12.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_12.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_12" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_13.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_13.json index 53ea4ae..cd0625a 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_13.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_13.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_13" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_14.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_14.json index b9ea064..bca128f 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_14.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_14.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_14" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_15.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_15.json index 59d96c2..fbfff78 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_15.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_15.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_15" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_16.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_16.json index d054287..50c94db 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_16.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_16.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_16" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_17.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_17.json index 4f1c447..c81da54 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_17.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_17.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_17" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_18.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_18.json index 433efe6..ef9fbe8 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_18.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_18.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_18" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_19.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_19.json index 03ed77a..e070511 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_19.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_19.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_19" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_20.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_20.json index 03249c7..d71349f 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_20.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_20.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_20" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_21.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_21.json index 17bcd1e..4ae434d 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_21.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_21.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_21" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_22.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_22.json index d43445e..51c2b7c 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_22.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_22.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_22" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_23.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_23.json index b34f2b4..753c5e7 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_23.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_23.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_23" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_24.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_24.json index c377342..b76d4f8 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_24.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_24.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_24" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_25.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_25.json index 9e8b249..623e206 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_25.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_25.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_25" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_26.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_26.json index 3cfcd8b..8662d64 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_26.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_26.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_26" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_27.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_27.json index 80b80a1..1cb76d1 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_27.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_27.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_27" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_28.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_28.json index 4753840..3cd2663 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_28.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_28.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_28" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_29.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_29.json index f4d86f2..1256f47 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_29.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_29.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_29" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_30.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_30.json index 572b85d..3c69ae8 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_30.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_30.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_30" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_31.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_31.json index 5b1a8f6..86e8dda 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_31.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.fortress_compass_31.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/fortress_compass_31" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_00.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_00.json index e08087c..a92b24c 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_00.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_00.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_00" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_01.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_01.json index 750e183..896b523 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_01.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_01.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_01" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_02.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_02.json index ba5cdf0..8cde2f6 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_02.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_02.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_02" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_03.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_03.json index c92e3c4..83e8fb6 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_03.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_03.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_03" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_04.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_04.json index c9cea1b..8d82a6d 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_04.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_04.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_04" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_05.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_05.json index 1748bdb..dc31edb 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_05.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_05.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_05" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_06.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_06.json index 6457621..2f78481 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_06.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_06.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_06" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_07.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_07.json index fe2bad4..b418c67 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_07.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_07.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_07" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_08.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_08.json index 942a262..8ce5206 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_08.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_08.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_08" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_09.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_09.json index 915f855..a20e202 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_09.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_09.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_09" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_10.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_10.json index 54891f1..16e9081 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_10.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_10.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_10" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_11.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_11.json index 923c116..8363e39 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_11.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_11.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_11" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_12.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_12.json index a45c80c..a0ba12b 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_12.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_12.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_12" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_13.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_13.json index 1410d6b..15686fa 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_13.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_13.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_13" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_14.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_14.json index 75ef2af..ad5d323 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_14.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_14.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_14" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_15.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_15.json index 2d93b49..dfe1c6f 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_15.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_15.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_15" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_16.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_16.json index b0290bb..79227e1 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_16.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_16.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_16" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_17.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_17.json index 4060f4f..b2d9996 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_17.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_17.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_17" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_18.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_18.json index 439def5..3123ba2 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_18.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_18.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_18" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_19.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_19.json index abbb061..987b74a 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_19.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_19.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_19" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_20.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_20.json index db2d8ff..0cb0b71 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_20.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_20.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_20" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_21.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_21.json index c8c44c6..56354a2 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_21.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_21.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_21" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_22.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_22.json index 5107125..a9af33d 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_22.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_22.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_22" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_23.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_23.json index 790d11d..14e7c5e 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_23.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_23.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_23" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_24.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_24.json index 713cedb..e9c6e93 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_24.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_24.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_24" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_25.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_25.json index 70a1524..36c1cda 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_25.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_25.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_25" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_26.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_26.json index 9a3c6ba..07f8ca9 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_26.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_26.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_26" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_27.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_27.json index d358bf6..784b57c 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_27.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_27.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_27" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_28.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_28.json index 68982d8..76ba1ad 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_28.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_28.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_28" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_29.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_29.json index bd5fc03..f4e73a3 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_29.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_29.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_29" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_30.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_30.json index 5024d66..c6584ba 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_30.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_30.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_30" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_31.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_31.json index 7f5752c..fca24b9 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_31.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass_31.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_31" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_00.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_00.json index 515f6fb..26e7f8f 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_00.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_00.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_00" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_01.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_01.json index 7bd8bbf..61376d2 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_01.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_01.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_01" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_02.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_02.json index c626b8a..38c010f 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_02.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_02.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_02" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_03.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_03.json index b730566..fd90f1a 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_03.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_03.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_03" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_04.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_04.json index 553ed11..7d028b7 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_04.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_04.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_04" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_05.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_05.json index 63172f9..e868418 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_05.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_05.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_05" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_06.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_06.json index 17785bc..2a2228a 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_06.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_06.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_06" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_07.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_07.json index d0b14dd..3904564 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_07.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_07.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_07" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_08.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_08.json index 98bb223..34c026e 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_08.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_08.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_08" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_09.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_09.json index 9ce36e4..2eeb29f 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_09.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_09.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_09" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_10.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_10.json index 4dddec1..2bceb14 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_10.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_10.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_10" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_11.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_11.json index aec497a..e2b3423 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_11.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_11.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_11" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_12.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_12.json index 5042674..a36b6fd 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_12.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_12.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_12" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_13.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_13.json index 43a753c..7ee5dd3 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_13.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_13.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_13" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_14.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_14.json index 6058a7f..baf0e53 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_14.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_14.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_14" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_15.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_15.json index 3111acf..9ed3492 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_15.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_15.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_15" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_16.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_16.json index 3980f41..a4a12b8 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_16.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_16.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_16" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_17.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_17.json index 7bfa8e2..637b05f 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_17.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_17.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_17" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_18.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_18.json index 7c4cdbc..f2355fb 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_18.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_18.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_18" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_19.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_19.json index 55f8977..e7025eb 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_19.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_19.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_19" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_20.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_20.json index 59a310b..345677a 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_20.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_20.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_20" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_21.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_21.json index 8d08b93..9ff2323 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_21.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_21.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_21" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_22.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_22.json index 37d8e16..4b1789a 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_22.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_22.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_22" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_23.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_23.json index c5b2df9..29f28a0 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_23.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_23.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_23" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_24.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_24.json index 1a5277c..e4188db 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_24.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_24.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_24" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_25.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_25.json index 7c0cb7e..143dd95 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_25.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_25.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_25" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_26.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_26.json index 0cd1fd5..c050c7c 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_26.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_26.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_26" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_27.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_27.json index 62357e1..b2141ff 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_27.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_27.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_27" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_28.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_28.json index 35ef70c..75c0553 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_28.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_28.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_28" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_29.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_29.json index 3e289f7..223840a 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_29.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_29.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_29" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_30.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_30.json index f4fdccc..b0f3658 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_30.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_30.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_30" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_31.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_31.json index a001364..ee44fc7 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_31.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass_31.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_31" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_00.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_00.json index 4bc72dd..f7a2baa 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_00.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_00.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_00" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_01.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_01.json index 47a9e79..709e9e3 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_01.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_01.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_01" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_02.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_02.json index b65e105..2788aaf 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_02.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_02.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_02" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_03.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_03.json index e7a460f..6f0104b 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_03.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_03.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_03" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_04.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_04.json index 63617e9..9ba5a86 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_04.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_04.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_04" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_05.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_05.json index 58b16fb..f688162 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_05.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_05.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_05" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_06.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_06.json index 78a5691..f950b26 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_06.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_06.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_06" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_07.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_07.json index a7b7130..0a5ef72 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_07.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_07.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_07" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_08.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_08.json index 6217646..60e3518 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_08.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_08.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_08" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_09.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_09.json index fb79c72..ab71b9f 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_09.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_09.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_09" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_10.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_10.json index fbd5262..1532d8d 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_10.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_10.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_10" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_11.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_11.json index 5c416c4..520efa5 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_11.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_11.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_11" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_12.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_12.json index 73cd5ca..0011d72 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_12.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_12.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_12" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_13.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_13.json index 91fd97a..e18c18d 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_13.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_13.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_13" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_14.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_14.json index 3c51272..1719ba3 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_14.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_14.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_14" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_15.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_15.json index 1755696..6c2c88c 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_15.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_15.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_15" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_16.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_16.json index f93eb1c..c5df679 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_16.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_16.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_16" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_17.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_17.json index 212da89..ad5d3ec 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_17.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_17.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_17" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_18.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_18.json index cc74f0e..101b545 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_18.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_18.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_18" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_19.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_19.json index 13d3ff8..43f4882 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_19.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_19.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_19" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_20.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_20.json index 613e38b..5ef4370 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_20.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_20.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_20" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_21.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_21.json index bbf0c7c..b0eae6d 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_21.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_21.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_21" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_22.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_22.json index 9259207..a19ea3e 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_22.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_22.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_22" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_23.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_23.json index 86f2710..e2ede27 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_23.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_23.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_23" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_24.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_24.json index aeff3d6..85f0a86 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_24.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_24.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_24" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_25.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_25.json index a4b11f1..37d1a21 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_25.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_25.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_25" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_26.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_26.json index 7b85ebe..345c71c 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_26.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_26.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_26" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_27.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_27.json index 20d0264..e448104 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_27.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_27.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_27" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_28.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_28.json index 13590c4..05476b6 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_28.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_28.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_28" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_29.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_29.json index 1e626b4..cb4069f 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_29.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_29.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_29" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_30.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_30.json index 938a4fd..c071b83 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_30.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_30.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_30" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_31.json b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_31.json index e39f316..d5ac7f7 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_31.json +++ b/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass_31.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_31" } diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass.json b/src/main/resources/assets/findyourway/models/item/mansion_compass.json similarity index 99% rename from src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass.json rename to src/main/resources/assets/findyourway/models/item/mansion_compass.json index 9ba110c..a9c01c9 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.mansion_compass.json +++ b/src/main/resources/assets/findyourway/models/item/mansion_compass.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/mansion_compass_16" }, diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass.json b/src/main/resources/assets/findyourway/models/item/monument_compass.json similarity index 99% rename from src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass.json rename to src/main/resources/assets/findyourway/models/item/monument_compass.json index c8086dd..c8e9768 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.monument_compass.json +++ b/src/main/resources/assets/findyourway/models/item/monument_compass.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/monument_compass_16" }, diff --git a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass.json b/src/main/resources/assets/findyourway/models/item/village_compass.json similarity index 99% rename from src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass.json rename to src/main/resources/assets/findyourway/models/item/village_compass.json index 76b0431..034c44b 100644 --- a/src/main/resources/assets/findyourway/models/item/item.findyourway.village_compass.json +++ b/src/main/resources/assets/findyourway/models/item/village_compass.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "findyourway:items/village_compass_16" }, diff --git a/src/main/resources/assets/findyourway/recipes/item.findyourway.ender_compass.json b/src/main/resources/data/findyourway/recipes/item.findyourway.ender_compass.json similarity index 100% rename from src/main/resources/assets/findyourway/recipes/item.findyourway.ender_compass.json rename to src/main/resources/data/findyourway/recipes/item.findyourway.ender_compass.json diff --git a/src/main/resources/assets/findyourway/recipes/item.findyourway.fortress_compass.json b/src/main/resources/data/findyourway/recipes/item.findyourway.fortress_compass.json similarity index 88% rename from src/main/resources/assets/findyourway/recipes/item.findyourway.fortress_compass.json rename to src/main/resources/data/findyourway/recipes/item.findyourway.fortress_compass.json index 97c65cb..0d46c1e 100644 --- a/src/main/resources/assets/findyourway/recipes/item.findyourway.fortress_compass.json +++ b/src/main/resources/data/findyourway/recipes/item.findyourway.fortress_compass.json @@ -10,7 +10,7 @@ "item": "minecraft:gold_nugget" }, "E": { - "item": "minecraft:netherbrick" + "item": "minecraft:nether_brick" }, "B": { "item": "minecraft:glowstone_dust" diff --git a/src/main/resources/assets/findyourway/recipes/item.findyourway.mansion_compass.json b/src/main/resources/data/findyourway/recipes/item.findyourway.mansion_compass.json similarity index 100% rename from src/main/resources/assets/findyourway/recipes/item.findyourway.mansion_compass.json rename to src/main/resources/data/findyourway/recipes/item.findyourway.mansion_compass.json diff --git a/src/main/resources/assets/findyourway/recipes/item.findyourway.monument_compass.json b/src/main/resources/data/findyourway/recipes/item.findyourway.monument_compass.json similarity index 85% rename from src/main/resources/assets/findyourway/recipes/item.findyourway.monument_compass.json rename to src/main/resources/data/findyourway/recipes/item.findyourway.monument_compass.json index a3e77fe..23d2df0 100644 --- a/src/main/resources/assets/findyourway/recipes/item.findyourway.monument_compass.json +++ b/src/main/resources/data/findyourway/recipes/item.findyourway.monument_compass.json @@ -7,8 +7,7 @@ ], "key": { "G": { - "item": "minecraft:dye", - "data": 4 + "tag": "forge:dyes/blue" }, "E": { "item": "minecraft:diamond" diff --git a/src/main/resources/assets/findyourway/recipes/item.findyourway.village_compass.json b/src/main/resources/data/findyourway/recipes/item.findyourway.village_compass.json similarity index 100% rename from src/main/resources/assets/findyourway/recipes/item.findyourway.village_compass.json rename to src/main/resources/data/findyourway/recipes/item.findyourway.village_compass.json diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 42ab490..a1fccaf 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "description": "examplemod resources", + "description": "findyourway resources", "pack_format": 4, "_comment": "A pack_format of 4 requires json lang files. Note: we require v4 pack meta for all mods." }