diff --git a/src/main/java/tobinio/visibleentities/VisibleEntities.java b/src/main/java/tobinio/visibleentities/VisibleEntities.java index 4db111c..32b444d 100644 --- a/src/main/java/tobinio/visibleentities/VisibleEntities.java +++ b/src/main/java/tobinio/visibleentities/VisibleEntities.java @@ -1,24 +1,16 @@ package tobinio.visibleentities; import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; -import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.color.block.BlockColorProvider; -import net.minecraft.client.color.block.BlockColors; import net.minecraft.client.option.KeyBinding; -import net.minecraft.client.render.TexturedRenderLayers; import net.minecraft.client.util.InputUtil; import net.minecraft.entity.EntityType; -import net.minecraft.entity.decoration.ItemFrameEntity; -import net.minecraft.state.property.Properties; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -import net.minecraft.util.math.ColorHelper; +import net.minecraft.util.Identifier; import org.lwjgl.glfw.GLFW; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,6 +29,10 @@ public class VisibleEntities implements ClientModInitializer { public static Boolean isActive = false; + public static Identifier id(String path) { + return Identifier.of(MOD_ID, path); + } + @Override public void onInitializeClient() { Config.HANDLER.load(); diff --git a/src/main/java/tobinio/visibleentities/entity/InteractionEntityRenderer.java b/src/main/java/tobinio/visibleentities/entity/InteractionEntityRenderer.java index 2d2a057..94440a0 100644 --- a/src/main/java/tobinio/visibleentities/entity/InteractionEntityRenderer.java +++ b/src/main/java/tobinio/visibleentities/entity/InteractionEntityRenderer.java @@ -1,14 +1,11 @@ package tobinio.visibleentities.entity; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.render.*; import net.minecraft.client.render.entity.EntityRenderer; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.decoration.InteractionEntity; import net.minecraft.util.Identifier; -import net.minecraft.util.math.Box; -import org.joml.Matrix4f; import tobinio.visibleentities.VisibleEntities; import tobinio.visibleentities.settings.Config; diff --git a/src/main/java/tobinio/visibleentities/mixin/BlockStatesLoaderMixin.java b/src/main/java/tobinio/visibleentities/mixin/BlockStatesLoaderMixin.java index dbfb4af..4c1af1f 100644 --- a/src/main/java/tobinio/visibleentities/mixin/BlockStatesLoaderMixin.java +++ b/src/main/java/tobinio/visibleentities/mixin/BlockStatesLoaderMixin.java @@ -2,10 +2,8 @@ package tobinio.visibleentities.mixin; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.client.render.model.BlockStatesLoader; import net.minecraft.state.StateManager; -import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.injection.At; @@ -38,9 +36,9 @@ public class BlockStatesLoaderMixin { STATIC_DEFINITIONS.put(Identifier.ofVanilla("item_frame"), ITEM_FRAME_STATE_MANAGER); STATIC_DEFINITIONS.put(Identifier.ofVanilla("glow_item_frame"), ITEM_FRAME_STATE_MANAGER); - STATIC_DEFINITIONS.put(Identifier.of(VisibleEntities.MOD_ID, "transparent_item_frame"), + STATIC_DEFINITIONS.put(VisibleEntities.id("transparent_item_frame"), ITEM_FRAME_STATE_MANAGER); - STATIC_DEFINITIONS.put(Identifier.of(VisibleEntities.MOD_ID, "transparent_glow_item_frame"), + STATIC_DEFINITIONS.put(VisibleEntities.id("transparent_glow_item_frame"), ITEM_FRAME_STATE_MANAGER); } } diff --git a/src/main/java/tobinio/visibleentities/mixin/ItemFrameEntityRendererMixin.java b/src/main/java/tobinio/visibleentities/mixin/ItemFrameEntityRendererMixin.java index 245cade..d3f1b5e 100644 --- a/src/main/java/tobinio/visibleentities/mixin/ItemFrameEntityRendererMixin.java +++ b/src/main/java/tobinio/visibleentities/mixin/ItemFrameEntityRendererMixin.java @@ -12,7 +12,6 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.decoration.ItemFrameEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -27,19 +26,6 @@ import tobinio.visibleentities.settings.Config; */ @Mixin (ItemFrameEntityRenderer.class) public abstract class ItemFrameEntityRendererMixin { - @Unique - private static final ModelIdentifier TRANSPARENT_NORMAL_FRAME = new ModelIdentifier(Identifier.of(VisibleEntities.MOD_ID, - "transparent_item_frame"), "map=false"); - @Unique - private static final ModelIdentifier TRANSPARENT_MAP_FRAME = new ModelIdentifier(Identifier.of(VisibleEntities.MOD_ID, - "transparent_item_frame"), "map=true"); - @Unique - private static final ModelIdentifier TRANSPARENT_GLOW_FRAME = new ModelIdentifier(Identifier.of(VisibleEntities.MOD_ID, - "transparent_glow_item_frame"), "map=false"); - @Unique - private static final ModelIdentifier TRANSPARENT_MAP_GLOW_FRAME = new ModelIdentifier(Identifier.of(VisibleEntities.MOD_ID, - "transparent_glow_item_frame"), "map=true"); - @Shadow @Final private BlockRenderManager blockRenderManager; @@ -68,6 +54,20 @@ public abstract class ItemFrameEntityRendererMixin { } } + @Unique + private static final ModelIdentifier TRANSPARENT_NORMAL_FRAME = of("transparent_item_frame", false); + @Unique + private static final ModelIdentifier TRANSPARENT_MAP_FRAME = of("transparent_item_frame", true); + @Unique + private static final ModelIdentifier TRANSPARENT_GLOW_FRAME = of("transparent_glow_item_frame", false); + @Unique + private static final ModelIdentifier TRANSPARENT_MAP_GLOW_FRAME = of("transparent_glow_item_frame", true); + + @Unique + private static ModelIdentifier of(String id, boolean map) { + return new ModelIdentifier(VisibleEntities.id(id), "map=%s".formatted(map)); + } + @Unique private ModelIdentifier getTransparentModelId(T entity, ItemStack stack) { boolean bl = entity.getType() == EntityType.GLOW_ITEM_FRAME; diff --git a/src/main/java/tobinio/visibleentities/settings/ModMenuIntegration.java b/src/main/java/tobinio/visibleentities/settings/ModMenuIntegration.java index be36103..f599f8c 100644 --- a/src/main/java/tobinio/visibleentities/settings/ModMenuIntegration.java +++ b/src/main/java/tobinio/visibleentities/settings/ModMenuIntegration.java @@ -4,12 +4,9 @@ import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; import dev.isxander.yacl3.api.ConfigCategory; import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.api.OptionDescription; import dev.isxander.yacl3.api.YetAnotherConfigLib; import dev.isxander.yacl3.api.controller.BooleanControllerBuilder; import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder; -import dev.isxander.yacl3.gui.controllers.slider.IntegerSliderController; -import dev.isxander.yacl3.gui.controllers.string.number.IntegerFieldController; import net.minecraft.text.Text; /**