diff --git a/build.gradle b/build.gradle index 8f157188..4fb822c4 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,8 @@ dependencies { modCompile "net.fabricmc:fabric-loader:${project.loader_version}" compileOnly "com.google.code.findbugs:jsr305:3.0.2" - modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modCompile "net.fabricmc.fabric-api:fabric-api-base:0.1.0+" + modCompile "net.fabricmc.fabric-api:fabric-events-lifecycle-v0:0.1.0+" modCompile "com.minelittlepony:Kirin:${project.kirin_version}" // include "com.minelittlepony:Kirin:${project.kirin_version}" diff --git a/gradle.properties b/gradle.properties index 58591217..5e538696 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,5 +18,5 @@ org.gradle.daemon=false # Dependencies fabric_version=0.3.0+ - kirin_version=1.14.3-1.1.2-SNAPSHOT - hd_skins_version=1.14.3-5.2.0-SNAPSHOT + kirin_version=1.14.3-1.2.0-SNAPSHOT + hd_skins_version=1.14.3-5.2.1-SNAPSHOT diff --git a/src/main/java/com/minelittlepony/client/FabMod.java b/src/main/java/com/minelittlepony/client/FabMod.java index c86a835d..0ba8fe5b 100644 --- a/src/main/java/com/minelittlepony/client/FabMod.java +++ b/src/main/java/com/minelittlepony/client/FabMod.java @@ -6,11 +6,11 @@ import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; import com.minelittlepony.client.gui.hdskins.IndirectHDSkins; -import com.minelittlepony.common.client.IModUtilities; +import com.minelittlepony.vendor.fabricmc.ModImpl; import javax.annotation.Nullable; -public class FabMod implements ClientModInitializer, ClientTickCallback, IModUtilities { +public class FabMod implements ClientModInitializer, ClientTickCallback, ModImpl { @Nullable private MineLPClient mlp; diff --git a/src/main/java/com/minelittlepony/client/PonyRenderManager.java b/src/main/java/com/minelittlepony/client/PonyRenderManager.java index 9be0de75..4bf889ca 100644 --- a/src/main/java/com/minelittlepony/client/PonyRenderManager.java +++ b/src/main/java/com/minelittlepony/client/PonyRenderManager.java @@ -13,7 +13,6 @@ import com.minelittlepony.client.render.entities.player.RenderPonyPlayer; import javax.annotation.Nullable; -import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.EntityRenderer; @@ -75,16 +74,16 @@ public class PonyRenderManager { * @param factory The replacement value * @param The entity type */ - @SuppressWarnings("unchecked") - public void switchRenderer(boolean state, Class type, EntityRendererRegistry.Factory factory) { + @SuppressWarnings({"unchecked"}) + public void switchRenderer(boolean state, Class type, Function> factory) { if (state) { if (!renderMap.containsKey(type)) { renderMap.put(type, MinecraftClient.getInstance().getEntityRenderManager().getRenderer(type)); } - EntityRendererRegistry.INSTANCE.register(type, factory); + MineLPClient.getInstance().getModUtilities().addRenderer((Class)type, factory); } else { if (renderMap.containsKey(type)) { - EntityRendererRegistry.INSTANCE.register(type, (m1, c) -> ((Function>) m -> (EntityRenderer) renderMap.get(type)).apply(m1)); + MineLPClient.getInstance().getModUtilities().addRenderer(type, m -> (EntityRenderer)renderMap.get(type)); } } } diff --git a/src/main/java/com/minelittlepony/client/gui/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/gui/hdskins/MineLPHDSkins.java index 0e0bc342..23b3bc14 100644 --- a/src/main/java/com/minelittlepony/client/gui/hdskins/MineLPHDSkins.java +++ b/src/main/java/com/minelittlepony/client/gui/hdskins/MineLPHDSkins.java @@ -1,6 +1,5 @@ package com.minelittlepony.client.gui.hdskins; -import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.MinecraftClient; import net.minecraft.util.Identifier; @@ -57,7 +56,7 @@ class MineLPHDSkins extends MineLPClient implements ISkinCacheClearListener { super.postInit(minecraft); // Preview on the select skin gui - EntityRendererRegistry.INSTANCE.register(DummyPony.class, RenderDummyPony::new); + getModUtilities().addRenderer(DummyPony.class, RenderDummyPony::new); HDSkins manager = HDSkins.getInstance(); diff --git a/src/main/java/com/minelittlepony/client/gui/hdskins/RenderDummyPony.java b/src/main/java/com/minelittlepony/client/gui/hdskins/RenderDummyPony.java index 5ab801eb..bc1ab5e4 100644 --- a/src/main/java/com/minelittlepony/client/gui/hdskins/RenderDummyPony.java +++ b/src/main/java/com/minelittlepony/client/gui/hdskins/RenderDummyPony.java @@ -14,7 +14,6 @@ import com.minelittlepony.pony.meta.Race; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.mojang.blaze3d.platform.GlStateManager; -import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.feature.FeatureRenderer; import net.minecraft.util.Identifier; @@ -26,8 +25,8 @@ class RenderDummyPony extends RenderDummyPlayer> renderPony = new RenderPony<>(this); - public RenderDummyPony(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { - super(manager, context); + public RenderDummyPony(EntityRenderDispatcher manager) { + super(manager); addFeature(new LayerGear<>(this)); } diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java b/src/main/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java index 05a3f54c..4f9a6375 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java +++ b/src/main/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java @@ -6,7 +6,6 @@ import com.minelittlepony.client.render.layer.LayerHeldPonyItem; import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical; import com.minelittlepony.client.render.layer.LayerEyeGlow.IGlowingRenderer; -import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.block.BlockState; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.feature.StuckArrowsFeatureRenderer; @@ -23,7 +22,7 @@ public class RenderEnderStallion extends RenderPonyMob ponyRenderer; - public RenderPonyGuardian(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { + public RenderPonyGuardian(EntityRenderDispatcher manager) { super(manager); features.clear(); @@ -69,8 +68,8 @@ public class RenderPonyGuardian extends GuardianEntityRenderer { public static class Elder extends RenderPonyGuardian { - public Elder(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { - super(manager, context); + public Elder(EntityRenderDispatcher manager) { + super(manager); } @Override diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java index 9d769e53..9aa6c892 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java +++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java @@ -5,7 +5,6 @@ import com.minelittlepony.client.render.layer.LayerHeldItemIllager; import com.minelittlepony.client.render.layer.LayerHeldPonyItem; import com.mojang.blaze3d.platform.GlStateManager; -import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.entity.mob.EvokerEntity; import net.minecraft.entity.mob.IllagerEntity; @@ -21,7 +20,7 @@ public abstract class RenderPonyIllager extends RenderP public static final Identifier EVOKER = new Identifier("minelittlepony", "textures/entity/illager/evoker_pony.png"); public static final Identifier VINDICATOR = new Identifier("minelittlepony", "textures/entity/illager/vindicator_pony.png"); - public RenderPonyIllager(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { + public RenderPonyIllager(EntityRenderDispatcher manager) { super(manager, new ModelIllagerPony<>()); } @@ -38,8 +37,8 @@ public abstract class RenderPonyIllager extends RenderP public static class Vindicator extends RenderPonyIllager { - public Vindicator(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { - super(manager, context); + public Vindicator(EntityRenderDispatcher manager) { + super(manager); } @@ -51,8 +50,8 @@ public abstract class RenderPonyIllager extends RenderP public static class Evoker extends RenderPonyIllager { - public Evoker(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { - super(manager, context); + public Evoker(EntityRenderDispatcher manager) { + super(manager); } @Override @@ -63,8 +62,8 @@ public abstract class RenderPonyIllager extends RenderP public static class Illusionist extends RenderPonyIllager { - public Illusionist(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { - super(manager, context); + public Illusionist(EntityRenderDispatcher manager) { + super(manager); } @Override diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyPillager.java b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyPillager.java index 9f506b00..017be91e 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyPillager.java +++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyPillager.java @@ -1,6 +1,5 @@ package com.minelittlepony.client.render.entities; -import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.entity.mob.PillagerEntity; import net.minecraft.util.Identifier; @@ -13,7 +12,7 @@ public class RenderPonyPillager extends RenderPonyMob()); } diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java b/src/main/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java index a9d86168..a8db8d64 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java +++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java @@ -6,7 +6,6 @@ import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical; import com.minelittlepony.client.render.layer.LayerPonyStrayOverlay; import com.mojang.blaze3d.platform.GlStateManager; -import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.entity.mob.AbstractSkeletonEntity; import net.minecraft.entity.mob.StrayEntity; @@ -19,7 +18,7 @@ public class RenderPonySkeleton extends public static final Identifier WITHER = new Identifier("minelittlepony", "textures/entity/skeleton/skeleton_wither_pony.png"); public static final Identifier STRAY = new Identifier("minelittlepony", "textures/entity/skeleton/stray_pony.png"); - public RenderPonySkeleton(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { + public RenderPonySkeleton(EntityRenderDispatcher manager) { super(manager, new ModelSkeletonPony<>()); } @@ -35,8 +34,8 @@ public class RenderPonySkeleton extends public static class Stray extends RenderPonySkeleton { - public Stray(EntityRenderDispatcher rm, EntityRendererRegistry.Context context) { - super(rm, context); + public Stray(EntityRenderDispatcher manager) { + super(manager); addFeature(new LayerPonyStrayOverlay<>(this)); } @@ -48,8 +47,8 @@ public class RenderPonySkeleton extends public static class Wither extends RenderPonySkeleton { - public Wither(EntityRenderDispatcher rm, EntityRendererRegistry.Context context) { - super(rm, context); + public Wither(EntityRenderDispatcher manager) { + super(manager); } @Override diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyTrader.java b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyTrader.java index a54fa124..c06ad752 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyTrader.java +++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyTrader.java @@ -1,6 +1,5 @@ package com.minelittlepony.client.render.entities; -import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.entity.passive.WanderingTraderEntity; import net.minecraft.util.Identifier; @@ -12,7 +11,7 @@ public class RenderPonyTrader extends RenderPonyMob.Caster(false)); } diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVex.java b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVex.java index c2c7f8fc..b9bd045c 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVex.java +++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVex.java @@ -1,6 +1,5 @@ package com.minelittlepony.client.render.entities; -import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.render.entity.BipedEntityRenderer; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.entity.mob.VexEntity; @@ -17,7 +16,7 @@ public class RenderPonyVex extends BipedEntityRenderer(), 0.3F); } diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java index 41288d8a..df7bc630 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java +++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java @@ -5,7 +5,6 @@ import com.minelittlepony.util.resources.FormattedTextureSupplier; import com.minelittlepony.util.resources.ITextureSupplier; import com.mojang.blaze3d.platform.GlStateManager; -import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.feature.VillagerClothingFeatureRenderer; @@ -20,7 +19,7 @@ public class RenderPonyVillager extends RenderPonyMob.Caster PROFESSIONS = new VillagerProfessionTextureCache<>(FORMATTER); - public RenderPonyVillager(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { + public RenderPonyVillager(EntityRenderDispatcher manager) { super(manager, new ModelVillagerPony<>()); } diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java index 94b8939c..21f6e9e9 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java +++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java @@ -4,7 +4,6 @@ import com.minelittlepony.client.model.entities.ModelWitchPony; import com.minelittlepony.client.render.layer.LayerHeldPonyItem; import com.mojang.blaze3d.platform.GlStateManager; -import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.model.json.ModelTransformation; import net.minecraft.entity.mob.WitchEntity; @@ -16,7 +15,7 @@ public class RenderPonyWitch extends RenderPonyMob private static final Identifier WITCH_TEXTURES = new Identifier("minelittlepony", "textures/entity/witch_pony.png"); - public RenderPonyWitch(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { + public RenderPonyWitch(EntityRenderDispatcher manager) { super(manager, new ModelWitchPony()); } diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java index b7618074..903bf9a2 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java +++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java @@ -3,7 +3,6 @@ package com.minelittlepony.client.render.entities; import com.minelittlepony.client.model.entities.ModelZombiePony; import com.mojang.blaze3d.platform.GlStateManager; -import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.entity.mob.DrownedEntity; import net.minecraft.entity.mob.GiantEntity; @@ -19,7 +18,7 @@ public class RenderPonyZombie extends RenderPonyMob public static final Identifier PIGMAN = new Identifier("minelittlepony", "textures/entity/zombie/zombie_pigman_pony.png"); public static final Identifier DROWNED = new Identifier("minelittlepony", "textures/entity/zombie/drowned_pony.png"); - public RenderPonyZombie(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { + public RenderPonyZombie(EntityRenderDispatcher manager) { super(manager, new ModelZombiePony<>()); } @@ -31,8 +30,8 @@ public class RenderPonyZombie extends RenderPonyMob public static class Drowned extends RenderPonyZombie { - public Drowned(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { - super(manager, context); + public Drowned(EntityRenderDispatcher manager) { + super(manager); } @Override @@ -43,8 +42,8 @@ public class RenderPonyZombie extends RenderPonyMob public static class Pigman extends RenderPonyZombie { - public Pigman(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { - super(manager, context); + public Pigman(EntityRenderDispatcher manager) { + super(manager); } @Override @@ -55,8 +54,8 @@ public class RenderPonyZombie extends RenderPonyMob public static class Husk extends RenderPonyZombie { - public Husk(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { - super(manager, context); + public Husk(EntityRenderDispatcher manager) { + super(manager); } @Override @@ -74,7 +73,7 @@ public class RenderPonyZombie extends RenderPonyMob public static class Giant extends RenderPonyMob.Caster> { - public Giant(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { + public Giant(EntityRenderDispatcher manager) { super(manager, new ModelZombiePony<>()); } diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java index 4dc6602b..796e24df 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java +++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java @@ -4,7 +4,6 @@ import com.minelittlepony.client.model.entities.ModelZombieVillagerPony; import com.minelittlepony.util.resources.FormattedTextureSupplier; import com.minelittlepony.util.resources.ITextureSupplier; -import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.feature.VillagerClothingFeatureRenderer; @@ -19,7 +18,7 @@ public class RenderPonyZombieVillager extends RenderPonyMob.Caster PROFESSIONS = new VillagerProfessionTextureCache<>(FORMATTER); - public RenderPonyZombieVillager(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { + public RenderPonyZombieVillager(EntityRenderDispatcher manager) { super(manager, new ModelZombieVillagerPony()); } diff --git a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java b/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java index 1849ae7d..f3c0c949 100644 --- a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java @@ -2,13 +2,13 @@ package com.minelittlepony.client.render.tileentities.skull; import com.google.common.collect.Maps; import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLPClient; import com.minelittlepony.client.render.LevitatingItemRenderer; import com.minelittlepony.pony.IPony; import com.minelittlepony.settings.PonyConfig; import com.minelittlepony.settings.PonySettings; import com.mojang.authlib.GameProfile; -import net.fabricmc.fabric.api.client.render.BlockEntityRendererRegistry; import net.minecraft.block.SkullBlock; import net.minecraft.block.entity.SkullBlockEntity; import net.minecraft.client.render.block.entity.SkullBlockEntityRenderer; @@ -48,7 +48,7 @@ public class PonySkullRenderer extends SkullBlockEntityRenderer { if (PonySettings.PONYSKULLS.get()) { if (!(INSTANCE instanceof PonySkullRenderer)) { backup = INSTANCE; - BlockEntityRendererRegistry.INSTANCE.register(SkullBlockEntity.class, ponyInstance); + MineLPClient.getInstance().getModUtilities().addRenderer(SkullBlockEntity.class, ponyInstance); INSTANCE = ponyInstance; } } else { @@ -57,7 +57,7 @@ public class PonySkullRenderer extends SkullBlockEntityRenderer { if (backup == null) { backup = new SkullBlockEntityRenderer(); } - BlockEntityRendererRegistry.INSTANCE.register(SkullBlockEntity.class, backup); + MineLPClient.getInstance().getModUtilities().addRenderer(SkullBlockEntity.class, backup); INSTANCE = backup; } }