aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java28
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java30
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java35
-rw-r--r--src/resources/assets/miscutils/lang/en_US.lang11
5 files changed, 79 insertions, 27 deletions
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 1c66b5cac2..02afada849 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -20,6 +20,7 @@ public class GenericChem extends ItemPackage {
public static final Material BAKELITE = new Material("Bakelite", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{90, 140, 140}, 120, 240, 23, 24, true, "", 0);//Not a GT Inherited Material
public static final Material NYLON = new Material("Nylon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{45, 45, 45}, 300, 600, 44, 48, true, "", 0);//Not a GT Inherited Material
+ public static final Material TEFLON = new Material("Teflon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{75, 45, 75}, 300, 600, 44, 48, true, "", 0);//Not a GT Inherited Material
//public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
//public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
@@ -55,6 +56,7 @@ public class GenericChem extends ItemPackage {
PhenolicResins = ItemUtils.generateSpecialUseDusts("phenolicresins", "Phenolic Resin", "HOC6H4CH2OH", Utils.rgbtoHexValue(80, 40, 40))[0];
MaterialGenerator.generate(BAKELITE, false);
MaterialGenerator.generate(NYLON, false);
+ MaterialGenerator.generate(TEFLON, false);
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
index 9c9fa7fa58..5e852b5f76 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
@@ -113,6 +113,24 @@ extends GregtechMeta_MultiBlockBase {
final int tX = this.getBaseMetaTileEntity().getXCoord();
final int tY = this.getBaseMetaTileEntity().getYCoord();
final int tZ = this.getBaseMetaTileEntity().getZCoord();
+
+
+ //Check Rear Middle
+ {
+ Block aBlock = this.getBaseMetaTileEntity()
+ .getBlockAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 4);
+ int aMeta = this.getBaseMetaTileEntity()
+ .getMetaIDAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 4);
+ IGregTechTileEntity aTile = this.getBaseMetaTileEntity()
+ .getIGregTechTileEntityAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 4);
+ if (!isValidBlockForStructure(aTile, getCasingTextureIndex(), true, aBlock, aMeta, getCasingBlock(),
+ getCasingMeta())) {
+ log("Bad Casing on Cutting Machine.");
+ return false;
+ }
+ }
+
+
for (byte i = -1; i < 2; i = (byte) (i + 1)) {
for (byte j = -1; j < 2; j = (byte) (j + 1)) {
if ((i != 0) || (j != 0)) {
@@ -121,7 +139,7 @@ extends GregtechMeta_MultiBlockBase {
int aMeta = this.getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i));
IGregTechTileEntity aTile = this.getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i));
if (!isValidBlockForStructure(aTile, getCasingTextureIndex(), true, aBlock, aMeta, getCasingBlock(), getCasingMeta())) {
- Logger.INFO("Bad Casing on Cutting Machine.");
+ log("Bad Casing on Cutting Machine.");
return false;
}
}
@@ -129,18 +147,18 @@ extends GregtechMeta_MultiBlockBase {
}
}
if ((this.mInputBusses.size() == 0) || (this.mOutputBusses.size() == 0)) {
- Logger.INFO("Incorrect amount of Input & Output busses.");
+ log("Incorrect amount of Input & Output busses.");
return false;
}
if ((this.mMaintenanceHatches.size() != 1)) {
- Logger.INFO("Incorrect amount of Maintenance or Energy hatches.");
+ log("Incorrect amount of Maintenance or Energy hatches.");
return false;
}
} else {
- Logger.INFO("False 5");
+ log("False 5");
return false;
}
- Logger.INFO("True");
+ log("True");
return true;
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
index e407e28b0e..f4f8a5fe78 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
@@ -113,9 +113,9 @@ extends GregtechMeta_MultiBlockBase {
}
if (inputs.length > 0) {
int para = (4* GT_Utility.getTier(this.getMaxInputVoltage()));
- Logger.WARNING("Recipe. ["+inputs.length+"]["+para+"]");
+ log("Recipe. ["+inputs.length+"]["+para+"]");
if (checkRecipeGeneric(inputs, new FluidStack[]{}, para, 100, 250, 10000)) {
- Logger.WARNING("Recipe 2.");
+ log("Recipe 2.");
return true;
}
}
@@ -152,6 +152,22 @@ extends GregtechMeta_MultiBlockBase {
return false;
}
}
+
+ //Check Rear Middle
+ {
+ Block aBlock = this.getBaseMetaTileEntity()
+ .getBlockAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 4);
+ int aMeta = this.getBaseMetaTileEntity()
+ .getMetaIDAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 4);
+ IGregTechTileEntity aTile = this.getBaseMetaTileEntity()
+ .getIGregTechTileEntityAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 4);
+ if (!isValidBlockForStructure(aTile, getCasingTextureIndex(), true, aBlock, aMeta, getCasingBlock(),
+ getCasingMeta())) {
+ log("Bad Casing on Extruder.");
+ return false;
+ }
+ }
+
final int tX = this.getBaseMetaTileEntity().getXCoord();
final int tY = this.getBaseMetaTileEntity().getYCoord();
final int tZ = this.getBaseMetaTileEntity().getZCoord();
@@ -164,7 +180,7 @@ extends GregtechMeta_MultiBlockBase {
int aMeta = this.getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i));
IGregTechTileEntity aTile = this.getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i));
if (!isValidBlockForStructure(aTile, getCasingTextureIndex(), true, aBlock, aMeta, getCasingBlock(), getCasingMeta())) {
- Logger.INFO("Bad Casing on Extruder.");
+ log("Bad Casing on Extruder.");
return false;
}
@@ -173,18 +189,18 @@ extends GregtechMeta_MultiBlockBase {
}
}
if ((this.mInputBusses.size() == 0) || (this.mOutputBusses.size() == 0)) {
- Logger.WARNING("Incorrect amount of Input || Output busses.");
+ log("Incorrect amount of Input || Output busses.");
return false;
}
if ((this.mMaintenanceHatches.size() != 1)) {
- Logger.WARNING("Incorrect amount of Maintenance hatches.");
+ log("Incorrect amount of Maintenance hatches.");
return false;
}
} else {
- Logger.WARNING("False 5");
+ log("False 5");
return false;
}
- Logger.WARNING("True");
+ log("True");
return true;
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
index 502b5e47b2..d798691d04 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
@@ -118,6 +118,21 @@ extends GregtechMeta_MultiBlockBase {
return false;
}
}
+
+ //Check Rear Middle
+ {
+ Block aBlock = this.getBaseMetaTileEntity()
+ .getBlockAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 4);
+ int aMeta = this.getBaseMetaTileEntity()
+ .getMetaIDAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 4);
+ IGregTechTileEntity aTile = this.getBaseMetaTileEntity()
+ .getIGregTechTileEntityAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 4);
+ if (!isValidBlockForStructure(aTile, getCasingTextureIndex(), true, aBlock, aMeta, getCasingBlock(),
+ getCasingMeta())) {
+ log("Bad Casing on Wiremill.");
+ return false;
+ }
+ }
final int tX = this.getBaseMetaTileEntity().getXCoord();
final int tY = this.getBaseMetaTileEntity().getYCoord();
final int tZ = this.getBaseMetaTileEntity().getZCoord();
@@ -129,7 +144,7 @@ extends GregtechMeta_MultiBlockBase {
int aMeta = this.getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i));
IGregTechTileEntity aTile = this.getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i));
if (!isValidBlockForStructure(aTile, getCasingTextureIndex(), true, aBlock, aMeta, getCasingBlock(), getCasingMeta())) {
- Logger.INFO("Bad Casing on Wiremill.");
+ log("Bad Casing on Wiremill.");
return false;
}
}
@@ -137,22 +152,22 @@ extends GregtechMeta_MultiBlockBase {
}
}
if ((this.mOutputHatches.size() != 0) || (this.mInputHatches.size() != 0)) {
- Logger.INFO("Use Busses, Not Hatches for Input/Output.");
+ log("Use Busses, Not Hatches for Input/Output.");
return false;
}
if ((this.mInputBusses.size() == 0) || (this.mOutputBusses.size() == 0)) {
- Logger.INFO("Incorrect amount of Input & Output busses.");
+ log("Incorrect amount of Input & Output busses.");
return false;
}
if ((this.mMaintenanceHatches.size() != 1)) {
- Logger.INFO("Incorrect amount of Maintenance or Energy hatches.");
+ log("Incorrect amount of Maintenance or Energy hatches.");
return false;
}
} else {
- Logger.INFO("False 5");
+ log("False 5");
return false;
}
- Logger.INFO("True");
+ log("True");
return true;
}
@@ -189,12 +204,4 @@ extends GregtechMeta_MultiBlockBase {
public byte getCasingTextureIndex() {
return (byte) TAE.GTPP_INDEX(6);
}
-
- private boolean addToMachineList(final IGregTechTileEntity tTileEntity) {
- return ((this.addMaintenanceToMachineList(tTileEntity, this.getCasingTextureIndex())) || (this.addInputToMachineList(tTileEntity, this.getCasingTextureIndex())) || (this.addOutputToMachineList(tTileEntity, this.getCasingTextureIndex())) || (this.addMufflerToMachineList(tTileEntity, this.getCasingTextureIndex())));
- }
-
- private boolean addEnergyInputToMachineList(final IGregTechTileEntity tTileEntity) {
- return ((this.addEnergyInputToMachineList(tTileEntity, this.getCasingTextureIndex())));
- }
} \ No newline at end of file
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index e1079c90de..e1102d708e 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -2761,4 +2761,13 @@ item.itemNuggetNylon.name=Nylon Nugget
item.itemPlateNylon.name=Nylon Plate
item.itemPlateDoubleNylon.name=Double Nylon Plate
item.itemCellNylon.name=Nylon Cell
-tile.Block of Nylon.name=Block of Nylon \ No newline at end of file
+tile.Block of Nylon.name=Block of Nylon
+item.itemIngotTeflon.name=Teflon Ingot
+item.itemDustTeflon.name=Teflon Dust
+item.itemDustTinyTeflon.name=Tiny Pile of Teflon Dust
+item.itemDustSmallTeflon.name=Small Pile of Teflon Dust
+item.itemNuggetTeflon.name=Teflon Nugget
+item.itemPlateTeflon.name=Teflon Plate
+item.itemPlateDoubleTeflon.name=Double Teflon Plate
+item.itemCellTeflon.name=Teflon Cell
+tile.Block of Teflon.name=Block of Teflon \ No newline at end of file
generated by cgit (git 2.46.0) at 2025-03-10 03:54:40 +0000