aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-09-18 21:59:03 +0200
committerTechnus <daniel112092@gmail.com>2017-09-18 21:59:20 +0200
commit2995f2941acd7731b5042de02e2b5e934bba6373 (patch)
tree60971511d00565a845a9d9e53c9fede7e90083cb /src/main
parent9fbcf1cd7eeaa134c802f2196a1b50cbee6d7b7c (diff)
downloadGT5-Unofficial-2995f2941acd7731b5042de02e2b5e934bba6373.tar.gz
GT5-Unofficial-2995f2941acd7731b5042de02e2b5e934bba6373.tar.bz2
GT5-Unofficial-2995f2941acd7731b5042de02e2b5e934bba6373.zip
Fix imports, change blueprint creative behaviour a bit.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/technus/tectech/Util.java12
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java1
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java38
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java1
6 files changed, 26 insertions, 28 deletions
diff --git a/src/main/java/com/github/technus/tectech/Util.java b/src/main/java/com/github/technus/tectech/Util.java
index d1a45ec657..b4ac02a0e6 100644
--- a/src/main/java/com/github/technus/tectech/Util.java
+++ b/src/main/java/com/github/technus/tectech/Util.java
@@ -322,7 +322,7 @@ public class Util {
TileEntity tileEntity, int facing, boolean hintsOnly) {
if(!tileEntity.hasWorldObj()) return false;
World world = tileEntity.getWorldObj();
- if ((world.isRemote && !hintsOnly)||(!world.isRemote && hintsOnly)) return false;
+ if (!world.isRemote && hintsOnly) return false;
//TE Rotation
@@ -424,11 +424,11 @@ public class Util {
if ((pointer = block - '0') >= 0) {
world.setBlock(x, y, z, blockType[pointer], blockMeta[pointer], 2);
} else if ((pointer = block - ' ') >= 0) {
- 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);
- }
+ //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);
+ //}
} else world.setBlock(x, y, z, TT_Container_Casings.sHintCasingsTT, 15,2);
}
}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java
index 535eafc2cd..1d0d00b713 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java
@@ -2,7 +2,6 @@ package com.github.technus.tectech.compatibility.thaumcraft.definitions;
import com.github.technus.tectech.TecTech;
import com.github.technus.tectech.elementalMatter.core.*;
-import com.github.technus.tectech.elementalMatter.core.classes.*;
import com.github.technus.tectech.elementalMatter.core.templates.cElementalDefinition;
import com.github.technus.tectech.elementalMatter.core.containers.cElementalDefinitionStack;
import com.github.technus.tectech.elementalMatter.core.transformations.aFluidDequantizationInfo;
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java
index ca6fa87acc..37e80c8922 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java
@@ -2,7 +2,6 @@ package com.github.technus.tectech.elementalMatter.definitions.complex;
import com.github.technus.tectech.TecTech;
import com.github.technus.tectech.elementalMatter.core.*;
-import com.github.technus.tectech.elementalMatter.core.classes.*;
import com.github.technus.tectech.elementalMatter.core.templates.cElementalDefinition;
import com.github.technus.tectech.elementalMatter.core.containers.cElementalDefinitionStack;
import com.github.technus.tectech.elementalMatter.core.transformations.*;
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
index c4beb63656..0037ab1feb 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
@@ -64,7 +64,7 @@ public class ConstructableTriggerItem extends Item {
}
return true;
}else if (aPlayer instanceof EntityClientPlayerMP){//particles and text client side
- if ((!aPlayer.isSneaking() || !aPlayer.capabilities.isCreativeMode)) {
+ //if ((!aPlayer.isSneaking() || !aPlayer.capabilities.isCreativeMode)) {
if(tTileEntity instanceof IGregTechTileEntity) {
IMetaTileEntity metaTE = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
if (metaTE instanceof IConstructable) {
@@ -85,24 +85,24 @@ public class ConstructableTriggerItem extends Item {
TecTech.proxy.printInchat(multiblockMap.get(tTileEntity.getClass().getCanonicalName()).getDescription(aStack.stackSize));
return false;
}
- } else {
- if(tTileEntity instanceof IGregTechTileEntity) {
- IMetaTileEntity metaTE = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
- if (metaTE instanceof IConstructable) {
- TecTech.proxy.printInchat(((IConstructable) metaTE).getStructureDescription(aStack.stackSize));
- return false;
- } else if(multiblockMap.containsKey(metaTE.getClass().getCanonicalName())){
- TecTech.proxy.printInchat(multiblockMap.get(metaTE.getClass().getCanonicalName()).getDescription(aStack.stackSize));
- return false;
- }
- } else if(tTileEntity instanceof IConstructable){
- TecTech.proxy.printInchat(((IConstructable) tTileEntity).getStructureDescription(aStack.stackSize));
- return false;
- } else if(multiblockMap.containsKey(tTileEntity.getClass().getCanonicalName())){
- TecTech.proxy.printInchat(multiblockMap.get(tTileEntity.getClass().getCanonicalName()).getDescription(aStack.stackSize));
- return false;
- }
- }
+ //} else {
+ // if(tTileEntity instanceof IGregTechTileEntity) {
+ // IMetaTileEntity metaTE = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
+ // if (metaTE instanceof IConstructable) {
+ // TecTech.proxy.printInchat(((IConstructable) metaTE).getStructureDescription(aStack.stackSize));
+ // return false;
+ // } else if(multiblockMap.containsKey(metaTE.getClass().getCanonicalName())){
+ // TecTech.proxy.printInchat(multiblockMap.get(metaTE.getClass().getCanonicalName()).getDescription(aStack.stackSize));
+ // return false;
+ // }
+ // } else if(tTileEntity instanceof IConstructable){
+ // TecTech.proxy.printInchat(((IConstructable) tTileEntity).getStructureDescription(aStack.stackSize));
+ // return false;
+ // } else if(multiblockMap.containsKey(tTileEntity.getClass().getCanonicalName())){
+ // TecTech.proxy.printInchat(multiblockMap.get(tTileEntity.getClass().getCanonicalName()).getDescription(aStack.stackSize));
+ // return false;
+ // }
+ //}
}
return false;
}
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 73fd845d58..3d4e61a84c 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
@@ -3,7 +3,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
import com.github.technus.tectech.CommonValues;
import com.github.technus.tectech.TecTech;
import com.github.technus.tectech.elementalMatter.core.*;
-import com.github.technus.tectech.elementalMatter.core.classes.*;
import com.github.technus.tectech.elementalMatter.core.containers.cElementalInstanceStack;
import com.github.technus.tectech.elementalMatter.core.transformations.aFluidQuantizationInfo;
import com.github.technus.tectech.elementalMatter.core.transformations.aItemQuantizationInfo;
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 c94040645c..3202a17659 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
@@ -209,6 +209,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
final int y=base.getYCoord();
final int z=base.getZCoord();
return base.getWorld().checkChunksExist(x-48,y-48,z-48,x+48,y+48,z+48);
+ //todo check if it is actually checking if chunks are loaded
}else return false;
}