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') 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') 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 8233c42e7ab872c59ba50697643a147820ec82f3 Mon Sep 17 00:00:00 2001 From: botn365 Date: Sat, 7 Mar 2020 16:40:37 +0100 Subject: fix no water consumed inULV cover recipe --- src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 2165f27ec7..4f14b8efc6 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -368,7 +368,7 @@ public class RECIPES_Machines { CI.getElectricMotor(i, 2), CI.getPlate(i, 4) }, - FluidUtils.getWater(i * 1500), + FluidUtils.getWater((i + 1) * 1500), aOutputs[i].copy(), 20 * 20, MaterialUtils.getVoltageForTier(i)); -- cgit From 1fa507f6365832d7996a316c5e3d93ecbc0f25cf Mon Sep 17 00:00:00 2001 From: botn365 Date: Tue, 24 Mar 2020 04:15:26 +0100 Subject: fix lafium compound being zpm instead of LuV --- src/Java/gtPlusPlus/core/material/ALLOY.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index 4e28b4a428..616a3f68ce 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -731,7 +731,7 @@ public final class ALLOY { "Lafium Compound", //Material Name MaterialState.SOLID, //State null, //Material Colour - 6750, //Melting Point in C + 6350, //Melting Point in C 9865, //Boiling Point in C -1, -1, -- cgit From 9babb9ce746c048838227f3b89532aa20eca2403 Mon Sep 17 00:00:00 2001 From: botn365 Date: Tue, 24 Mar 2020 05:17:19 +0100 Subject: improved LRE tool tip --- src/Java/gtPlusPlus/core/config/ConfigHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java index 61e7045192..7436ed08b0 100644 --- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java @@ -1,6 +1,6 @@ package gtPlusPlus.core.config; -import static gtPlusPlus.core.item.general.RF2EU_Battery.rfPerEU; +import static gtPlusPlus.core.item.general.RF2EU_Battery.*; import static gtPlusPlus.core.lib.CORE.*; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.*; import static gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames; -- cgit From e1c54ec68482cb787627bb519283a2a0804e7fff Mon Sep 17 00:00:00 2001 From: botn365 Date: Tue, 24 Mar 2020 05:19:13 +0100 Subject: Revert "improved LRE tool tip" This reverts commit 9babb9ce746c048838227f3b89532aa20eca2403. --- src/Java/gtPlusPlus/core/config/ConfigHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java index 7436ed08b0..61e7045192 100644 --- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java @@ -1,6 +1,6 @@ package gtPlusPlus.core.config; -import static gtPlusPlus.core.item.general.RF2EU_Battery.*; +import static gtPlusPlus.core.item.general.RF2EU_Battery.rfPerEU; import static gtPlusPlus.core.lib.CORE.*; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.*; import static gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames; -- 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') 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 ff320d634893b52a4877692bfb584dcf9b4126d1 Mon Sep 17 00:00:00 2001 From: botn365 Date: Tue, 24 Mar 2020 05:41:23 +0100 Subject: make lower tier charge pack recipes less canceres --- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 69bd414d9c..52de45efa5 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1544,39 +1544,39 @@ public class RECIPES_GREGTECH { //Low tier Charge Packs final ItemStack[] aPackBatteries = new ItemStack[] { - ItemList.Battery_RE_LV_Lithium.get(GTNH ? 8 : 4), - ItemList.Battery_RE_MV_Lithium.get(GTNH ? 8 : 4), - ItemList.Battery_RE_HV_Lithium.get(GTNH ? 8 : 4), - GregtechItemList.Battery_RE_EV_Lithium.get(GTNH ? 8 : 4), - ItemList.Energy_LapotronicOrb.get(GTNH ? 8 : 4), + ItemList.Battery_RE_LV_Lithium.get(4), + ItemList.Battery_RE_MV_Lithium.get(4), + ItemList.Battery_RE_HV_Lithium.get(4), + GregtechItemList.Battery_RE_EV_Lithium.get(4), + ItemList.Energy_LapotronicOrb.get(4), }; final ItemStack[] aPackPlates = new ItemStack[] { - CI.getPlate(1, GTNH ? 6 : 3), - CI.getPlate(2, GTNH ? 12 : 6), - CI.getPlate(3, GTNH ? 18 : 9), - CI.getPlate(4, GTNH ? 24 : 12), - CI.getPlate(5, GTNH ? 30 : 15), + CI.getPlate(1,8), + CI.getPlate(2,8), + CI.getPlate(3,8), + CI.getPlate(4,8), + CI.getPlate(5,8), }; final ItemStack[] aPackWire = new ItemStack[] { - CI.getTieredComponent(OrePrefixes.wireGt02, 1, GTNH ? 16 : 8), - CI.getTieredComponent(OrePrefixes.wireGt04, 2, GTNH ? 16 : 8), - CI.getTieredComponent(OrePrefixes.wireGt08, 3, GTNH ? 14 : 7), - CI.getTieredComponent(OrePrefixes.wireGt12, 4, GTNH ? 12 : 6), - CI.getTieredComponent(OrePrefixes.wireGt16, 5, GTNH ? 12 : 6), + CI.getTieredComponent(OrePrefixes.wireGt02, 1,6), + CI.getTieredComponent(OrePrefixes.wireGt04, 2,6), + CI.getTieredComponent(OrePrefixes.wireGt08, 3,6), + CI.getTieredComponent(OrePrefixes.wireGt12, 4,6), + CI.getTieredComponent(OrePrefixes.wireGt16, 5,6), }; final ItemStack[] aPackCircuit = new ItemStack[] { - CI.getTieredComponent(OrePrefixes.circuit, 1, GTNH ? 4 : 2), - CI.getTieredComponent(OrePrefixes.circuit, 2, GTNH ? 4 : 2), - CI.getTieredComponent(OrePrefixes.circuit, 3, GTNH ? 8 : 4), - CI.getTieredComponent(OrePrefixes.circuit, 4, GTNH ? 8 : 4), - CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 12 : 6), + CI.getTieredComponent(OrePrefixes.circuit, 1,4), + CI.getTieredComponent(OrePrefixes.circuit, 2,4), + CI.getTieredComponent(OrePrefixes.circuit, 3,4), + CI.getTieredComponent(OrePrefixes.circuit, 4,4), + CI.getTieredComponent(OrePrefixes.circuit, 5,4), }; final ItemStack[] aPackRing = new ItemStack[] { - CI.getTieredComponent(OrePrefixes.ring, 1, GTNH ? 20 : 10), - CI.getTieredComponent(OrePrefixes.ring, 2, GTNH ? 20 : 10), - CI.getTieredComponent(OrePrefixes.ring, 3, GTNH ? 20 : 10), - CI.getTieredComponent(OrePrefixes.ring, 4, GTNH ? 20 : 10), - CI.getTieredComponent(OrePrefixes.ring, 5, GTNH ? 20 : 10), + CI.getTieredComponent(OrePrefixes.ring, 1,12), + CI.getTieredComponent(OrePrefixes.ring, 2,12), + CI.getTieredComponent(OrePrefixes.ring, 3,12), + CI.getTieredComponent(OrePrefixes.ring, 4,12), + CI.getTieredComponent(OrePrefixes.ring, 5,12), }; final ItemStack[] aPackOutput = new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_1), -- cgit From 3f6a286591f41733898990e922971f3e6215dcd5 Mon Sep 17 00:00:00 2001 From: botn365 Date: Tue, 24 Mar 2020 07:41:08 +0100 Subject: charge pack recipe balance and rocket fuel recipe fix --- .../core/item/chemistry/RocketFuels.java | 20 ++-- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 126 ++++++++++----------- 2 files changed, 71 insertions(+), 75 deletions(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java index bbdf322817..25151a91c5 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -19,6 +19,7 @@ import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; +import gtPlusPlus.core.item.chemistry.*; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -82,19 +83,24 @@ public class RocketFuels extends ItemPackage { } public static void createNitrogenTetroxide(){ - CORE.RA.addDehydratorRecipe( + CORE.RA.addChemicalPlantRecipe( new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 4) + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 4), + ItemUtils.getSimpleStack(mOrangeCatalyst, 0), }, - FluidUtils.getFluidStack("nitricacid", 2000), - FluidUtils.getFluidStack(Nitrogen_Tetroxide, 450), + new FluidStack[] { + FluidUtils.getFluidStack("nitricacid", 2000) + }, new ItemStack[]{ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 1) }, - new int[]{100, 50}, + new FluidStack[] { + FluidUtils.getFluidStack(Nitrogen_Tetroxide, 2000), + }, 20*16, - 500); + 500, + 4); } public static void createHydrazine(){ @@ -125,7 +131,7 @@ public class RocketFuels extends ItemPackage { FluidUtils.getFluidStack("hydrogen", 2000), FluidUtils.getFluidStack(Monomethylhydrazine, 3000), new ItemStack[] { - CI.emptyCells(4) + CI.emptyCells(2) }, new int[] {10000}, 20*48, diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 52de45efa5..db382836ce 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -109,6 +109,9 @@ public class RECIPES_GREGTECH { addFuels(); } + + static int[] aVoltageRecipe = {8,30,120,480,1920,7680,30720,122880,491520,1966080}; + private static void chemplantRecipes() { @@ -191,7 +194,7 @@ public class RECIPES_GREGTECH { ALLOY.QUANTUM.getFluid(256), ELEMENT.STANDALONE.HYPOGEN.getFluid(4), 2048 * 4, - (int) GT_Values.V[9], + (int) aVoltageRecipe[9], 600000000 * 2); //Rhugnor @@ -200,7 +203,7 @@ public class RECIPES_GREGTECH { ALLOY.PIKYONIUM.getFluid(128), ELEMENT.STANDALONE.RHUGNOR.getFluid(8), 2048 * 4, - (int) GT_Values.V[7], + (int) aVoltageRecipe[7], 150000000 * 2); } @@ -211,9 +214,9 @@ public class RECIPES_GREGTECH { ItemStack[] aCoilWire = new ItemStack[] { ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, GTNH ? 64 : 32), - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 48 : 16), - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, GTNH ? 32 : 8), - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, GTNH ? 16 : 4), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 64 : 32), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, GTNH ? 64 : 32), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, GTNH ? 64 : 32), }; @@ -248,7 +251,7 @@ public class RECIPES_GREGTECH { }, ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32), 20 * 60 * 10 * (GTNH ? 2 : 1), - (int) GT_Values.V[6]); + (int) aVoltageRecipe[6]); //Slow Fusion Controller CORE.RA.addAssemblylineRecipe( @@ -276,7 +279,7 @@ public class RECIPES_GREGTECH { }, GregtechItemList.Miniature_Fusion.get(1), 20 * 60 * 5 * (GTNH ? 2 : 1), - (int) GT_Values.V[7]); + (int) aVoltageRecipe[7]); //Plasma Tank @@ -299,7 +302,7 @@ public class RECIPES_GREGTECH { }, GregtechItemList.Plasma_Tank.get(1), 20 * 60 * 1 * (GTNH ? 2 : 1), - (int) GT_Values.V[5]); + (int) aVoltageRecipe[5]); // Turbine Automation Port CORE.RA.addAssemblylineRecipe( @@ -328,7 +331,7 @@ public class RECIPES_GREGTECH { }, GregtechItemList.Hatch_Input_TurbineHousing.get(4), 20 * 60 * 60 * (GTNH ? 2 : 1), - (int) GT_Values.V[8]); + (int) aVoltageRecipe[8]); /* @@ -354,21 +357,20 @@ public class RECIPES_GREGTECH { aResearch[aCasingSlot], 20 * 60 * 60, new ItemStack[] { - CI.getTieredComponent(OrePrefixes.plate, j-1, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.circuit, j-2, GTNH ? 16 : 8), - CI.getTieredComponent(OrePrefixes.cableGt08, j+1, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.gearGt, j-1, GTNH ? 8 : 4), + CI.getTieredComponent(OrePrefixes.plate, j-1,16), + CI.getTieredComponent(OrePrefixes.cableGt08, j+1,(GTNH ? 32 : 16)), + CI.getTieredComponent(OrePrefixes.gearGt, j-1, 4), aCoilWire[aCasingSlot] }, new FluidStack[] { - CI.getTieredFluid(j, 144 * 3 * (GTNH ? 16 : 8)), - CI.getTertiaryTieredFluid(j-2, 144 * 4 * (GTNH ? 16 : 8)), - CI.getAlternativeTieredFluid(j, 144 * 6 * (GTNH ? 16 : 8)), + CI.getTieredFluid(j, 144 *(GTNH ? 8 : 4)), + CI.getTertiaryTieredFluid(j-2, 144 * (GTNH ? 16 : 8)), + CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 12)), }, aGemCasings[aCasingSlot++], 20 * 60 * 1 * (GTNH ? 2 : 1), - (int) GT_Values.V[j]); + (int) aVoltageRecipe[j]); } /* @@ -395,22 +397,22 @@ public class RECIPES_GREGTECH { 20 * 60 * 60 * 5, new ItemStack[] { aGemCasings[aCasingSlot], - ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.plate, j, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.circuit, j, GTNH ? 16 : 8), + ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], 16), + CI.getTieredComponent(OrePrefixes.plate, j, 16), + CI.getTieredComponent(OrePrefixes.circuit, j, 8), CI.getTieredComponent(OrePrefixes.wireGt16, j+1, GTNH ? 32 : 16), CI.getTieredComponent(OrePrefixes.bolt, j, GTNH ? 8 : 4), CI.getTieredComponent(OrePrefixes.screw, j-1, GTNH ? 8 : 4), }, new FluidStack[] { - CI.getTieredFluid(j, 144 * 3 * (GTNH ? 16 : 8)), - CI.getTertiaryTieredFluid(j-2, 144 * 4 * (GTNH ? 16 : 8)), - CI.getAlternativeTieredFluid(j, 144 * 6 * (GTNH ? 16 : 8)), - CI.getTertiaryTieredFluid(j-1, 144 * 5 * (GTNH ? 16 : 8)), + CI.getTieredFluid(j, 144 * 1 * (GTNH ? 16 : 8)), + CI.getTertiaryTieredFluid(j-2, 144 * 2 * (GTNH ? 16 : 8)), + CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 8)), + CI.getTertiaryTieredFluid(j-1, 144 * (GTNH ? 16 : 8)), }, aGemBatteries[aCasingSlot++], 20 * 60 * 1 * (GTNH ? 2 : 1), - (int) GT_Values.V[j]); + (int) aVoltageRecipe[j]); } @@ -439,7 +441,7 @@ public class RECIPES_GREGTECH { }, ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1), 20 * 60 * 30 * (GTNH ? 2 : 1), - (int) GT_Values.V[7]); + (int) aVoltageRecipe[7]); @@ -447,9 +449,9 @@ public class RECIPES_GREGTECH { ItemStack[] aChargeResearch = new ItemStack[] { ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1), - ItemUtils.getSimpleStack(ModItems.itemChargePack_High_1, 1), - ItemUtils.getSimpleStack(ModItems.itemChargePack_High_2, 1), - ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", 1), + ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1), }; ItemStack[] aChargeOutputs = new ItemStack[] { @@ -458,44 +460,32 @@ public class RECIPES_GREGTECH { ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1), ItemUtils.getSimpleStack(ModItems.itemChargePack_High_4, 1), }; - - ItemStack[] aBufferCoreInputs = new ItemStack[] { - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", GTNH ? 8 : 4), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", GTNH ? 8 : 4), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", GTNH ? 8 : 4), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", GTNH ? 8 : 4), - }; - + int aCurrSlot = 0; for (int h = 6; h < 10; h++) { CORE.RA.addAssemblylineRecipe( aChargeResearch[aCurrSlot], 20 * 60 * 10 * (aCurrSlot + 1), new ItemStack[] { - ItemUtils.getSimpleStack( - aGemBatteries[aCurrSlot], GTNH ? 4 : 2), - aBufferCoreInputs[aCurrSlot], + ItemUtils.getSimpleStack(aGemBatteries[aCurrSlot],2), aCoilWire[aCurrSlot], - CI.getTieredComponent(OrePrefixes.plate, h, GTNH ? 16 : 8), - CI.getTieredComponent(OrePrefixes.plate, h-1, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.circuit, h, GTNH ? 16 : 4), - CI.getTieredComponent(OrePrefixes.circuit, h-1, GTNH ? 32 : 8), - CI.getTieredComponent(OrePrefixes.cableGt12, h-1, GTNH ? 32 : 16), + CI.getTieredComponent(OrePrefixes.plate, h, 8), + CI.getTieredComponent(OrePrefixes.circuit, h, 4), + CI.getTieredComponent(OrePrefixes.circuit, h-1, 8), + CI.getTieredComponent(OrePrefixes.cableGt12, h-1, 16), CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8), CI.getTieredComponent(OrePrefixes.bolt, h-2, GTNH ? 32 : 16), - CI.getElectricMotor(h, GTNH ? 8 : 4), - CI.getFieldGenerator(h-1, 2), - CI.getRobotArm(h-2, GTNH ? 4 : 2), + CI.getFieldGenerator(h, 1), }, new FluidStack[] { - CI.getTieredFluid(h, 144 * 18 * (GTNH ? 8 : 4)), - CI.getTertiaryTieredFluid(h-1, 144 * 18 * (GTNH ? 8 : 4)), - CI.getAlternativeTieredFluid(h-1, 144 * 18 * (GTNH ? 8 : 4)), - CI.getAlternativeTieredFluid(h-2, 144 * 18 * (GTNH ? 8 : 4)), + CI.getTieredFluid(h, 144 * 4 * (GTNH ? 8 : 4)), + CI.getTertiaryTieredFluid(h-1, 144 * 4 * (GTNH ? 8 : 4)), + CI.getAlternativeTieredFluid(h-1, 144 * 4 * (GTNH ? 8 : 4)), + CI.getAlternativeTieredFluid(h-2, 144 * 4 * (GTNH ? 8 : 4)), }, aChargeOutputs[aCurrSlot], 20 * 60 * 30 * (GTNH ? 2 : 1) * (aCurrSlot+1), - (int) GT_Values.V[h]); + (int) aVoltageRecipe[h]); aCurrSlot++; } @@ -523,7 +513,7 @@ public class RECIPES_GREGTECH { }, ItemUtils.getItemStackFromFQRN("miscutils:personalCloakingDevice", 1), 20 * 60 * 30 * (GTNH ? 2 : 1), - (int) GT_Values.V[8]); + (int) aVoltageRecipe[8]); } @@ -2170,7 +2160,7 @@ public class RECIPES_GREGTECH { null, new int[] { 50, 50, 50, 50, 50, 50 }, 20 * 300 * 9, - (int) GT_Values.V[7], + (int) aVoltageRecipe[7], 750 * 20); // Lepton Smash @@ -2186,9 +2176,9 @@ public class RECIPES_GREGTECH { Particle.getBaseParticle(Particle.TAU_NEUTRINO), }, null, - new int[] { 600, 40, 20, 15, 10, 5 }, - 20 * 300 * 8, - (int) GT_Values.V[7], + new int[] { 1500, 40, 20, 15, 10, 5 }, + 20 * 10, + (int) aVoltageRecipe[7], 750 * 20); // Boson Smash @@ -2205,7 +2195,7 @@ public class RECIPES_GREGTECH { null, new int[] { 160, 260, 150, 150, 1 }, 20 * 300 * 6, - (int) GT_Values.V[7], + (int) aVoltageRecipe[7], 750 * 20); @@ -2226,7 +2216,7 @@ public class RECIPES_GREGTECH { null, new int[] { 10, 20, 20, 10, 10, 5, 5, 2 }, 17 * 247 * 32, - (int) GT_Values.V[8], + (int) aVoltageRecipe[8], 750 * 20); // Graviton Smash @@ -2240,7 +2230,7 @@ public class RECIPES_GREGTECH { null, new int[] {15, 100}, 20 * (GTNH ? 90 : 30), - (int) GT_Values.V[6], + (int) aVoltageRecipe[6], 1000 * 20); FluidStack aPlasma = Materials.Duranium.getMolten(GTNH ? 40 : 10); @@ -2263,7 +2253,7 @@ public class RECIPES_GREGTECH { null, new int[] {100}, 20 * (GTNH ? 300 : 60), - (int) GT_Values.V[6], + (int) aVoltageRecipe[6], 1000 * 20); /* @@ -2300,7 +2290,7 @@ public class RECIPES_GREGTECH { null, new int[] { 275, 250, 225, 275, 250, 225, 275, 250, 275}, 20 * 20 * (IonCount++) * tenCountA, - (int) GT_Values.V[7], + (int) aVoltageRecipe[7], 1500 * 20 * tenCountA); } else { @@ -2334,7 +2324,7 @@ public class RECIPES_GREGTECH { null, new int[] { 125, 125, 125, 125, 125, 125, 125, 125, 125 }, 20 * 20, - (int) GT_Values.V[6], + (int) aVoltageRecipe[6], 15000); // Generate Hydrogen Plasma Recipe @@ -2356,7 +2346,7 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("plasma.hydrogen", 1), new int[] { 250, 250, 250, 500, 500, 500, 10000 }, 20 * 60 * 2, - (int) GT_Values.V[7], + (int) aVoltageRecipe[6], 750 * 20); @@ -2381,7 +2371,7 @@ public class RECIPES_GREGTECH { null, new int[] { 750, 750, 750, 750, 750, 750, 750, 750, 750 }, 20 * 20, - (int) GT_Values.V[6], + (int) aVoltageRecipe[6], 15000); CORE.RA.addCyclotronRecipe( @@ -2404,7 +2394,7 @@ public class RECIPES_GREGTECH { null, new int[] { 375, 375, 375, 375, 375, 375, 375, 375, 375 }, 20 * 20, - (int) GT_Values.V[6], + (int) aVoltageRecipe[6], 15000); @@ -2428,7 +2418,7 @@ public class RECIPES_GREGTECH { null, new int[] { 2500 }, 20 * 60 * 15, - (int) GT_Values.V[7], + (int) aVoltageRecipe[7], 15000); -- cgit From 0c2fab19086ea35e83d6f2900ba4db53303551b9 Mon Sep 17 00:00:00 2001 From: botn365 Date: Tue, 24 Mar 2020 07:42:48 +0100 Subject: revert recipe --- .../gtPlusPlus/core/item/chemistry/RocketFuels.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 25151a91c5..e6426dd6df 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -19,7 +19,6 @@ import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; -import gtPlusPlus.core.item.chemistry.*; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -83,24 +82,19 @@ public class RocketFuels extends ItemPackage { } public static void createNitrogenTetroxide(){ - CORE.RA.addChemicalPlantRecipe( + CORE.RA.addDehydratorRecipe( new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 4), - ItemUtils.getSimpleStack(mOrangeCatalyst, 0), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 4) }, - new FluidStack[] { - FluidUtils.getFluidStack("nitricacid", 2000) - }, + FluidUtils.getFluidStack("nitricacid", 2000), + FluidUtils.getFluidStack(Nitrogen_Tetroxide, 450), new ItemStack[]{ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 1) }, - new FluidStack[] { - FluidUtils.getFluidStack(Nitrogen_Tetroxide, 2000), - }, + new int[]{100, 50}, 20*16, - 500, - 4); + 500); } public static void createHydrazine(){ -- 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') 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') 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 5b1eb1dec77f6eb6ff27998145af6d262e569faf Mon Sep 17 00:00:00 2001 From: botn365 Date: Wed, 25 Mar 2020 11:24:11 +0100 Subject: some more balance tweaking --- src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index db382836ce..b95f3500cf 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -2177,7 +2177,7 @@ public class RECIPES_GREGTECH { }, null, new int[] { 1500, 40, 20, 15, 10, 5 }, - 20 * 10, + 20 * 20, (int) aVoltageRecipe[7], 750 * 20); -- 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') 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 From 67ca10777454cadcb4ba44a1e2a4345b6a4adb93 Mon Sep 17 00:00:00 2001 From: botn365 Date: Sat, 28 Mar 2020 19:51:30 +0100 Subject: made changes from comments --- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 51 +++++++++++----------- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 2 +- 2 files changed, 26 insertions(+), 27 deletions(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index b95f3500cf..c7bbe7c7cd 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -110,7 +110,6 @@ public class RECIPES_GREGTECH { addFuels(); } - static int[] aVoltageRecipe = {8,30,120,480,1920,7680,30720,122880,491520,1966080}; private static void chemplantRecipes() { @@ -194,7 +193,7 @@ public class RECIPES_GREGTECH { ALLOY.QUANTUM.getFluid(256), ELEMENT.STANDALONE.HYPOGEN.getFluid(4), 2048 * 4, - (int) aVoltageRecipe[9], + (int) MaterialUtils.getVoltageForTier(9), 600000000 * 2); //Rhugnor @@ -203,7 +202,7 @@ public class RECIPES_GREGTECH { ALLOY.PIKYONIUM.getFluid(128), ELEMENT.STANDALONE.RHUGNOR.getFluid(8), 2048 * 4, - (int) aVoltageRecipe[7], + (int) MaterialUtils.getVoltageForTier(7), 150000000 * 2); } @@ -251,7 +250,7 @@ public class RECIPES_GREGTECH { }, ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32), 20 * 60 * 10 * (GTNH ? 2 : 1), - (int) aVoltageRecipe[6]); + (int) MaterialUtils.getVoltageForTier(6)); //Slow Fusion Controller CORE.RA.addAssemblylineRecipe( @@ -279,7 +278,7 @@ public class RECIPES_GREGTECH { }, GregtechItemList.Miniature_Fusion.get(1), 20 * 60 * 5 * (GTNH ? 2 : 1), - (int) aVoltageRecipe[7]); + (int) MaterialUtils.getVoltageForTier(7)); //Plasma Tank @@ -302,7 +301,7 @@ public class RECIPES_GREGTECH { }, GregtechItemList.Plasma_Tank.get(1), 20 * 60 * 1 * (GTNH ? 2 : 1), - (int) aVoltageRecipe[5]); + (int) MaterialUtils.getVoltageForTier(5)); // Turbine Automation Port CORE.RA.addAssemblylineRecipe( @@ -331,7 +330,7 @@ public class RECIPES_GREGTECH { }, GregtechItemList.Hatch_Input_TurbineHousing.get(4), 20 * 60 * 60 * (GTNH ? 2 : 1), - (int) aVoltageRecipe[8]); + (int) MaterialUtils.getVoltageForTier(8)); /* @@ -370,7 +369,7 @@ public class RECIPES_GREGTECH { }, aGemCasings[aCasingSlot++], 20 * 60 * 1 * (GTNH ? 2 : 1), - (int) aVoltageRecipe[j]); + (int) MaterialUtils.getVoltageForTier(j)); } /* @@ -412,7 +411,7 @@ public class RECIPES_GREGTECH { }, aGemBatteries[aCasingSlot++], 20 * 60 * 1 * (GTNH ? 2 : 1), - (int) aVoltageRecipe[j]); + (int) MaterialUtils.getVoltageForTier(j)); } @@ -441,7 +440,7 @@ public class RECIPES_GREGTECH { }, ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1), 20 * 60 * 30 * (GTNH ? 2 : 1), - (int) aVoltageRecipe[7]); + (int) MaterialUtils.getVoltageForTier(7)); @@ -485,7 +484,7 @@ public class RECIPES_GREGTECH { }, aChargeOutputs[aCurrSlot], 20 * 60 * 30 * (GTNH ? 2 : 1) * (aCurrSlot+1), - (int) aVoltageRecipe[h]); + (int) MaterialUtils.getVoltageForTier(h)); aCurrSlot++; } @@ -513,7 +512,7 @@ public class RECIPES_GREGTECH { }, ItemUtils.getItemStackFromFQRN("miscutils:personalCloakingDevice", 1), 20 * 60 * 30 * (GTNH ? 2 : 1), - (int) aVoltageRecipe[8]); + (int) MaterialUtils.getVoltageForTier(8)); } @@ -2160,7 +2159,7 @@ public class RECIPES_GREGTECH { null, new int[] { 50, 50, 50, 50, 50, 50 }, 20 * 300 * 9, - (int) aVoltageRecipe[7], + (int) MaterialUtils.getVoltageForTier(7), 750 * 20); // Lepton Smash @@ -2176,9 +2175,9 @@ public class RECIPES_GREGTECH { Particle.getBaseParticle(Particle.TAU_NEUTRINO), }, null, - new int[] { 1500, 40, 20, 15, 10, 5 }, - 20 * 20, - (int) aVoltageRecipe[7], + new int[] { 600, 40, 20, 15, 10, 5 }, + 20 * 300 * 8, + (int) MaterialUtils.getVoltageForTier(7), 750 * 20); // Boson Smash @@ -2195,7 +2194,7 @@ public class RECIPES_GREGTECH { null, new int[] { 160, 260, 150, 150, 1 }, 20 * 300 * 6, - (int) aVoltageRecipe[7], + (int) MaterialUtils.getVoltageForTier(7), 750 * 20); @@ -2216,7 +2215,7 @@ public class RECIPES_GREGTECH { null, new int[] { 10, 20, 20, 10, 10, 5, 5, 2 }, 17 * 247 * 32, - (int) aVoltageRecipe[8], + (int) MaterialUtils.getVoltageForTier(8), 750 * 20); // Graviton Smash @@ -2230,7 +2229,7 @@ public class RECIPES_GREGTECH { null, new int[] {15, 100}, 20 * (GTNH ? 90 : 30), - (int) aVoltageRecipe[6], + (int) MaterialUtils.getVoltageForTier(6), 1000 * 20); FluidStack aPlasma = Materials.Duranium.getMolten(GTNH ? 40 : 10); @@ -2253,7 +2252,7 @@ public class RECIPES_GREGTECH { null, new int[] {100}, 20 * (GTNH ? 300 : 60), - (int) aVoltageRecipe[6], + (int) MaterialUtils.getVoltageForTier(6), 1000 * 20); /* @@ -2290,7 +2289,7 @@ public class RECIPES_GREGTECH { null, new int[] { 275, 250, 225, 275, 250, 225, 275, 250, 275}, 20 * 20 * (IonCount++) * tenCountA, - (int) aVoltageRecipe[7], + (int) MaterialUtils.getVoltageForTier(7), 1500 * 20 * tenCountA); } else { @@ -2324,7 +2323,7 @@ public class RECIPES_GREGTECH { null, new int[] { 125, 125, 125, 125, 125, 125, 125, 125, 125 }, 20 * 20, - (int) aVoltageRecipe[6], + (int) MaterialUtils.getVoltageForTier(6), 15000); // Generate Hydrogen Plasma Recipe @@ -2346,7 +2345,7 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("plasma.hydrogen", 1), new int[] { 250, 250, 250, 500, 500, 500, 10000 }, 20 * 60 * 2, - (int) aVoltageRecipe[6], + (int) MaterialUtils.getVoltageForTier(6), 750 * 20); @@ -2371,7 +2370,7 @@ public class RECIPES_GREGTECH { null, new int[] { 750, 750, 750, 750, 750, 750, 750, 750, 750 }, 20 * 20, - (int) aVoltageRecipe[6], + (int) MaterialUtils.getVoltageForTier(6), 15000); CORE.RA.addCyclotronRecipe( @@ -2394,7 +2393,7 @@ public class RECIPES_GREGTECH { null, new int[] { 375, 375, 375, 375, 375, 375, 375, 375, 375 }, 20 * 20, - (int) aVoltageRecipe[6], + (int) MaterialUtils.getVoltageForTier(6), 15000); @@ -2418,7 +2417,7 @@ public class RECIPES_GREGTECH { null, new int[] { 2500 }, 20 * 60 * 15, - (int) aVoltageRecipe[7], + (int) MaterialUtils.getVoltageForTier(7), 15000); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 4f14b8efc6..2165f27ec7 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -368,7 +368,7 @@ public class RECIPES_Machines { CI.getElectricMotor(i, 2), CI.getPlate(i, 4) }, - FluidUtils.getWater((i + 1) * 1500), + FluidUtils.getWater(i * 1500), aOutputs[i].copy(), 20 * 20, MaterialUtils.getVoltageForTier(i)); -- cgit