diff options
author | Technus <daniel112092@gmail.com> | 2017-03-25 14:11:06 +0100 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2017-03-25 14:11:06 +0100 |
commit | 8b7a9f6ecfc106741dcf8fd999fc364ac948beed (patch) | |
tree | ab4e855cc6c8e5b0ff78ee0183249e2cd354998c | |
parent | 5b5ed5f14d8902fbef72e383bdc3c8f8eb812d8f (diff) | |
download | GT5-Unofficial-8b7a9f6ecfc106741dcf8fd999fc364ac948beed.tar.gz GT5-Unofficial-8b7a9f6ecfc106741dcf8fd999fc364ac948beed.tar.bz2 GT5-Unofficial-8b7a9f6ecfc106741dcf8fd999fc364ac948beed.zip |
Removed deprecated fields, reworked Structure things
15 files changed, 153 insertions, 51 deletions
diff --git a/build.properties b/build.properties index f77bc158d5..23cc1df20d 100644 --- a/build.properties +++ b/build.properties @@ -4,8 +4,8 @@ tectech.version=3.3.3 ic2.version=2.2.790-experimental nei.version=1.0.3.74 -gregtech.jenkinsbuild=401 -gregtech.version=5.09.27.35 +gregtech.jenkinsbuild=406 +gregtech.version=5.09.27.36 cofhcore.cf=2246/920 cofhcore.version=[1.7.10]3.0.3-303-dev cofhlib.cf=2246/918 diff --git a/src/main/java/com/github/technus/tectech/Util.java b/src/main/java/com/github/technus/tectech/Util.java index c7d8641ae1..ca8f813959 100644 --- a/src/main/java/com/github/technus/tectech/Util.java +++ b/src/main/java/com/github/technus/tectech/Util.java @@ -35,12 +35,12 @@ public class Util { //Check Machine Structure based on string[][] (effectively char[][][]), ond offset of the controller //This only checks for REGULAR BLOCKS! - public static boolean StuctureChecker(String[][] structure,//0-9 casing, +- air no air, A... ignore 'A'-CHAR-1 blocks - Block[] blockType,//use numbers 0-9 for casing types - byte[] blockMeta,//use numbers 0-9 for casing types - int horizontalOffset, int verticalOffset, int depthOffset, - IGregTechTileEntity aBaseMetaTileEntity, - boolean forceCheck) { + public static boolean StructureChecker(String[][] structure,//0-9 casing, +- air no air, A... ignore 'A'-CHAR-1 blocks + Block[] blockType,//use numbers 0-9 for casing types + byte[] blockMeta,//use numbers 0-9 for casing types + int horizontalOffset, int verticalOffset, int depthOffset, + IGregTechTileEntity aBaseMetaTileEntity, + boolean forceCheck) { //TE Rotation byte facing = aBaseMetaTileEntity.getFrontFacing(); World world=aBaseMetaTileEntity.getWorld(); @@ -60,6 +60,8 @@ public class Util { for (char block : __structure.toCharArray()) {//left to right if (block > '@') {//characters allow to skip check a-1 skip, b-2 skips etc. a += block - '@'; + } else if (block < '+') {//used to mark THINGS + a++; } else { //get x y z from rotation switch (facing) {//translation @@ -87,20 +89,19 @@ public class Util { if (world.getBlock(x, y, z).getMaterial() == Material.air) return false; break; - default: {//check for block (countable) + default: //check for block (countable) int pointer = block - '0'; //countable air -> net.minecraft.block.BlockAir if (world.getBlock(x, y, z) != blockType[pointer]) { if (TecTech.ModConfig.DEBUG_MODE) - TecTech.Logger.info("Struct-block-error " + x + " " + y + " " + z + "/" + a + " " + c + "/" + world.getBlock(x, y, z) + " " + blockType[pointer]); + TecTech.Logger.info("Struct-block-error " + x + " " + y + " " + z + " / " + a + " " + b + " " + c + " / " + world.getBlock(x, y, z).getUnlocalizedName() + " " + blockType[pointer].getUnlocalizedName()); return false; } if (world.getBlockMetadata(x, y, z) != blockMeta[pointer]) { if (TecTech.ModConfig.DEBUG_MODE) - TecTech.Logger.info("Struct-meta-id-error " + x + " " + y + " " + z + "/" + a + " " + c + "/" + world.getBlockMetadata(x, y, z) + " " + blockMeta[pointer]); + TecTech.Logger.info("Struct-meta-id-error " + x + " " + y + " " + z + " / " + a + " " + b + " " + c + " / " + world.getBlockMetadata(x, y, z) + " " + blockMeta[pointer]); return false; } - } } }else if (forceCheck) return false; a++;//block in horizontal layer @@ -113,11 +114,11 @@ public class Util { return true; } - public static boolean StuctureBuilder(String[][] structure,//0-9 casing, +- air no air, A... ignore 'A'-CHAR+1 blocks - Block[] blockType,//use numbers 0-9 for casing types - byte[] blockMeta,//use numbers 0-9 for casing types - int horizontalOffset, int verticalOffset, int depthOffset, - IGregTechTileEntity aBaseMetaTileEntity) { + public static boolean StructureBuilder(String[][] structure,//0-9 casing, +- air no air, A... ignore 'A'-CHAR+1 blocks + Block[] blockType,//use numbers 0-9 for casing types + byte[] blockMeta,//use numbers 0-9 for casing types + int horizontalOffset, int verticalOffset, int depthOffset, + IGregTechTileEntity aBaseMetaTileEntity) { //TE Rotation byte facing = aBaseMetaTileEntity.getFrontFacing(); World world=aBaseMetaTileEntity.getWorld(); @@ -136,6 +137,8 @@ public class Util { for (char block : __structure.toCharArray()) {//left to right if (block > '@') {//characters allow to skip check a-1 skip, b-2 skips etc. a += block - '@'; + } else if (block < '+') {//used to mark THINGS + a++; } else { //get x y z from rotation switch (facing) {//translation @@ -156,14 +159,15 @@ public class Util { if (world.blockExists(x,y,z)) {//this actually checks if the chunk is loaded switch (block) { case '-'://must be air - world.setBlock(x,y,z,Blocks.air,0,3); + world.setBlock(x,y,z,Blocks.air,0,2); break; case '+'://must not be air - world.setBlock(x,y,z,Blocks.glass,0,3); + world.setBlock(x,y,z,Blocks.wool,15,2); + break; default: {//check for block (countable) int pointer = block - '0'; //countable air -> net.minecraft.block.BlockAir - world.setBlock(x,y,z,blockType[pointer],blockMeta[pointer],3); + world.setBlock(x,y,z,blockType[pointer],blockMeta[pointer],2); } } } @@ -265,10 +269,11 @@ public class Util { output.add(""); output.add("String[][]"); //perform your duties - #2 - write strings + output.add("{"); c = -depthOffset; for (int cz=0;cz<depthSize;cz++) {//front to back b = verticalOffset; - output.add(""); + String addMe="{"; for (int by=0;by<verticalSize;by++) {//top to bottom a = -horizontalOffset; String line=""; @@ -290,14 +295,14 @@ public class Util { int meta=world.getBlockMetadata(x,y,z); if(a==0 && b==0 && c==0){ - line+='X'; + line+='#'; }else if(block.getMaterial()==Material.air){ line+='-'; }else if(block.hasTileEntity(meta)){ line+='+'; }else{ ItemStack stack=new ItemStack(block,1,meta); - String str="?"; + String str="?";//OH YEAH NPEs for(int i=0;i<array.length;i++){ if(array[i]!=null && stack.getItem()==array[i].getItem() && stack.getItemDamage()==array[i].getItemDamage()) { str = Integer.toString(i); @@ -329,13 +334,25 @@ public class Util { while(l.length()>0 && l.toCharArray()[l.length()-1]=='~') l=l.substring(0,l.length()-1); if(l.length()==0) - l="#"; - output.add(l); - }else output.add(line); + l="E,"; + else{ + l="\""+l+"\","; + } + addMe+=l; + }else { + if(line.length()==0) + line="E,"; + else{ + line="\""+line+"\","; + } + addMe+=line; + } b--;//horizontal layer } + output.add(addMe+"},"); c++;//depth } + output.add("}"); return output.toArray(new String[0]); } diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java index cf0a152ab4..6169f142b3 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java +++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java @@ -24,7 +24,6 @@ public final class QuantumGlassRender implements ISimpleBlockRenderingHandler { //Get icons from custom register (useful for renderers and fluids) IIcon side = QuantumGlass.stuff; - GL11.glDisable(GL11.GL_CULL_FACE); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1.0F, 0.0F); renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, side); @@ -50,7 +49,6 @@ public final class QuantumGlassRender implements ISimpleBlockRenderingHandler { renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, side); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); - GL11.glEnable(GL11.GL_CULL_FACE); } @Override @@ -64,6 +62,7 @@ public final class QuantumGlassRender implements ISimpleBlockRenderingHandler { tes.setBrightness(15728880); tes.setColorOpaque_F(0F, 1F, 1F); IIcon side = QuantumGlass.stuff; + GL11.glDisable(GL11.GL_CULL_FACE); //South if (world.getBlock(x, y, z + 1).getClass() != QuantumGlass.class) { @@ -107,6 +106,7 @@ public final class QuantumGlassRender implements ISimpleBlockRenderingHandler { tes.addVertexWithUV(x + 1, y + 0.001, z + 1, side.getMaxU(), side.getMinV()); tes.addVertexWithUV(x + 1, y + 0.001, z, side.getMaxU(), side.getMaxV()); } + GL11.glEnable(GL11.GL_CULL_FACE); return true; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java index 6ec33ce966..70d1f087e1 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java @@ -14,7 +14,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import static com.github.technus.tectech.Util.StuctureBuilder; +import static com.github.technus.tectech.Util.StructureBuilder; import static gregtech.api.enums.GT_Values.E; /** @@ -67,7 +67,7 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E @Override public void construct() { - StuctureBuilder(shape,blockType,blockMeta,7,7,0,this.getBaseMetaTileEntity()); + StructureBuilder(shape,blockType,blockMeta,7,7,0,this.getBaseMetaTileEntity()); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java index a539be1824..abd3e53024 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java @@ -1,34 +1,118 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; +import com.github.technus.tectech.TecTech; import com.github.technus.tectech.elementalMatter.CommonValues; +import com.github.technus.tectech.thing.block.QuantumGlass; +import com.github.technus.tectech.thing.casing.GT_Block_CasingsTT; +import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT; +import com.github.technus.tectech.thing.metaTileEntity.constructableTT; +import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; +import gregtech.common.blocks.GT_Block_Casings2; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import static com.github.technus.tectech.Util.StructureBuilder; +import static gregtech.api.enums.GT_Values.E; + /** * Created by danie_000 on 17.12.2016. */ -public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockBase_EM { +public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockBase_EM implements constructableTT { private static Textures.BlockIcons.CustomIcon ScreenOFF; private static Textures.BlockIcons.CustomIcon ScreenON; //use multi A energy inputs, use less power the longer it runs private static final String[][] shape = new String[][]{ - {"",//left to right top - "", - ""},//front - {},//behind front - {} //behind + {E, "Y00000000000", E,}, + {"Y00000000000", "U0000111111111110000", "Y00000000000",}, + {"U0000222222222220000", "S00111133333333333111100", "U0000222222222220000",}, + {"S00222200000000000222200", "Q001133331111111111133331100", "S00222200000000000222200",}, + {"Q00000000K00000000", "O0011331111K1111331100", "Q00000000K00000000",}, + {"O000000S000000", "M00113311S11331100", "O000000S000000",}, + {"M000000W000000", "L0113311W1133110", "M000000W000000",}, + {"L00000[00000", "K013311[113310", "L00000[00000",}, + {"K0000_0000", "J01311_11310", "K0000_0000",}, + {"J000c000", "I0131c1310", "J000c000",}, + {"I000e000", "H0131e1310", "I000e000",}, + {"H000g000", "G0131g1310", "H000g000",}, + {"G000i000", "F0131i1310", "G000i000",}, + {"F000k000", "E0131k1310", "F000k000",}, + {"E000m000", "D0131m1310", "E000m000",}, + {"E000m000", "D0131m1310", "E000m000",}, + {"D000o000", "C0131o1310", "D000o000",}, + {"D000o000", "C0131o1310", "D000o000",}, + {"C000q000", "B0131q1310", "C000q000",}, + {"C000q000", "B0131q1310", "C000q000",}, + {"B000s000", "A0131s1310", "B000s000",}, + {"B000s000", "A0131s1310", "B000s000",}, + {"A020u020", "0131u1310", "A020u020",}, + {"A020u020", "0131u1310", "A020u020",}, + {"A020u020", "0131u1310", "A020u020",}, + {"A020u020", "0131u1310", "A020u020",}, + {"00+w020", "1310v1310", "000w020",}, + {"0000v020", "1310v1310", "++00v020",}, + {"000w020", "1310v1310", "000w020",}, + {"4444v020", "5314v1310", "4444v020",}, + {"224w020", "5314v1310", "++4w020",}, + {"+244v020", "5314v1310", "++44v020",}, + {"224w020", "5314v1310", "++4w020",}, + {"4444v020", "5314v1310", "4444v020",}, + {"000w020", "1310v1310", "000w020",}, + {"0000v020", "1310v1310", "++00v020",}, + {"000w020", "1310v1310", "000w020",}, + {"A020u020", "0131u1310", "A020u020",}, + {"A020u020", "0131u1310", "A020u020",}, + {"A020u020", "0131u1310", "A020u020",}, + {"A020u020", "0131u1310", "A020u020",}, + {"B000s000", "A0131s1310", "B000s000",}, + {"B000s000", "A0131s1310", "B000s000",}, + {"C000q000", "B0131q1310", "C000q000",}, + {"C000q000", "B0131q1310", "C000q000",}, + {"D000o000", "C0131o1310", "D000o000",}, + {"D000o000", "C0131o1310", "D000o000",}, + {"E000m000", "D0131m1310", "E000m000",}, + {"E000m000", "D0131m1310", "E000m000",}, + {"F000k000", "E0131k1310", "F000k000",}, + {"G000i000", "F0131i1310", "G000i000",}, + {"H000g000", "G0131g1310", "H000g000",}, + {"I000e000", "H0131e1310", "I000e000",}, + {"J000c000", "I0131c1310", "J000c000",}, + {"K0000_0000", "J01311_11310", "K0000_0000",}, + {"L00000[00000", "K013311[113310", "L00000[00000",}, + {"M000000W000000", "L0113311W1133110", "M000000W000000",}, + {"O000000S000000", "M00113311S11331100", "O000000S000000",}, + {"Q00000000K00000000", "O0011331111K1111331100", "Q00000000K00000000",}, + {"S00222200000000000222200", "Q001133331111111111133331100", "S00222200000000000222200",}, + {"U0000222222222220000", "S00111133333333333111100", "U0000222222222220000",}, + {"Y00000000000", "U0000111111111110000", "Y00000000000",}, + {E, "Y00000000000", E,}, + }; + private static final Block[] blockType = new Block[]{ + GT_Container_CasingsTT.sBlockCasingsTT, + GregTech_API.sBlockCasings4, + QuantumGlass.INSTANCE, + GT_Container_CasingsTT.sBlockCasingsTT, + GT_Container_CasingsTT.sBlockCasingsTT, + GT_Container_CasingsTT.sBlockCasingsTT + }; + private static final byte[] blockMeta = new byte[]{3,7,0,9,3,9}; + + private static final Block[] blockType2 = new Block[]{ + GT_Container_CasingsTT.sBlockCasingsTT, + GT_Container_CasingsTT.sBlockCasingsTT, + QuantumGlass.INSTANCE, + GT_Container_CasingsTT.sBlockCasingsTT, + GT_Container_CasingsTT.sBlockCasingsTT, + GT_Container_CasingsTT.sBlockCasingsTT }; - private static final int[] casingRequirements = new int[]{}; - private static final Block[] blockType = new Block[]{}; - private static final byte[] blockMeta = new byte[]{}; + private static final byte[] blockMeta2 = new byte[]{3,6,0,8,5,9}; public GT_MetaTileEntity_EM_collider(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -59,7 +143,16 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB @Override public boolean checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - return false; + return iGregTechTileEntity.getMetaIDOffset(0,-1,0)==3? + EM_StructureCheck(shape,blockType,blockMeta,0,-2,28): + EM_StructureCheck(shape,blockType2,blockMeta2,0,-2,28); + } + + @Override + public void construct() { + if(TecTech.Rnd.nextBoolean()) + StructureBuilder(shape,blockType,blockMeta,0,-2,28,this.getBaseMetaTileEntity()); + else StructureBuilder(shape,blockType2,blockMeta2,0,-2,28,this.getBaseMetaTileEntity()); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java index 0e7ebe8bd7..897f828b34 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java @@ -23,7 +23,6 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB {},//behind front {} //behind }; - private static final int[] casingRequirements = new int[]{}; private static final Block[] blockType = new Block[]{}; private static final byte[] blockMeta = new byte[]{}; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java index e47c2aab3b..7bdb4ef75b 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java @@ -18,7 +18,6 @@ public class GT_MetaTileEntity_EM_crafter extends GT_MetaTileEntity_MultiblockBa {},//behind front {} //behind }; - private static final int[] casingRequirements = new int[]{}; private static final Block[] blockType = new Block[]{}; private static final byte[] blockMeta = new byte[]{}; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java index 6d2d0e9ab6..c7e77b4e4d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java @@ -28,7 +28,6 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa {},//behind front {} //behind }; - private static final int[] casingRequirements = new int[]{}; private static final Block[] blockType = new Block[]{}; private static final byte[] blockMeta = new byte[]{}; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java index 55bc1f5953..8f8462fdea 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java @@ -18,7 +18,6 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa {},//behind front {} //behind }; - private static final int[] casingRequirements = new int[]{}; private static final Block[] blockType = new Block[]{}; private static final byte[] blockMeta = new byte[]{}; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java index 8d79a0bf8a..fe5a1ea6ed 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java @@ -18,7 +18,6 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa {},//behind front {} //behind }; - private static final int[] casingRequirements = new int[]{}; private static final Block[] blockType = new Block[]{}; private static final byte[] blockMeta = new byte[]{}; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java index 8cf9473ce1..03224f41ee 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java @@ -18,7 +18,6 @@ public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_Multibloc {},//behind front {} //behind }; - private static final int[] casingRequirements = new int[]{}; private static final Block[] blockType = new Block[]{}; private static final byte[] blockMeta = new byte[]{}; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java index b23a427e3f..ead78ef590 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java @@ -21,7 +21,6 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas {},//behind front {} //behind }; - private static final int[] casingRequirements = new int[]{}; private static final Block[] blockType = new Block[]{}; private static final byte[] blockMeta = new byte[]{}; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java index 165e128c3c..ed830449c2 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java @@ -26,7 +26,6 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB {},//behind front {} //behind }; - private static final int[] casingRequirements = new int[]{}; private static final Block[] blockType = new Block[]{}; private static final byte[] blockMeta = new byte[]{}; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java index a16425cb93..cd6f8b5af9 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java @@ -31,7 +31,7 @@ import net.minecraftforge.fluids.FluidStack; import java.util.ArrayList; -import static com.github.technus.tectech.Util.StuctureChecker; +import static com.github.technus.tectech.Util.StructureChecker; import static com.github.technus.tectech.elementalMatter.CommonValues.*; import static gregtech.api.enums.GT_Values.V; import static gregtech.api.enums.GT_Values.VN; @@ -1212,7 +1212,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt Block[] blockType,//use numbers 0-9 for casing types byte[] blockMeta,//use numbers 0-9 for casing types int horizontalOffset, int verticalOffset, int depthOffset){ - return StuctureChecker(structure,blockType,blockMeta,horizontalOffset,verticalOffset,depthOffset,getBaseMetaTileEntity(),!mMachine); + return StructureChecker(structure,blockType,blockMeta,horizontalOffset,verticalOffset,depthOffset,getBaseMetaTileEntity(),!mMachine); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java index ef9d7b6c63..b970e02237 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java @@ -95,7 +95,7 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements iConn "Advanced data transmission", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Don't stare at the beam!", EnumChatFormatting.AQUA + "Must be painted to work", - EnumChatFormatting.AQUA + "Do not cross,split or turn" + EnumChatFormatting.AQUA + "Do not cross or split" }; } |