From 25f621b2064b5e3f989c85652ea6c472e86092b9 Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+techlord22@users.noreply.github.com> Date: Fri, 8 Nov 2024 19:29:39 -0500 Subject: [PATCH 1/7] TextureUtils.addIconRegister --- src/main/java/gregtech/client/ClientProxy.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/client/ClientProxy.java b/src/main/java/gregtech/client/ClientProxy.java index b0581389bcf..8285d6c5885 100644 --- a/src/main/java/gregtech/client/ClientProxy.java +++ b/src/main/java/gregtech/client/ClientProxy.java @@ -33,6 +33,7 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.SimpleReloadableResourceManager; import net.minecraft.entity.player.EntityPlayer; @@ -46,6 +47,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.Constants; import net.minecraftforge.event.entity.player.ItemTooltipEvent; @@ -91,8 +93,6 @@ public void onPreLoad() { OpticalPipeRenderer.INSTANCE.preInit(); LaserPipeRenderer.INSTANCE.preInit(); MetaEntities.initRenderers(); - TextureUtils.addIconRegister(GTFluidRegistration.INSTANCE::registerSprites); - TextureUtils.addIconRegister(PipeRenderer::initializeRestrictor); } @Override @@ -114,6 +114,13 @@ public static void registerColors() { ToolItems.registerColors(); } + @SubscribeEvent + public static void textureStitchPre(@NotNull TextureStitchEvent.Pre event) { + TextureMap map = event.getMap(); + GTFluidRegistration.INSTANCE.registerSprites(map); + PipeRenderer.initializeRestrictor(map); + } + @SubscribeEvent public static void registerModels(ModelRegistryEvent event) { MetaBlocks.registerStateMappers(); From 826d62462aacc03e7b315c3e46180a3b8d605e9c Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+techlord22@users.noreply.github.com> Date: Fri, 8 Nov 2024 19:35:15 -0500 Subject: [PATCH 2/7] TextureUtils.getMissingSprite --- .../gregtech/api/metatileentity/MetaTileEntity.java | 5 +++-- .../client/renderer/handler/CCLBlockRenderer.java | 5 ----- .../renderer/handler/MetaTileEntityRenderer.java | 9 +++------ .../gregtech/client/renderer/pipe/CableRenderer.java | 6 +++--- .../gregtech/client/renderer/pipe/PipeRenderer.java | 11 ++++------- src/main/java/gregtech/client/utils/RenderUtil.java | 7 +++++++ 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java index 24649f1d1f5..0d1cffeb555 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java @@ -35,6 +35,7 @@ import gregtech.api.util.Mods; import gregtech.client.renderer.texture.Textures; import gregtech.client.utils.BloomEffectUtil; +import gregtech.client.utils.RenderUtil; import gregtech.client.utils.TooltipHelper; import gregtech.common.ConfigHolder; import gregtech.common.creativetab.GTCreativeTabs; @@ -270,7 +271,7 @@ public boolean showToolUsages() { @SideOnly(Side.CLIENT) public Pair getParticleTexture() { - return Pair.of(TextureUtils.getMissingSprite(), 0xFFFFFF); + return Pair.of(RenderUtil.getMissingSprite(), 0xFFFFFF); } /** @@ -296,7 +297,7 @@ public void setRenderContextStack(ItemStack itemStack) { */ @SideOnly(Side.CLIENT) public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation, IVertexOperation[] pipeline) { - TextureAtlasSprite atlasSprite = TextureUtils.getMissingSprite(); + TextureAtlasSprite atlasSprite = RenderUtil.getMissingSprite(); IVertexOperation[] renderPipeline = ArrayUtils.add(pipeline, new ColourMultiplier(GTUtility.convertRGBtoOpaqueRGBA_CL(getPaintingColorForRendering()))); for (EnumFacing face : EnumFacing.VALUES) { diff --git a/src/main/java/gregtech/client/renderer/handler/CCLBlockRenderer.java b/src/main/java/gregtech/client/renderer/handler/CCLBlockRenderer.java index e2046685f86..3ab0177fa7b 100644 --- a/src/main/java/gregtech/client/renderer/handler/CCLBlockRenderer.java +++ b/src/main/java/gregtech/client/renderer/handler/CCLBlockRenderer.java @@ -102,11 +102,6 @@ public void handleRenderBlockDamage(IBlockAccess world, BlockPos pos, IBlockStat codechicken.lib.render.BlockRenderer.renderCuboid(renderState, Cuboid6.full, 0); } - @Override - public TextureAtlasSprite getParticleTexture() { - return TextureUtils.getMissingSprite(); - } - @Override public void registerTextures(TextureMap map) {} diff --git a/src/main/java/gregtech/client/renderer/handler/MetaTileEntityRenderer.java b/src/main/java/gregtech/client/renderer/handler/MetaTileEntityRenderer.java index 8e0fe1f6962..28e936839f8 100644 --- a/src/main/java/gregtech/client/renderer/handler/MetaTileEntityRenderer.java +++ b/src/main/java/gregtech/client/renderer/handler/MetaTileEntityRenderer.java @@ -8,6 +8,8 @@ import gregtech.client.renderer.texture.Textures; import gregtech.client.utils.ItemRenderCompat; +import gregtech.client.utils.RenderUtil; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; @@ -153,17 +155,12 @@ public void handleRenderBlockDamage(IBlockAccess world, BlockPos pos, IBlockStat public static Pair getParticleTexture(IBlockAccess world, BlockPos pos) { MetaTileEntity metaTileEntity = GTUtility.getMetaTileEntity(world, pos); if (metaTileEntity == null) { - return Pair.of(TextureUtils.getMissingSprite(), 0xFFFFFF); + return Pair.of(RenderUtil.getMissingSprite(), 0xFFFFFF); } else { return metaTileEntity.getParticleTexture(); } } - @Override - public TextureAtlasSprite getParticleTexture() { - return TextureUtils.getMissingSprite(); - } - @Override public void registerTextures(TextureMap map) {} diff --git a/src/main/java/gregtech/client/renderer/pipe/CableRenderer.java b/src/main/java/gregtech/client/renderer/pipe/CableRenderer.java index 17edbcd501d..5c91a2f44cc 100644 --- a/src/main/java/gregtech/client/renderer/pipe/CableRenderer.java +++ b/src/main/java/gregtech/client/renderer/pipe/CableRenderer.java @@ -6,6 +6,7 @@ import gregtech.api.pipenet.tile.IPipeTile; import gregtech.api.unification.material.Material; import gregtech.api.util.GTUtility; +import gregtech.client.utils.RenderUtil; import gregtech.common.pipelike.cable.Insulation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -14,7 +15,6 @@ import codechicken.lib.render.pipeline.ColourMultiplier; import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.texture.TextureUtils; import codechicken.lib.vec.uv.IconTransformation; import org.apache.commons.lang3.tuple.Pair; import org.jetbrains.annotations.Nullable; @@ -84,11 +84,11 @@ public TextureAtlasSprite getParticleTexture(IPipeType pipeType, @Nullable Ma @Override public Pair getParticleTexture(IPipeTile pipeTile) { if (pipeTile == null) { - return Pair.of(TextureUtils.getMissingSprite(), 0xFFFFFF); + return Pair.of(RenderUtil.getMissingSprite(), 0xFFFFFF); } IPipeType pipeType = pipeTile.getPipeType(); if (!(pipeType instanceof Insulation)) { - return Pair.of(TextureUtils.getMissingSprite(), 0xFFFFFF); + return Pair.of(RenderUtil.getMissingSprite(), 0xFFFFFF); } Material material = pipeTile instanceof TileEntityMaterialPipeBase ? ((TileEntityMaterialPipeBase) pipeTile).getPipeMaterial() : null; diff --git a/src/main/java/gregtech/client/renderer/pipe/PipeRenderer.java b/src/main/java/gregtech/client/renderer/pipe/PipeRenderer.java index e3195dba22c..8d4aac1ad6a 100644 --- a/src/main/java/gregtech/client/renderer/pipe/PipeRenderer.java +++ b/src/main/java/gregtech/client/renderer/pipe/PipeRenderer.java @@ -15,6 +15,8 @@ import gregtech.client.renderer.texture.Textures; import gregtech.client.utils.ItemRenderCompat; +import gregtech.client.utils.RenderUtil; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; @@ -406,11 +408,6 @@ public IModelState getTransforms() { return TransformUtils.DEFAULT_BLOCK; } - @Override - public TextureAtlasSprite getParticleTexture() { - return TextureUtils.getMissingSprite(); - } - @Override public boolean isBuiltInRenderer() { return true; @@ -428,13 +425,13 @@ public boolean isGui3d() { public Pair getParticleTexture(IPipeTile pipeTile) { if (pipeTile == null) { - return Pair.of(TextureUtils.getMissingSprite(), 0xFFFFFF); + return Pair.of(RenderUtil.getMissingSprite(), 0xFFFFFF); } IPipeType pipeType = pipeTile.getPipeType(); Material material = pipeTile instanceof TileEntityMaterialPipeBase ? ((TileEntityMaterialPipeBase) pipeTile).getPipeMaterial() : null; if (pipeType == null) { - return Pair.of(TextureUtils.getMissingSprite(), 0xFFFFFF); + return Pair.of(RenderUtil.getMissingSprite(), 0xFFFFFF); } TextureAtlasSprite atlasSprite = getParticleTexture(pipeType, material); int pipeColor = getPipeColor(material, pipeTile.getPaintingColor()); diff --git a/src/main/java/gregtech/client/utils/RenderUtil.java b/src/main/java/gregtech/client/utils/RenderUtil.java index 070ff054c10..423ad44cd71 100644 --- a/src/main/java/gregtech/client/utils/RenderUtil.java +++ b/src/main/java/gregtech/client/utils/RenderUtil.java @@ -667,4 +667,11 @@ public void put(int element, float @NotNull... data) { builder.setApplyDiffuseLighting(false); return builder.build(); } + + /** + * @return the missing texture atlas sprite + */ + public static @NotNull TextureAtlasSprite getMissingSprite() { + return Minecraft.getMinecraft().getTextureMapBlocks().getMissingSprite(); + } } From fe8ceef9d86c605a1cdd51aa888f97b51e905de4 Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+techlord22@users.noreply.github.com> Date: Fri, 8 Nov 2024 19:41:38 -0500 Subject: [PATCH 3/7] remove BakedModelHandler.addBuiltInBlock --- .../modelfactories/BakedModelHandler.java | 84 ------------------- 1 file changed, 84 deletions(-) diff --git a/src/main/java/gregtech/client/model/modelfactories/BakedModelHandler.java b/src/main/java/gregtech/client/model/modelfactories/BakedModelHandler.java index 3aa4d37f038..75786779f13 100644 --- a/src/main/java/gregtech/client/model/modelfactories/BakedModelHandler.java +++ b/src/main/java/gregtech/client/model/modelfactories/BakedModelHandler.java @@ -2,23 +2,13 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; -import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.Tuple; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.ModelFluid; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.client.model.PerspectiveMapWrapper; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; @@ -26,19 +16,11 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import codechicken.lib.render.item.CCRenderItem; import codechicken.lib.texture.TextureUtils; -import codechicken.lib.util.TransformUtils; -import org.apache.commons.lang3.tuple.Pair; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import javax.vecmath.Matrix4f; - @SideOnly(Side.CLIENT) public class BakedModelHandler { @@ -49,25 +31,13 @@ protected ModelResourceLocation getModelResourceLocation(IBlockState state) { return getSimpleModelLocation(state.getBlock()); } }; - private static final ItemMeshDefinition SIMPLE_MESH_DEFINITION = (stack) -> getSimpleModelLocation( - Block.getBlockFromItem(stack.getItem())); private static ModelResourceLocation getSimpleModelLocation(Block block) { return new ModelResourceLocation(Block.REGISTRY.getNameForObject(block), ""); } - private final List> builtInBlocks = new ArrayList<>(); private final List fluidBlocks = new ArrayList<>(); - public void addBuiltInBlock(Block block, String particleTexture) { - this.builtInBlocks.add(new Tuple<>(block, particleTexture)); - ModelLoader.setCustomStateMapper(block, SIMPLE_STATE_MAPPER); - Item itemFromBlock = Item.getItemFromBlock(block); - if (itemFromBlock != Items.AIR) { - ModelLoader.setCustomMeshDefinition(itemFromBlock, SIMPLE_MESH_DEFINITION); - } - } - public void addFluidBlock(BlockFluidBase fluidBase) { this.fluidBlocks.add(fluidBase); ModelLoader.setCustomStateMapper(fluidBase, SIMPLE_STATE_MAPPER); @@ -83,59 +53,5 @@ public void onModelsBake(ModelBakeEvent event) { ModelResourceLocation resourceLocation = getSimpleModelLocation(fluidBlock); event.getModelRegistry().putObject(resourceLocation, bakedModel); } - for (Tuple tuple : builtInBlocks) { - ModelResourceLocation resourceLocation = getSimpleModelLocation(tuple.getFirst()); - ModelBuiltInRenderer bakedModel = new ModelBuiltInRenderer(tuple.getSecond()); - event.getModelRegistry().putObject(resourceLocation, bakedModel); - } - } - - private static class ModelBuiltInRenderer implements IBakedModel { - - private final String particleTexture; - - public ModelBuiltInRenderer(String particleTexture) { - this.particleTexture = particleTexture; - } - - @NotNull - @Override - public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { - return Collections.emptyList(); - } - - @Override - public boolean isAmbientOcclusion() { - return true; - } - - @Override - public boolean isGui3d() { - return true; - } - - @Override - public boolean isBuiltInRenderer() { - return true; - } - - @NotNull - @Override - public TextureAtlasSprite getParticleTexture() { - return TextureUtils.getBlockTexture(particleTexture); - } - - @NotNull - @Override - public ItemOverrideList getOverrides() { - return ItemOverrideList.NONE; - } - - @NotNull - @Override - public Pair handlePerspective(@NotNull TransformType cameraTransformType) { - CCRenderItem.notifyTransform(cameraTransformType); - return PerspectiveMapWrapper.handlePerspective(this, TransformUtils.DEFAULT_BLOCK, cameraTransformType); - } } } From 4ad96e72158d599c926c767763481122ed860636 Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+techlord22@users.noreply.github.com> Date: Fri, 8 Nov 2024 19:54:48 -0500 Subject: [PATCH 4/7] TextureUtils.getTexture --- .../modelfactories/BakedModelHandler.java | 6 ++-- .../gregtech/client/utils/RenderUtil.java | 28 +++++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/main/java/gregtech/client/model/modelfactories/BakedModelHandler.java b/src/main/java/gregtech/client/model/modelfactories/BakedModelHandler.java index 75786779f13..7506494a04b 100644 --- a/src/main/java/gregtech/client/model/modelfactories/BakedModelHandler.java +++ b/src/main/java/gregtech/client/model/modelfactories/BakedModelHandler.java @@ -1,5 +1,7 @@ package gregtech.client.model.modelfactories; +import gregtech.client.utils.RenderUtil; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.IBakedModel; @@ -16,8 +18,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import codechicken.lib.texture.TextureUtils; - import java.util.ArrayList; import java.util.List; @@ -49,7 +49,7 @@ public void onModelsBake(ModelBakeEvent event) { Fluid fluid = ObfuscationReflectionHelper.getPrivateValue(BlockFluidBase.class, fluidBlock, "definedFluid"); ModelFluid modelFluid = new ModelFluid(fluid); IBakedModel bakedModel = modelFluid.bake(modelFluid.getDefaultState(), DefaultVertexFormats.ITEM, - TextureUtils::getTexture); + RenderUtil::getTexture); ModelResourceLocation resourceLocation = getSimpleModelLocation(fluidBlock); event.getModelRegistry().putObject(resourceLocation, bakedModel); } diff --git a/src/main/java/gregtech/client/utils/RenderUtil.java b/src/main/java/gregtech/client/utils/RenderUtil.java index 423ad44cd71..f38d5cee0d4 100644 --- a/src/main/java/gregtech/client/utils/RenderUtil.java +++ b/src/main/java/gregtech/client/utils/RenderUtil.java @@ -25,7 +25,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import codechicken.lib.texture.TextureUtils; import codechicken.lib.vec.Matrix4; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -392,7 +391,7 @@ public static void renderFluidOverLay(float x, float y, float width, float heigh float r = (color >> 16 & 255) / 255.0f; float g = (color >> 8 & 255) / 255.0f; float b = (color & 255) / 255.0f; - TextureAtlasSprite sprite = TextureUtils.getTexture(fluidStack.getFluid().getStill(fluidStack)); + TextureAtlasSprite sprite = getTexture(fluidStack.getFluid().getStill(fluidStack)); GlStateManager.enableBlend(); GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); @@ -530,8 +529,7 @@ public static void drawFluidForGui(FluidStack contents, int tankCapacity, int st heightT--; Fluid fluid = contents.getFluid(); ResourceLocation fluidStill = fluid.getStill(contents); - TextureAtlasSprite fluidStillSprite = Minecraft.getMinecraft().getTextureMapBlocks() - .getAtlasSprite(fluidStill.toString()); + TextureAtlasSprite fluidStillSprite = getTexture(fluidStill); int fluidColor = fluid.getColor(contents); int scaledAmount; if (contents.amount == tankCapacity) { @@ -668,10 +666,30 @@ public void put(int element, float @NotNull... data) { return builder.build(); } + /** + * @return the block texture map + */ + public static @NotNull TextureMap getTextureMap() { + return Minecraft.getMinecraft().getTextureMapBlocks(); + } + + /** + * @param location the location of the texture in the Block Texture Map + * @return the texture at the location + * @throws IllegalArgumentException if the texture does not exist in the atlas + */ + public static @NotNull TextureAtlasSprite getTexture(@NotNull ResourceLocation location) { + TextureAtlasSprite sprite = getTextureMap().getTextureExtry(location.toString()); + if (sprite == null) { + throw new IllegalArgumentException("Texture does not exist at " + location); + } + return sprite; + } + /** * @return the missing texture atlas sprite */ public static @NotNull TextureAtlasSprite getMissingSprite() { - return Minecraft.getMinecraft().getTextureMapBlocks().getMissingSprite(); + return getTextureMap().getMissingSprite(); } } From 7477c089196116682b4d1c1f8256896087f53704 Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+techlord22@users.noreply.github.com> Date: Fri, 8 Nov 2024 20:07:57 -0500 Subject: [PATCH 5/7] CCLBlockRenderer and ICCLBlockRenderer --- .../client/renderer/ICCLBlockRenderer.java | 19 --- .../renderer/handler/CCLBlockRenderer.java | 117 ------------------ 2 files changed, 136 deletions(-) delete mode 100644 src/main/java/gregtech/client/renderer/ICCLBlockRenderer.java delete mode 100644 src/main/java/gregtech/client/renderer/handler/CCLBlockRenderer.java diff --git a/src/main/java/gregtech/client/renderer/ICCLBlockRenderer.java b/src/main/java/gregtech/client/renderer/ICCLBlockRenderer.java deleted file mode 100644 index f1d70220390..00000000000 --- a/src/main/java/gregtech/client/renderer/ICCLBlockRenderer.java +++ /dev/null @@ -1,19 +0,0 @@ -package gregtech.client.renderer; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public interface ICCLBlockRenderer { - - @SideOnly(Side.CLIENT) - void renderItem(ItemStack rawStack, ItemCameraTransforms.TransformType transformType); - - @SideOnly(Side.CLIENT) - void renderBlock(IBlockAccess world, BlockPos pos, IBlockState state, BufferBuilder buffer); -} diff --git a/src/main/java/gregtech/client/renderer/handler/CCLBlockRenderer.java b/src/main/java/gregtech/client/renderer/handler/CCLBlockRenderer.java deleted file mode 100644 index 3ab0177fa7b..00000000000 --- a/src/main/java/gregtech/client/renderer/handler/CCLBlockRenderer.java +++ /dev/null @@ -1,117 +0,0 @@ -package gregtech.client.renderer.handler; - -import gregtech.api.util.GTLog; -import gregtech.api.util.GTUtility; -import gregtech.client.renderer.ICCLBlockRenderer; -import gregtech.client.renderer.texture.Textures; -import gregtech.client.utils.ItemRenderCompat; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.model.IModelState; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import codechicken.lib.render.CCRenderState; -import codechicken.lib.render.block.BlockRenderingRegistry; -import codechicken.lib.render.block.ICCBlockRenderer; -import codechicken.lib.render.item.IItemRenderer; -import codechicken.lib.texture.TextureUtils; -import codechicken.lib.util.TransformUtils; -import codechicken.lib.vec.Cuboid6; -import codechicken.lib.vec.Vector3; -import codechicken.lib.vec.uv.IconTransformation; - -@SideOnly(Side.CLIENT) -public class CCLBlockRenderer implements ICCBlockRenderer, IItemRenderer { - - public static final ModelResourceLocation MODEL_LOCATION = new ModelResourceLocation( - GTUtility.gregtechId("ccl_block"), "normal"); - public static final CCLBlockRenderer INSTANCE = new CCLBlockRenderer(); - public static EnumBlockRenderType BLOCK_RENDER_TYPE; - public static Minecraft mc = Minecraft.getMinecraft(); - - public static void preInit() { - BLOCK_RENDER_TYPE = BlockRenderingRegistry.createRenderType("gregtech_ccl_block"); - BlockRenderingRegistry.registerRenderer(BLOCK_RENDER_TYPE, INSTANCE); - MinecraftForge.EVENT_BUS.register(INSTANCE); - TextureUtils.addIconRegister(Textures::register); - } - - @SubscribeEvent - public void onModelsBake(ModelBakeEvent event) { - GTLog.logger.info("Injected ccl block render model"); - event.getModelRegistry().putObject(MODEL_LOCATION, this); - } - - @Override - public void renderItem(ItemStack rawStack, ItemCameraTransforms.TransformType transformType) { - ItemStack stack = ItemRenderCompat.getRepresentedStack(rawStack); - if (stack.getItem() instanceof ItemBlock itemBlock && - itemBlock.getBlock() instanceof ICCLBlockRenderer renderer) { - renderer.renderItem(stack, transformType); - } - } - - @Override - public boolean renderBlock(IBlockAccess world, BlockPos pos, IBlockState state, BufferBuilder buffer) { - if (state != null && (state.getBlock() instanceof ICCLBlockRenderer)) { - ((ICCLBlockRenderer) state.getBlock()).renderBlock(world, pos, state, buffer); - return true; - } - return false; - } - - @Override - public IModelState getTransforms() { - return TransformUtils.DEFAULT_BLOCK; - } - - @Override - public boolean isBuiltInRenderer() { - return true; - } - - @Override - public void renderBrightness(IBlockState state, float brightness) {} - - @Override - public void handleRenderBlockDamage(IBlockAccess world, BlockPos pos, IBlockState state, TextureAtlasSprite sprite, - BufferBuilder buffer) { - if (state == null || !(state.getBlock() instanceof ICCLBlockRenderer)) { - return; - } - CCRenderState renderState = CCRenderState.instance(); - renderState.reset(); - renderState.bind(buffer); - renderState.setPipeline(new Vector3(new Vec3d(pos)).translation(), new IconTransformation(sprite)); - codechicken.lib.render.BlockRenderer.renderCuboid(renderState, Cuboid6.full, 0); - } - - @Override - public void registerTextures(TextureMap map) {} - - @Override - public boolean isAmbientOcclusion() { - return true; - } - - @Override - public boolean isGui3d() { - return true; - } -} From 24ce53082c85282939516f620d0c655a29491e06 Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+techlord22@users.noreply.github.com> Date: Fri, 8 Nov 2024 20:24:51 -0500 Subject: [PATCH 6/7] TextureUtils.IIconRegister --- .../java/gregtech/client/ClientProxy.java | 7 ++++++ .../client/renderer/ICubeRenderer.java | 5 ++-- .../handler/MetaTileEntityRenderer.java | 1 - .../client/renderer/pipe/PipeRenderer.java | 1 - .../client/renderer/texture/Textures.java | 9 +++---- .../texture/custom/ClipboardRenderer.java | 7 +++--- .../texture/custom/CrateRenderer.java | 8 ++++--- .../renderer/texture/custom/DrumRenderer.java | 8 ++++--- .../texture/custom/LargeTurbineRenderer.java | 8 ++++--- .../custom/QuantumStorageRenderer.java | 6 +++-- .../client/texture/IconRegistrar.java | 24 +++++++++++++++++++ 11 files changed, 62 insertions(+), 22 deletions(-) create mode 100644 src/main/java/gregtech/client/texture/IconRegistrar.java diff --git a/src/main/java/gregtech/client/ClientProxy.java b/src/main/java/gregtech/client/ClientProxy.java index 8285d6c5885..8ee3f9925c2 100644 --- a/src/main/java/gregtech/client/ClientProxy.java +++ b/src/main/java/gregtech/client/ClientProxy.java @@ -20,6 +20,7 @@ import gregtech.client.renderer.pipe.LaserPipeRenderer; import gregtech.client.renderer.pipe.OpticalPipeRenderer; import gregtech.client.renderer.pipe.PipeRenderer; +import gregtech.client.renderer.texture.Textures; import gregtech.client.utils.ItemRenderCompat; import gregtech.client.utils.TooltipHelper; import gregtech.common.CommonProxy; @@ -119,6 +120,12 @@ public static void textureStitchPre(@NotNull TextureStitchEvent.Pre event) { TextureMap map = event.getMap(); GTFluidRegistration.INSTANCE.registerSprites(map); PipeRenderer.initializeRestrictor(map); + Textures.register(map); + CableRenderer.INSTANCE.registerIcons(map); + FluidPipeRenderer.INSTANCE.registerIcons(map); + ItemPipeRenderer.INSTANCE.registerIcons(map); + OpticalPipeRenderer.INSTANCE.registerIcons(map); + LaserPipeRenderer.INSTANCE.registerIcons(map); } @SubscribeEvent diff --git a/src/main/java/gregtech/client/renderer/ICubeRenderer.java b/src/main/java/gregtech/client/renderer/ICubeRenderer.java index 5fb0a866a42..92c880d5511 100644 --- a/src/main/java/gregtech/client/renderer/ICubeRenderer.java +++ b/src/main/java/gregtech/client/renderer/ICubeRenderer.java @@ -2,6 +2,8 @@ import gregtech.api.gui.resources.ResourceHelper; +import gregtech.client.texture.IconRegistrar; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.EnumFacing; @@ -11,13 +13,12 @@ import codechicken.lib.render.CCRenderState; import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.texture.TextureUtils.IIconRegister; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Matrix4; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public interface ICubeRenderer extends IIconRegister { +public interface ICubeRenderer extends IconRegistrar { String EMISSIVE = "_emissive"; diff --git a/src/main/java/gregtech/client/renderer/handler/MetaTileEntityRenderer.java b/src/main/java/gregtech/client/renderer/handler/MetaTileEntityRenderer.java index 28e936839f8..0645d2acbb8 100644 --- a/src/main/java/gregtech/client/renderer/handler/MetaTileEntityRenderer.java +++ b/src/main/java/gregtech/client/renderer/handler/MetaTileEntityRenderer.java @@ -63,7 +63,6 @@ public static void preInit() { BLOCK_RENDER_TYPE = BlockRenderingRegistry.createRenderType("meta_tile_entity"); BlockRenderingRegistry.registerRenderer(BLOCK_RENDER_TYPE, INSTANCE); MinecraftForge.EVENT_BUS.register(INSTANCE); - TextureUtils.addIconRegister(Textures::register); } @SubscribeEvent diff --git a/src/main/java/gregtech/client/renderer/pipe/PipeRenderer.java b/src/main/java/gregtech/client/renderer/pipe/PipeRenderer.java index 8d4aac1ad6a..02857ea7a47 100644 --- a/src/main/java/gregtech/client/renderer/pipe/PipeRenderer.java +++ b/src/main/java/gregtech/client/renderer/pipe/PipeRenderer.java @@ -128,7 +128,6 @@ public void preInit() { blockRenderType = BlockRenderingRegistry.createRenderType(name); BlockRenderingRegistry.registerRenderer(blockRenderType, this); MinecraftForge.EVENT_BUS.register(this); - TextureUtils.addIconRegister(this::registerIcons); } public ModelResourceLocation getModelLocation() { diff --git a/src/main/java/gregtech/client/renderer/texture/Textures.java b/src/main/java/gregtech/client/renderer/texture/Textures.java index 5d4664f999b..cebee67e23a 100644 --- a/src/main/java/gregtech/client/renderer/texture/Textures.java +++ b/src/main/java/gregtech/client/renderer/texture/Textures.java @@ -21,6 +21,8 @@ import gregtech.client.renderer.texture.custom.LargeTurbineRenderer; import gregtech.client.renderer.texture.custom.QuantumStorageRenderer; +import gregtech.client.texture.IconRegistrar; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.BlockRenderLayer; @@ -32,7 +34,6 @@ import codechicken.lib.render.BlockRenderer.BlockFace; import codechicken.lib.render.CCRenderState; import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.texture.TextureUtils.IIconRegister; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Matrix4; import codechicken.lib.vec.TransformationList; @@ -52,7 +53,7 @@ public class Textures { public static final Map CUBE_RENDERER_REGISTRY = new HashMap<>(); private static final ThreadLocal blockFaces = ThreadLocal.withInitial(BlockFace::new); - public static final List iconRegisters = new ArrayList<>(); + public static final List iconRegisters = new ArrayList<>(); // Custom Renderers public static final ClipboardRenderer CLIPBOARD_RENDERER = new ClipboardRenderer(); @@ -648,8 +649,8 @@ public class Textures { @SideOnly(Side.CLIENT) public static void register(TextureMap textureMap) { GTLog.logger.info("Loading meta tile entity texture sprites..."); - for (IIconRegister iconRegister : iconRegisters) { - iconRegister.registerIcons(textureMap); + for (IconRegistrar registrar : iconRegisters) { + registrar.registerIcons(textureMap); } RESTRICTIVE_OVERLAY = textureMap.registerSprite(gregtechId("blocks/pipe/pipe_restrictive")); diff --git a/src/main/java/gregtech/client/renderer/texture/custom/ClipboardRenderer.java b/src/main/java/gregtech/client/renderer/texture/custom/ClipboardRenderer.java index 107200e2989..319fe32b325 100644 --- a/src/main/java/gregtech/client/renderer/texture/custom/ClipboardRenderer.java +++ b/src/main/java/gregtech/client/renderer/texture/custom/ClipboardRenderer.java @@ -1,6 +1,7 @@ package gregtech.client.renderer.texture.custom; import gregtech.client.renderer.texture.Textures; +import gregtech.client.texture.IconRegistrar; import gregtech.common.metatileentities.MetaTileEntityClipboard; import net.minecraft.client.Minecraft; @@ -17,17 +18,17 @@ import codechicken.lib.render.CCRenderState; import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.texture.TextureUtils.IIconRegister; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Matrix4; import codechicken.lib.vec.Rotation; import org.apache.commons.lang3.tuple.Pair; +import org.jetbrains.annotations.NotNull; import java.util.Arrays; import java.util.HashMap; import java.util.List; -public class ClipboardRenderer implements IIconRegister { +public class ClipboardRenderer implements IconRegistrar { private static final Cuboid6 pageBox = new Cuboid6(3 / 16.0, 0.25 / 16.0, 0.25 / 16.0, 13 / 16.0, 14.25 / 16.0, 0.3 / 16.0); @@ -57,7 +58,7 @@ public ClipboardRenderer() { @Override @SideOnly(Side.CLIENT) - public void registerIcons(TextureMap textureMap) { + public void registerIcons(@NotNull TextureMap textureMap) { this.textures[0] = textureMap.registerSprite(new ResourceLocation("gregtech:blocks/clipboard/wood")); boxTextureMap.put(boardBox, this.textures[0]); this.textures[1] = textureMap.registerSprite(new ResourceLocation("gregtech:blocks/clipboard/clip")); diff --git a/src/main/java/gregtech/client/renderer/texture/custom/CrateRenderer.java b/src/main/java/gregtech/client/renderer/texture/custom/CrateRenderer.java index 0f999dd687d..7bba5ac6640 100644 --- a/src/main/java/gregtech/client/renderer/texture/custom/CrateRenderer.java +++ b/src/main/java/gregtech/client/renderer/texture/custom/CrateRenderer.java @@ -3,6 +3,8 @@ import gregtech.api.util.GTUtility; import gregtech.client.renderer.texture.Textures; +import gregtech.client.texture.IconRegistrar; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.BlockRenderLayer; @@ -13,12 +15,12 @@ import codechicken.lib.render.CCRenderState; import codechicken.lib.render.pipeline.ColourMultiplier; import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.texture.TextureUtils.IIconRegister; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Matrix4; import org.apache.commons.lang3.ArrayUtils; +import org.jetbrains.annotations.NotNull; -public class CrateRenderer implements IIconRegister { +public class CrateRenderer implements IconRegistrar { private final String basePath; @@ -32,7 +34,7 @@ public CrateRenderer(String basePath) { @Override @SideOnly(Side.CLIENT) - public void registerIcons(TextureMap textureMap) { + public void registerIcons(@NotNull TextureMap textureMap) { this.sideSprite = textureMap.registerSprite(GTUtility.gregtechId("blocks/" + basePath)); } diff --git a/src/main/java/gregtech/client/renderer/texture/custom/DrumRenderer.java b/src/main/java/gregtech/client/renderer/texture/custom/DrumRenderer.java index d02d824d280..67c9153fcd3 100644 --- a/src/main/java/gregtech/client/renderer/texture/custom/DrumRenderer.java +++ b/src/main/java/gregtech/client/renderer/texture/custom/DrumRenderer.java @@ -3,6 +3,8 @@ import gregtech.api.GTValues; import gregtech.client.renderer.texture.Textures; +import gregtech.client.texture.IconRegistrar; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.BlockRenderLayer; @@ -13,11 +15,11 @@ import codechicken.lib.render.CCRenderState; import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.texture.TextureUtils.IIconRegister; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Matrix4; +import org.jetbrains.annotations.NotNull; -public class DrumRenderer implements IIconRegister { +public class DrumRenderer implements IconRegistrar { private final String basePath; @@ -31,7 +33,7 @@ public DrumRenderer(String basePath) { @Override @SideOnly(Side.CLIENT) - public void registerIcons(TextureMap textureMap) { + public void registerIcons(@NotNull TextureMap textureMap) { String formattedBase = GTValues.MODID + ":blocks/" + basePath; this.textures = new TextureAtlasSprite[3]; this.textures[0] = textureMap.registerSprite(new ResourceLocation(formattedBase + "/top")); diff --git a/src/main/java/gregtech/client/renderer/texture/custom/LargeTurbineRenderer.java b/src/main/java/gregtech/client/renderer/texture/custom/LargeTurbineRenderer.java index f2f2e063d82..9a9afd2b794 100644 --- a/src/main/java/gregtech/client/renderer/texture/custom/LargeTurbineRenderer.java +++ b/src/main/java/gregtech/client/renderer/texture/custom/LargeTurbineRenderer.java @@ -5,6 +5,8 @@ import gregtech.client.renderer.cclop.LightMapOperation; import gregtech.client.renderer.texture.Textures; +import gregtech.client.texture.IconRegistrar; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.BlockRenderLayer; @@ -15,12 +17,12 @@ import codechicken.lib.render.CCRenderState; import codechicken.lib.render.pipeline.ColourMultiplier; import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.texture.TextureUtils.IIconRegister; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Matrix4; import org.apache.commons.lang3.ArrayUtils; +import org.jetbrains.annotations.NotNull; -public class LargeTurbineRenderer implements IIconRegister { +public class LargeTurbineRenderer implements IconRegistrar { @SideOnly(Side.CLIENT) private TextureAtlasSprite baseRingSprite; @@ -37,7 +39,7 @@ public LargeTurbineRenderer() { @Override @SideOnly(Side.CLIENT) - public void registerIcons(TextureMap textureMap) { + public void registerIcons(@NotNull TextureMap textureMap) { this.baseRingSprite = textureMap .registerSprite(GTUtility.gregtechId("blocks/multiblock/large_turbine/base_ring")); this.baseBackgroundSprite = textureMap diff --git a/src/main/java/gregtech/client/renderer/texture/custom/QuantumStorageRenderer.java b/src/main/java/gregtech/client/renderer/texture/custom/QuantumStorageRenderer.java index 6796e164b0b..d91778df070 100644 --- a/src/main/java/gregtech/client/renderer/texture/custom/QuantumStorageRenderer.java +++ b/src/main/java/gregtech/client/renderer/texture/custom/QuantumStorageRenderer.java @@ -5,6 +5,7 @@ import gregtech.api.util.TextFormattingUtil; import gregtech.client.renderer.texture.Textures; import gregtech.client.renderer.texture.cube.SimpleSidedCubeRenderer.RenderSide; +import gregtech.client.texture.IconRegistrar; import gregtech.client.utils.RenderUtil; import gregtech.common.ConfigHolder; import gregtech.common.metatileentities.storage.MetaTileEntityQuantumChest; @@ -36,10 +37,11 @@ import codechicken.lib.texture.TextureUtils; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Matrix4; +import org.jetbrains.annotations.NotNull; import java.util.EnumMap; -public class QuantumStorageRenderer implements TextureUtils.IIconRegister { +public class QuantumStorageRenderer implements IconRegistrar { private static final Cuboid6 glassBox = new Cuboid6(1 / 16.0, 1 / 16.0, 1 / 16.0, 15 / 16.0, 15 / 16.0, 15 / 16.0); @@ -64,7 +66,7 @@ public QuantumStorageRenderer() { } @Override - public void registerIcons(TextureMap textureMap) { + public void registerIcons(@NotNull TextureMap textureMap) { this.glassTexture = textureMap .registerSprite(new ResourceLocation("gregtech:blocks/overlay/machine/overlay_screen_glass")); } diff --git a/src/main/java/gregtech/client/texture/IconRegistrar.java b/src/main/java/gregtech/client/texture/IconRegistrar.java new file mode 100644 index 00000000000..ccd855368a8 --- /dev/null +++ b/src/main/java/gregtech/client/texture/IconRegistrar.java @@ -0,0 +1,24 @@ +package gregtech.client.texture; + +import net.minecraft.client.renderer.texture.TextureMap; + +import net.minecraftforge.fml.relauncher.Side; + +import net.minecraftforge.fml.relauncher.SideOnly; + +import org.jetbrains.annotations.NotNull; + +/** + * Functional Interface for registering ResourceLocations to a TextureMap. + *

+ * Called during {@link net.minecraftforge.client.event.TextureStitchEvent.Pre} + */ +@FunctionalInterface +public interface IconRegistrar { + + /** + * @param map the map to register textures to + */ + @SideOnly(Side.CLIENT) + void registerIcons(@NotNull TextureMap map); +} From b290fbcc8c0dcdfde571ffb8c55d7371344f0fb3 Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+techlord22@users.noreply.github.com> Date: Fri, 8 Nov 2024 20:36:32 -0500 Subject: [PATCH 7/7] spotless --- src/main/java/gregtech/api/metatileentity/MetaTileEntity.java | 1 - src/main/java/gregtech/client/ClientProxy.java | 1 - src/main/java/gregtech/client/renderer/ICubeRenderer.java | 1 - .../client/renderer/handler/MetaTileEntityRenderer.java | 2 -- src/main/java/gregtech/client/renderer/pipe/PipeRenderer.java | 2 -- src/main/java/gregtech/client/renderer/texture/Textures.java | 1 - .../gregtech/client/renderer/texture/custom/CrateRenderer.java | 1 - .../gregtech/client/renderer/texture/custom/DrumRenderer.java | 1 - .../client/renderer/texture/custom/LargeTurbineRenderer.java | 1 - .../client/renderer/texture/custom/QuantumStorageRenderer.java | 1 - src/main/java/gregtech/client/texture/IconRegistrar.java | 2 -- 11 files changed, 14 deletions(-) diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java index 0d1cffeb555..b0648610103 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java @@ -89,7 +89,6 @@ import codechicken.lib.render.CCRenderState; import codechicken.lib.render.pipeline.ColourMultiplier; import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.texture.TextureUtils; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Matrix4; import com.cleanroommc.modularui.api.IGuiHolder; diff --git a/src/main/java/gregtech/client/ClientProxy.java b/src/main/java/gregtech/client/ClientProxy.java index 8ee3f9925c2..35969198260 100644 --- a/src/main/java/gregtech/client/ClientProxy.java +++ b/src/main/java/gregtech/client/ClientProxy.java @@ -62,7 +62,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; -import codechicken.lib.texture.TextureUtils; import org.jetbrains.annotations.NotNull; import paulscode.sound.SoundSystemConfig; diff --git a/src/main/java/gregtech/client/renderer/ICubeRenderer.java b/src/main/java/gregtech/client/renderer/ICubeRenderer.java index 92c880d5511..1830ecad570 100644 --- a/src/main/java/gregtech/client/renderer/ICubeRenderer.java +++ b/src/main/java/gregtech/client/renderer/ICubeRenderer.java @@ -1,7 +1,6 @@ package gregtech.client.renderer; import gregtech.api.gui.resources.ResourceHelper; - import gregtech.client.texture.IconRegistrar; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/src/main/java/gregtech/client/renderer/handler/MetaTileEntityRenderer.java b/src/main/java/gregtech/client/renderer/handler/MetaTileEntityRenderer.java index 0645d2acbb8..80db7976e18 100644 --- a/src/main/java/gregtech/client/renderer/handler/MetaTileEntityRenderer.java +++ b/src/main/java/gregtech/client/renderer/handler/MetaTileEntityRenderer.java @@ -7,7 +7,6 @@ import gregtech.client.renderer.CubeRendererState; import gregtech.client.renderer.texture.Textures; import gregtech.client.utils.ItemRenderCompat; - import gregtech.client.utils.RenderUtil; import net.minecraft.block.state.IBlockState; @@ -40,7 +39,6 @@ import codechicken.lib.render.block.ICCBlockRenderer; import codechicken.lib.render.item.IItemRenderer; import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.texture.TextureUtils; import codechicken.lib.util.TransformUtils; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Matrix4; diff --git a/src/main/java/gregtech/client/renderer/pipe/PipeRenderer.java b/src/main/java/gregtech/client/renderer/pipe/PipeRenderer.java index 02857ea7a47..563f780c26a 100644 --- a/src/main/java/gregtech/client/renderer/pipe/PipeRenderer.java +++ b/src/main/java/gregtech/client/renderer/pipe/PipeRenderer.java @@ -14,7 +14,6 @@ import gregtech.client.renderer.CubeRendererState; import gregtech.client.renderer.texture.Textures; import gregtech.client.utils.ItemRenderCompat; - import gregtech.client.utils.RenderUtil; import net.minecraft.block.state.IBlockState; @@ -50,7 +49,6 @@ import codechicken.lib.render.item.IItemRenderer; import codechicken.lib.render.pipeline.ColourMultiplier; import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.texture.TextureUtils; import codechicken.lib.util.TransformUtils; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Matrix4; diff --git a/src/main/java/gregtech/client/renderer/texture/Textures.java b/src/main/java/gregtech/client/renderer/texture/Textures.java index cebee67e23a..76f91891093 100644 --- a/src/main/java/gregtech/client/renderer/texture/Textures.java +++ b/src/main/java/gregtech/client/renderer/texture/Textures.java @@ -20,7 +20,6 @@ import gregtech.client.renderer.texture.custom.FireboxActiveRenderer; import gregtech.client.renderer.texture.custom.LargeTurbineRenderer; import gregtech.client.renderer.texture.custom.QuantumStorageRenderer; - import gregtech.client.texture.IconRegistrar; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/src/main/java/gregtech/client/renderer/texture/custom/CrateRenderer.java b/src/main/java/gregtech/client/renderer/texture/custom/CrateRenderer.java index 7bba5ac6640..78558aaa1aa 100644 --- a/src/main/java/gregtech/client/renderer/texture/custom/CrateRenderer.java +++ b/src/main/java/gregtech/client/renderer/texture/custom/CrateRenderer.java @@ -2,7 +2,6 @@ import gregtech.api.util.GTUtility; import gregtech.client.renderer.texture.Textures; - import gregtech.client.texture.IconRegistrar; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/src/main/java/gregtech/client/renderer/texture/custom/DrumRenderer.java b/src/main/java/gregtech/client/renderer/texture/custom/DrumRenderer.java index 67c9153fcd3..f2fd93de8ba 100644 --- a/src/main/java/gregtech/client/renderer/texture/custom/DrumRenderer.java +++ b/src/main/java/gregtech/client/renderer/texture/custom/DrumRenderer.java @@ -2,7 +2,6 @@ import gregtech.api.GTValues; import gregtech.client.renderer.texture.Textures; - import gregtech.client.texture.IconRegistrar; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/src/main/java/gregtech/client/renderer/texture/custom/LargeTurbineRenderer.java b/src/main/java/gregtech/client/renderer/texture/custom/LargeTurbineRenderer.java index 9a9afd2b794..27545d1a47a 100644 --- a/src/main/java/gregtech/client/renderer/texture/custom/LargeTurbineRenderer.java +++ b/src/main/java/gregtech/client/renderer/texture/custom/LargeTurbineRenderer.java @@ -4,7 +4,6 @@ import gregtech.client.renderer.cclop.ColourOperation; import gregtech.client.renderer.cclop.LightMapOperation; import gregtech.client.renderer.texture.Textures; - import gregtech.client.texture.IconRegistrar; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/src/main/java/gregtech/client/renderer/texture/custom/QuantumStorageRenderer.java b/src/main/java/gregtech/client/renderer/texture/custom/QuantumStorageRenderer.java index d91778df070..893cfa843ee 100644 --- a/src/main/java/gregtech/client/renderer/texture/custom/QuantumStorageRenderer.java +++ b/src/main/java/gregtech/client/renderer/texture/custom/QuantumStorageRenderer.java @@ -34,7 +34,6 @@ import codechicken.lib.render.CCRenderState; import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.texture.TextureUtils; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Matrix4; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/gregtech/client/texture/IconRegistrar.java b/src/main/java/gregtech/client/texture/IconRegistrar.java index ccd855368a8..6e6ec35ea65 100644 --- a/src/main/java/gregtech/client/texture/IconRegistrar.java +++ b/src/main/java/gregtech/client/texture/IconRegistrar.java @@ -1,9 +1,7 @@ package gregtech.client.texture; import net.minecraft.client.renderer.texture.TextureMap; - import net.minecraftforge.fml.relauncher.Side; - import net.minecraftforge.fml.relauncher.SideOnly; import org.jetbrains.annotations.NotNull;