diff options
author | Technus <daniel112092@gmail.com> | 2017-08-10 11:35:20 +0200 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2017-08-10 11:35:20 +0200 |
commit | d552232aa0383f930cefc776ca3e02d1b9db47dd (patch) | |
tree | 83cd28874058d9ce1568da99be5b2c2ad6844b69 /src | |
parent | 77d73ac431886f134fc1d698aaa4e7c7ee0e761e (diff) | |
download | GT5-Unofficial-d552232aa0383f930cefc776ca3e02d1b9db47dd.tar.gz GT5-Unofficial-d552232aa0383f930cefc776ca3e02d1b9db47dd.tar.bz2 GT5-Unofficial-d552232aa0383f930cefc776ca3e02d1b9db47dd.zip |
Multiblock iConstructible expainsion to allow hinting of the structure
Diffstat (limited to 'src')
55 files changed, 466 insertions, 146 deletions
diff --git a/src/main/java/com/github/technus/tectech/Util.java b/src/main/java/com/github/technus/tectech/Util.java index d83df4d61f..cf039bcb8d 100644 --- a/src/main/java/com/github/technus/tectech/Util.java +++ b/src/main/java/com/github/technus/tectech/Util.java @@ -1,6 +1,7 @@ package com.github.technus.tectech; import com.github.technus.tectech.auxiliary.TecTechConfig; +import com.github.technus.tectech.thing.casing.TT_Container_Casings; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -305,11 +306,12 @@ public class Util { 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) { + IGregTechTileEntity aBaseMetaTileEntity, boolean hintsOnly) { + World world = aBaseMetaTileEntity.getWorld(); + if ((world.isRemote && !hintsOnly)||(!world.isRemote && hintsOnly)) return false; + //TE Rotation byte facing = aBaseMetaTileEntity.getFrontFacing(); - World world = aBaseMetaTileEntity.getWorld(); - if (world.isRemote) return false; int x, y, z, a, b, c, pointer; final int @@ -378,34 +380,64 @@ public class Util { //Check block if (world.blockExists(x, y, z)) {//this actually checks if the chunk is loaded - switch (block) { + if(hintsOnly){ + switch (block) { + case '-'://must be air + TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 13); + break; + case '+'://must not be air + TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 14); + break; + default: //check for block + if ((pointer = block - '0') >= 0) { + TecTech.proxy.hint_particle(world,x, y, z, blockType[pointer], blockMeta[pointer]); + } else if ((pointer = block - ' ') >= 0) { + switch(pointer){ + case 0: TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 0); break; + case 1: TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 1); break; + case 2: TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 2); break; + case 3: TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 3); break; + case 4: TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 4); break; + case 5: TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 5); break; + case 6: TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 6); break; + case 7: TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 7); break; + case 8: TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 8); break; + case 9: TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 9); break; + case 10:TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 10); break; + case 11:TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 11); break; + default:TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 12); + } + } else TecTech.proxy.hint_particle(world,x, y, z, TT_Container_Casings.sHintCasingsTT, 15); + } + }else{ + switch (block) { case '-'://must be air world.setBlock(x, y, z, Blocks.air, 0, 2); break; case '+'://must not be air - world.setBlock(x, y, z, Blocks.stone, 15, 2); + world.setBlock(x, y, z, TT_Container_Casings.sBlockCasingsTT, 14, 2); break; default: //check for block if ((pointer = block - '0') >= 0) { world.setBlock(x, y, z, blockType[pointer], blockMeta[pointer], 2); } else if ((pointer = block - ' ') >= 0) { switch(pointer){ - case 0: world.setBlock(x, y, z, Blocks.wool, 11, 2); break; - case 1: world.setBlock(x, y, z, Blocks.wool, 3, 2); break; - case 2: world.setBlock(x, y, z, Blocks.wool, 0, 2); break; - case 3: world.setBlock(x, y, z, Blocks.wool, 8, 2); break; - case 4: world.setBlock(x, y, z, Blocks.wool, 7, 2); break; - case 5: world.setBlock(x, y, z, Blocks.wool, 15, 2); break; - case 6: world.setBlock(x, y, z, Blocks.stained_hardened_clay, 11, 2); break; - case 7: world.setBlock(x, y, z, Blocks.stained_hardened_clay, 3, 2); break; - case 8: world.setBlock(x, y, z, Blocks.stained_hardened_clay, 0, 2); break; - case 9: world.setBlock(x, y, z, Blocks.stained_hardened_clay, 8, 2); break; - case 10:world.setBlock(x, y, z, Blocks.stained_hardened_clay, 7, 2); break; - case 11:world.setBlock(x, y, z, Blocks.stained_hardened_clay, 15, 2); break; - default:world.setBlock(x, y, z, Blocks.lapis_block, 0, 2); + case 0: world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 0, 2); break; + case 1: world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 1,2); break; + case 2: world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 2,2); break; + case 3: world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 3,2); break; + case 4: world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 4,2); break; + case 5: world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 5, 2); break; + case 6: world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 6, 2); break; + case 7: world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 7,2); break; + case 8: world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 8,2); break; + case 9: world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 9,2); break; + case 10:world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 10,2); break; + case 11:world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 11, 2); break; + default:world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 12, 2); } - - } + } else world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 15,2); + } } } a++;//block in horizontal layer diff --git a/src/main/java/com/github/technus/tectech/vec3pos.java b/src/main/java/com/github/technus/tectech/Vec3pos.java index 1a4a38f142..b38a76ded5 100644 --- a/src/main/java/com/github/technus/tectech/vec3pos.java +++ b/src/main/java/com/github/technus/tectech/Vec3pos.java @@ -5,24 +5,24 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; /** * Created by Tec on 05.04.2017. */ -public class vec3pos implements Comparable<vec3pos> { +public class Vec3pos implements Comparable<Vec3pos> { public final int x, z; public final short y; - public vec3pos(int x, short y, int z) { + public Vec3pos(int x, short y, int z) { this.x = x; this.y = y; this.z = z; } - public vec3pos(IGregTechTileEntity te) { + public Vec3pos(IGregTechTileEntity te) { this.x = te.getXCoord(); this.y = te.getYCoord(); this.z = te.getZCoord(); } @Override - public int compareTo(vec3pos o) { + public int compareTo(Vec3pos o) { int tmp=y-o.y; if (tmp!=0) return tmp; tmp=x-o.x; @@ -32,8 +32,8 @@ public class vec3pos implements Comparable<vec3pos> { @Override public boolean equals(Object obj) { - if(obj instanceof vec3pos){ - vec3pos v=(vec3pos) obj; + if(obj instanceof Vec3pos){ + Vec3pos v=(Vec3pos) obj; return x==v.x && z==v.z && y==v.y; } return false; diff --git a/src/main/java/com/github/technus/tectech/dataFramework/quantumDataPacket.java b/src/main/java/com/github/technus/tectech/dataFramework/QuantumDataPacket.java index 7e2919879f..8f40dfb09d 100644 --- a/src/main/java/com/github/technus/tectech/dataFramework/quantumDataPacket.java +++ b/src/main/java/com/github/technus/tectech/dataFramework/QuantumDataPacket.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.dataFramework; -import com.github.technus.tectech.vec3pos; +import com.github.technus.tectech.Vec3pos; import net.minecraft.nbt.NBTTagCompound; import java.util.LinkedHashSet; @@ -9,26 +9,26 @@ import java.util.Set; /** * Created by Tec on 05.04.2017. */ -public class quantumDataPacket { +public class QuantumDataPacket { public static byte maxHistory = 64; public long computation = 0; - public Set<vec3pos> trace = new LinkedHashSet<>(); + public Set<Vec3pos> trace = new LinkedHashSet<>(); - public quantumDataPacket(vec3pos pos, long computation) { + public QuantumDataPacket(Vec3pos pos, long computation) { this.computation = computation; trace.add(pos); } - public quantumDataPacket(quantumDataPacket q, long computation) { + public QuantumDataPacket(QuantumDataPacket q, long computation) { this.computation = computation; trace.addAll(q.trace); } - public quantumDataPacket(NBTTagCompound nbt) { + public QuantumDataPacket(NBTTagCompound nbt) { computation = nbt.getLong("qComputation"); for (int i = 0; i < nbt.getByte("qHistory"); i++) { - trace.add(new vec3pos( + trace.add(new Vec3pos( nbt.getInteger("qX" + i), nbt.getShort("qY" + i), nbt.getInteger("qZ" + i) @@ -41,7 +41,7 @@ public class quantumDataPacket { nbt.setLong("qComputation", computation); nbt.setByte("qHistory", (byte) trace.size()); int i = 0; - for (vec3pos v : trace) { + for (Vec3pos v : trace) { nbt.setInteger("qX" + i, v.x); nbt.setShort("qY" + i, v.y); nbt.setInteger("qZ" + i, v.z); @@ -50,7 +50,7 @@ public class quantumDataPacket { return nbt; } - public boolean contains(vec3pos v) { + public boolean contains(Vec3pos v) { return trace.contains(v); } @@ -58,18 +58,18 @@ public class quantumDataPacket { return trace.size() <= maxHistory; } - public quantumDataPacket unifyTraceWith(quantumDataPacket p) { + public QuantumDataPacket unifyTraceWith(QuantumDataPacket p) { trace.addAll(p.trace); return check() ? this : null; } - public quantumDataPacket unifyPacketWith(quantumDataPacket p) { + public QuantumDataPacket unifyPacketWith(QuantumDataPacket p) { computation += p.computation; trace.addAll(p.trace); return check() ? this : null; } - public long computationIfNotContained(vec3pos pos) { + public long computationIfNotContained(Vec3pos pos) { if (trace.contains(pos)) return 0; return computation; } diff --git a/src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java b/src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java new file mode 100644 index 0000000000..779430345b --- /dev/null +++ b/src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java @@ -0,0 +1,106 @@ +package com.github.technus.tectech.entity.fx; + +import com.github.technus.tectech.TecTech; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import org.lwjgl.opengl.GL11; + +@SideOnly(Side.CLIENT) +public class BlockHint extends EntityFX { + private IIcon[] icons = new IIcon[6]; + + public BlockHint(World world, int x, int y, int z, Block block, int meta) { + super(world, x+.25, y+.5, z+.25); + particleGravity = 0; + prevPosX = posX; + prevPosY = posY; + prevPosZ = posZ; + noClip = true; + particleMaxAge = 200 + TecTech.Rnd.nextInt(200); + for (int i = 0; i < 6; i++) icons[i] = block.getIcon(i, meta); + setParticleIcon(icons[TecTech.Rnd.nextInt(6)]); + } + + @Override + public void renderParticle(Tessellator tes, float subTickTime, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) { + + float size = .5f; + + + float X = (float) (this.prevPosX + (this.posX - this.prevPosX) * (double) subTickTime - interpPosX); + float Y = (float) (this.prevPosY + (this.posY - this.prevPosY) * (double) subTickTime - interpPosY) - size / 2; + float Z = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) subTickTime - interpPosZ); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_BLEND); + GL11.glDepthMask(false); + tes.setColorRGBA_F(.8F, .9F, 1F, .5F); + + //var8, var9 - X U + //var 10, var 11 - Y V + for(int i=0;i<6;i++){ + if(icons[i]==null) continue; + double u=icons[i].getMinU(); + double U=icons[i].getMaxU(); + double v=icons[i].getMinV(); + double V=icons[i].getMaxV(); + + switch (i){//{DOWN, UP, NORTH, SOUTH, WEST, EAST} + case 0: + tes.addVertexWithUV(X, Y, Z + size, u, V); + tes.addVertexWithUV(X, Y, Z, u, v); + tes.addVertexWithUV(X + size, Y, Z, U, v); + tes.addVertexWithUV(X + size, Y, Z + size, U, V); + break; + case 1: + tes.addVertexWithUV(X, Y + size, Z, u, v); + tes.addVertexWithUV(X, Y + size, Z + size, u, V); + tes.addVertexWithUV(X + size, Y + size, Z + size, U, V); + tes.addVertexWithUV(X + size, Y + size, Z, U, v); + break; + case 2: + tes.addVertexWithUV(X, Y, Z, U, V); + tes.addVertexWithUV(X, Y + size, Z, U, v); + tes.addVertexWithUV(X + size, Y + size, Z, u, v); + tes.addVertexWithUV(X + size, Y, Z, u, V); + break; + case 3: + tes.addVertexWithUV(X + size, Y, Z + size, U, V); + tes.addVertexWithUV(X + size, Y + size, Z + size, U, v); + tes.addVertexWithUV(X, Y + size, Z + size, u, v); + tes.addVertexWithUV(X, Y, Z + size, u, V); + break; + case 4: + tes.addVertexWithUV(X, Y, Z + size, U, V); + tes.addVertexWithUV(X, Y + size, Z + size, U, v); + tes.addVertexWithUV(X, Y + size, Z, u, v); + tes.addVertexWithUV(X, Y, Z, u, V); + break; + case 5: + tes.addVertexWithUV(X + size, Y, Z, U, V); + tes.addVertexWithUV(X + size, Y + size, Z, U, v); + tes.addVertexWithUV(X + size, Y + size, Z + size, u, v); + tes.addVertexWithUV(X + size, Y, Z + size, u, V); + break; + } + } + + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_BLEND); + GL11.glDepthMask(true); + } + + @Override + public int getFXLayer() { + return 1; + } + + @Override + public boolean shouldRenderInPass(int pass) { + return pass==2; + } +} diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index 78975b8c35..ad1517adb2 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -7,8 +7,8 @@ import com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompat; import com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompatEnabled; import com.github.technus.tectech.thing.CustomItemList; import com.github.technus.tectech.thing.block.QuantumGlassBlock; -import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT; -import com.github.technus.tectech.thing.item.DebugBuilder; +import com.github.technus.tectech.thing.casing.TT_Container_Casings; +import com.github.technus.tectech.thing.item.ConstructibleTriggerItem; import com.github.technus.tectech.thing.item.DebugContainer_EM; import com.github.technus.tectech.thing.item.ParametrizerMemoryCard; import cpw.mods.fml.common.ProgressManager; @@ -115,9 +115,10 @@ public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft private void registerThingsInTabs() { QuantumGlassBlock.INSTANCE.setCreativeTab(mainTab); - GT_Container_CasingsTT.sBlockCasingsTT.setCreativeTab(mainTab); + TT_Container_Casings.sBlockCasingsTT.setCreativeTab(mainTab); + TT_Container_Casings.sHintCasingsTT.setCreativeTab(mainTab); DebugContainer_EM.INSTANCE.setCreativeTab(mainTab); - DebugBuilder.INSTANCE.setCreativeTab(mainTab); + ConstructibleTriggerItem.INSTANCE.setCreativeTab(mainTab); ParametrizerMemoryCard.INSTANCE.setCreativeTab(mainTab); } diff --git a/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java index e66aa158cc..344fa44ff9 100644 --- a/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java @@ -3,8 +3,9 @@ package com.github.technus.tectech.loader; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.block.QuantumGlassBlock; 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.item.DebugBuilder; +import com.github.technus.tectech.thing.casing.GT_Block_HintTT; +import com.github.technus.tectech.thing.casing.TT_Container_Casings; +import com.github.technus.tectech.thing.item.ConstructibleTriggerItem; import com.github.technus.tectech.thing.item.DebugContainer_EM; import com.github.technus.tectech.thing.item.ParametrizerMemoryCard; import cpw.mods.fml.common.Loader; @@ -16,8 +17,10 @@ import openmodularturrets.blocks.turretheads.TurretHeadEM; */ public class ThingsLoader implements Runnable { public void run() { - GT_Container_CasingsTT.sBlockCasingsTT = new GT_Block_CasingsTT(); + TT_Container_Casings.sBlockCasingsTT = new GT_Block_CasingsTT(); TecTech.Logger.info("Elemental Casing registered"); + TT_Container_Casings.sHintCasingsTT = new GT_Block_HintTT(); + TecTech.Logger.info("Hint Blocks registered"); QuantumGlassBlock.run(); TecTech.Logger.info("Quantum Glass registered"); @@ -30,7 +33,7 @@ public class ThingsLoader implements Runnable { } DebugContainer_EM.run(); - DebugBuilder.run(); + ConstructibleTriggerItem.run(); ParametrizerMemoryCard.run(); TecTech.Logger.info("Debug Items registered"); } diff --git a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java index 4908cfdfba..f33d486662 100644 --- a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java +++ b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java @@ -17,7 +17,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.magicAddon.EssentiaCompat.essentiaContainerCompat; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.E; import static gregtech.api.enums.GT_Values.V; @@ -62,8 +62,8 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_ } @Override - public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta,1, 1, 0, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + StructureBuilder(shape, blockType, blockMeta,1, 1, 0, getBaseMetaTileEntity(),hintsOnly); } @Override diff --git a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java index cbcca01e9c..85da98508d 100644 --- a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java +++ b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java @@ -17,7 +17,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.magicAddon.EssentiaCompat.essentiaContainerCompat; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.E; import static gregtech.api.enums.GT_Values.V; @@ -62,8 +62,8 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu } @Override - public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta,1, 1, 0, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + StructureBuilder(shape, blockType, blockMeta,1, 1, 0, getBaseMetaTileEntity(),hintsOnly); } @Override diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java index 62e4373c61..3fc49def16 100644 --- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java +++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java @@ -1,6 +1,7 @@ package com.github.technus.tectech.proxy; import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.entity.fx.BlockHint; import com.github.technus.tectech.thing.block.QuantumGlassRender; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; @@ -9,6 +10,7 @@ import cpw.mods.fml.common.Loader; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.particle.EntityExplodeFX; @@ -48,7 +50,16 @@ public class ClientProxy extends CommonProxy { } @Override - public void particles(IGregTechTileEntity aMuffler, byte facing) {//CUTE! + public void hint_particle(World world, int x, int y, int z, Block block, int meta) { + Minecraft.getMinecraft().effectRenderer.addEffect(new BlockHint(world,x,y,z,block,meta)); + + EntityFX particle = new EntityExplodeFX(world, x + TecTech.Rnd.nextFloat() * 0.5F, y + TecTech.Rnd.nextFloat() * 0.5F, z + TecTech.Rnd.nextFloat() * 0.5F, 0, 0, 0); + particle.setRBGColorF(0, 0.6F * TecTech.Rnd.nextFloat(), 0.8f); + Minecraft.getMinecraft().effectRenderer.addEffect(particle); + } + + @Override + public void em_particle(IGregTechTileEntity aMuffler, byte facing) {//CUTE! ForgeDirection aDir = ForgeDirection.getOrientation(facing); float xPos = aDir.offsetX * 0.76F + aMuffler.getXCoord() + 0.25F; float yPos = aDir.offsetY * 0.76F + aMuffler.getYCoord() + 0.25F; diff --git a/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java b/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java index af265e9118..efba0f1fda 100644 --- a/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java +++ b/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java @@ -2,6 +2,7 @@ package com.github.technus.tectech.proxy; import cpw.mods.fml.common.network.IGuiHandler; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; @@ -12,7 +13,8 @@ public class CommonProxy implements IGuiHandler { public void registerRenderInfo() {} - public void particles(IGregTechTileEntity aMuffler, byte facing) {}//CUTE! + public void hint_particle(World world, int x, int y, int z, Block block, int meta){} + public void em_particle(IGregTechTileEntity aMuffler, byte facing) {}//CUTE! @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java index d3269609ff..9bd92d53e3 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -35,7 +35,8 @@ public enum CustomItemList implements IItemContainer { Machine_Multi_MatterToEM, Machine_Multi_EMToMatter, Machine_Multi_EMjunction, Machine_Multi_Transformer, Machine_Multi_Computer, Machine_Multi_Microwave, Machine_Multi_Infuser, Machine_Multi_Switch, Machine_Multi_BHG, Machine_Multi_Annihilation, Machine_Multi_Decay, - Machine_Multi_EMmachine, Machine_Multi_Stabilizer, Machine_Multi_Collider, Machine_Multi_Wormhole, Machine_Multi_EMCrafter, Machine_Multi_Scanner, Machine_Multi_Research; + Machine_Multi_EMmachine, Machine_Multi_Stabilizer, Machine_Multi_Collider, Machine_Multi_Wormhole, Machine_Multi_EMCrafter, Machine_Multi_Scanner, Machine_Multi_Research, + hint_0,hint_1,hint_2,hint_3,hint_4,hint_5,hint_6,hint_7,hint_8,hint_9,hint_10,hint_11,hint_default,hint_air,hint_noAir,hint_error; private ItemStack mStack = null; diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java index 83c80478a4..15f9adb188 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java @@ -167,10 +167,6 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract { return getIcon(aSide, tMeta); } - public int colorMultiplier(IBlockAccess aWorld, int aX, int aY, int aZ) { - return super.colorMultiplier(aWorld, aX, aY, aZ); - } - @Override public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { for (int i = 0; i <= 15; i++) { diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java new file mode 100644 index 0000000000..796c37a0ee --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java @@ -0,0 +1,101 @@ +package com.github.technus.tectech.thing.casing; + +import com.github.technus.tectech.auxiliary.Reference; +import com.github.technus.tectech.thing.CustomItemList; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.util.GT_LanguageManager; +import gregtech.common.blocks.GT_Block_Casings_Abstract; +import gregtech.common.blocks.GT_Material_Casings; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + +import java.util.List; + +/** + * Created by danie_000 on 03.10.2016. + */ +public class GT_Block_HintTT extends GT_Block_Casings_Abstract { + private static IIcon hint[] = new IIcon[16]; + + public GT_Block_HintTT() { + super(GT_Item_CasingsTT.class, "gt.blockhintTT", GT_Material_Casings.INSTANCE); + + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Hint 1 dot");//id is -1 + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Hint 2 dots"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Hint 3 dots"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Hint 4 dots"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Hint 5 dots"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Hint 6 dots"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Hint 7 dots"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Hint 8 dots"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Hint 9 dots"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Hint 10 dots"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Hint 11 dots"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Hint 12 dots"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hint default"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Hint air"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Hint no air"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Hint error"); + + + CustomItemList.hint_0.set(new ItemStack(this, 1, 0)); + CustomItemList.hint_1.set(new ItemStack(this, 1, 1)); + CustomItemList.hint_2.set(new ItemStack(this, 1, 2)); + CustomItemList.hint_3.set(new ItemStack(this, 1, 3)); + CustomItemList.hint_4.set(new ItemStack(this, 1, 4)); + CustomItemList.hint_5.set(new ItemStack(this, 1, 5)); + CustomItemList.hint_6.set(new ItemStack(this, 1, 6)); + CustomItemList.hint_7.set(new ItemStack(this, 1, 7)); + CustomItemList.hint_8.set(new ItemStack(this, 1, 8)); + CustomItemList.hint_9.set(new ItemStack(this, 1, 9)); + CustomItemList.hint_10.set(new ItemStack(this, 1, 10)); + CustomItemList.hint_11.set(new ItemStack(this, 1, 11)); + CustomItemList.hint_default.set(new ItemStack(this, 1, 12)); + CustomItemList.hint_air.set(new ItemStack(this, 1, 13)); + CustomItemList.hint_noAir.set(new ItemStack(this, 1, 14)); + CustomItemList.hint_error.set(new ItemStack(this, 1, 15)); + } + + @Override + public void registerBlockIcons(IIconRegister aIconRegister) { + //super.registerBlockIcons(aIconRegister); + hint[0] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_0"); + hint[1] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_1"); + hint[2] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_2"); + hint[3] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_3"); + hint[4] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_4"); + hint[5] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_5"); + hint[6] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_6"); + hint[7] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_7"); + hint[8] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_8"); + hint[9] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_9"); + hint[10] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_10"); + hint[11] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_11"); + hint[12] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_DEFAULT"); + hint[13] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_AIR"); + hint[14] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_NOAIR"); + hint[15] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_ERROR"); + } + + public IIcon getIcon(int aSide, int aMeta) { + return hint[aMeta]; + } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) { + int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); + return getIcon(aSide, tMeta); + } + + @Override + public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + for (int i = 0; i <= 15; i++) { + aList.add(new ItemStack(aItem, 1, i)); + } + } +} diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_HintTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_HintTT.java new file mode 100644 index 0000000000..84f41f0ed7 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_HintTT.java @@ -0,0 +1,57 @@ +package com.github.technus.tectech.thing.casing; + +import gregtech.common.blocks.GT_Item_Casings_Abstract; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +import java.util.List; + +import static com.github.technus.tectech.CommonValues.tecMark; + +/** + * Created by danie_000 on 03.10.2016. + */ +public class GT_Item_HintTT extends GT_Item_Casings_Abstract { + public GT_Item_HintTT(Block par1) { + super(par1); + } + + @Override + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + aList.add(tecMark); + aList.add("Helps while building"); + switch (aStack.getItemDamage()) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Placeholder for a certain group."); + break; + case 12: + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Default placeholder in case of overflow."); + break; + case 13: + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Make sure it contains Air material."); + break; + case 14: + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Make sure it does not contain Air material."); + break; + case 15: + aList.add(EnumChatFormatting.BLUE.toString() + "ERROR, what did u expect?"); + break; + default://WTF? + aList.add("Damn son where did you get that!?"); + aList.add(EnumChatFormatting.BLUE.toString() + "From outer space... I guess..."); + } + } +} diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Container_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java index 7e7360de18..98f53cfe30 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Container_CasingsTT.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java @@ -5,6 +5,7 @@ import net.minecraft.block.Block; /** * Created by danie_000 on 03.10.2016. */ -public class GT_Container_CasingsTT { +public class TT_Container_Casings { public static Block sBlockCasingsTT; + public static Block sHintCasingsTT; } diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugBuilder.java b/src/main/java/com/github/technus/tectech/thing/item/ConstructibleTriggerItem.java index 36f4dee352..638a419e19 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/DebugBuilder.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ConstructibleTriggerItem.java @@ -20,10 +20,10 @@ import static com.github.technus.tectech.auxiliary.Reference.MODID; /** * Created by Tec on 15.03.2017. */ -public class DebugBuilder extends Item { - public static DebugBuilder INSTANCE; +public class ConstructibleTriggerItem extends Item { + public static ConstructibleTriggerItem INSTANCE; - private DebugBuilder() { + private ConstructibleTriggerItem() { super(); //setMaxStackSize(1); setUnlocalizedName("em.debugBuilder"); @@ -34,10 +34,19 @@ public class DebugBuilder extends Item { public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (aPlayer instanceof EntityPlayerMP) { - if (tTileEntity != null && tTileEntity instanceof IGregTechTileEntity) { + if (aPlayer.isSneaking() && aPlayer.capabilities.isCreativeMode && tTileEntity != null && tTileEntity instanceof IGregTechTileEntity) { IMetaTileEntity metaTE = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity(); if (metaTE != null && metaTE instanceof iConstructible) { - ((iConstructible) metaTE).construct(aStack.stackSize); + ((iConstructible) metaTE).construct(aStack.stackSize, false); + return true; + } + } + } + if(aWorld.isRemote){ + if ((!aPlayer.isSneaking() || !aPlayer.capabilities.isCreativeMode) && tTileEntity != null && tTileEntity instanceof IGregTechTileEntity) { + IMetaTileEntity metaTE = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity(); + if (metaTE != null && metaTE instanceof iConstructible) { + ((iConstructible) metaTE).construct(aStack.stackSize, true); return true; } } @@ -48,12 +57,12 @@ public class DebugBuilder extends Item { @Override public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { aList.add(CommonValues.tecMark); - aList.add("Constructs Multiblocks"); - aList.add(EnumChatFormatting.BLUE + "Quantity affects construction"); + aList.add("Triggers Constructible Interface"); + aList.add(EnumChatFormatting.BLUE + "Quantity affects construction details"); } public static void run() { - INSTANCE = new DebugBuilder(); + INSTANCE = new ConstructibleTriggerItem(); GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java index 1eec7d054d..aeb7abb7e6 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java @@ -1,7 +1,7 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import com.github.technus.tectech.CommonValues; -import com.github.technus.tectech.dataFramework.quantumDataPacket; +import com.github.technus.tectech.dataFramework.QuantumDataPacket; import com.github.technus.tectech.thing.metaTileEntity.pipe.iConnectsToDataPipe; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -29,7 +29,7 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector extends GT_MetaTileE private static Textures.BlockIcons.CustomIcon EM_D_ACTIVE; private static Textures.BlockIcons.CustomIcon EM_D_CONN; - public quantumDataPacket q; + public QuantumDataPacket q; public short id = -1; @@ -73,7 +73,7 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector extends GT_MetaTileE super.loadNBTData(aNBT); id = aNBT.getShort("eID"); if (aNBT.hasKey("eDATA")) - q = new quantumDataPacket(aNBT.getCompoundTag("eDATA")); + q = new QuantumDataPacket(aNBT.getCompoundTag("eDATA")); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java index 7cc512e6cc..b934ec90e3 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java @@ -153,7 +153,7 @@ public class GT_MetaTileEntity_Hatch_MufflerElemental extends GT_MetaTileEntity_ } } } else if (aBaseMetaTileEntity.isClientSide() && getBaseMetaTileEntity().isActive()) { - TecTech.proxy.particles(getBaseMetaTileEntity(), getBaseMetaTileEntity().getFrontFacing()); + TecTech.proxy.em_particle(getBaseMetaTileEntity(), getBaseMetaTileEntity().getFrontFacing()); } super.onPostTick(aBaseMetaTileEntity, aTick); //DOES NOT CHECK FOR TOO MUCH, it is done only while putting stuff in (OPTIMIZATION!!!) diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/iConstructible.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/iConstructible.java index b93575e0af..63055a83a1 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/iConstructible.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/iConstructible.java @@ -4,6 +4,6 @@ package com.github.technus.tectech.thing.metaTileEntity; * Created by Tec on 24.03.2017. */ public interface iConstructible { - void construct(int qty); + void construct(int qty, boolean hintsOnly); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java index c8823c4c5f..ef2bb0480a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java @@ -11,7 +11,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; /** * Created by danie_000 on 17.12.2016. @@ -57,8 +57,8 @@ public class GT_MetaTileEntity_EM_annihilation extends GT_MetaTileEntity_Multibl } @Override - public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta, 5, 5, 0,getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + StructureBuilder(shape, blockType, blockMeta, 5, 5, 0,getBaseMetaTileEntity(),hintsOnly); } @Override 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 c06ae38198..e0ace3f6b5 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 @@ -18,7 +18,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.E; /** @@ -145,9 +145,9 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E } @Override - public void construct(int qty) { - if((qty&1)==1) StructureBuilder(shape, blockType, blockMeta,16, 16, 0, getBaseMetaTileEntity()); - else StructureBuilder(shape2, blockType2, blockMeta2,16, 16, 0, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + if((qty&1)==1) StructureBuilder(shape, blockType, blockMeta,16, 16, 0, getBaseMetaTileEntity(),hintsOnly); + else StructureBuilder(shape2, blockType2, blockMeta2,16, 16, 0, getBaseMetaTileEntity(),hintsOnly); } @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 d3117c71ab..e2cecba047 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 @@ -2,7 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.thing.block.QuantumGlassBlock; -import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT; +import com.github.technus.tectech.thing.casing.TT_Container_Casings; import com.github.technus.tectech.thing.metaTileEntity.iConstructible; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,7 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; /** * Created by danie_000 on 17.12.2016. @@ -59,12 +59,12 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB {"F2222#\"#2222","F41155555114","F2222#\"#2222",}, }; private static final Block[] blockType = new Block[]{ - GT_Container_CasingsTT.sBlockCasingsTT, - GT_Container_CasingsTT.sBlockCasingsTT, - GT_Container_CasingsTT.sBlockCasingsTT, + TT_Container_Casings.sBlockCasingsTT, + TT_Container_Casings.sBlockCasingsTT, + TT_Container_Casings.sBlockCasingsTT, QuantumGlassBlock.INSTANCE, - GT_Container_CasingsTT.sBlockCasingsTT, - GT_Container_CasingsTT.sBlockCasingsTT + TT_Container_Casings.sBlockCasingsTT, + TT_Container_Casings.sBlockCasingsTT }; private static final byte[] blockMeta1 = new byte[]{4, 7, 4, 0, 4, 8}; private static final byte[] blockMeta2 = new byte[]{4, 7, 5, 0, 6, 9}; @@ -123,7 +123,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB public boolean EM_checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX*2; int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ*2; - if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir) != GT_Container_CasingsTT.sBlockCasingsTT) { + if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir) != TT_Container_Casings.sBlockCasingsTT) { eTier = 0; return false; } @@ -155,7 +155,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB } @Override - public void construct(int qty) { + public void construct(int qty, boolean hintsOnly) { IGregTechTileEntity iGregTechTileEntity=getBaseMetaTileEntity(); int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX*4; int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ*4; @@ -166,9 +166,9 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB iGregTechTileEntity.getZCoord()+zDir, Blocks.lapis_block); if ((qty & 1) == 1) - StructureBuilder(shape, blockType, blockMeta1, 11, 1, 18, iGregTechTileEntity); + StructureBuilder(shape, blockType, blockMeta1, 11, 1, 18, iGregTechTileEntity,hintsOnly); else - StructureBuilder(shape, blockType, blockMeta2, 11, 1, 18, iGregTechTileEntity); + StructureBuilder(shape, blockType, blockMeta2, 11, 1, 18, iGregTechTileEntity,hintsOnly); } @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 94401ffa51..df717c8b90 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 @@ -4,12 +4,12 @@ import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.Util; import com.github.technus.tectech.auxiliary.TecTechConfig; -import com.github.technus.tectech.dataFramework.quantumDataPacket; +import com.github.technus.tectech.dataFramework.QuantumDataPacket; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputData; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputData; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Rack; import com.github.technus.tectech.thing.metaTileEntity.iConstructible; -import com.github.technus.tectech.vec3pos; +import com.github.technus.tectech.Vec3pos; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -26,7 +26,7 @@ import java.util.ArrayList; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.V; /** @@ -153,8 +153,8 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB @Override public void EM_outputFunction() { if (eOutputData.size() > 0) { - final vec3pos pos = new vec3pos(getBaseMetaTileEntity()); - quantumDataPacket pack = new quantumDataPacket(pos, eAvailableData); + final Vec3pos pos = new Vec3pos(getBaseMetaTileEntity()); + QuantumDataPacket pack = new QuantumDataPacket(pos, eAvailableData); for (GT_MetaTileEntity_Hatch_InputData i : eInputData) { if (i.q == null || i.q.contains(pos)) continue; pack = pack.unifyPacketWith(i.q); @@ -211,18 +211,18 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB } @Override - public void construct(int qty) { + public void construct(int qty, boolean hintsOnly) { IGregTechTileEntity igt=getBaseMetaTileEntity(); - StructureBuilder(front, blockType, blockMeta, 1, 2, 0, igt); - StructureBuilder(cap, blockType, blockMeta, 1, 2, -1, igt); + StructureBuilder(front, blockType, blockMeta, 1, 2, 0, igt,hintsOnly); + StructureBuilder(cap, blockType, blockMeta, 1, 2, -1, igt,hintsOnly); byte offset=-2; for (int rackSlices = qty>12?12:qty; rackSlices>0 ; rackSlices--) { - StructureBuilder(slice, blockType, blockMeta, 1, 2, offset--, igt); + StructureBuilder(slice, blockType, blockMeta, 1, 2, offset--, igt,hintsOnly); } - StructureBuilder(cap, blockType, blockMeta, 1, 2, offset--, igt); - StructureBuilder(terminator, blockType, blockMeta, 1, 2, offset,igt); + StructureBuilder(cap, blockType, blockMeta, 1, 2, offset--, igt,hintsOnly); + StructureBuilder(terminator, blockType, blockMeta, 1, 2, offset,igt,hintsOnly); } @Override 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 72002df975..d4ecd5e378 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 @@ -11,7 +11,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; /** * Created by danie_000 on 17.12.2016. @@ -57,8 +57,8 @@ public class GT_MetaTileEntity_EM_crafter extends GT_MetaTileEntity_MultiblockBa } @Override - public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta,2, 2, 0, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + StructureBuilder(shape, blockType, blockMeta,2, 2, 0, getBaseMetaTileEntity(),hintsOnly); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java index 6e3b5ac449..99f48c25ff 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java @@ -15,7 +15,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition.stableRawLifeTime; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.VN; /** @@ -60,8 +60,8 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase } @Override - public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta,2, 2, 0, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + StructureBuilder(shape, blockType, blockMeta,2, 2, 0, getBaseMetaTileEntity(),hintsOnly); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java index c65b78bcd9..e7b6acc5ee 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java @@ -23,7 +23,7 @@ import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.refMass; import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.refUnstableMass; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.V; /** @@ -65,8 +65,8 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo } @Override - public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + StructureBuilder(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(),hintsOnly); } @Override 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 4858da01c5..12948f1ecb 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 @@ -16,7 +16,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.GregTech_API.mEUtoRF; /** @@ -62,8 +62,8 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa } @Override - public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta,1, 2, 0, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + StructureBuilder(shape, blockType, blockMeta,1, 2, 0, getBaseMetaTileEntity(),hintsOnly); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java index c9a0752a50..e659116a28 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java @@ -12,7 +12,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.V; /** @@ -53,8 +53,8 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB } @Override - public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta,1, 1, 0, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + StructureBuilder(shape, blockType, blockMeta,1, 1, 0, getBaseMetaTileEntity(),hintsOnly); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java index 3ca53af948..cc79a9fc12 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java @@ -21,7 +21,7 @@ import static com.github.technus.tectech.Util.isInputEqual; import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.refMass; import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.refUnstableMass; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.V; /** @@ -62,8 +62,8 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock } @Override - public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + StructureBuilder(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(),hintsOnly); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index 081eb3afd5..bca3324c89 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.E; import static gregtech.api.enums.GT_Values.V; @@ -78,8 +78,8 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB } @Override - public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta,1, 3, 4, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + StructureBuilder(shape, blockType, blockMeta,1, 3, 4, getBaseMetaTileEntity(),hintsOnly); } @Override 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 1564401a9c..c69167f5b0 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 @@ -11,7 +11,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; /** * Created by danie_000 on 17.12.2016. @@ -61,8 +61,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa } @Override - public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta,2, 2, 0, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + StructureBuilder(shape, blockType, blockMeta,2, 2, 0, getBaseMetaTileEntity(),hintsOnly); } @Override 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 0fc67fa016..2ae8da7587 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 @@ -11,7 +11,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; /** * Created by danie_000 on 17.12.2016. @@ -51,8 +51,8 @@ public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_Multibloc } @Override - public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta,2, 2, 0, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + StructureBuilder(shape, blockType, blockMeta,2, 2, 0, getBaseMetaTileEntity(),hintsOnly); } @Override 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 48be9c893c..b87cc72d26 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 @@ -1,10 +1,10 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import com.github.technus.tectech.CommonValues; -import com.github.technus.tectech.dataFramework.quantumDataPacket; +import com.github.technus.tectech.dataFramework.QuantumDataPacket; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputData; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputData; -import com.github.technus.tectech.vec3pos; +import com.github.technus.tectech.Vec3pos; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -16,7 +16,7 @@ import net.minecraftforge.common.util.ForgeDirection; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.V; /** @@ -100,8 +100,8 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas } total += total / 100F; - final vec3pos pos = new vec3pos(getBaseMetaTileEntity()); - quantumDataPacket pack = new quantumDataPacket(pos, 0); + final Vec3pos pos = new Vec3pos(getBaseMetaTileEntity()); + QuantumDataPacket pack = new QuantumDataPacket(pos, 0); for (GT_MetaTileEntity_Hatch_InputData i : eInputData) { if (i.q == null || i.q.contains(pos)) continue; pack = pack.unifyPacketWith(i.q); @@ -119,9 +119,9 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas if (part > 0) { remaining -= part; if (remaining > 0) - out.q = new quantumDataPacket(pack, part); + out.q = new QuantumDataPacket(pack, part); else if (part + remaining > 0) { - out.q = new quantumDataPacket(pack, part + remaining); + out.q = new QuantumDataPacket(pack, part + remaining); break; } else break; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java index 6d5891eeae..c08765e4fe 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java @@ -12,7 +12,7 @@ import net.minecraftforge.common.util.ForgeDirection; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.GregTech_API.sBlockCasings1; /** 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 6e8a09cd20..1a22640b19 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 @@ -18,7 +18,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; +import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.E; /** @@ -84,8 +84,8 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB } @Override - public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta,4, 4, 0, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + StructureBuilder(shape, blockType, blockMeta,4, 4, 0, getBaseMetaTileEntity(),hintsOnly); } @Override 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 d3bd5cb35f..d4cd958204 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 @@ -10,7 +10,7 @@ import com.github.technus.tectech.elementalMatter.classes.tElementalException; import com.github.technus.tectech.thing.metaTileEntity.hatch.*; import com.github.technus.tectech.thing.metaTileEntity.multi.gui.GT_Container_MultiMachineEM; import com.github.technus.tectech.thing.metaTileEntity.multi.gui.GT_GUIContainer_MultiMachineEM; -import com.github.technus.tectech.vec3pos; +import com.github.technus.tectech.Vec3pos; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -140,7 +140,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt //Get Available data, Override only on data producers should return mAvailableData that is set in check recipe protected long EM_getAvailableData() { long result = 0; - final vec3pos pos = new vec3pos(getBaseMetaTileEntity()); + final Vec3pos pos = new Vec3pos(getBaseMetaTileEntity()); for (GT_MetaTileEntity_Hatch_InputData in : eInputData) if (in.q != null) result += in.q.computationIfNotContained(pos); return result; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 463353e00f..b371cb25de 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -115,9 +115,9 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock } @Override - public void construct(int qty) { - if((qty&0x1)==1) StructureBuilder(shape, blockType, blockMeta,2, 2, 0, getBaseMetaTileEntity()); - else StructureBuilder(shapeFlipped, blockType, blockMeta,2, 1, 0, getBaseMetaTileEntity()); + public void construct(int qty, boolean hintsOnly) { + if((qty&0x1)==1) StructureBuilder(shape, blockType, blockMeta,2, 2, 0, getBaseMetaTileEntity(),hintsOnly); + else StructureBuilder(shapeFlipped, blockType, blockMeta,2, 1, 0, getBaseMetaTileEntity(),hintsOnly); } @Override diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 0bdbcfd41a..10aebd7391 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -1,7 +1,7 @@ itemGroup.TecTech=TecTech Interdimensional tile.quantumGlass.name=Quantum Glass item.em.debugContainer.name=Debug EM Container -item.em.debugBuilder.name=Debug Builder +item.em.debugBuilder.name=Multiblock Machine Blueprint item.em.parametrizerMemoryCard.name=Parametrizer Memory Card death.attack.microwaving=%1$s was dehydrated by radiation. diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_0.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_0.png Binary files differnew file mode 100644 index 0000000000..ad6cc6eaa3 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_0.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_1.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_1.png Binary files differnew file mode 100644 index 0000000000..401b8ba303 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_1.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_10.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_10.png Binary files differnew file mode 100644 index 0000000000..a6d05e419b --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_10.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_11.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_11.png Binary files differnew file mode 100644 index 0000000000..6642e5646c --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_11.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_2.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_2.png Binary files differnew file mode 100644 index 0000000000..ba328f6ed6 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_2.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_3.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_3.png Binary files differnew file mode 100644 index 0000000000..a6dc35f9a6 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_3.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_4.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_4.png Binary files differnew file mode 100644 index 0000000000..ba0d727722 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_4.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_5.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_5.png Binary files differnew file mode 100644 index 0000000000..c4f62763f7 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_5.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_6.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_6.png Binary files differnew file mode 100644 index 0000000000..cb3aa9325d --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_6.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_7.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_7.png Binary files differnew file mode 100644 index 0000000000..9a88af8a0e --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_7.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_8.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_8.png Binary files differnew file mode 100644 index 0000000000..03c11338c3 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_8.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_9.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_9.png Binary files differnew file mode 100644 index 0000000000..e9cbd7d06f --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_9.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_AIR.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_AIR.png Binary files differnew file mode 100644 index 0000000000..9d709ad4b9 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_AIR.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_DEFAULT.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_DEFAULT.png Binary files differnew file mode 100644 index 0000000000..d8f9721be0 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_DEFAULT.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_ERROR.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_ERROR.png Binary files differnew file mode 100644 index 0000000000..3313d24d7d --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_ERROR.png diff --git a/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_NOAIR.png b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_NOAIR.png Binary files differnew file mode 100644 index 0000000000..13102c6823 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/iconsets/HINT_NOAIR.png diff --git a/src/main/resources/assets/tectech/textures/items/itemDebugBuilder.png b/src/main/resources/assets/tectech/textures/items/itemDebugBuilder.png Binary files differindex ceac5d0ba5..dd2b6911c9 100644 --- a/src/main/resources/assets/tectech/textures/items/itemDebugBuilder.png +++ b/src/main/resources/assets/tectech/textures/items/itemDebugBuilder.png |