From bf51d170f68a677a9ab0e0ce38c7f856b283a51a Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Sat, 14 Dec 2019 20:22:03 +0100 Subject: Added Morons "Ademic Steel", + fixed additional oredict for oredict enforcer + added a config option to disable the crafting patch + made setters for overrides chainable (Werkstoff.Stats) + version increace Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: ba3570045ef6d4f29a51d6db16f5c57b4414e981 --- build.properties | 2 +- .../java/com/github/bartimaeusnek/ASM/BWCore.java | 1 + .../github/bartimaeusnek/bartworks/MainMod.java | 9 ++++--- .../server/EventHandler/ServerEventHandler.java | 2 +- .../bartworks/system/material/Werkstoff.java | 9 ++++--- .../bartworks/system/material/WerkstoffLoader.java | 28 ++++++++++++++++++++++ .../processingLoaders/AdditionalRecipes.java | 1 + 7 files changed, 44 insertions(+), 8 deletions(-) diff --git a/build.properties b/build.properties index 8876906369..e03086e26c 100644 --- a/build.properties +++ b/build.properties @@ -22,7 +22,7 @@ mc_version=1.7.10 majorUpdate=0 minorUpdate=5 -buildNumber=3_pre3 +buildNumber=3_pre4 APIVersion=8 ic2.version=2.2.828-experimental gregtech.version=5.09.32.36 diff --git a/src/main/java/com/github/bartimaeusnek/ASM/BWCore.java b/src/main/java/com/github/bartimaeusnek/ASM/BWCore.java index a4c8fe9dea..578b768652 100644 --- a/src/main/java/com/github/bartimaeusnek/ASM/BWCore.java +++ b/src/main/java/com/github/bartimaeusnek/ASM/BWCore.java @@ -65,6 +65,7 @@ public class BWCore extends DummyModContainer { shouldTransform[3] = Loader.isModLoaded("Thaumcraft") && ConfigHandler.enabledPatches[3]; shouldTransform[4] = true; shouldTransform[5] = Loader.isModLoaded("RWG") && ConfigHandler.enabledPatches[5]; + shouldTransform[6] = ConfigHandler.enabledPatches[6]; //shouldTransform[6] = true; BWCore.BWCORE_LOG.info("Extra Utilities found and ASM Patch enabled? " + shouldTransform[0]); BWCore.BWCORE_LOG.info("Thaumcraft found and ASM Patch enabled? " + shouldTransform[3]); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java index 88aa7b547c..a054945a32 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java @@ -284,12 +284,15 @@ 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)); } } + HashSet oreDictNames = new HashSet<>(werkstoff.getADDITIONAL_OREDICT()); + oreDictNames.add(werkstoff.getVarName()); MainMod.runMoltenUnificationEnfocement(werkstoff); MainMod.runUnficationDeleter(werkstoff); + for (String s : oreDictNames) for (OrePrefixes prefixes : OrePrefixes.values()) { - if (OreDictionary.getOres(prefixes + werkstoff.getVarName()).size() > 1) { - for (int j = 0; j < OreDictionary.getOres(prefixes + werkstoff.getVarName()).size(); j++) { - ItemStack toReplace = OreDictionary.getOres(prefixes + werkstoff.getVarName()).get(j); + if (OreDictionary.getOres(prefixes + s).size() > 1) { + for (int j = 0; j < OreDictionary.getOres(prefixes + s).size(); j++) { + ItemStack toReplace = OreDictionary.getOres(prefixes + s).get(j); ItemStack replacement = werkstoff.get(prefixes); if (GT_Utility.areStacksEqual(toReplace,replacement) || replacement == null || replacement.getItem() == null) continue; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/server/EventHandler/ServerEventHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/server/EventHandler/ServerEventHandler.java index 33a1333322..cf084f627a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/server/EventHandler/ServerEventHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/server/EventHandler/ServerEventHandler.java @@ -67,7 +67,7 @@ public class ServerEventHandler { String oreDictName = OreDictionary.getOreName(oreID); for (Werkstoff e : Werkstoff.werkstoffHashSet) { replace = e.getGenerationFeatures().enforceUnification; - if (replace && oreDictName.contains(e.getVarName())) { + if (replace && (oreDictName.contains(e.getVarName()) || e.getADDITIONAL_OREDICT().stream().anyMatch(oreDictName::contains))) { String prefix = oreDictName.replace(e.getVarName(), ""); toReplace = GT_OreDictUnificator.get(OrePrefixes.getPrefix(prefix),e.getVarName(),stack.stackSize); } 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 afa98aa857..09810a54cb 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 @@ -670,24 +670,27 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { return durOverride; } - public void setDurOverride(int durOverride) { + public Werkstoff.Stats setDurOverride(int durOverride) { this.durOverride = durOverride; + return this; } public float getSpeedOverride() { return speedOverride; } - public void setSpeedOverride(float speedOverride) { + public Werkstoff.Stats setSpeedOverride(float speedOverride) { this.speedOverride = speedOverride; + return this; } public byte getQualityOverride() { return qualityOverride; } - public void setQualityOverride(byte qualityOverride) { + public Werkstoff.Stats setQualityOverride(byte qualityOverride) { this.qualityOverride = qualityOverride; + return this; } byte qualityOverride; 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 6ff6c28d98..71e6f1d016 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 @@ -1305,6 +1305,32 @@ public class WerkstoffLoader implements Runnable { new Pair<>(Materials.Chlorine,1), new Pair<>(Materials.Oxygen,1) ); + public static final Werkstoff AdemicSteel = new Werkstoff( + new short[]{0xcc,0xcc,0xcc}, + "Ademic Steel", + "The break in the line", + new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setDurOverride(6144).setMeltingPoint(1800).setSpeedOverride(12).setQualityOverride((byte) 4), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().onlyDust().addMetalItems().addCraftingMetalWorkingItems().addMolten().addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems(), + 96, + TextureSet.SET_METALLIC, + new Pair<>(Materials.Steel ,2), + new Pair<>(Materials.VanadiumSteel,1), + new Pair<>(Materials.DamascusSteel,1), + new Pair<>(Materials.Carbon,4) + ); + public static final Werkstoff RawAdemicSteel = new Werkstoff( + new short[]{0xed,0xed,0xed}, + "Raw Ademic Steel", + new Werkstoff.Stats().setCentrifuge(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().onlyDust().addMixerRecipes(), + 97, + TextureSet.SET_ROUGH, + new Pair<>(Materials.Steel ,2), + new Pair<>(Materials.VanadiumSteel,1), + new Pair<>(Materials.DamascusSteel,1) + ); public static HashMap items = new HashMap<>(); public static HashBiMap fluids = HashBiMap.create(); @@ -1435,12 +1461,14 @@ public class WerkstoffLoader implements Runnable { Materials.Radon.add(WerkstoffLoader.NOBLE_GAS); WerkstoffLoader.Oganesson.add(WerkstoffLoader.NOBLE_GAS,WerkstoffLoader.ANAEROBE_GAS); + Materials.Nitrogen.add(WerkstoffLoader.ANAEROBE_GAS); WerkstoffLoader.Calcium.add(WerkstoffLoader.ANAEROBE_SMELTING); WerkstoffLoader.LuVTierMaterial.add(WerkstoffLoader.NOBLE_GAS_SMELTING); WerkstoffLoader.Ruridit.add(WerkstoffLoader.NOBLE_GAS_SMELTING); + WerkstoffLoader.AdemicSteel.add(WerkstoffLoader.NOBLE_GAS_SMELTING); WerkstoffLoader.MagnetoResonaticDust.add(WerkstoffLoader.NO_BLAST); 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 807db1f804..a585f8291b 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 @@ -51,6 +51,7 @@ public class AdditionalRecipes implements Runnable { @Override @SuppressWarnings("deprecation") public void run() { + GT_Values.RA.addImplosionRecipe(WerkstoffLoader.RawAdemicSteel.get(dust),4,WerkstoffLoader.AdemicSteel.get(dust),null); ((BWRecipes.BW_Recipe_Map_LiquidFuel)BWRecipes.instance.getMappingsFor((byte) 2)).addLiquidFuel(WerkstoffLoader.FormicAcid.getBridgeMaterial(),40); //Thorium/Yttrium Glas GT_Values.RA.addBlastRecipe(WerkstoffLoader.YttriumOxide.get(dustSmall, 2), WerkstoffLoader.Thorianit.get(dustSmall, 2), Materials.Glass.getMolten(144), null, new ItemStack(ItemRegistry.bw_glasses[0], 1, 12), null, 800, BW_Util.getMachineVoltageFromTier(5), 3663); -- cgit