From 140f4732820a3ccbb46322dfb95b106bd4d811f2 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Tue, 12 Jul 2022 03:24:48 +0100 Subject: [PATCH] fix: update class names to the latest forge renames --- build.gradle | 2 +- .../sekwah/narutomod/capabilities/NinjaCapabilityHandler.java | 2 +- .../java/com/sekwah/narutomod/client/events/RenderEvents.java | 2 +- .../java/com/sekwah/narutomod/datagen/NarutoDataGenerators.java | 2 +- .../java/com/sekwah/narutomod/entity/NarutoDataSerialisers.java | 2 +- src/main/java/com/sekwah/narutomod/entity/NarutoEntities.java | 2 +- src/main/java/com/sekwah/narutomod/events/PlayerEvents.java | 2 +- src/main/resources/META-INF/mods.toml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index d7d6f1bb..87513916 100644 --- a/build.gradle +++ b/build.gradle @@ -155,7 +155,7 @@ dependencies { // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.19-41.0.93' + minecraft 'net.minecraftforge:forge:1.19-41.0.94' implementation 'org.spongepowered:mixin:0.8.5' annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' diff --git a/src/main/java/com/sekwah/narutomod/capabilities/NinjaCapabilityHandler.java b/src/main/java/com/sekwah/narutomod/capabilities/NinjaCapabilityHandler.java index f6adc47c..ed4fcbcf 100644 --- a/src/main/java/com/sekwah/narutomod/capabilities/NinjaCapabilityHandler.java +++ b/src/main/java/com/sekwah/narutomod/capabilities/NinjaCapabilityHandler.java @@ -66,7 +66,7 @@ public static void onPlayerUpdate(TickEvent.PlayerTickEvent event) { public static void playerClone(PlayerEvent.Clone event) { event.getOriginal().reviveCaps(); event.getOriginal().getCapability(NINJA_DATA).ifPresent(original -> { - event.getPlayer().getCapability(NINJA_DATA).ifPresent(future -> { + event.getEntity().getCapability(NINJA_DATA).ifPresent(future -> { future.deserializeNBT(original.serializeNBT()); }); }); diff --git a/src/main/java/com/sekwah/narutomod/client/events/RenderEvents.java b/src/main/java/com/sekwah/narutomod/client/events/RenderEvents.java index 1ac6ebe0..3e023a4d 100644 --- a/src/main/java/com/sekwah/narutomod/client/events/RenderEvents.java +++ b/src/main/java/com/sekwah/narutomod/client/events/RenderEvents.java @@ -25,7 +25,7 @@ public class RenderEvents { */ @SubscribeEvent public static void playerRenderEvent(RenderPlayerEvent.Pre event) { - event.getPlayer().getCapability(NinjaCapabilityHandler.NINJA_DATA).ifPresent(ninjaData -> { + event.getEntity().getCapability(NinjaCapabilityHandler.NINJA_DATA).ifPresent(ninjaData -> { if(ninjaData.getInvisible()) { event.setCanceled(true); } diff --git a/src/main/java/com/sekwah/narutomod/datagen/NarutoDataGenerators.java b/src/main/java/com/sekwah/narutomod/datagen/NarutoDataGenerators.java index 4eaeb8a7..0e4bed08 100644 --- a/src/main/java/com/sekwah/narutomod/datagen/NarutoDataGenerators.java +++ b/src/main/java/com/sekwah/narutomod/datagen/NarutoDataGenerators.java @@ -1,9 +1,9 @@ package com.sekwah.narutomod.datagen; import net.minecraft.data.DataGenerator; +import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public class NarutoDataGenerators { diff --git a/src/main/java/com/sekwah/narutomod/entity/NarutoDataSerialisers.java b/src/main/java/com/sekwah/narutomod/entity/NarutoDataSerialisers.java index 6e35f498..b74fb43f 100644 --- a/src/main/java/com/sekwah/narutomod/entity/NarutoDataSerialisers.java +++ b/src/main/java/com/sekwah/narutomod/entity/NarutoDataSerialisers.java @@ -43,7 +43,7 @@ public Direction copy(Direction value) { } }; - private static final DeferredRegister> DATA_SERIALIZERS = DeferredRegister.create(ForgeRegistries.Keys.DATA_SERIALIZERS, NarutoMod.MOD_ID); + private static final DeferredRegister> DATA_SERIALIZERS = DeferredRegister.create(ForgeRegistries.Keys.ENTITY_DATA_SERIALIZERS, NarutoMod.MOD_ID); public static final RegistryObject ATTACH_FACE_ENTRY = DATA_SERIALIZERS.register("attach_face", () -> ATTACH_FACE); diff --git a/src/main/java/com/sekwah/narutomod/entity/NarutoEntities.java b/src/main/java/com/sekwah/narutomod/entity/NarutoEntities.java index 1ec8c893..72279c82 100644 --- a/src/main/java/com/sekwah/narutomod/entity/NarutoEntities.java +++ b/src/main/java/com/sekwah/narutomod/entity/NarutoEntities.java @@ -24,7 +24,7 @@ @Mod.EventBusSubscriber(modid = NarutoMod.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class NarutoEntities { - private static final DeferredRegister> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITIES, MOD_ID); + private static final DeferredRegister> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, MOD_ID); public static final RegistryObject> KUNAI = register("kunai", EntityType.Builder.of(KunaiEntity::new, MobCategory.MISC).sized(0.5F, 0.5F).setTrackingRange(8)); diff --git a/src/main/java/com/sekwah/narutomod/events/PlayerEvents.java b/src/main/java/com/sekwah/narutomod/events/PlayerEvents.java index 666925a3..f9cd4ddc 100644 --- a/src/main/java/com/sekwah/narutomod/events/PlayerEvents.java +++ b/src/main/java/com/sekwah/narutomod/events/PlayerEvents.java @@ -11,7 +11,7 @@ public class PlayerEvents { @SubscribeEvent - public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { + public static void onEntityUpdate(LivingEvent.LivingTickEvent event) { // Do chakra updates and other stuff here unless handled in capabilities } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index a4781540..72471123 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -17,7 +17,7 @@ A mod that adds new items and other features to the game that are from/based on [[dependencies.narutomod]] modId="forge" mandatory=true - versionRange="[41.0.69,)" + versionRange="[41.0.94,)" ordering="NONE" side="BOTH"