aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2018-02-23 17:56:16 +0100
committerTechnus <daniel112092@gmail.com>2018-02-23 17:56:16 +0100
commitb82fb691d0ee54463a6a48bcd4c8bfb81eb0af8b (patch)
tree016d13029efe93767694f7c932b47e6087b3cc93
parent7d335300ea21e7e80bdae2a86ad0118066f55d71 (diff)
downloadGT5-Unofficial-b82fb691d0ee54463a6a48bcd4c8bfb81eb0af8b.tar.gz
GT5-Unofficial-b82fb691d0ee54463a6a48bcd4c8bfb81eb0af8b.tar.bz2
GT5-Unofficial-b82fb691d0ee54463a6a48bcd4c8bfb81eb0af8b.zip
Stuff and bugfixes.
-rw-r--r--src/main/java/com/github/technus/tectech/TecTech.java13
-rw-r--r--src/main/java/com/github/technus/tectech/Util.java231
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java4
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java4
-rw-r--r--src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java5
-rw-r--r--src/main/java/com/github/technus/tectech/proxy/ClientProxy.java25
-rw-r--r--src/main/java/com/github/technus/tectech/proxy/CommonProxy.java5
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java25
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java6
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java11
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java17
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java13
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java8
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java9
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java86
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java173
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DebugStructureWriter.java2
-rw-r--r--src/main/resources/assets/tectech/lang/en_US.lang1
-rw-r--r--src/main/resources/assets/tectech/textures/items/itemFrontRotate.pngbin0 -> 439 bytes
29 files changed, 422 insertions, 252 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 4616bf8671..84f2ddf58b 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -184,12 +184,15 @@ public class TecTech {
));
String modId;
for(Block block : GameData.getBlockRegistry().typeSafeIterable()) {
- modId = GameRegistry.findUniqueIdentifierFor(block).modId;
- if (modIDs.contains(modId)) {//Full Whitelisted Mods
- continue;
- } else if ("OpenBlocks".equals(modId)) {
- if ("grave".equals(GameRegistry.findUniqueIdentifierFor(block).name)) {
+ GameRegistry.UniqueIdentifier uniqueIdentifier=GameRegistry.findUniqueIdentifierFor(block);
+ if (uniqueIdentifier != null) {
+ modId = uniqueIdentifier.modId;
+ if (modIDs.contains(modId)) {//Full Whitelisted Mods
continue;
+ } else if ("OpenBlocks".equals(modId)) {
+ if ("grave".equals(GameRegistry.findUniqueIdentifierFor(block).name)) {
+ continue;
+ }
}
}
block.setResistance(6);
diff --git a/src/main/java/com/github/technus/tectech/Util.java b/src/main/java/com/github/technus/tectech/Util.java
index 87f3a2bebb..9d53689517 100644
--- a/src/main/java/com/github/technus/tectech/Util.java
+++ b/src/main/java/com/github/technus/tectech/Util.java
@@ -34,7 +34,8 @@ import static gregtech.api.enums.GT_Values.E;
* Created by Tec on 21.03.2017.
*/
public final class Util {
- private Util() {}
+ private Util() {
+ }
public static String intBitsToString(int number) {
StringBuilder result = new StringBuilder(16);
@@ -375,15 +376,15 @@ public final class Util {
return false;
}
//TE Rotation
- int facingAndRotation = aBaseMetaTileEntity.getFrontFacing() + (frontRotation==null?0:(frontRotation.getFrontRotation()<<3));
+ int facingAndRotation = aBaseMetaTileEntity.getFrontFacing() + (frontRotation == null ? 0 : (frontRotation.getFrontRotation() << 3));
IGregTechTileEntity igt;
IMetaTileEntity imt = aBaseMetaTileEntity.getMetaTileEntity();
int x, y, z, a, b, c, pointer;
- int baseX=aBaseMetaTileEntity.getXCoord(),
- baseZ=aBaseMetaTileEntity.getZCoord(),
- baseY=aBaseMetaTileEntity.getYCoord();
+ int baseX = aBaseMetaTileEntity.getXCoord(),
+ baseZ = aBaseMetaTileEntity.getZCoord(),
+ baseY = aBaseMetaTileEntity.getYCoord();
//a,b,c - relative to block face!
//x,y,z - relative to block position on map!
//yPos - absolute height of checked block
@@ -403,7 +404,7 @@ public final class Util {
a += block - '@';
}//else if (block < '+')//used to mark THINGS
// a++;
- else if (block=='.') {
+ else if (block == '.') {
a++;
} else {
//get x y z from rotation
@@ -534,7 +535,7 @@ public final class Util {
y = baseY + c;
break;
default:
- if(DEBUG_MODE) {
+ if (DEBUG_MODE) {
TecTech.Logger.info("facing = " + facingAndRotation);
}
return false;
@@ -617,38 +618,38 @@ public final class Util {
int horizontalOffset, int verticalOffset, int depthOffset,
IGregTechTileEntity aBaseMetaTileEntity, boolean hintsOnly) {
byte facing = aBaseMetaTileEntity.getFrontFacing();
- return StructureBuilderExtreme(structure,blockType,blockMeta,
- horizontalOffset,verticalOffset,depthOffset,
- aBaseMetaTileEntity.getWorld().getTileEntity(aBaseMetaTileEntity.getXCoord(),aBaseMetaTileEntity.getYCoord(),aBaseMetaTileEntity.getZCoord()),null,
- facing,hintsOnly);
+ return StructureBuilderExtreme(structure, blockType, blockMeta,
+ horizontalOffset, verticalOffset, depthOffset,
+ aBaseMetaTileEntity.getWorld().getTileEntity(aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), aBaseMetaTileEntity.getZCoord()), null,
+ facing, hintsOnly);
}
public static boolean StructureBuilderExtreme(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, IFrontRotation frontRotation, boolean hintsOnly) {
+ 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, IFrontRotation frontRotation, boolean hintsOnly) {
byte facing = aBaseMetaTileEntity.getFrontFacing();
- return StructureBuilderExtreme(structure,blockType,blockMeta,
- horizontalOffset,verticalOffset,depthOffset,
- aBaseMetaTileEntity.getWorld().getTileEntity(aBaseMetaTileEntity.getXCoord(),aBaseMetaTileEntity.getYCoord(),aBaseMetaTileEntity.getZCoord()),frontRotation,
- facing,hintsOnly);
+ return StructureBuilderExtreme(structure, blockType, blockMeta,
+ horizontalOffset, verticalOffset, depthOffset,
+ aBaseMetaTileEntity.getWorld().getTileEntity(aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), aBaseMetaTileEntity.getZCoord()), frontRotation,
+ facing, hintsOnly);
}
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,
- TileEntity tileEntity, int facing, boolean hintsOnly){
- return StructureBuilderExtreme(structure,blockType,blockMeta,horizontalOffset,verticalOffset,depthOffset,tileEntity,null,facing,hintsOnly);
- }
-
- public static boolean StructureBuilderExtreme(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,
- TileEntity tileEntity, IFrontRotation frontRotation, int facing, boolean hintsOnly) {
- if(!tileEntity.hasWorldObj()) {
+ TileEntity tileEntity, int facing, boolean hintsOnly) {
+ return StructureBuilderExtreme(structure, blockType, blockMeta, horizontalOffset, verticalOffset, depthOffset, tileEntity, null, facing, hintsOnly);
+ }
+
+ public static boolean StructureBuilderExtreme(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,
+ TileEntity tileEntity, IFrontRotation frontRotation, int facing, boolean hintsOnly) {
+ if (!tileEntity.hasWorldObj()) {
return false;
}
World world = tileEntity.getWorldObj();
@@ -660,12 +661,12 @@ public final class Util {
int x, y, z, a, b, c, pointer;
int
- baseX=tileEntity.xCoord,
- baseZ=tileEntity.zCoord,
- baseY=tileEntity.yCoord;
+ baseX = tileEntity.xCoord,
+ baseZ = tileEntity.zCoord,
+ baseY = tileEntity.yCoord;
//a,b,c - relative to block face!
//x,y,z - relative to block position on map!
- if(frontRotation!=null) {
+ if (frontRotation != null) {
facing += frontRotation.getFrontRotation() << 3;
}
@@ -679,12 +680,13 @@ public final class Util {
if (block < ' ') {//Control chars allow skipping
b -= block;
break;
- } if (block > '@')//characters allow to skip check a-1 skip, b-2 skips etc.
+ }
+ 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 if (block=='.')// this TE
+ // a++;
+ else if (block == '.')// this TE
{
a++;
} else {
@@ -816,7 +818,7 @@ public final class Util {
y = baseY + c;
break;
default:
- if(DEBUG_MODE) {
+ if (DEBUG_MODE) {
TecTech.Logger.info("facing = " + facing);
}
return false;
@@ -829,49 +831,49 @@ public final class Util {
//Check block
if (world.blockExists(x, y, z)) {//this actually checks if the chunk is loaded
- if(hintsOnly){
+ 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) {
- if(world.getBlock(x,y,z)!=blockType[pointer] || world.getBlockMetadata(x,y,z)!=blockMeta[pointer]) {
- TecTech.proxy.hint_particle(world, x, y, z, blockType[pointer], blockMeta[pointer]);
- }
- } else if ((pointer = block - ' ') >= 0) {
- if(pointer>=0 && pointer<12) {
- TecTech.proxy.hint_particle(world, x, y, z, TT_Container_Casings.sHintCasingsTT, pointer);
+ 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) {
+ if (world.getBlock(x, y, z) != blockType[pointer] || world.getBlockMetadata(x, y, z) != blockMeta[pointer]) {
+ TecTech.proxy.hint_particle(world, x, y, z, blockType[pointer], blockMeta[pointer]);
+ }
+ } else if ((pointer = block - ' ') >= 0) {
+ if (pointer >= 0 && pointer < 12) {
+ TecTech.proxy.hint_particle(world, x, y, z, TT_Container_Casings.sHintCasingsTT, pointer);
+ } else {
+ 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, 12);
+ TecTech.proxy.hint_particle(world, x, y, z, TT_Container_Casings.sHintCasingsTT, 15);
}
- } else {
- TecTech.proxy.hint_particle(world, x, y, z, TT_Container_Casings.sHintCasingsTT, 15);
- }
}
- }else{
+ } 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, 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 (block - ' ' < 0) {
- world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 15, 2);
- } //else {
+ case '-'://must be air
+ world.setBlock(x, y, z, Blocks.air, 0, 2);
+ break;
+ case '+'://must not be air
+ 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 (block - ' ' < 0) {
+ world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 15, 2);
+ } //else {
//switch(pointer){
// case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 11:
// world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, pointer, 2); break;
// default:world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 12, 2);
//}
- //}
+ //}
}
}
}
@@ -900,9 +902,9 @@ public final class Util {
int x, y, z, a, b, c;
int
- baseX=aBaseMetaTileEntity.getXCoord(),
- baseZ=aBaseMetaTileEntity.getZCoord(),
- baseY=aBaseMetaTileEntity.getYCoord();
+ baseX = aBaseMetaTileEntity.getXCoord(),
+ baseZ = aBaseMetaTileEntity.getZCoord(),
+ baseY = aBaseMetaTileEntity.getYCoord();
//a,b,c - relative to block face!
//x,y,z - relative to block position on map!
//yPos - absolute height of checked block
@@ -1081,7 +1083,7 @@ public final class Util {
if (ignoreAir) {
StringBuilder builder = new StringBuilder();
char temp = '@';
- for (char ch : line.toString().toCharArray()){
+ for (char ch : line.toString().toCharArray()) {
if (ch == '-') {
temp += 1;
if (temp == '~') {
@@ -1096,21 +1098,21 @@ public final class Util {
builder.append(ch);
}
}
- while (builder.length()>0 && builder.charAt(builder.length() - 1) == '~') {
+ while (builder.length() > 0 && builder.charAt(builder.length() - 1) == '~') {
builder.deleteCharAt(builder.length() - 1);
}
- if (builder.length()==0) {
+ if (builder.length() == 0) {
builder.append("E,");
} else {
- builder.insert(0,'"');
+ builder.insert(0, '"');
builder.append('"').append(',');
}
addMe.append(builder);
} else {
- if (line.length()==0) {
+ if (line.length() == 0) {
line.append("E,");
} else {
- line.insert(0,'"');
+ line.insert(0, '"');
line.append('"').append(',');
}
addMe.append(line);
@@ -1119,11 +1121,11 @@ public final class Util {
}
//region less verbose
addMe.append('}').append(',');
- String builtStr=addMe.toString().replaceAll("(E,)+(?=})",E/*Remove Empty strings at end*/);
+ String builtStr = addMe.toString().replaceAll("(E,)+(?=})", E/*Remove Empty strings at end*/);
Matcher matcher = matchE_.matcher(builtStr);
while (matcher.find()) {
- byte lenEE = (byte)(matcher.group(1).length()>>1);
- builtStr=builtStr.replaceFirst("E,(E,)+","\"\\\\u00"+String.format("%02X", lenEE-1)+"\",");
+ byte lenEE = (byte) (matcher.group(1).length() >> 1);
+ builtStr = builtStr.replaceFirst("E,(E,)+", "\"\\\\u00" + String.format("%02X", lenEE - 1) + "\",");
//builtStr=builtStr.replaceFirst("E,(E,)+\"","\"\\\\u00"+String.format("%02X", lenEE));
}
//endregion
@@ -1250,7 +1252,7 @@ public final class Util {
public static final String[] VN = new String[]{"ULV", "LV", "MV", "HV", "EV", "IV", "LuV", "ZPM", "UV", "UHV", "UEV", "UIV", "UMV", "UXV", "OpV", "MAX"};
- public static final long[] V = new long[]{8L, 32L, 128L, 512L, 2048L, 8192L, 32768L, 131072L, 524288L, 2097152L, 8388608L, 33554432L, 134217728L, 536870912L, 1073741824L, Integer.MAX_VALUE-7};
+ public static final long[] V = new long[]{8L, 32L, 128L, 512L, 2048L, 8192L, 32768L, 131072L, 524288L, 2097152L, 8388608L, 33554432L, 134217728L, 536870912L, 1073741824L, Integer.MAX_VALUE - 7};
public static byte getTier(long l) {
byte b = -1;
@@ -1260,20 +1262,20 @@ public final class Util {
if (b >= V.length) {
return b;
}
- } while(l > V[b]);
+ } while (l > V[b]);
return b;
}
- public static String[] splitButDifferent(String string,String delimiter){
- String[] strings= new String[StringUtils.countMatches(string,delimiter)+1];
- int lastEnd=0;
- for(int i=0;i<strings.length-1;i++){
- int nextEnd=string.indexOf(delimiter,lastEnd);
- strings[i]=string.substring(lastEnd,nextEnd);
- lastEnd=nextEnd+delimiter.length();
+ public static String[] splitButDifferent(String string, String delimiter) {
+ String[] strings = new String[StringUtils.countMatches(string, delimiter) + 1];
+ int lastEnd = 0;
+ for (int i = 0; i < strings.length - 1; i++) {
+ int nextEnd = string.indexOf(delimiter, lastEnd);
+ strings[i] = string.substring(lastEnd, nextEnd);
+ lastEnd = nextEnd + delimiter.length();
}
- strings[strings.length-1]=string.substring(lastEnd);
+ strings[strings.length - 1] = string.substring(lastEnd);
return strings;
}
@@ -1285,41 +1287,42 @@ public final class Util {
return strings;
}
- public static boolean areBitsSet(int setBits,int testedValue){
- return (testedValue&setBits)==setBits;
+ public static boolean areBitsSet(int setBits, int testedValue) {
+ return (testedValue & setBits) == setBits;
}
- public static class TT_ItemStack implements Comparable<TT_ItemStack>{
+ public static class TT_ItemStack implements Comparable<TT_ItemStack> {
public final Item mItem;
public final int mStackSize;
public final int mMetaData;
public TT_ItemStack(Item aItem, long aStackSize, long aMetaData) {
this.mItem = aItem;
- this.mStackSize = (byte)((int)aStackSize);
- this.mMetaData = (short)((int)aMetaData);
+ this.mStackSize = (byte) ((int) aStackSize);
+ this.mMetaData = (short) ((int) aMetaData);
}
public TT_ItemStack(ItemStack aStack) {
- if(aStack==null){
- mItem=null;
- mStackSize=mMetaData=0;
- }else{
- mItem=aStack.getItem();
- mStackSize=aStack.stackSize;
- mMetaData=Items.feather.getDamage(aStack);
+ if (aStack == null) {
+ mItem = null;
+ mStackSize = mMetaData = 0;
+ } else {
+ mItem = aStack.getItem();
+ mStackSize = aStack.stackSize;
+ mMetaData = Items.feather.getDamage(aStack);
}
}
@Override
public int compareTo(TT_ItemStack o) {
- if(mMetaData>o.mMetaData) return 1;
- if(mMetaData<o.mMetaData) return -1;
- if(mStackSize>o.mStackSize) return 1;
- if(mStackSize<o.mStackSize) return -1;
- if(mItem!=null && o.mItem!=null) return mItem.getUnlocalizedName().compareTo(o.mItem.getUnlocalizedName());
- if(mItem==null && o.mItem==null) return 0;
- if(mItem!=null) return 1;
+ if (mMetaData > o.mMetaData) return 1;
+ if (mMetaData < o.mMetaData) return -1;
+ if (mStackSize > o.mStackSize) return 1;
+ if (mStackSize < o.mStackSize) return -1;
+ if (mItem != null && o.mItem != null)
+ return mItem.getUnlocalizedName().compareTo(o.mItem.getUnlocalizedName());
+ if (mItem == null && o.mItem == null) return 0;
+ if (mItem != null) return 1;
return -1;
}
@@ -1327,19 +1330,19 @@ public final class Util {
public boolean equals(Object aStack) {
return aStack == this ||
(aStack instanceof TT_ItemStack &&
- ((mItem==((TT_ItemStack) aStack).mItem) || ((TT_ItemStack) aStack).mItem.getUnlocalizedName().equals(this.mItem.getUnlocalizedName())) &&
+ ((mItem == ((TT_ItemStack) aStack).mItem) || ((TT_ItemStack) aStack).mItem.getUnlocalizedName().equals(this.mItem.getUnlocalizedName())) &&
((TT_ItemStack) aStack).mStackSize == this.mStackSize &&
((TT_ItemStack) aStack).mMetaData == this.mMetaData);
}
@Override
public int hashCode() {
- return (mItem!=null?mItem.getUnlocalizedName().hashCode():0) ^ (mMetaData << 16) ^ (mStackSize<<24);
+ return (mItem != null ? mItem.getUnlocalizedName().hashCode() : 0) ^ (mMetaData << 16) ^ (mStackSize << 24);
}
@Override
public String toString() {
- return Integer.toString(hashCode())+' '+(mItem==null?"null":mItem.getUnlocalizedName())+' '+mMetaData+' '+mStackSize;
+ return Integer.toString(hashCode()) + ' ' + (mItem == null ? "null" : mItem.getUnlocalizedName()) + ' ' + mMetaData + ' ' + mStackSize;
}
}
}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index 9c0008ab07..db20de53c5 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -22,7 +22,7 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.util.ForgeDirection;
-import static com.github.technus.tectech.Util.StructureBuilder;
+import static com.github.technus.tectech.Util.StructureBuilderExtreme;
import static com.github.technus.tectech.Util.V;
import static com.github.technus.tectech.compatibility.thaumcraft.EssentiaCompat.essentiaContainerCompat;
import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
@@ -99,7 +99,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
iGregTechTileEntity.getWorld().setBlock(iGregTechTileEntity.getXCoord() + xDir, iGregTechTileEntity.getYCoord() + yDir, iGregTechTileEntity.getZCoord() + zDir, TT_Container_Casings.sHintCasingsTT, 12, 2);
}
}
- StructureBuilder(shape, blockType, blockMeta,1, 1, 0, iGregTechTileEntity,hintsOnly);
+ StructureBuilderExtreme(shape, blockType, blockMeta,1, 1, 0, iGregTechTileEntity,this,hintsOnly);
}
@Override
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index 085884b80a..8c5387160d 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -22,7 +22,7 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.util.ForgeDirection;
-import static com.github.technus.tectech.Util.StructureBuilder;
+import static com.github.technus.tectech.Util.StructureBuilderExtreme;
import static com.github.technus.tectech.Util.V;
import static com.github.technus.tectech.compatibility.thaumcraft.EssentiaCompat.essentiaContainerCompat;
import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
@@ -99,7 +99,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
iGregTechTileEntity.getWorld().setBlock(iGregTechTileEntity.getXCoord() + xDir, iGregTechTileEntity.getYCoord() + yDir, iGregTechTileEntity.getZCoord() + zDir, TT_Container_Casings.sHintCasingsTT, 12, 2);
}
}
- StructureBuilder(shape, blockType, blockMeta,1, 1, 0, iGregTechTileEntity,hintsOnly);
+ StructureBuilderExtreme(shape, blockType, blockMeta,1, 1, 0, iGregTechTileEntity,this,hintsOnly);
}
@Override
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
index 29533c5a0a..6fa5b552e5 100644
--- a/src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java
+++ b/src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java
@@ -6,6 +6,7 @@ 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.init.Blocks;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import org.lwjgl.opengl.GL11;
@@ -14,6 +15,10 @@ import org.lwjgl.opengl.GL11;
public class BlockHint extends EntityFX {
private IIcon[] icons = new IIcon[6];
+ public BlockHint(World world){