From 1c479f3d865656b028d1d85107fdb18c73d77a28 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 2 Oct 2022 23:35:26 +0700 Subject: [PATCH] register layer defs in event --- .../java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java | 5 ++--- .../mc/otm/client/model/GravitationStabilizerModel.java | 5 +++-- .../mc/otm/client/model/TritaniumArmorModel.java | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java index 6860ef25e..00abadb01 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java +++ b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java @@ -100,6 +100,8 @@ public final class OverdriveThatMatters { DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> { modBus.addListener(EventPriority.NORMAL, AndroidMenuKeyMapping.INSTANCE::register); modBus.addListener(EventPriority.NORMAL, AndroidAbilityKeyMapping.INSTANCE::register); + modBus.addListener(EventPriority.NORMAL, TritaniumArmorModel::register); + modBus.addListener(EventPriority.NORMAL, GravitationStabilizerModel::register); }); ClientConfig.INSTANCE.register(); @@ -194,8 +196,5 @@ public final class OverdriveThatMatters { EVENT_BUS.addListener(EventPriority.NORMAL, AndroidAbilityKeyMapping.INSTANCE::onRenderLevel); event.enqueueWork(GlobalEventHandlerKt::recordClientThread); - - TritaniumArmorModel.register(); - GravitationStabilizerModel.register(); } } diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/model/GravitationStabilizerModel.java b/src/main/java/ru/dbotthepony/mc/otm/client/model/GravitationStabilizerModel.java index 8df645490..4c817d68e 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/model/GravitationStabilizerModel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/model/GravitationStabilizerModel.java @@ -5,6 +5,7 @@ import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.builders.*; import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.event.EntityRenderersEvent; import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.registry.MNames; @@ -52,7 +53,7 @@ public class GravitationStabilizerModel { return def = LayerDefinition.create(meshdefinition, 64, 64); } - public static void register() { - ForgeHooksClient.registerLayerDefinition(LAYER_LOCATION, GravitationStabilizerModel::createBodyLayer); + public static void register(EntityRenderersEvent.RegisterLayerDefinitions event) { + event.registerLayerDefinition(LAYER_LOCATION, GravitationStabilizerModel::createBodyLayer); } } diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java b/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java index 49da53a19..3d01c8910 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java @@ -12,6 +12,7 @@ import net.minecraft.client.model.geom.ModelLayers; import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.builders.*; import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.event.EntityRenderersEvent; import javax.annotation.ParametersAreNonnullByDefault; @@ -100,8 +101,8 @@ public class TritaniumArmorModel { return defLegs = LayerDefinition.create(meshdefinition, 64, 64); } - public static void register() { - ForgeHooksClient.registerLayerDefinition(LAYER_LOCATION, TritaniumArmorModel::createBodyLayer); - ForgeHooksClient.registerLayerDefinition(LAYER_LOCATION_LEGS, TritaniumArmorModel::createLegsLayer); + public static void register(EntityRenderersEvent.RegisterLayerDefinitions event) { + event.registerLayerDefinition(LAYER_LOCATION, TritaniumArmorModel::createBodyLayer); + event.registerLayerDefinition(LAYER_LOCATION_LEGS, TritaniumArmorModel::createLegsLayer); } }