diff options
author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-09-07 00:20:03 +0200 |
---|---|---|
committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-09-07 00:20:03 +0200 |
commit | c6b938f6c98156b1b452032a98cf1214c3656a17 (patch) | |
tree | bdf5ecaa568ae8ff2fe37a9b639bd2843a35c907 /src/main | |
parent | 509c8d741a7333df2bb64b218bf2baf55ae9370f (diff) | |
download | GT5-Unofficial-c6b938f6c98156b1b452032a98cf1214c3656a17.tar.gz GT5-Unofficial-c6b938f6c98156b1b452032a98cf1214c3656a17.tar.bz2 GT5-Unofficial-c6b938f6c98156b1b452032a98cf1214c3656a17.zip |
recipe changes
+added fluid container registration for LCR
+fixed boxinator(packager) recipes
+rebalanced PGSD Overhaul v1
+fixed typos
+added HotIngots
+started on own logic system for oreprefixes
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Former-commit-id: a1fb14768be881f1fa6324bf66a685f32bd14803
Diffstat (limited to 'src/main')
4 files changed, 324 insertions, 92 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java new file mode 100644 index 0000000000..f82dcc2307 --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java @@ -0,0 +1,125 @@ +/* + * Copyright (c) 2019 bartimaeusnek + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package com.github.bartimaeusnek.bartworks.system.material; + +import gregtech.api.enums.*; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaPipeEntity; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_ModHandler.RecipeBits; +import gregtech.api.util.GT_OreDictUnificator; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import static gregtech.api.enums.GT_Values.RA; + +public class BW_MetaGeneratedFrames extends MetaPipeEntity { + + public final Werkstoff mMaterial; + + public BW_MetaGeneratedFrames(int aID, String aName, String aNameRegional, Werkstoff aMaterial) { + super(aID, aName, aNameRegional, 0); + mMaterial = aMaterial; + + GT_OreDictUnificator.registerOre(OrePrefixes.frameGt, aMaterial, getStackForm(1)); + GT_ModHandler.addCraftingRecipe(getStackForm(2), RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"SSS", "SwS", "SSS", 'S', OrePrefixes.stick.get(mMaterial)}); + RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 4), ItemList.Circuit_Integrated.getWithDamage(0, 4), getStackForm(1), 64, 8); + } + + public BW_MetaGeneratedFrames(String aName, Werkstoff aMaterial) { + super(aName, 0); + mMaterial = aMaterial; + } + + @Override + public byte getTileEntityBaseType() { + return 4; + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new BW_MetaGeneratedFrames(this.mName, this.mMaterial); + } + + @Override + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections, byte aColorIndex, boolean aConnected, boolean aRedstone) { + return new ITexture[]{new GT_RenderedTexture(this.mMaterial.getTexSet().mTextures[OrePrefixes.frameGt.mTextureIndex], Dyes.getModulation(aColorIndex, this.mMaterial.getRGBA()))}; + } + + @Override + public String[] getDescription() { + return new String[]{"Just something you can put a Cover or CFoam on."}; + } + + @Override + public final boolean isSimpleMachine() { + return true; + } + + @Override + public final boolean isFacingValid(byte aFacing) { + return false; + } + + @Override + public final boolean isValidSlot(int aIndex) { + return false; + } + + @Override + public final boolean renderInside(byte aSide) { + return true; + } + + @Override + public final float getThickNess() { + return 1.0F; + } + + @Override + public final void saveNBTData(NBTTagCompound aNBT) {/*Do nothing*/} + + @Override + public final void loadNBTData(NBTTagCompound aNBT) {/*Do nothing*/} + + @Override + public final boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + return false; + } + + @Override + public final boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + return false; + } + + public int connect(byte aSide) { + return 0; + } + + public void disconnect(byte aSide) { + /* Do nothing*/ + } +}
\ No newline at end of file diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java index 0f0d9d3c5e..83aeae3afc 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java @@ -346,14 +346,48 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { //logic gate shit /* dust 1 - metal 10 + metal 10 (ingot, nugget) gem 100 ore 1000 cell 10000 plasma 100000 molten 1000000 + crafting metal 10000000 (sticks, plates) + meta crafting metal 100000000 (gears, screws, bolts, springs) + multiple ingotWorth stuff 1000000000 (double, triple, quadrupe, ingot/plates) */ - public byte toGenerate = 0b0001001; + public short toGenerate = 0b0001001; + public static final HashMap<OrePrefixes,Integer> prefixLogic = new HashMap<>(); + + static { + for (OrePrefixes p : OrePrefixes.values()){ + Werkstoff.GenerationFeatures.prefixLogic.put(p,0); + } + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.dust,1); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.dustTiny,1); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.dustSmall,1); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingot,10); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingotHot,10); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.nugget,10); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.gem,100); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.gemFlawed,100); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.gemExquisite,100); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.gemChipped,100); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.gemFlawless,100); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ore,1000); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.dustImpure,1000); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.dustPure,1000); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.crushed,1000); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.crushedPurified,1000); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.crushedCentrifuged,1000); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.cell,10000); + Werkstoff.GenerationFeatures.prefixLogic.put(WerkstoffLoader.cellMolten,1000000); + Werkstoff.GenerationFeatures.prefixLogic.put(WerkstoffLoader.cellMolten,1000000); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plate,10000000); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.stick,10000000); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.rod,10000000); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.stickLong,10000000); + } //public byte toGenerateSecondary = 0b0000000; public byte blacklist; @@ -364,6 +398,8 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { * Auto add Chemical Recipes 1 * Auto add mixer Recipes 10 * Auto add Sifter Recipe 100 + * Auto add MetalWorking(sticks, plates) Recipe 1000 + * Auto add MetalWorking(crafting components) Recipe 10000 */ public byte extraRecipes; 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 e4d744921f..26f4783a0f 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 @@ -662,7 +662,7 @@ public class WerkstoffLoader implements Runnable { ); public static final Werkstoff PTConcentrate = new Werkstoff( Materials.Platinum.getRGBA(), - "Platin Concentrate", + "Platinum Concentrate", "", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -674,7 +674,7 @@ public class WerkstoffLoader implements Runnable { ); public static final Werkstoff PTSaltCrude = new Werkstoff( Materials.Platinum.getRGBA(), - "Platin Salt", + "Platinum Salt", "", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -686,7 +686,7 @@ public class WerkstoffLoader implements Runnable { ); public static final Werkstoff PTSaltRefined = new Werkstoff( Materials.Platinum.getRGBA(), - "Refined Platin Salt", + "Refined Platinum Salt", "", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -698,7 +698,7 @@ public class WerkstoffLoader implements Runnable { ); public static final Werkstoff PTMetallicPowder = new Werkstoff( Materials.Platinum.getRGBA(), - "Platin Metallic Powder", + "Platinum Metallic Powder", "", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -730,9 +730,9 @@ public class WerkstoffLoader implements Runnable { TextureSet.SET_ROUGH //No Byproducts ); - public static final Werkstoff AmmoniumCloride = new Werkstoff( + public static final Werkstoff AmmoniumChloride = new Werkstoff( new short[]{0xff,0xff,0xff}, - "Ammonium Cloride", + "Ammonium Chloride", subscriptNumbers("NH4Cl"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, @@ -745,7 +745,7 @@ public class WerkstoffLoader implements Runnable { ); public static final Werkstoff PTRawPowder = new Werkstoff( Materials.Platinum.getRGBA(), - "Reprecipated Platin", + "Reprecipated Platinum", "PtCl", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -936,7 +936,7 @@ public class WerkstoffLoader implements Runnable { ); public static final Werkstoff HotRutheniumTetroxideSollution= new Werkstoff( new short[]{0xc7,0xc7,0xc7}, - "Hot Ruthenium Tetroxide Sollution", + "Hot Ruthenium Tetroxide Solution", "???", new Werkstoff.Stats().setGas(true).setMeltingPoint(700), Werkstoff.Types.COMPOUND, @@ -952,7 +952,7 @@ public class WerkstoffLoader implements Runnable { ); public static final Werkstoff RutheniumTetroxideSollution = new Werkstoff( new short[]{0xc7,0xc7,0xc7}, - "Ruthenium Tetroxide Sollution", + "Ruthenium Tetroxide Solution", "???", new Werkstoff.Stats().setMeltingPoint(313), Werkstoff.Types.COMPOUND, @@ -1081,7 +1081,7 @@ public class WerkstoffLoader implements Runnable { ); public static final Werkstoff CrudeRhMetall = new Werkstoff( new short[]{0x66, 0x66, 0x66}, - "Crude Rhodium Metall", + "Crude Rhodium Metal", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), @@ -1160,14 +1160,24 @@ public class WerkstoffLoader implements Runnable { public static final Werkstoff ReRh = new Werkstoff( new short[]{0x77, 0x66, 0x49}, "Reprecipated Rhodium", - "RERh", + subscriptNumbers("Rh2NH4"), new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), 87, TextureSet.SET_QUARTZ ); - + public static final Werkstoff LuVTierMaterial = new Werkstoff( + new short[]{0xff, 0xee, 0xee}, + "Rhodium-Plated Palladium", + new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(4500), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().addMixerRecipes(), + 88, + TextureSet.SET_METALLIC, + new Pair<>(Materials.Palladium,3), + new Pair<>(WerkstoffLoader.Rhodium,1) + ); public static HashMap<OrePrefixes, BW_MetaGenerated_Items> items = new HashMap<>(); @@ -1345,7 +1355,30 @@ public class WerkstoffLoader implements Runnable { } if ((WerkstoffLoader.toGenerateGlobal & 0b10) != 0) { WerkstoffLoader.items.put(ingot, new BW_MetaGenerated_Items(ingot)); + WerkstoffLoader.items.put(ingotHot, new BW_MetaGenerated_Items(ingotHot)); //1750 WerkstoffLoader.items.put(nugget, new BW_MetaGenerated_Items(nugget)); + +// WerkstoffLoader.items.put(plate, new BW_MetaGenerated_Items(plate)); +// WerkstoffLoader.items.put(rod, new BW_MetaGenerated_Items(rod)); +// WerkstoffLoader.items.put(stickLong, new BW_MetaGenerated_Items(stickLong)); +// +// WerkstoffLoader.items.put(gearGt, new BW_MetaGenerated_Items(gearGt)); +// WerkstoffLoader.items.put(gearGtSmall, new BW_MetaGenerated_Items(gearGtSmall)); +// WerkstoffLoader.items.put(bolt, new BW_MetaGenerated_Items(bolt)); +// WerkstoffLoader.items.put(screw, new BW_MetaGenerated_Items(screw)); +// WerkstoffLoader.items.put(ring, new BW_MetaGenerated_Items(ring)); +// WerkstoffLoader.items.put(spring, new BW_MetaGenerated_Items(spring)); +// WerkstoffLoader.items.put(springSmall, new BW_MetaGenerated_Items(springSmall)); +// +// WerkstoffLoader.items.put(plateDouble, new BW_MetaGenerated_Items(plateDouble)); +// WerkstoffLoader.items.put(plateTriple, new BW_MetaGenerated_Items(plateTriple)); +// WerkstoffLoader.items.put(plateQuadruple, new BW_MetaGenerated_Items(plateQuadruple)); +// WerkstoffLoader.items.put(plateQuintuple, new BW_MetaGenerated_Items(plateQuintuple)); +// WerkstoffLoader.items.put(plateDense, new BW_MetaGenerated_Items(plateDense)); +// WerkstoffLoader.items.put(ingotDouble, new BW_MetaGenerated_Items(ingotDouble)); +// WerkstoffLoader.items.put(ingotTriple, new BW_MetaGenerated_Items(ingotTriple)); +// WerkstoffLoader.items.put(ingotQuadruple, new BW_MetaGenerated_Items(ingotQuadruple)); +// WerkstoffLoader.items.put(ingotQuintuple, new BW_MetaGenerated_Items(ingotQuintuple)); } if ((WerkstoffLoader.toGenerateGlobal & 0b100) != 0) { WerkstoffLoader.items.put(gem, new BW_MetaGenerated_Items(gem)); @@ -1393,6 +1426,21 @@ public class WerkstoffLoader implements Runnable { for (Werkstoff werkstoff : Werkstoff.werkstoffHashSet) { Materials werkstoffBridgeMaterial = new Materials(-1,werkstoff.getTexSet(),0,0,0,false,werkstoff.getDefaultName(),werkstoff.getDefaultName()); GT_OreDictUnificator.addAssociation(ore,werkstoffBridgeMaterial,new ItemStack(WerkstoffLoader.BWOres,1,werkstoff.getmID()),true); + for (OrePrefixes prefixes : values()) { + if (werkstoff.get(prefixes) != null && werkstoff.get(prefixes).getItem() != null) + GT_OreDictUnificator.addAssociation(prefixes, werkstoffBridgeMaterial, werkstoff.get(prefixes), true); + } + if (werkstoff.getGenerationFeatures().hasCells()) { + werkstoffBridgeMaterial.setHasCorrespondingFluid(true); + werkstoffBridgeMaterial.setHasCorrespondingGas(true); + werkstoffBridgeMaterial.mFluid = werkstoff.getFluidOrGas(1).getFluid(); + werkstoffBridgeMaterial.mGas = werkstoff.getFluidOrGas(1).getFluid(); + + } + if (werkstoff.getGenerationFeatures().hasMolten()) { + werkstoffBridgeMaterial.mStandardMoltenFluid = werkstoff.getMolten(1).getFluid(); + + } toRem.add(werkstoffBridgeMaterial); } try { @@ -1608,22 +1656,32 @@ public class WerkstoffLoader implements Runnable { "T ", 'T', werkstoff.get(dust) }); + GT_Values.RA.addBoxingRecipe(werkstoff.get(dustTiny,9), ItemList.Schematic_Dust.get(0L), werkstoff.get(dust), 100, 4); + GT_Values.RA.addBoxingRecipe(werkstoff.get(dustSmall,4), ItemList.Schematic_Dust.get(0L), werkstoff.get(dust), 100, 4); + GT_Values.RA.addBoxingRecipe(werkstoff.get(dustTiny,9), ItemList.Schematic_3by3.get(0L), werkstoff.get(dust), 100, 4); + GT_Values.RA.addBoxingRecipe(werkstoff.get(dustSmall,4), ItemList.Schematic_2by2.get(0L), werkstoff.get(dust), 100, 4); + if ((werkstoff.getGenerationFeatures().toGenerate & 0b10) != 0 && !werkstoff.getStats().isBlastFurnace()) { GT_ModHandler.addSmeltingRecipe(werkstoff.get(dust), werkstoff.get(ingot)); GT_ModHandler.addSmeltingRecipe(werkstoff.get(dustTiny), werkstoff.get(nugget)); } else if ((werkstoff.getGenerationFeatures().toGenerate & 0b10) != 0 && werkstoff.getStats().isBlastFurnace() && werkstoff.getStats().meltingPoint != 0){ if (werkstoff.contains(WerkstoffLoader.ANAEROBE_SMELTING)){ - GT_Values.RA.addBlastRecipe(werkstoff.get(dust),GT_Utility.getIntegratedCircuit(11),Materials.Nitrogen.getGas(1000),null,werkstoff.get(ingot),null,(int) Math.max(werkstoff.getStats().getMass() / 40L, 1L) * werkstoff.getStats().meltingPoint, 120, werkstoff.getStats().getMeltingPoint()); + GT_Values.RA.addBlastRecipe(werkstoff.get(dust),GT_Utility.getIntegratedCircuit(11),Materials.Nitrogen.getGas(1000),null,werkstoff.getStats().meltingPoint < 1750 ? werkstoff.get(ingot) : werkstoff.get(ingotHot),null,(int) Math.max(werkstoff.getStats().getMass() / 40L, 1L) * werkstoff.getStats().meltingPoint, 120, werkstoff.getStats().getMeltingPoint()); } else { - GT_Values.RA.addBlastRecipe(werkstoff.get(dust), GT_Utility.getIntegratedCircuit(1), null, null, werkstoff.get(ingot), null, (int) Math.max(werkstoff.getStats().getMass() / 40L, 1L) * werkstoff.getStats().meltingPoint, 120, werkstoff.getStats().getMeltingPoint()); + GT_Values.RA.addBlastRecipe(werkstoff.get(dust), GT_Utility.getIntegratedCircuit(1), null, null, werkstoff.getStats().meltingPoint < 1750 ? werkstoff.get(ingot) : werkstoff.get(ingotHot), null, (int) Math.max(werkstoff.getStats().getMass() / 40L, 1L) * werkstoff.getStats().meltingPoint, 120, werkstoff.getStats().getMeltingPoint()); if (werkstoff.getStats().meltingPoint <= 1000) { GT_Values.RA.addPrimitiveBlastRecipe(werkstoff.get(dust), null, 9, werkstoff.get(ingot), null, (int) Math.max(werkstoff.getStats().getMass() / 40L, 1L) * werkstoff.getStats().meltingPoint); GT_ModHandler.addRCBlastFurnaceRecipe(werkstoff.get(ingot), werkstoff.get(dust), werkstoff.getStats().meltingPoint); } } } + + if (werkstoff.getStats().isBlastFurnace() && werkstoff.getStats().meltingPoint > 1750){ + GT_Values.RA.addVacuumFreezerRecipe(werkstoff.get(ingotHot),werkstoff.get(ingot),(int) Math.max(werkstoff.getStats().mass * 3L, 1L)); + } + if ((werkstoff.getGenerationFeatures().toGenerate & 0b10) != 0){ GT_ModHandler.addPulverisationRecipe(werkstoff.get(ingot),werkstoff.get(dust)); GT_ModHandler.addPulverisationRecipe(werkstoff.get(nugget),werkstoff.get(dustTiny)); @@ -1807,7 +1865,7 @@ public class WerkstoffLoader implements Runnable { //Tank "Recipe" GT_Utility.addFluidContainerData(new FluidContainerRegistry.FluidContainerData(new FluidStack(WerkstoffLoader.fluids.get(werkstoff), 1000),werkstoff.get(cell),Materials.Empty.getCells(1))); - + FluidContainerRegistry.registerFluidContainer(werkstoff.getFluidOrGas(1).getFluid(),werkstoff.get(cell),Materials.Empty.getCells(1)); GT_Values.RA.addFluidCannerRecipe(Materials.Empty.getCells(1), werkstoff.get(cell), new FluidStack(fluids.get(werkstoff),1000), GT_Values.NF); GT_Values.RA.addFluidCannerRecipe(werkstoff.get(cell), Materials.Empty.getCells(1), GT_Values.NF, new FluidStack(fluids.get(werkstoff),1000)); @@ -1853,6 +1911,7 @@ public class WerkstoffLoader implements Runnable { //Tank "Recipe" FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(new FluidStack(WerkstoffLoader.molten.get(werkstoff), 144),werkstoff.get(cellMolten),Materials.Empty.getCells(1)); + FluidContainerRegistry.registerFluidContainer(werkstoff.getMolten(144),werkstoff.get(cell),Materials.Empty.getCells(1)); GT_Utility.addFluidContainerData(data); GT_Values.RA.addFluidCannerRecipe(Materials.Empty.getCells(1), werkstoff.get(cellMolten), new FluidStack(molten.get(werkstoff),144), GT_Values.NF); GT_Values.RA.addFluidCannerRecipe(werkstoff.get(cellMolten), Materials.Empty.getCells(1), GT_Values.NF, new FluidStack(molten.get(werkstoff),144)); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/PlatinumSludgeOverHaul.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/PlatinumSludgeOverHaul.java index 3d1f916a91..b590615154 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/PlatinumSludgeOverHaul.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/PlatinumSludgeOverHaul.java @@ -22,6 +22,8 @@ package com.github.bartimaeusnek.bartworks.system.material.processingLoaders; +import com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_Items; +import com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration.BW_Meta_Items; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.util.BW_Util; import gregtech.api.enums.GT_Values; @@ -47,74 +49,77 @@ public class PlatinumSludgeOverHaul { private PlatinumSludgeOverHaul(){} public static void runHelperrecipes(){ + //DilutedSulfuricAcid + GT_Values.RA.addMixerRecipe(Materials.SulfuricAcid.getCells(3),Materials.Water.getCells(1),GT_Utility.getIntegratedCircuit(1),null,null,null, Materials.DilutedSulfuricAcid.getCells(4),30,30); + //FormicAcid - GT_Values.RA.addChemicalRecipe(Sodiumformate.get(cell,2), GT_Utility.getIntegratedCircuit(21), Materials.SulfuricAcid.getFluid(1000),null,FormicAcid.get(cell,2),Sodiumsulfate.get(dust),15); - GT_Values.RA.addChemicalRecipe(Materials.SulfuricAcid.getCells(2), GT_Utility.getIntegratedCircuit(21), Sodiumformate.getFluidOrGas(1000),FormicAcid.getFluidOrGas(2000),Materials.Empty.getCells(2),Sodiumsulfate.get(dust),15); + GT_Values.RA.addChemicalRecipe(Sodiumformate.get(cell,2), GT_Utility.getIntegratedCircuit(1), Materials.SulfuricAcid.getFluid(1000),null,FormicAcid.get(cell,2),Sodiumsulfate.get(dust),15); + GT_Values.RA.addChemicalRecipe(Materials.SulfuricAcid.getCells(2), GT_Utility.getIntegratedCircuit(1), Sodiumformate.getFluidOrGas(1000),FormicAcid.getFluidOrGas(2000),Materials.Empty.getCells(2),Sodiumsulfate.get(dust),15); //AquaRegia GT_Values.RA.addMixerRecipe(Materials.DilutedSulfuricAcid.getCells(1),Materials.NitricAcid.getCells(1),GT_Utility.getIntegratedCircuit(1),null,null,null, AquaRegia.get(cell,2),30,30); //AmmoniumCloride - GT_Values.RA.addChemicalRecipe(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(11), Materials.HydrochloricAcid.getFluid(1000),null,AmmoniumCloride.get(cell,1),null,15); - GT_Values.RA.addChemicalRecipe(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11), Materials.Ammonia.getGas(1000),AmmoniumCloride.getFluidOrGas(1000),Materials.Empty.getCells(1),null,15); + GT_Values.RA.addChemicalRecipe(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(1), Materials.HydrochloricAcid.getFluid(1000),null, AmmoniumChloride.get(cell,1),null,15); + GT_Values.RA.addChemicalRecipe(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1), Materials.Ammonia.getGas(1000), AmmoniumChloride.getFluidOrGas(1000),Materials.Empty.getCells(1),null,15); //base sollution for (Werkstoff w :Werkstoff.werkstoffHashMap.values()) if (w.containsStuff(Materials.Sulfur)&&(w.containsStuff(Materials.Copper)||w.containsStuff(Materials.Nickel))) { - GT_Values.RA.addChemicalRecipe(w.get(crushedPurified), GT_Utility.getIntegratedCircuit(11), AquaRegia.getFluidOrGas(150), PTConcentrate.getFluidOrGas(150), null, 250); - GT_Values.RA.addChemicalRecipe(w.get(crushedPurified), PTMetallicPowder.get(dust), AquaRegia.getFluidOrGas(1150), PTConcentrate.getFluidOrGas(1150), PTResidue.get(dust), 250); + GT_Values.RA.addChemicalRecipe(w.get(crushedPurified), GT_Utility.getIntegratedCircuit(1), AquaRegia.getFluidOrGas(150), PTConcentrate.getFluidOrGas(150), null, 250); + GT_Values.RA.addChemicalRecipe(w.get(crushedPurified), PTMetallicPowder.get(dust), AquaRegia.getFluidOrGas(1150), PTConcentrate.getFluidOrGas(1150), PTResidue.get(dustTiny), 250); } for (Materials m : Materials.values()) if (materialsContains(m,Materials.Sulfur)&&(materialsContains(m,Materials.Copper)||materialsContains(m,Materials.Nickel))){ - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(crushedPurified,m,1), GT_Utility.getIntegratedCircuit(11), AquaRegia.getFluidOrGas(150), PTConcentrate.getFluidOrGas(150), null, 250); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(crushedPurified,m,1), PTMetallicPowder.get(dust), AquaRegia.getFluidOrGas(1150), PTConcentrate.getFluidOrGas(1150), PTResidue.get(dust), 250); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(crushedPurified,m,1), GT_Utility.getIntegratedCircuit(1), AquaRegia.getFluidOrGas(150), PTConcentrate.getFluidOrGas(150), null, 250); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(crushedPurified,m,1), PTMetallicPowder.get(dust), AquaRegia.getFluidOrGas(1150), PTConcentrate.getFluidOrGas(1150), PTResidue.get(dustTiny), 250); } //Pt - GT_Values.RA.addChemicalRecipe(PTMetallicPowder.get(dust), GT_Utility.getIntegratedCircuit(11), AquaRegia.getFluidOrGas(1000), PTConcentrate.getFluidOrGas(1000), PTResidue.get(dust), 250); - GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{},new FluidStack[]{PTConcentrate.getFluidOrGas(1000),AmmoniumCloride.getFluidOrGas(1000)},new FluidStack[]{PDAmmonia.getFluidOrGas(1000)},new ItemStack[]{PTSaltCrude.get(dustTiny,8),PTRawPowder.get(dustTiny)},600,30); + GT_Values.RA.addChemicalRecipe(PTMetallicPowder.get(dust), GT_Utility.getIntegratedCircuit(1), AquaRegia.getFluidOrGas(1000), PTConcentrate.getFluidOrGas(1000), PTResidue.get(dustTiny), 250); + GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{},new FluidStack[]{PTConcentrate.getFluidOrGas(1000), AmmoniumChloride.getFluidOrGas(1000)},new FluidStack[]{PDAmmonia.getFluidOrGas(100),Materials.Ammonia.getGas(900)},new ItemStack[]{PTSaltCrude.get(dustTiny,8),PTRawPowder.get(dustTiny)},600,30); GT_Values.RA.addSifterRecipe(PTSaltCrude.get(dust),new ItemStack[]{ - PTSaltRefined.get(dustTiny), - PTSaltRefined.get(dustTiny), - PTSaltRefined.get(dustTiny), - PTSaltRefined.get(dustTiny), - PTSaltRefined.get(dustTiny), - PTSaltRefined.get(dustTiny), - PTSaltRefined.get(dustTiny), - PTSaltRefined.get(dustTiny), - PTSaltRefined.get(dustTiny), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), },new int[]{ 1000,1000,1000,1000,1000,1000,1000,1000,500, },600,30); - GT_Values.RA.addBlastRecipe(PTSaltRefined.get(dust),null,null,null,PTMetallicPowder.get(dust),null,200,120,900); + GT_Values.RA.addBlastRecipe(PTSaltRefined.get(dust),GT_Utility.getIntegratedCircuit(1),null,null,PTMetallicPowder.get(dust),null,200,120,900); GT_Values.RA.addChemicalRecipe(PTRawPowder.get(dust,2),Materials.Calcium.getDust(1),null,null,Materials.Platinum.getDust(2),CalciumChloride.get(dust),30); //Pd - GT_Values.RA.addChemicalRecipe(PDMetallicPowder.get(dust), GT_Utility.getIntegratedCircuit(11), PDAmmonia.getFluidOrGas(1000), null,PDSalt.get(dustTiny,16),PDRawPowder.get(dustTiny,2), 250); - GT_Values.RA.addChemicalRecipe(GT_Utility.getIntegratedCircuit(10),null,PDAmmonia.getFluidOrGas(1000), null, PDSalt.get(dustTiny,9), 250); + GT_Values.RA.addChemicalRecipe(PDMetallicPowder.get(dust),GT_Utility.getIntegratedCircuit(1),Materials.Ammonia.getGas(1000), PDAmmonia.getFluidOrGas(1000), null, 250); + GT_Values.RA.addChemicalRecipe(PDMetallicPowder.get(dust), GT_Utility.getIntegratedCircuit(1), PDAmmonia.getFluidOrGas(1000), null,PDSalt.get(dustTiny,16),PDRawPowder.get(dustTiny,2), 250); + GT_Values.RA.addChemicalRecipe(GT_Utility.getIntegratedCircuit(2),null,PDAmmonia.getFluidOrGas(1000), null, PDSalt.get(dustTiny,9), 250); GT_Values.RA.addSifterRecipe(PDSalt.get(dust),new ItemStack[]{ - PDMetallicPowder.get(dustTiny), - PDMetallicPowder.get(dustTiny), - PDMetallicPowder.get(dustTiny), - PDMetallicPowder.get(dustTiny), - PDMetallicPowder.get(dustTiny), - PDMetallicPowder.get(dustTiny), - PDMetallicPowder.get(dustTiny), - PDMetallicPowder.get(dustTiny), - PDMetallicPowder.get(dustTiny), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), },new int[]{ 1000,1000,1000,1000,1000,1000,1000,1000,500, },600,30); GT_Values.RA.addChemicalRecipeForBasicMachineOnly(PDRawPowder.get(dust,2), Materials.Empty.getCells(1), FormicAcid.getFluidOrGas(4000), Materials.Ammonia.getGas(2000),Materials.Palladium.getDust(2),Materials.Ethylene.getCells(1), 250,30); GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{PDRawPowder.get(dust,2)},new FluidStack[]{FormicAcid.getFluidOrGas(4000)},new FluidStack[]{Materials.Ammonia.getGas(2000),Materials.Ethylene.getGas(1000),Materials.Water.getFluid(1000)},new ItemStack[]{Materials.Palladium.getDust(2)},250,30); - GT_Values.RA.addChemicalRecipe(Sodiumsulfate.get(cell,2),Materials.Hydrogen.getCells(1),null,Materials.SulfuricAcid.getFluid(2000),Materials.Sodium.getDust(1),Materials.Empty.getCells(3),30); + GT_Values.RA.addChemicalRecipe(Sodiumsulfate.get(dust,2),Materials.Hydrogen.getCells(1),null,Materials.SulfuricAcid.getFluid(2000),Materials.Sodium.getDust(1),Materials.Empty.getCells(3),30); //K2S2O7 - GT_Values.RA.addChemicalRecipe(Sodiumsulfate.get(cell,1),Materials.Potassium.getDust(2),Materials.Oxygen.getGas(3000),null,PotassiumDisulfate.get(dust),Materials.Empty.getCells(1),30); + GT_Values.RA.addChemicalRecipe(Sodiumsulfate.get(dust),Materials.Potassium.getDust(2),Materials.Oxygen.getGas(3000),null,PotassiumDisulfate.get(dust),Materials.Empty.getCells(1),30); //Rh/Os/Ir/Ru GT_Values.RA.addBlastRecipe(PTResidue.get(dust),GT_Utility.getIntegratedCircuit(11),PotassiumDisulfate.getMolten(1440),RHSulfate.getFluidOrGas(1440),LeachResidue.get(dust),null,200,120,775); //Ru - GT_Values.RA.addBlastRecipe(LeachResidue.get(dust),Materials.Saltpeter.getDust(8),Materials.SaltWater.getFluid(1000), GT_ModHandler.getSteam(1000),SodiumRuthenate.get(dust,3),IrOsLeachResidue.get(dust,6),200,120,775); + GT_Values.RA.addBlastRecipe(LeachResidue.get(dust,10),Materials.Saltpeter.getDust(10),Materials.SaltWater.getFluid(1000), GT_ModHandler.getSteam(1000),SodiumRuthenate.get(dust,3),IrOsLeachResidue.get(dust,6),200,120,775); GT_Values.RA.addChemicalRecipe(SodiumRuthenate.get(dust,6),Materials.Chlorine.getCells(3),null,RutheniumTetroxideSollution.getFluidOrGas(9000),Materials.Empty.getCells(3),300); - GT_Values.RA.addFluidHeaterRecipe(null,RutheniumTetroxideSollution.getFluidOrGas(800),HotRutheniumTetroxideSollution.getFluidOrGas(800),600,480); - //int circuitConfig, FluidStack aInput, FluidStack aInput2, FluidStack aOutput, int aDuration, int aEUt - GT_Values.RA.addCrackingRecipe(17,RutheniumTetroxideSollution.getFluidOrGas(1000),null,HotRutheniumTetroxideSollution.getFluidOrGas(1000),150,480); + GT_Values.RA.addFluidHeaterRecipe(null,RutheniumTetroxideSollution.getFluidOrGas(800),HotRutheniumTetroxideSollution.getFluidOrGas(1600),300,480); + GT_Values.RA.addCrackingRecipe(17,RutheniumTetroxideSollution.getFluidOrGas(1000),null,HotRutheniumTetroxideSollution.getFluidOrGas(2000),150,480); GT_Values.RA.addDistillationTowerRecipe(HotRutheniumTetroxideSollution.getFluidOrGas(9000),new FluidStack[]{ Materials.Water.getFluid(1800), RutheniumTetroxide.getFluidOrGas(7200) @@ -122,36 +127,37 @@ public class PlatinumSludgeOverHaul { GT_Values.RA.addChemicalRecipe(RutheniumTetroxide.get(dust,1),Materials.HydrochloricAcid.getCells(8),null,Materials.Water.getFluid(2000),Ruthenium.get(dust),Materials.Chlorine.getCells(6),300); //Os - GT_Values.RA.addBlastRecipe(IrOsLeachResidue.get(dust),GT_Utility.getIntegratedCircuit(11),Materials.HydrochloricAcid.getFluid(1000), AcidicOsmiumSolution.getFluidOrGas(1000), IrLeachResidue.get(dust),null,200,120,775); - GT_Values.RA.addDistillationTowerRecipe(AcidicOsmiumSolution.getFluidOrGas(1000),new FluidStack[]{OsmiumSolution.getFluidOrGas(100),Materials.Water.getFluid(900)},null,600,BW_Util.getMachineVoltageFromTier(5)); + GT_Values.RA.addBlastRecipe(IrOsLeachResidue.get(dust,4),GT_Utility.getIntegratedCircuit(11),Materials.HydrochloricAcid.getFluid(1000), AcidicOsmiumSolution.getFluidOrGas(2000), IrLeachResidue.get(dust,2),null,200,120,775); + GT_Values.RA.addDistillationTowerRecipe(AcidicOsmiumSolution.getFluidOrGas(1000),new FluidStack[]{OsmiumSolution.getFluidOrGas(100),Materials.Water.getFluid(900)},null,150,BW_Util.getMachineVoltageFromTier(5)); GT_Values.RA.addChemicalRecipe(OsmiumSolution.get(cell),Materials.HydrochloricAcid.getCells(8),null,Materials.Water.getFluid(2000),Materials.Osmium.getDust(1),Materials.Chlorine.getCells(6),300); //Ir GT_Values.RA.addBlastRecipe(IrLeachResidue.get(dust),GT_Utility.getIntegratedCircuit(1),null, null,PGSDResidue.get(dust),IridiumDioxide.get(dust),200,120,775); GT_Values.RA.addChemicalRecipe(IridiumDioxide.get(dust),Materials.HydrochloricAcid.getCells(1),null,AcidicIridiumSolution.getFluidOrGas(1000),Materials.Empty.getCells(1),null,300); - GT_Values.RA.addChemicalRecipe(AcidicIridiumSolution.get(cell),AmmoniumCloride.get(cell,3),null,Materials.Ammonia.getGas(3000),Materials.Empty.getCells(4),IridiumChloride.get(dust),300); + GT_Values.RA.addChemicalRecipe(AcidicIridiumSolution.get(cell), AmmoniumChloride.get(cell,3),null,Materials.Ammonia.getGas(3000),Materials.Empty.getCells(4),IridiumChloride.get(dust),300); GT_Values.RA.addChemicalRecipe(IridiumChloride.get(dust),Materials.Calcium.getDust(3),null,CalciumChloride.getFluidOrGas(3000),PGSDResidue2.get(dust),Materials.Iridium.getDust(1),300,1920); + //Rh - GT_Values.RA.addMixerRecipe(RHSulfate.get(cell),null,null,null,Materials.Water.getFluid(1000),RHSulfateSolution.getFluidOrGas(1000),LeachResidue.get(dustSmall),300,30); + GT_Values.RA.addMixerRecipe(RHSulfate.get(cell,5),null,null,null,Materials.Water.getFluid(5000),RHSulfateSolution.getFluidOrGas(5000),LeachResidue.get(dustTiny),300,30); GT_Values.RA.addChemicalRecipe(Materials.Zinc.getDust(1),null,RHSulfateSolution.getFluidOrGas(1000),null,ZincSulfate.get(dust),CrudeRhMetall.get(dust),300); GT_Values.RA.addBlastRecipe(CrudeRhMetall.get(dust),Materials.Salt.getDust(1),Materials.Chlorine.getGas(1000),null,RHSalt.get(dust,3),null,300,120,600); - GT_Values.RA.addMixerRecipe(RHSalt.get(dust),null,null,null,Materials.Water.getFluid(1000),RHSaltSolution.getFluidOrGas(1000),null,300,30); - GT_Values.RA.addChemicalRecipe(SodiumNitrate.get(dust),GT_Utility.getIntegratedCircuit(11),RHSaltSolution.getFluidOrGas(1000),null,RHNitrate.get(dust),Materials.Salt.getDust(1),300); + GT_Values.RA.addMixerRecipe(RHSalt.get(dust,10),null,null,null,Materials.Water.getFluid(2000),RHSaltSolution.getFluidOrGas(2000),null,300,30); + GT_Values.RA.addChemicalRecipe(SodiumNitrate.get(dust),GT_Utility.getIntegratedCircuit(1),RHSaltSolution.getFluidOrGas(1000),null,RHNitrate.get(dust),Materials.Salt.getDust(1),300); GT_Values.RA.addSifterRecipe(RHNitrate.get(dust),new ItemStack[]{ - RhFilterCake.get(dustTiny), - RhFilterCake.get(dustTiny), - RhFilterCake.get(dustTiny), - RhFilterCake.get(dustTiny), - RhFilterCake.get(dustTiny), - RhFilterCake.get(dustTiny), - RhFilterCake.get(dustTiny), - RhFilterCake.get(dustTiny), - RhFilterCake.get(dustTiny), + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust), },new int[]{ 1000,1000,1000,1000,1000,1000,1000,1000,500, },600,30); GT_Values.RA.addMixerRecipe(RhFilterCake.get(dust),null,null,null,Materials.Water.getFluid(1000),RHFilterCakeSolution.getFluidOrGas(1000),null,300,30); - GT_Values.RA.addChemicalRecipe(GT_Utility.getIntegratedCircuit(10),null,RHFilterCakeSolution.getFluidOrGas(1000),null,ReRh.get(dust),null,300); + GT_Values.RA.addChemicalRecipe(GT_Utility.getIntegratedCircuit(2),null,RHFilterCakeSolution.getFluidOrGas(1000),null,ReRh.get(dust),null,300); GT_Values.RA.addChemicalRecipe(ReRh.get(dust),Materials.Empty.getCells(1),Materials.HydrochloricAcid.getFluid(1000),Materials.Chlorine.getGas(1000),Rhodium.get(dust),Materials.Ammonia.getCells(1),300); } @@ -215,10 +221,11 @@ public class PlatinumSludgeOverHaul { if (PlatinumSludgeOverHaul.isInBlackList(recipe.mInputs[j])) continue recipeloop; } - if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushed) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedCentrifuged) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedPurified)) { - int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = PTMetallicPowder.get(dustTiny).splitStack(amount * 11); - } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dust) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustImpure) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustPure)) { +// if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushed) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedCentrifuged) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedPurified)) { +// int amount = recipe.mOutputs[i].stackSize; +// recipe.mOutputs[i] = PTMetallicPowder.get(dustTiny).splitStack(amount * 11); +// } else + if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dust) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustImpure) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustPure)) { int amount = recipe.mOutputs[i].stackSize; recipe.mOutputs[i] = PTMetallicPowder.get(dust).splitStack(amount); } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustSmall)) { @@ -234,10 +241,11 @@ public class PlatinumSludgeOverHaul { if (PlatinumSludgeOverHaul.isInBlackList(recipe.mInputs[j])) continue recipeloop; } - if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushed) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedCentrifuged) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedPurified)) { - int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = PDMetallicPowder.get(dustTiny).splitStack(amount * 11); - } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dust) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustImpure) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustPure)) { +// if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushed) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedCentrifuged) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedPurified)) { +// int amount = recipe.mOutputs[i].stackSize; +// recipe.mOutputs[i] = PDMetallicPowder.get(dustTiny).splitStack(amount * 11); +// } else + if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dust) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustImpure) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustPure)) { int amount = recipe.mOutputs[i].stackSize; recipe.mOutputs[i] = PDMetallicPowder.get(dust).splitStack(amount); } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustSmall)) { @@ -253,18 +261,19 @@ public class PlatinumSludgeOverHaul { if (PlatinumSludgeOverHaul.isInBlackList(recipe.mInputs[j])) continue recipeloop; } - if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushed) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedCentrifuged) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedPurified)) { - int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = IrOsLeachResidue.get(dustTiny).splitStack(amount * 22); - } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dust) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustImpure) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustPure)) { +// if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushed) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedCentrifuged) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedPurified)) { +// int amount = recipe.mOutputs[i].stackSize; +// recipe.mOutputs[i] = IrOsLeachResidue.get(dustTiny).splitStack(amount * 22); +// } else + if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dust) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustImpure) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustPure)) { int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = IrOsLeachResidue.get(dust).splitStack(amount * 2); + recipe.mOutputs[i] = PTMetallicPowder.get(dust).splitStack(amount * 4); } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustSmall)) { int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = IrOsLeachResidue.get(dustSmall).splitStack(amount * 2); + recipe.mOutputs[i] = PTMetallicPowder.get(dustSmall).splitStack(amount * 4); } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustTiny)) { int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = IrOsLeachResidue.get(dustTiny).splitStack(amount * 2); + recipe.mOutputs[i] = PTMetallicPowder.get(dustTiny).splitStack(amount * 4); } } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mMaterial.mMaterial.equals(Materials.Iridium)) { for (int j = 0; j < recipe.mInputs.length; j++) { @@ -272,18 +281,19 @@ public class PlatinumSludgeOverHaul { if (PlatinumSludgeOverHaul.isInBlackList(recipe.mInputs[j])) continue recipeloop; } - if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushed) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedCentrifuged) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedPurified)) { - int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = IrOsLeachResidue.get(dustTiny).splitStack(amount * 11); - } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dust) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustImpure) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustPure)) { +// if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushed) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedCentrifuged) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(crushedPurified)) { +// int amount = recipe.mOutputs[i].stackSize; +// recipe.mOutputs[i] = IrOsLeachResidue.get(dustTiny).splitStack(amount * 11); +// } else + if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dust) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustImpure) || GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustPure)) { int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = IrOsLeachResidue.get(dust).splitStack(amount); + recipe.mOutputs[i] = PTMetallicPowder.get(dust).splitStack(amount * 2); } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustSmall)) { int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = IrOsLeachResidue.get(dustSmall).splitStack(amount); + recipe.mOutputs[i] = PTMetallicPowder.get(dustSmall).splitStack(amount * 2); } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix.equals(dustTiny)) { int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = IrOsLeachResidue.get(dustTiny).splitStack(amount); + recipe.mOutputs[i] = PTMetallicPowder.get(dustTiny).splitStack(amount * 2); } } } @@ -340,6 +350,8 @@ public class PlatinumSludgeOverHaul { private static boolean isInBlackList(ItemStack stack){ if (!BW_Util.checkStackAndPrefix(stack)) return false; + if (stack.getItem() instanceof BW_MetaGenerated_Items) + return true; for (Materials m : PlatinumSludgeOverHaul.BLACKLIST){ if (GT_OreDictUnificator.getAssociation(stack).mMaterial.mMaterial.equals(m)) return true; |