diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common')
5 files changed, 55 insertions, 48 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java b/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java index 1c1f9c20f9..f9e87b07fb 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java @@ -61,15 +61,15 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) { - aCoverVariable += aPlayer.isSneaking() ? 4096 : 1024; + aCoverVariable += (mMaxTransferRate * (aPlayer.isSneaking() ? 0.1f : 0.01f)); } else { - aCoverVariable -= aPlayer.isSneaking() ? 4096 : 1024; + aCoverVariable -= (mMaxTransferRate * (aPlayer.isSneaking() ? 0.1f : 0.01f)); } if (aCoverVariable > mMaxTransferRate) { aCoverVariable = mInitialTransferRate; } if (aCoverVariable <= 0) { - aCoverVariable = mInitialTransferRate; + aCoverVariable = mMaxTransferRate; } GT_Utility.sendChatToPlayer(aPlayer, LangUtils.trans("009", "Overflow point: ") + aCoverVariable + trans("010", "L")); return aCoverVariable; @@ -88,7 +88,7 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { aCoverVariable = mInitialTransferRate; } if (aCoverVariable <= 0) { - aCoverVariable = mInitialTransferRate; + aCoverVariable = mMaxTransferRate; } GT_Utility.sendChatToPlayer(aPlayer, LangUtils.trans("009", "Overflow point: ") + aCoverVariable + trans("010", "L")); aTileEntity.setCoverDataAtSide(aSide, aCoverVariable); 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 9885db20d6..f67513deb9 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 @@ -174,22 +174,21 @@ extends GregtechMeta_MultiBlockBase { final int tZ = this.getBaseMetaTileEntity().getZCoord(); 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)) { - for (byte k = 0; k < 5; k = (byte) (k + 1)) { - - Block aBlock = this.getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)); - 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())) { - log("Bad Casing on Extruder."); - return false; - } - else { - if (aTile == null) { - aCasingCount++; - } - } + for (byte k = 0; k < 5; k = (byte) (k + 1)) { + if (j == 0 && i ==0) + k = 4; + Block aBlock = this.getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)); + 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())) { + log("Bad Casing on Extruder."); + return false; } + else { + if (aTile == null) { + aCasingCount++; + } + } } } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java index af4132f5ff..325ec8f95d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java @@ -94,17 +94,19 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_Multi "Controller Block for the Large Rocket Engine", "Supply Rocket Fuels and 1000L(3000L boosted) of "+mLubricantName+" per hour to run", "Supply 4L of "+mCoolantName+" per second per 2100 eu/t to boost output (optional)", - "Consumes upto 37500L of Air per second", - "Produces as much energy as you put fuel in becomes less ", - "When producing more then 30K eu/t fuel wil be consume less efficiently (3x - 1.5x eff@55Keu/t)", + "Consumes 2000L/s of air per 16384 eu/t produced", + "Produces as much energy as you put fuel in", + "produses 1500 posution/S per 16384 eu/t produced", + "When producing more then 32K eu/t fuel wil be consume less efficiently (3x - 1.5x eff@57Keu/t input energy)", + "formula: x = input of energy (10K^(1/3)/ x^(1/3)) * (40K^(1/3)/ x^(1/3))", "Boosting will produce 3x the amount of power but will consume 3x fuel", "Size(WxHxD): 3x3x10, Controller (front centered)", - "3x3x10 of Stable "+mCasingName+" (hollow, Min 64!)", + "3x3x10 of "+mCasingName+" (hollow, Min 64!)", "8x "+mGearboxName+" inside the Hollow Casing", "1x Dynamo Hatch (Top Middle, Max 8) suports tectech dynamos", - "8x Air Intake Hatch (one of the Casings next to a Gear Box, top row allowed)", - "2x Input Hatch (Rocket Fuel/Booster) (one of the Casings next to a Gear Box, top row not allowed)", - "1x Maintenance Hatch (one of the Casings next to a Gear Box)", + "8x Air Intake Hatch (one of the Casings next to a "+mGearboxName+", top row allowed)", + "3x Input Hatch (Rocket Fuel/Booster/co2) (one of the Casings next to a "+mGearboxName+", top row not allowed)", + "1x Maintenance Hatch (one of the Casings next to a "+mGearboxName+")", "1x Muffler Hatch (Back Centre)", }; } @@ -282,10 +284,13 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_Multi public void setEUProduction(int energy){ energy /= 20; double energyEfficiency; + double tDevideEnergy = Math.cbrt(energy); if (energy > 10000) { - energyEfficiency = ((double) Math.cbrt(10000)/Math.cbrt(energy)); + //cbrt(10 000) / + energyEfficiency = ((double) 21.5443469/tDevideEnergy); if (energy >= 40000) - energyEfficiency *= ((double) Math.cbrt(40000)/Math.cbrt(energy)); + //cbrt(40 000) / + energyEfficiency *= ((double)34.19951893/tDevideEnergy); energyEfficiency *= energy; } else { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java index a7afaa6b56..2896cdeba3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java @@ -66,7 +66,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase { "X X", "X X", "XXXXXXXXX", - "Machine Hulls (all bottom layer)", + "Machine Casings (all bottom layer)", "Sterile Farm Casings (rest)", "Controller (front centered)", "All hatches must be on the bottom layer", @@ -150,16 +150,17 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase { * mCurrentDirectionZ; // Get Expected Tier - Block aCasingBlock = aBaseMetaTileEntity.getBlockAtSide((byte) 0); - int aCasingMeta = aBaseMetaTileEntity.getMetaIDAtSide((byte) 0); - - // Bad Casings - if ((aCasingBlock != GregTech_API.sBlockCasings1) || aCasingMeta > 9) { - return false; - } - else { - mLevel = this.getCasingTierOnClientSide(); - } +// Block aCasingBlock = aBaseMetaTileEntity.getBlockAtSide((byte) 3); +// int aCasingMeta = aBaseMetaTileEntity.getMetaIDAtSide((byte) 3); +// +// // Bad Casings +// if ((aCasingBlock != GregTech_API.sBlockCasings1) || aCasingMeta > 9) { +// Logger.INFO("is false"); +// return false; +// } +// else { + mLevel = this.getCasingTier(); + //} int aID = TAE.getIndexFromPage(1, 15); int tAmount = 0; check : for (int i = mOffsetX_Lower; i <= mOffsetX_Upper; ++i) { @@ -180,13 +181,13 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase { Block tBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j); byte tMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j); - if ((tBlock == ModBlocks.blockCasings2Misc) && (tMeta == 15) && (h >= 0)) { + if ((h >= 0) && (tBlock == ModBlocks.blockCasings2Misc) && (tMeta == 15) ) { ++tAmount; } - else if ((tBlock == GregTech_API.sBlockCasings1) && (tMeta == mLevel) && (h == -1)) { + else if ((h == -1) && (tBlock == GregTech_API.sBlockCasings1) && (tMeta == mLevel) ) { ++tAmount; } - else if ((tBlock == GregTech_API.sBlockCasings1) && (tMeta != mLevel) && (h == -1)) { + else if ((h == -1) && (tBlock == GregTech_API.sBlockCasings1) && (tMeta != mLevel) ) { Logger.INFO("Found wrong tiered casing."); return false; } @@ -338,7 +339,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase { this.fixAllMaintenanceIssue(); // Silly Client Syncing if (aBaseMetaTileEntity.isClientSide()) { - this.mLevel = getCasingTierOnClientSide(); + this.mLevel = getCasingTier(); } } @@ -482,8 +483,8 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase { return false; } - @SideOnly(Side.CLIENT) - private final int getCasingTierOnClientSide() { + + private final int getCasingTier() { if (this == null || this.getBaseMetaTileEntity().getWorld() == null) { return 0; } @@ -491,8 +492,10 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase { Block aInitStructureCheck; int aInitStructureCheckMeta; IGregTechTileEntity aBaseMetaTileEntity = this.getBaseMetaTileEntity(); - aInitStructureCheck = aBaseMetaTileEntity.getBlockOffset(0, -1, 0); - aInitStructureCheckMeta = aBaseMetaTileEntity.getMetaIDOffset(0, -1, 0); + int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; + int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; + aInitStructureCheck = aBaseMetaTileEntity.getBlockOffset(xDir, -1, zDir); + aInitStructureCheckMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir, -1, zDir); if (aInitStructureCheck == GregTech_API.sBlockCasings1) { return aInitStructureCheckMeta; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index 9b898e34af..3eabcf517e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -267,7 +267,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe mAllDynamoHatches.addAll(this.mDynamoHatches); if (LoadedMods.TecTech) { - mAllDynamoHatches.addAll(this.mTecTechEnergyHatches); + mAllEnergyHatches.addAll(this.mTecTechEnergyHatches); mAllDynamoHatches.addAll(this.mTecTechDynamoHatches); } |