From 5dc624b85b41a6c590fcc36aa2788ff4d5fd6240 Mon Sep 17 00:00:00 2001 From: bot Date: Sun, 9 Feb 2020 16:58:16 +0000 Subject: chance tool tip to say casing instead of hull --- .../machines/multi/production/algae/GregtechMTE_AlgaePondBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech') 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..1b54eccc6e 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 Casing (all bottom layer)", "Sterile Farm Casings (rest)", "Controller (front centered)", "All hatches must be on the bottom layer", -- cgit From cce87b7d7c4cba69f76b42405184cb7188a93fbf Mon Sep 17 00:00:00 2001 From: bot Date: Sun, 9 Feb 2020 16:59:11 +0000 Subject: GregtechMTE_AlgaePondBase.java edited online with Bitbucket --- .../machines/multi/production/algae/GregtechMTE_AlgaePondBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech') 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 1b54eccc6e..9df0813879 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 Casing (all bottom layer)", + "Machine Casings (all bottom layer)", "Sterile Farm Casings (rest)", "Controller (front centered)", "All hatches must be on the bottom layer", -- cgit From 63d8ed92dc34e62f0b7a5338fd7126e0e6fa01aa Mon Sep 17 00:00:00 2001 From: bot Date: Tue, 18 Feb 2020 17:43:33 +0000 Subject: fix tecttech energy hatch not adding power to storage --- .../multi/storage/GregtechMetaTileEntity_PowerSubStationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech') 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); } -- cgit From b0bdee4b66ba7e22f67554520abfaa986a3f47df Mon Sep 17 00:00:00 2001 From: korneel vandamme Date: Sun, 23 Feb 2020 20:06:54 +0100 Subject: attempt fix for safe making all gt machine sunbreakble --- .../events/PickaxeBlockBreakEventHandler.java | 42 ++++++++++++++++------ .../base/machines/GregtechMetaSafeBlockBase.java | 29 --------------- 2 files changed, 32 insertions(+), 39 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech') diff --git a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java index cfc274a3d6..956d045b3e 100644 --- a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java @@ -1,20 +1,19 @@ package gtPlusPlus.core.handler.events; +import java.util.List; import java.util.UUID; import cpw.mods.fml.common.eventhandler.SubscribeEvent; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; - +import net.minecraft.world.ChunkPosition; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.metatileentity.BaseMetaPipeEntity; import gregtech.api.metatileentity.BaseMetaTileEntity; - import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent.BreakEvent; +import net.minecraftforge.event.world.ExplosionEvent; public class PickaxeBlockBreakEventHandler { @SubscribeEvent @@ -22,31 +21,54 @@ public class PickaxeBlockBreakEventHandler { try{ final TileEntity entity = event.world.getTileEntity(event.x, event.y, event.z); if (entity != null){ - final EntityPlayer playerInternal = event.getPlayer(); - if ((entity instanceof BaseMetaTileEntity) && !(BaseMetaPipeEntity.class.isInstance(entity))){ + if (entity instanceof BaseMetaTileEntity) { + final EntityPlayer playerInternal = event.getPlayer(); final IMetaTileEntity X = ((BaseMetaTileEntity)entity).getMetaTileEntity(); - //final Block ThisBlock = X.getBaseMetaTileEntity().getBlock(event.x, event.y, event.z); - if (X instanceof GregtechMetaSafeBlockBase){ + if(X instanceof GregtechMetaSafeBlockBase) { final UUID ownerUUID = ((GregtechMetaSafeBlockBase)X).ownerUUID; final UUID accessorUUID = playerInternal.getUniqueID(); if (((GregtechMetaSafeBlockBase)X).bUnbreakable){ if (accessorUUID == ownerUUID){ PlayerUtils.messagePlayer(playerInternal, "Since you own this block, it has been destroyed."); - event.setCanceled(false); } else { - event.setCanceled(true); PlayerUtils.messagePlayer(playerInternal, "Since you do not own this block, it has not been destroyed."); + event.setCanceled(true); } } } } + } } catch (final NullPointerException e) { //System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: "+e.getCause()); } } + + @SubscribeEvent + public void onExplode(ExplosionEvent.Detonate event) { + try { + @SuppressWarnings("unchecked") + List pos = event.explosion.affectedBlockPositions; + for(int i = 0;i 0)) { - */ - if (aBaseMetaTileEntity.isServerSide() && (aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified() || ((aTimer % 200) == 0) || (this.mSuccess > 0))) { - this.value_last = this.value_current; - this.value_current = this.bUnbreakable; - if (this.value_last != this.value_current){ - Logger.WARNING("VALUE CHANGE - Ticking for a moment."); - if (this.bUnbreakable == true){ - //Xasda.setmTileEntity((BaseMetaTileEntity) aBaseMetaTileEntity); - //Utils.LOG_ERROR("Safe is Indestructible."); - this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()).setResistance(Float.MAX_VALUE); - this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()).setBlockUnbreakable(); - } - else { - //Xasda.setmTileEntity((BaseMetaTileEntity) aBaseMetaTileEntity); - //Utils.LOG_ERROR("Safe is not Indestructible."); - this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()).setResistance(1F); - this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()).setHardness(2); - - } - } - else { - - } - - } - } @Override public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) { -- cgit From 6b41e3f8f770ec57fd9223d7689b0292c4ec327c Mon Sep 17 00:00:00 2001 From: botn365 Date: Sat, 7 Mar 2020 16:36:36 +0100 Subject: improve overflow cover handeling --- .../xmod/gregtech/common/covers/GTPP_Cover_Overflow.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech') 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); -- cgit From 597196c1b18c883c77edfdfda977812ab0be8b38 Mon Sep 17 00:00:00 2001 From: botn365 Date: Tue, 24 Mar 2020 05:21:43 +0100 Subject: improve LRE tool tip --- .../GregtechMetaTileEntity_LargeRocketEngine.java | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech') 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 { -- cgit From e936a0be7639aca3a213b9c50eeb36f9fd736bea Mon Sep 17 00:00:00 2001 From: botn365 Date: Wed, 25 Mar 2020 09:55:39 +0100 Subject: fix extruder not counting back center casing --- .../GregtechMetaTileEntity_IndustrialExtruder.java | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech') 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++; + } + } } } } -- cgit From e58c293570572fd1ce2837b64586d2b81e24885b Mon Sep 17 00:00:00 2001 From: botn365 Date: Wed, 25 Mar 2020 11:17:26 +0100 Subject: fixes algea pond formin isue on servers --- .../algae/GregtechMTE_AlgaePondBase.java | 35 ++++++++++++---------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech') 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..9f388566ac 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 @@ -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.getCasingTierOnClientSide(); + //} 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; } @@ -482,7 +483,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase { return false; } - @SideOnly(Side.CLIENT) + private final int getCasingTierOnClientSide() { 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; } -- cgit From 76fe150a3dbaec5d4d3b4441cb1d0f705e5ac407 Mon Sep 17 00:00:00 2001 From: botn365 Date: Sat, 28 Mar 2020 15:54:39 +0100 Subject: renaming function --- .../machines/multi/production/algae/GregtechMTE_AlgaePondBase.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech') 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 9f388566ac..b59f9be3c7 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 @@ -159,7 +159,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase { // return false; // } // else { - mLevel = this.getCasingTierOnClientSide(); + mLevel = this.getCasingTier(); //} int aID = TAE.getIndexFromPage(1, 15); int tAmount = 0; @@ -339,7 +339,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase { this.fixAllMaintenanceIssue(); // Silly Client Syncing if (aBaseMetaTileEntity.isClientSide()) { - this.mLevel = getCasingTierOnClientSide(); + this.mLevel = getCasingTier(); } } @@ -484,7 +484,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase { } - private final int getCasingTierOnClientSide() { + private final int getCasingTier() { if (this == null || this.getBaseMetaTileEntity().getWorld() == null) { return 0; } -- cgit