diff options
author | Martin Robertz <dream-master@gmx.net> | 2022-04-22 14:26:41 +0200 |
---|---|---|
committer | Martin Robertz <dream-master@gmx.net> | 2022-04-22 14:26:54 +0200 |
commit | ab42ce8ee7b603cad887e9a808ed500bff6b8daf (patch) | |
tree | 9e96fb7776ca3d272142d2c2cb098e56a3f3045e /src | |
parent | e7bda903586700f231d63056e6cfc4a0196ce1ab (diff) | |
download | GT5-Unofficial-ab42ce8ee7b603cad887e9a808ed500bff6b8daf.tar.gz GT5-Unofficial-ab42ce8ee7b603cad887e9a808ed500bff6b8daf.tar.bz2 GT5-Unofficial-ab42ce8ee7b603cad887e9a808ed500bff6b8daf.zip |
fix plasma to molten ratio on vac freezers
(cherry picked from commit f0b8c6e8c1a18b2872c47ceb19782fca731a8094)
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 34c1cc3a41..9420a106ea 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -274,7 +274,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { * This makes cover tabs visible on GregTech machines */ public boolean mCoverTabsVisible = true; - + /** * This controls whether cover tabs display on the left (default) or right side of the UI */ @@ -301,7 +301,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { // Locking public static ReentrantLock TICK_LOCK = new ReentrantLock(); - + private final ConcurrentMap<UUID, GT_ClientPreference> mClientPrefernces = new ConcurrentHashMap<>(); static { @@ -584,7 +584,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { RecipeSorter.register("gregtech:shaped", GT_Shaped_Recipe.class, RecipeSorter.Category.SHAPED, "after:minecraft:shaped before:minecraft:shapeless"); RecipeSorter.register("gregtech:shapeless", GT_Shapeless_Recipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless"); - + // Register chunk manager with Forge GT_ChunkManager.init(); } @@ -1431,7 +1431,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } ProgressManager.pop(progressBar); } - + @SubscribeEvent public void onLivingUpdate(LivingUpdateEvent aEvent) { if (aEvent.entityLiving.onGround) { @@ -1476,7 +1476,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { if (aEvent.side.isServer()) { if (this.mUniverse == null) { this.mUniverse = aEvent.world; - } + } if (this.isFirstServerWorldTick) { File tSaveDiretory = getSaveDirectory(); if (tSaveDiretory != null) { @@ -1805,16 +1805,16 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { // If not check the ore dict rFuelValue = Math.max(rFuelValue, getOreDictNames(aFuel).stream().mapToInt(f -> oreDictBurnTimes.getOrDefault(f, 0)).max().orElse(0)); } - + // If we have something from the GT MetaGenerated_Item, ItemFuelValue, or OreDict return if (rFuelValue > 0) return rFuelValue; - + // Otherwise, a few more checks - if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Blocks.wooden_button, 1))) return 150; - else if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Blocks.ladder, 1))) return 100; - else if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.sign, 1))) return 600; - else if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.wooden_door, 1))) return 600; - else if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_MSSFUEL.get(1))) return 150000; + if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Blocks.wooden_button, 1))) return 150; + else if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Blocks.ladder, 1))) return 100; + else if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.sign, 1))) return 600; + else if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.wooden_door, 1))) return 600; + else if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_MSSFUEL.get(1))) return 150000; else if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_SSFUEL.get(1))) return 100000; return 0; @@ -1829,7 +1829,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { return addFluid(aMaterial.mName.toLowerCase(Locale.ENGLISH), "molten.autogenerated", aMaterial.mDefaultLocalName, aMaterial, aMaterial.mRGBa, 2, aMaterial.getGasTemperature(), GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), ItemList.Cell_Empty.get(1L), 1000); } - + public Fluid addAutogeneratedMoltenFluid(Materials aMaterial) { return addFluid("molten." + aMaterial.mName.toLowerCase(Locale.ENGLISH), "molten.autogenerated", "Molten " + aMaterial.mDefaultLocalName, aMaterial, aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000 : aMaterial.mMeltingPoint, GT_OreDictUnificator.get(OrePrefixes.cellMolten, aMaterial, 1L), ItemList.Cell_Empty.get(1L), 144); @@ -1837,7 +1837,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { public Fluid addAutogeneratedPlasmaFluid(Materials aMaterial) { return addFluid("plasma." + aMaterial.mName.toLowerCase(Locale.ENGLISH), "plasma.autogenerated", aMaterial.mDefaultLocalName + " Plasma", aMaterial, - aMaterial.mMoltenRGBa, 3, 10000, GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L), ItemList.Cell_Empty.get(1L), 1000); + aMaterial.mMoltenRGBa, 3, 10000, GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L), ItemList.Cell_Empty.get(1L), aMaterial.getMolten(1) != null ? 144 : 1000); } public void addAutoGeneratedHydroCrackedFluids(Materials aMaterial){ @@ -1868,7 +1868,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } aMaterial.setHydroCrackedFluids(crackedFluids); } - + public void addAutoGeneratedSteamCrackedFluids(Materials aMaterial){ Fluid[] crackedFluids = new Fluid[3]; String[] namePrefixes = { "lightlysteamcracked.", "moderatelysteamcracked.", "severelysteamcracked." }; @@ -1896,7 +1896,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } aMaterial.setSteamCrackedFluids(crackedFluids); } - + public Fluid addFluid(String aName, String aLocalized, Materials aMaterial, int aState, int aTemperatureK) { return addFluid(aName, aLocalized, aMaterial, aState, aTemperatureK, null, null, 0); } @@ -2040,7 +2040,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { public void activateOreDictHandler() { this.mOreDictActivated = true; ProgressManager.ProgressBar progressBar = ProgressManager.push("Register materials", mEvents.size()); - + if (Loader.isModLoaded("betterloadingscreen")){ GT_Values.cls_enabled = true; try { @@ -2074,7 +2074,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { GT_UndergroundOil.migrate(event); GT_Pollution.migrate(event); } - + @SubscribeEvent public void onBlockBreakSpeedEvent(PlayerEvent.BreakSpeed aEvent) { |