aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-06-15 23:01:39 +0200
committerTechnus <daniel112092@gmail.com>2017-06-15 23:01:39 +0200
commite0c3e6a3418d9f9cb0f55692430331e6c7e0720b (patch)
treeda5d00bd3a6ba99ae493ec95ff47890382b95b67 /src/main/java/gregtech/api/metatileentity
parent58c5e2719d63426cef9be6a540848d6a0ea69c34 (diff)
parent8d2d3d2f35dd341f25a7e719c3ca82338b69f8c8 (diff)
downloadGT5-Unofficial-e0c3e6a3418d9f9cb0f55692430331e6c7e0720b.tar.gz
GT5-Unofficial-e0c3e6a3418d9f9cb0f55692430331e6c7e0720b.tar.bz2
GT5-Unofficial-e0c3e6a3418d9f9cb0f55692430331e6c7e0720b.zip
Merge branch 'experimental' into reMerge
# Conflicts: # build.properties # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java # src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java # src/main/java/gregtech/common/GT_Proxy.java # src/main/java/gregtech/common/GT_RecipeAdder.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java # src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java # src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png # src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
-rw-r--r--src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java7
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java2
2 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
index 1f2eb96835..ab08b0cd92 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
@@ -169,7 +169,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity {
tCovered = true;
}
//System.out.println("Cover: "+mBaseMetaTileEntity.getCoverIDAtSide(aSide));
- //toDo: filter cover ids that actually protect against temperature (rubber/plastic maybe?)
+ //toDo: filter cover ids that actually protect against temperature (rubber/plastic maybe?, more like asbestos)
return tCovered;
}
@@ -665,9 +665,8 @@ public abstract class MetaPipeEntity implements IMetaTileEntity {
int tX = getBaseMetaTileEntity().getXCoord(), tY = getBaseMetaTileEntity().getYCoord(), tZ = getBaseMetaTileEntity().getZCoord();
World tWorld = getBaseMetaTileEntity().getWorld();
tWorld.setBlock(tX, tY, tZ, Blocks.air);
- if (GregTech_API.sMachineExplosions) {
+ if (GregTech_API.sMachineExplosions)
tWorld.createExplosion(null, tX + 0.5, tY + 0.5, tZ + 0.5, tStrength, true);
- }
}
@Override
@@ -697,7 +696,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity {
}
@Override
- public boolean allowGeneralRedstoneOutput() {
+ public boolean allowGeneralRedstoneOutput(){
return false;
}
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index ccaba49a0b..5d6178e062 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -605,7 +605,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
return false;
}
- private void addFluidOutputs(FluidStack[] mOutputFluids) {
+ protected void addFluidOutputs(FluidStack[] mOutputFluids) {
int min=mOutputFluids.length>mOutputHatches.size()?mOutputHatches.size():mOutputFluids.length;
for (int i = 0; i < min; ++i) {
if (this.mOutputHatches.get(i) != null && mOutputFluids[i] != null && isValidMetaTileEntity(this.mOutputHatches.get(i))) {