From c9fa2faffad73b649c662cefd630aac65f2c7367 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Mon, 2 Sep 2019 00:23:43 +0200 Subject: Moar Fixes +THTR now puts out the correct amount of IC2HotCoolant +improvements on the Unification Enforcer (added a way to convert old fluids) +fixed original EBF noble gas recipe to not be affected by lower tier gas +rebalanced ZPM+ Circuits +added new Textures by EmeraldsEmerald Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 7cb480259f0cc023c04bc55a58785649b242cf8f --- .../github/bartimaeusnek/bartworks/MainMod.java | 14 +++++++------ .../tileentities/multis/GT_TileEntity_THTR.java | 23 ++++++++++----------- .../bartworks/system/material/WerkstoffLoader.java | 4 ++-- .../processingLoaders/AdditionalRecipes.java | 20 +++++++++++++++++- .../textures/items/gt.bwMetaGeneratedItem0/0.png | Bin 606 -> 566 bytes .../textures/items/gt.bwMetaGeneratedItem0/1.png | Bin 375 -> 298 bytes .../textures/items/gt.bwMetaGeneratedItem0/2.png | Bin 396 -> 443 bytes .../textures/items/gt.bwMetaGeneratedItem0/3.png | Bin 245 -> 232 bytes 8 files changed, 40 insertions(+), 21 deletions(-) (limited to 'src/main') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java index b13b4cadb5..bee7086eb9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java @@ -75,10 +75,7 @@ import org.apache.logging.log4j.Logger; import java.io.IOException; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; +import java.util.*; import static com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_ElectricImplosionCompressor.eicMap; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.*; @@ -213,7 +210,11 @@ public final class MainMod { for (GT_Recipe recipe : map.mRecipeList) { for (int i = 0; i < recipe.mFluidInputs.length; i++) { if (GT_Utility.areFluidsEqual(recipe.mFluidInputs[i], wrongNamedFluid)) { + Collection col = map.mRecipeFluidMap.get(wrongNamedFluid.getFluid()); + map.mRecipeFluidMap.remove(wrongNamedFluid.getFluid()); + map.mRecipeFluidMap.put(werkstoff.getFluidOrGas(1).getFluid(),col); recipe.mFluidInputs[i] = werkstoff.getFluidOrGas(recipe.mFluidInputs[i].amount); + map.mRecipeFluidNameMap.add(werkstoff.getFluidOrGas(1).getFluid().getName()); } } for (int i = 0; i < recipe.mFluidOutputs.length; i++) { @@ -223,6 +224,7 @@ public final class MainMod { } } } + GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.add(new BWRecipes.DynamicGTRecipe(false,null,null,null,null,new FluidStack[]{wrongNamedFluid},new FluidStack[]{werkstoff.getFluidOrGas(1)},1,1,0)); } MainMod.runMoltenUnificationEnfocement(werkstoff); for (OrePrefixes prefixes : OrePrefixes.values()) { @@ -383,13 +385,13 @@ public final class MainMod { for (Werkstoff werkstoff : Werkstoff.werkstoffHashMap.values()) { if (!werkstoff.contains(GasTag)) continue; - int time = (int) ((double) recipe.mDuration / 200D * (200D + (werkstoff.getStats().getProtons() > mat.getProtons() ? (double) mat.getProtons() - (double) werkstoff.getStats().getProtons() : (double) mat.getProtons()*2.75D - (double) werkstoff.getStats().getProtons()))); + int time = (int) ((double) recipe.mDuration / 200D * (200D + (werkstoff.getStats().getProtons() >= mat.getProtons() ? (double) mat.getProtons() - (double) werkstoff.getStats().getProtons() : (double) mat.getProtons()*2.75D - (double) werkstoff.getStats().getProtons()))); toAdd.add(new BWRecipes.DynamicGTRecipe(false, recipe.mInputs, recipe.mOutputs, recipe.mSpecialItems, recipe.mChances, new FluidStack[]{new FluidStack(fluids.get(werkstoff), recipe.mFluidInputs[0].amount)}, recipe.mFluidOutputs, time, recipe.mEUt, recipe.mSpecialValue)); } for (Materials materials : Materials.values()) { if (!materials.contains(GasTag)) continue; - int time = (int) ((double) recipe.mDuration / 200D * (200D + (materials.getProtons() > mat.getProtons() ? (double) mat.getProtons() - (double) materials.getProtons() : (double) mat.getProtons()*2.75D - (double) materials.getProtons()))); + int time = (int) ((double) recipe.mDuration / 200D * (200D + (materials.getProtons() >= mat.getProtons() ? (double) mat.getProtons() - (double) materials.getProtons() : (double) mat.getProtons()*2.75D - (double) materials.getProtons()))); toAdd.add(new BWRecipes.DynamicGTRecipe(false, recipe.mInputs, recipe.mOutputs, recipe.mSpecialItems, recipe.mChances, new FluidStack[]{materials.getGas(recipe.mFluidInputs[0].amount)}, recipe.mFluidOutputs, time, recipe.mEUt, recipe.mSpecialValue)); } for (ItemStack is : noGas) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java index edbe884c1f..d1b0d2ebce 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java @@ -149,11 +149,10 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase { this.updateSlots(); if (this.mOutputFluids == null || this.mOutputFluids[0] == null) this.mOutputFluids = new FluidStack[]{FluidRegistry.getFluidStack("ic2hotcoolant",0)}; - //this.mOutputFluids[0].amount+=toProduce; + this.mEUt=0; this.mMaxProgresstime=648000; - return true; } @@ -178,7 +177,7 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase { } } - toProduce = (long) ((0.03471*(float)this.TRISOPeletSupply + 0.0267*(float)this.BISOPeletSupply)); + toProduce = (long) ((0.00711111111111111111111111111111D*(double)this.TRISOPeletSupply + 0.00474074074074074074074074074074D*(double)this.BISOPeletSupply)); if (toProduce > accessibleCoolant) { // new ExplosionIC2( @@ -339,17 +338,17 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase { new ItemStack(GregTech_API.sBlockCasings3,1,12), 40, BW_Util.getMachineVoltageFromTier(5) - ); - GT_Values.RA.addMixerRecipe(WerkstoffLoader.Thorium232.get(OrePrefixes.dust,10),Materials.Uranium235.getDust(1),GT_Utility.getIntegratedCircuit(1),null,null,null,new ItemStack(THTRMaterials.aTHTR_Materials),400,30); - GT_Values.RA.addFormingPressRecipe(new ItemStack(THTRMaterials.aTHTR_Materials),Materials.Graphite.getDust(64),new ItemStack(THTRMaterials.aTHTR_Materials,1,4),40,30); + ); + GT_Values.RA.addMixerRecipe(WerkstoffLoader.Thorium232.get(OrePrefixes.dust,10),Materials.Uranium235.getDust(1),GT_Utility.getIntegratedCircuit(1),null,null,null,new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials),400,30); + GT_Values.RA.addFormingPressRecipe(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials),Materials.Graphite.getDust(64),new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials,1,4),40,30); ItemStack[] pellets = new ItemStack[6]; - Arrays.fill(pellets,new ItemStack(THTRMaterials.aTHTR_Materials,64,1)); - GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(false,new ItemStack[]{new ItemStack(THTRMaterials.aTHTR_Materials,1,4),GT_Utility.getIntegratedCircuit(17)},pellets,null,null,null,null,24000,30,0); - GT_Values.RA.addFormingPressRecipe(new ItemStack(THTRMaterials.aTHTR_Materials,1,4),Materials.Silicon.getDust(64),new ItemStack(THTRMaterials.aTHTR_Materials,1,2),40,30); - GT_Values.RA.addFormingPressRecipe(new ItemStack(THTRMaterials.aTHTR_Materials,1,2),Materials.Graphite.getDust(64),new ItemStack(THTRMaterials.aTHTR_Materials,1,5),40,30); + Arrays.fill(pellets,new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials,64,1)); + GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(false,new ItemStack[]{new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials,1,4),GT_Utility.getIntegratedCircuit(17)},pellets,null,null,null,null,24000,30,0); + GT_Values.RA.addFormingPressRecipe(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials,1,4),Materials.Silicon.getDust(64),new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials,1,2),40,30); + GT_Values.RA.addFormingPressRecipe(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials,1,2),Materials.Graphite.getDust(64),new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials,1,5),40,30); pellets = new ItemStack[6]; - Arrays.fill(pellets,new ItemStack(THTRMaterials.aTHTR_Materials,64,3)); - GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(false,new ItemStack[]{new ItemStack(THTRMaterials.aTHTR_Materials,1,5),GT_Utility.getIntegratedCircuit(17)},pellets,null,null,null,null,48000,30,0); + Arrays.fill(pellets,new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials,64,3)); + GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(false,new ItemStack[]{new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials,1,5),GT_Utility.getIntegratedCircuit(17)},pellets,null,null,null,null,48000,30,0); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index bc7b4b54aa..bf3ae4bb9e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -947,8 +947,8 @@ public class WerkstoffLoader implements Runnable { GT_ModHandler.addPulverisationRecipe(werkstoff.get(gemExquisite), werkstoff.get(dust, 4)); GT_ModHandler.addPulverisationRecipe(werkstoff.get(gemFlawless), werkstoff.get(dust, 2)); GT_ModHandler.addPulverisationRecipe(werkstoff.get(gem), werkstoff.get(dust)); - GT_ModHandler.addPulverisationRecipe(werkstoff.get(gemFlawed), werkstoff.get(dustSmall, 1)); - GT_ModHandler.addPulverisationRecipe(werkstoff.get(gemChipped), werkstoff.get(dustTiny)); + GT_ModHandler.addPulverisationRecipe(werkstoff.get(gemFlawed), werkstoff.get(dustSmall, 2)); + GT_ModHandler.addPulverisationRecipe(werkstoff.get(gemChipped), werkstoff.get(dustSmall)); GT_ModHandler.addCraftingRecipe(werkstoff.get(gemFlawless, 2), 0, new Object[]{"h ", "W ", 'W', werkstoff.get(gemExquisite)}); GT_ModHandler.addCraftingRecipe(werkstoff.get(gem, 2), 0, new Object[]{"h ", "W ", 'W', werkstoff.get(gemFlawless)}); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java index 3878422bbe..0acd99df2d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java @@ -80,7 +80,7 @@ public class AdditionalRecipes implements Runnable { GT_Values.RA.addAutoclaveRecipe(WerkstoffLoader.MagnetoResonaticDust.get(dust),WerkstoffLoader.Krypton.getFluidOrGas(1000),WerkstoffLoader.MagnetoResonaticDust.get(gem),10000,4500, BW_Util.getMachineVoltageFromTier(5)); - for (int i = 0; i < 11; i++) { + for (int i = 0; i <= 6; i++) { GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes.add( new BWRecipes.DynamicGTRecipe(false, new ItemStack[]{ @@ -98,6 +98,24 @@ public class AdditionalRecipes implements Runnable { Materials.SolderingAlloy.getMolten((i+1)*36) },null,(i+1)*750, BW_Util.getMachineVoltageFromTier((i+1)),CLEANROOM)); } + for (int i = 7; i <= 10; i++) { + GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes.add( + new BWRecipes.DynamicGTRecipe(false, + new ItemStack[]{ + BW_Meta_Items.getNEWCIRCUITS().getStack(3), + WerkstoffLoader.MagnetoResonaticDust.get(gemExquisite,(2)), + BW_Meta_Items.getNEWCIRCUITS().getStack(i+3), + ItemList.Circuit_Parts_DiodeSMD.get((i+6)*4), + ItemList.Circuit_Parts_CapacitorSMD.get((i+6)*4), + ItemList.Circuit_Parts_TransistorSMD.get((i+6)*4) + }, + new ItemStack[]{ + BW_Meta_Items.getNEWCIRCUITS().getStack(i+4) + },null,null, + new FluidStack[]{ + Materials.SolderingAlloy.getMolten((i+1)*144) + },null,(i+1)*1500, BW_Util.getMachineVoltageFromTier(i+1),CLEANROOM)); + } //manual override for older GT Werkstoff werkstoff = WerkstoffLoader.Oganesson; diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/0.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/0.png index c597cc08ae..e16102588a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/0.png and b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/0.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/1.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/1.png index f2ec0dcb97..491164695b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/1.png and b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/2.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/2.png index 43291b873a..968e0745c9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/2.png and b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/3.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/3.png index 7987d1fff6..9e22dd6726 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/3.png and b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/3.png differ -- cgit