diff --git a/build.gradle b/build.gradle index 237e2668..4eb1dc9e 100644 --- a/build.gradle +++ b/build.gradle @@ -86,6 +86,12 @@ mixin { repositories { maven { url = 'https://repo.spongepowered.org/maven/' } + maven { + url "https://cursemaven.com" + content { + includeGroup "curse.maven" + } + } jcenter() mavenCentral() @@ -94,6 +100,9 @@ repositories { dependencies { minecraft "net.minecraftforge:forge:${config.MINECRAFT_VERSION}-${config.FORGE_VERSION}" annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' + + // Soul Fire'd dependency + implementation fg.deobf("curse.maven:soulfired-662413:4875142") } jar { diff --git a/build.properties b/build.properties index 70f809a1..1a9236bc 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ VERSION=2.5.1 MINECRAFT_VERSION=1.19.2 -FORGE_VERSION=43.1.1 +FORGE_VERSION=43.2.0 MAPPINGS_CHANNEL=official MAPPINGS_VERSION=1.19.2 # Do not edit anything below this line, it contains base information for the project. diff --git a/src/main/java/org/infernalstudios/infernalexp/access/FireTypeAccess.java b/src/main/java/org/infernalstudios/infernalexp/access/FireTypeAccess.java deleted file mode 100644 index 84abb3ee..00000000 --- a/src/main/java/org/infernalstudios/infernalexp/access/FireTypeAccess.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2022 Infernal Studios - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.infernalstudios.infernalexp.access; - -import org.infernalstudios.infernalexp.api.FireType; - -public interface FireTypeAccess { - - FireType getFireType(); - - void setFireType(FireType type); - -} diff --git a/src/main/java/org/infernalstudios/infernalexp/api/FireType.java b/src/main/java/org/infernalstudios/infernalexp/api/FireType.java deleted file mode 100644 index e4232c71..00000000 --- a/src/main/java/org/infernalstudios/infernalexp/api/FireType.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright 2021 Infernal Studios - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.infernalstudios.infernalexp.api; - -import net.minecraft.client.renderer.texture.TextureAtlas; -import net.minecraft.client.resources.model.Material; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -public class FireType { - - private static final Map FIRE_TYPES = new HashMap<>(); - - private final ResourceLocation name; - private final ResourceLocation block; - private final ResourceLocation sprite0; - private final ResourceLocation sprite1; - - private FireType(ResourceLocation name, ResourceLocation block, ResourceLocation sprite0, ResourceLocation sprite1) { - this.name = name; - this.block = block; - this.sprite0 = sprite0; - this.sprite1 = sprite1; - - FIRE_TYPES.put(name, this); - } - - public static FireType register(ResourceLocation name) { - return register(name, name, "block/" + name.getPath()); - } - - public static FireType register(ResourceLocation name, ResourceLocation block) { - return register(name, block, "block/" + name.getPath()); - } - - public static FireType register(ResourceLocation name, ResourceLocation block, String spriteLocation) { - return register(name, block, spriteLocation + "_0", spriteLocation + "_1"); - } - - public static FireType register(ResourceLocation name, ResourceLocation block, String spriteLocation0, String spriteLocation1) { - if (FIRE_TYPES.containsKey(name)) - throw new IllegalStateException(name.toString() + " already exists in the FireType registry."); - - return new FireType(name, block, new ResourceLocation(name.getNamespace(), spriteLocation0), new ResourceLocation(name.getNamespace(), spriteLocation1)); - } - - public static FireType getOrDefault(ResourceLocation name, FireType defaultType) { - return FIRE_TYPES.getOrDefault(name, defaultType); - } - - public static Set getFireTypes() { - return new HashSet<>(FIRE_TYPES.values()); - } - - public ResourceLocation getName() { - return this.name; - } - - public ResourceLocation getBlock() { - return this.block; - } - - @OnlyIn(Dist.CLIENT) - public Material getSprite0() { - return MaterialCache.getOrCreate(this.sprite0); - } - - @OnlyIn(Dist.CLIENT) - public Material getSprite1() { - return MaterialCache.getOrCreate(this.sprite1); - } - - @OnlyIn(Dist.CLIENT) - private static final class MaterialCache { - - private static final Map RENDER_MATERIALS = new HashMap<>(); - - private static Material getOrCreate(ResourceLocation resourceLocation) { - if (!RENDER_MATERIALS.containsKey(resourceLocation)) - RENDER_MATERIALS.put(resourceLocation, new Material(TextureAtlas.LOCATION_BLOCKS, resourceLocation)); - - return RENDER_MATERIALS.get(resourceLocation); - } - - } - -} diff --git a/src/main/java/org/infernalstudios/infernalexp/client/ClientFireType.java b/src/main/java/org/infernalstudios/infernalexp/client/ClientFireType.java deleted file mode 100644 index 96f0f702..00000000 --- a/src/main/java/org/infernalstudios/infernalexp/client/ClientFireType.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2022 Infernal Studios - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.infernalstudios.infernalexp.client; - -import net.minecraft.client.resources.model.Material; - -public class ClientFireType { - - private final Material associatedSprite0; - private final Material associatedSprite1; - - public ClientFireType(Material associatedSprite0, Material associatedSprite1) { - this.associatedSprite0 = associatedSprite0; - this.associatedSprite1 = associatedSprite1; - } - - public Material getAssociatedSprite0() { - return associatedSprite0; - } - - public Material getAssociatedSprite1() { - return associatedSprite1; - } - -} diff --git a/src/main/java/org/infernalstudios/infernalexp/init/IEFireTypes.java b/src/main/java/org/infernalstudios/infernalexp/init/IEFireTypes.java index 8868449b..7f5a7657 100644 --- a/src/main/java/org/infernalstudios/infernalexp/init/IEFireTypes.java +++ b/src/main/java/org/infernalstudios/infernalexp/init/IEFireTypes.java @@ -16,21 +16,35 @@ package org.infernalstudios.infernalexp.init; -import net.minecraft.resources.ResourceLocation; import org.infernalstudios.infernalexp.InfernalExpansion; -import org.infernalstudios.infernalexp.api.FireType; - -public class IEFireTypes { - public static final FireType FIRE = FireType.register(new ResourceLocation("fire")); - public static final FireType SOUL_FIRE = FireType.register(new ResourceLocation("soul_fire")); - public static final FireType GLOW_FIRE = FireType.register(new ResourceLocation(InfernalExpansion.MOD_ID, "glow_fire")); - public static final FireType ENDER_FIRE = FireType.register(new ResourceLocation("endergetic", "ender_fire")); - public static final FireType BORIC_FIRE = FireType.register(new ResourceLocation("byg", "boric_fire")); - public static final FireType CRYPTIC_FIRE = FireType.register(new ResourceLocation("byg", "cryptic_fire")); - - public static void register() {} +import crystalspider.soulfired.api.FireBuilder; +import crystalspider.soulfired.api.FireManager; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.fml.ModList; - ; +public class IEFireTypes { + public static final ResourceLocation GLOW_FIRE_TYPE = new ResourceLocation(InfernalExpansion.MOD_ID, "glow"); + public static final ResourceLocation ENDER_FIRE_TYPE = new ResourceLocation("endergetic", "ender"); + public static void register() { + FireBuilder fireBuilder = FireManager.fireBuilder(GLOW_FIRE_TYPE); + FireManager.registerFire( + fireBuilder + .setDamage(2) + .removeFireAspect() + .removeFlame() + .build() + ); + if (ModList.get().isLoaded(ENDER_FIRE_TYPE.getNamespace())) { + FireManager.registerFire( + fireBuilder + .reset(ENDER_FIRE_TYPE) + .setDamage(3) + .removeFireAspect() + .removeFlame() + .build() + ); + } + } } diff --git a/src/main/java/org/infernalstudios/infernalexp/mixin/client/MixinEntityRendererManager.java b/src/main/java/org/infernalstudios/infernalexp/mixin/client/MixinEntityRendererManager.java deleted file mode 100644 index 1ff087d4..00000000 --- a/src/main/java/org/infernalstudios/infernalexp/mixin/client/MixinEntityRendererManager.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2022 Infernal Studios - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.infernalstudios.infernalexp.mixin.client; - -import org.infernalstudios.infernalexp.access.FireTypeAccess; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyVariable; - -import com.mojang.blaze3d.vertex.PoseStack; - -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.entity.EntityRenderDispatcher; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.world.entity.Entity; - -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) -@Mixin(EntityRenderDispatcher.class) -public class MixinEntityRendererManager { - - @ModifyVariable(method = "renderFlame", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/client/resources/model/Material;sprite()Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;", ordinal = 0), name = "textureatlassprite") - private TextureAtlasSprite IE_renderCustomFires0(TextureAtlasSprite original, PoseStack matrixStackIn, MultiBufferSource bufferIn, Entity entityIn) { - return ((FireTypeAccess) entityIn).getFireType().getSprite0().sprite(); - } - - @ModifyVariable(method = "renderFlame", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/client/resources/model/Material;sprite()Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;", ordinal = 1), name = "textureatlassprite1") - private TextureAtlasSprite IE_renderCustomFires1(TextureAtlasSprite original, PoseStack matrixStackIn, MultiBufferSource bufferIn, Entity entityIn) { - return ((FireTypeAccess) entityIn).getFireType().getSprite1().sprite(); - } - -} diff --git a/src/main/java/org/infernalstudios/infernalexp/mixin/client/MixinModelBakery.java b/src/main/java/org/infernalstudios/infernalexp/mixin/client/MixinModelBakery.java index 90fae7a2..bd515188 100644 --- a/src/main/java/org/infernalstudios/infernalexp/mixin/client/MixinModelBakery.java +++ b/src/main/java/org/infernalstudios/infernalexp/mixin/client/MixinModelBakery.java @@ -16,36 +16,33 @@ package org.infernalstudios.infernalexp.mixin.client; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.Material; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.ModList; -import org.infernalstudios.infernalexp.api.FireType; -import org.infernalstudios.infernalexp.init.IEFireTypes; +import java.util.Set; + import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import java.util.Set; +import crystalspider.soulfired.api.FireManager; +import crystalspider.soulfired.api.client.FireClientManager; +import net.minecraft.client.resources.model.Material; +import net.minecraft.client.resources.model.ModelBakery; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fml.ModList; @OnlyIn(Dist.CLIENT) @Mixin(ModelBakery.class) public class MixinModelBakery { - @Shadow @Final protected static Set UNREFERENCED_TEXTURES; static { - FireType.getFireTypes().forEach(fireType -> { - if (fireType != IEFireTypes.FIRE) { - if (ModList.get().isLoaded(fireType.getName().getNamespace())) { - UNREFERENCED_TEXTURES.add(fireType.getSprite0()); - UNREFERENCED_TEXTURES.add(fireType.getSprite1()); - } + FireManager.getFireTypes().forEach(fireType -> { + if (ModList.get().isLoaded(fireType.getNamespace())) { + UNREFERENCED_TEXTURES.add(FireClientManager.getMaterial0(fireType)); + UNREFERENCED_TEXTURES.add(FireClientManager.getMaterial0(fireType)); } }); } - } diff --git a/src/main/java/org/infernalstudios/infernalexp/mixin/client/MixinOverlayRenderer.java b/src/main/java/org/infernalstudios/infernalexp/mixin/client/MixinOverlayRenderer.java deleted file mode 100644 index 501ddc2d..00000000 --- a/src/main/java/org/infernalstudios/infernalexp/mixin/client/MixinOverlayRenderer.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2022 Infernal Studios - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.infernalstudios.infernalexp.mixin.client; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ScreenEffectRenderer; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import org.infernalstudios.infernalexp.access.FireTypeAccess; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyVariable; - -import com.mojang.blaze3d.vertex.PoseStack; - -@Mixin(ScreenEffectRenderer.class) -public class MixinOverlayRenderer { - - @ModifyVariable(method = "renderFire", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/client/resources/model/Material;sprite()Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;", ordinal = 0), name = "textureatlassprite") - private static TextureAtlasSprite IE_renderCustomFiresOverlay(TextureAtlasSprite original, Minecraft minecraftIn, PoseStack matrixStackIn) { - return ((FireTypeAccess) minecraftIn.player).getFireType().getSprite1().sprite(); - } - -} diff --git a/src/main/java/org/infernalstudios/infernalexp/mixin/common/MixinAbstractFireBlock.java b/src/main/java/org/infernalstudios/infernalexp/mixin/common/MixinAbstractFireBlock.java index 0e0b9ca0..6bace7e3 100644 --- a/src/main/java/org/infernalstudios/infernalexp/mixin/common/MixinAbstractFireBlock.java +++ b/src/main/java/org/infernalstudios/infernalexp/mixin/common/MixinAbstractFireBlock.java @@ -16,27 +16,20 @@ package org.infernalstudios.infernalexp.mixin.common; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.BaseFireBlock; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.entity.Entity; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.Level; -import net.minecraftforge.fml.ModList; -import net.minecraftforge.registries.ForgeRegistries; -import org.infernalstudios.infernalexp.access.FireTypeAccess; -import org.infernalstudios.infernalexp.api.FireType; import org.infernalstudios.infernalexp.blocks.GlowFireBlock; import org.infernalstudios.infernalexp.init.IEBlocks; -import org.infernalstudios.infernalexp.init.IEFireTypes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.BaseFireBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; + @Mixin(BaseFireBlock.class) public abstract class MixinAbstractFireBlock extends Block { @@ -50,15 +43,4 @@ private static void IE_getFireForPlacement(BlockGetter reader, BlockPos pos, Cal info.setReturnValue(IEBlocks.GLOW_FIRE.get().defaultBlockState()); } } - - @Inject(method = "entityInside", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;hurt(Lnet/minecraft/world/damagesource/DamageSource;F)Z")) - private void IE_setCustomFires(BlockState state, Level worldIn, BlockPos pos, Entity entityIn, CallbackInfo info) { - FireType.getFireTypes().forEach(fireType -> { - if (fireType != IEFireTypes.FIRE && ModList.get().isLoaded(fireType.getName().getNamespace())) { - if (ForgeRegistries.BLOCKS.getKey(state.getBlock()).equals(fireType.getBlock()) && state.getBlock() instanceof BaseFireBlock) { - ((FireTypeAccess) entityIn).setFireType(fireType); - } - } - }); - } } diff --git a/src/main/java/org/infernalstudios/infernalexp/mixin/common/MixinEntity.java b/src/main/java/org/infernalstudios/infernalexp/mixin/common/MixinEntity.java deleted file mode 100644 index fbbb9022..00000000 --- a/src/main/java/org/infernalstudios/infernalexp/mixin/common/MixinEntity.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright 2022 Infernal Studios - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.infernalstudios.infernalexp.mixin.common; - -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.syncher.EntityDataAccessor; -import net.minecraft.network.syncher.EntityDataSerializers; -import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.level.Level; - -import org.infernalstudios.infernalexp.access.FireTypeAccess; -import org.infernalstudios.infernalexp.api.FireType; -import org.infernalstudios.infernalexp.init.IEFireTypes; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.At.Shift; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(Entity.class) -public abstract class MixinEntity implements FireTypeAccess { - - @Shadow - @Final - protected SynchedEntityData entityData; - - @Unique - private static final EntityDataAccessor FIRE_TYPE = SynchedEntityData.defineId(Entity.class, EntityDataSerializers.STRING); - - @Inject(method = "", at = @At("TAIL")) - private void IE_init(EntityType entityTypeIn, Level worldIn, CallbackInfo ci) { - this.entityData.define(FIRE_TYPE, IEFireTypes.FIRE.getName().toString()); - } - - @Inject(method = "saveWithoutId", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/CompoundTag;putShort(Ljava/lang/String;S)V", ordinal = 0, shift = Shift.AFTER)) - private void IE_writeCustomFires(CompoundTag tag, CallbackInfoReturnable ci) { - tag.putString("fireType", this.getFireType().getName().toString()); - } - - @Inject(method = "load", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/CompoundTag;getShort(Ljava/lang/String;)S", ordinal = 0, shift = Shift.AFTER)) - private void IE_readCustomFires(CompoundTag tag, CallbackInfo ci) { - this.setFireType(FireType.getOrDefault(new ResourceLocation(tag.getString("fireType")), IEFireTypes.FIRE)); - } - - @Inject(method = "setSecondsOnFire", at = @At("HEAD")) - private void IE_setToDefaultFireType(int seconds, CallbackInfo ci) { - this.setFireType(IEFireTypes.FIRE); - } - - @Override - public FireType getFireType() { - return FireType.getOrDefault(new ResourceLocation(this.entityData.get(FIRE_TYPE)), IEFireTypes.FIRE); - } - - @Override - public void setFireType(FireType type) { - this.entityData.set(FIRE_TYPE, type.getName().toString()); - } - -} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index e6bda225..6a5158bf 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -82,3 +82,9 @@ mandatory = true versionRange = "[1.19,)" ordering = "NONE" side = "BOTH" +[[dependencies.infernalexp]] +modId = "soulfired" +mandatory = true +versionRange = "[3.2.0.0,)" +ordering = "NONE" +side = "BOTH" diff --git a/src/main/resources/infernal-expansion.mixins.json b/src/main/resources/infernal-expansion.mixins.json index 524d730b..90662f25 100644 --- a/src/main/resources/infernal-expansion.mixins.json +++ b/src/main/resources/infernal-expansion.mixins.json @@ -14,7 +14,6 @@ "common.MixinArrowEntity", "common.MixinBubbleColumnBlock", "common.MixinDimensionGeneratorSettings", - "common.MixinEntity", "common.MixinMagmaCubeEntity", "common.MixinMinecraftServer", "common.MixinMultiNoiseBiomeSourcePreset", @@ -35,12 +34,10 @@ "client": [ "client.MixinBlockGetter", "client.MixinClientPacketListener", - "client.MixinEntityRendererManager", "client.MixinItemInHandRenderer", "client.MixinItemProperties", "client.MixinModelBakery", "client.MixinMultiPlayerGameMode", - "client.MixinOverlayRenderer", "client.MixinPaintingSpriteUploader", "client.MixinPlayerRenderer", "client.OptionInstanceAccessor"