From 018903ff3d872a0a1a39d99cb4259fe3dc98bce3 Mon Sep 17 00:00:00 2001 From: Technus Date: Mon, 6 Apr 2020 22:31:28 +0200 Subject: Move to proper id's out of GT++ space... but they are still unused on hatches... so does not really matter... (cherry picked from commit 880f24355b6afbc860dc28a66c9f660f2b5610d8) --- src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java | 2 +- .../tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java index 8e80ad7e7c..32ce6e78f9 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java @@ -39,7 +39,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { public GT_Block_Reinforced(String aName) { super(GT_Item_Storage.class, aName, new GT_Material_Reinforced()); for (byte i = 0; i < 16; i = (byte) (i + 1)) { - Textures.BlockIcons.casingTexturePages[0][(i + 80)] = new GT_CopiedBlockTexture(this, 6, i); + Textures.BlockIcons.casingTexturePages[1][i + 80] = new GT_CopiedBlockTexture(this, 6, i); } setStepSound(soundTypeStone); setCreativeTab(GregTech_API.TAB_GREGTECH); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index 30fb9da414..67ce33f104 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -27,7 +27,7 @@ import static gregtech.GT_Mod.GT_FML_LOGGER; public class GT_MetaTileEntity_AssemblyLine extends GT_MetaTileEntity_MultiBlockBase { - public ArrayList mDataAccessHatches = new ArrayList(); + public ArrayList mDataAccessHatches = new ArrayList<>(); public GT_MetaTileEntity_AssemblyLine(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); -- cgit