From b0d3533c5e412d54295f720ebd527e3c14248081 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Fri, 4 Feb 2022 14:51:16 -0800 Subject: Updates (#84) * Update to work w/ new GT5u rendering code * explicitly depend on tectech * Remove deprecated tectech ICustomBlockSetting interface Former-commit-id: 4aa48a3f9af82af04cb39dd1c406d5245b44fbea --- .../github/bartimaeusnek/bartworks/MainMod.java | 1 + .../client/renderer/BW_Renderer_Block_Ores.java | 27 ++++++---------------- .../material/BW_MetaGeneratedBlocks_Casing.java | 3 +-- 3 files changed, 9 insertions(+), 22 deletions(-) (limited to 'src/main') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java index 8c464f2993..94c91ccb94 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java @@ -68,6 +68,7 @@ import static gregtech.api.enums.GT_Values.VN; dependencies = "required-after:IC2; " + "required-after:gregtech; " + "after:berriespp; " + + "after:tectech; " + "after:GalacticraftMars; " + "after:GalacticraftCore; " + "after:Forestry; " diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java index 795acbec17..364529af99 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java @@ -28,11 +28,16 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import static gregtech.common.render.GT_Renderer_Block.*; +import static gregtech.common.render.GT_Renderer_Block.renderNegativeXFacing; +import static gregtech.common.render.GT_Renderer_Block.renderNegativeYFacing; +import static gregtech.common.render.GT_Renderer_Block.renderNegativeZFacing; +import static gregtech.common.render.GT_Renderer_Block.renderPositiveXFacing; +import static gregtech.common.render.GT_Renderer_Block.renderPositiveYFacing; +import static gregtech.common.render.GT_Renderer_Block.renderPositiveZFacing; +import static gregtech.common.render.GT_Renderer_Block.renderStandardBlock; public class BW_Renderer_Block_Ores implements ISimpleBlockRenderingHandler { public static BW_Renderer_Block_Ores INSTANCE = new BW_Renderer_Block_Ores(); @@ -46,30 +51,12 @@ public class BW_Renderer_Block_Ores implements ISimpleBlockRenderingHandler { aRenderer.setRenderBoundsFromBlock(aBlock); GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setNormal(0.0F, -1.0F, 0.0F); renderNegativeYFacing(null, aRenderer, aBlock, 0, 0, 0, tTileEntity.getTexture(aBlock, (byte) 0), true); - Tessellator.instance.draw(); - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setNormal(0.0F, 1.0F, 0.0F); renderPositiveYFacing(null, aRenderer, aBlock, 0, 0, 0, tTileEntity.getTexture(aBlock, (byte) 1), true); - Tessellator.instance.draw(); - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setNormal(0.0F, 0.0F, -1.0F); renderNegativeZFacing(null, aRenderer, aBlock, 0, 0, 0, tTileEntity.getTexture(aBlock, (byte) 2), true); - Tessellator.instance.draw(); - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setNormal(0.0F, 0.0F, 1.0F); renderPositiveZFacing(null, aRenderer, aBlock, 0, 0, 0, tTileEntity.getTexture(aBlock, (byte) 3), true); - Tessellator.instance.draw(); - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setNormal(-1.0F, 0.0F, 0.0F); renderNegativeXFacing(null, aRenderer, aBlock, 0, 0, 0, tTileEntity.getTexture(aBlock, (byte) 4), true); - Tessellator.instance.draw(); - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setNormal(1.0F, 0.0F, 0.0F); renderPositiveXFacing(null, aRenderer, aBlock, 0, 0, 0, tTileEntity.getTexture(aBlock, (byte) 5), true); - Tessellator.instance.draw(); aBlock.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); aRenderer.setRenderBoundsFromBlock(aBlock); GL11.glTranslatef(0.5F, 0.5F, 0.5F); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java index c892ead1d9..e13bca3bf5 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java @@ -40,8 +40,7 @@ import net.minecraft.world.World; import java.util.List; import java.util.Optional; -public class BW_MetaGeneratedBlocks_Casing extends BW_MetaGenerated_Blocks implements com.github.technus.tectech.mechanics.structure.ICustomBlockSetting, - com.gtnewhorizon.structurelib.structure.ICustomBlockSetting +public class BW_MetaGeneratedBlocks_Casing extends BW_MetaGenerated_Blocks implements com.gtnewhorizon.structurelib.structure.ICustomBlockSetting { public BW_MetaGeneratedBlocks_Casing(Material p_i45386_1_, Class tileEntity, String blockName, OrePrefixes prefixes) { -- cgit