diff options
Diffstat (limited to 'src')
6 files changed, 23 insertions, 18 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java b/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java index 7c8d9ee154..26ed966008 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java @@ -78,20 +78,20 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas } if (totalFlow <= 0) return 0; tEU = totalFlow; - addOutput(GT_ModHandler.getSteam(totalFlow)); + addOutput(GT_ModHandler.getSteam(totalFlow * 100)); if (totalFlow == aOptFlow) { - tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 100L); + tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); } else { float efficiency = 1.0f - Math.abs((totalFlow - aOptFlow) / (float) aOptFlow); tEU *= efficiency; - tEU = Math.max(1, GT_Utility.safeInt((long) tEU * (long) aBaseEff / 100L)); + tEU = Math.max(1, GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L)); } if (tEU > maxPower) { tEU = GT_Utility.safeInt(maxPower); } - return tEU; + return tEU * 100; } @Override @@ -151,7 +151,7 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas .addInfo("Controller block for Supercritical Fluid Turbine") .addInfo("Needs a Turbine, place inside controller") .addInfo("Use Supercritical Steam to generate power.") - .addInfo("Outputs Steam as well as producing power") + .addInfo("Outputs 100L of Steam per 1L of SC Steam as well as producing power") .addInfo("1L Supercritical Steam = 100 EU") .addInfo("Extreme Heated Steam will cause more damage to the turbine.") .addInfo("Power output depends on turbine and fitting") diff --git a/src/main/java/goodgenerator/items/MyMaterial.java b/src/main/java/goodgenerator/items/MyMaterial.java index 1e75167ef0..9d0dfc7b6e 100644 --- a/src/main/java/goodgenerator/items/MyMaterial.java +++ b/src/main/java/goodgenerator/items/MyMaterial.java @@ -302,7 +302,10 @@ public class MyMaterial implements Runnable { .setBlastFurnace(true) .setProtons(200) .setMass(450) - .setRadioactive(true), + .setRadioactive(true) + .setDurOverride(180224) + .setSpeedOverride(100f) + .setQualityOverride((byte) 11), Werkstoff.Types.ELEMENT, new Werkstoff.GenerationFeatures().disable() .onlyDust() diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index 9259d67f82..472612c901 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -1835,6 +1835,8 @@ public class RecipeLoader_02 { .addTo(plasmaForgeRecipes); } + public static float EHEEfficiencyMultiplier = 1.2f; + public static void FinishLoadRecipe() { for (GT_Recipe plasmaFuel : RecipeMaps.plasmaFuels.getAllRecipes()) { FluidStack tPlasma = GT_Utility.getFluidForFilledItem(plasmaFuel.mInputs[0], true); @@ -1842,12 +1844,12 @@ public class RecipeLoader_02 { continue; } int tUnit = plasmaFuel.mSpecialValue; - if (tUnit > 200_000) { - tPlasma.amount = 1500; + if (tUnit > 500_000) { + tPlasma.amount = 25000; + } else if (tUnit > 300_000) { + tPlasma.amount = 10000; } else if (tUnit > 100_000) { - tPlasma.amount = 1000; - } else if (tUnit > 50_000) { - tPlasma.amount = 800; + tPlasma.amount = 2500; } else if (tUnit > 10_000) { tPlasma.amount = 500; } else { @@ -1861,8 +1863,8 @@ public class RecipeLoader_02 { FluidStack output = FluidRegistry.getFluidStack(tOutName, tPlasma.amount); if (output == null) output = FluidRegistry.getFluidStack("molten." + tOutName, tPlasma.amount); if (output != null) { - long waterAmount = (long) tUnit * 3 * tPlasma.amount / 160; - long criticalSteamAmount = (long) tUnit * 3 * tPlasma.amount / 100; + long waterAmount = (long) (tUnit * EHEEfficiencyMultiplier * tPlasma.amount / 160); + long criticalSteamAmount = (long) (tUnit * EHEEfficiencyMultiplier * tPlasma.amount / 100); MyRecipeAdder.instance.addExtremeHeatExchangerRecipe( tPlasma, output, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index f7057065eb..dcdbda4508 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -259,7 +259,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { case "Fluorine" -> recipeBuilder.metadata(FUEL_VALUE, 147_456) .metadata(FUEL_TYPE, 4) .addTo(GT_RecipeConstants.Fuel); - case "Force" -> recipeBuilder.metadata(FUEL_VALUE, 150_000) + case "Force" -> recipeBuilder.metadata(FUEL_VALUE, 180_000) .metadata(FUEL_TYPE, 4) .addTo(GT_RecipeConstants.Fuel); case "Gadolinium" -> recipeBuilder.metadata(FUEL_VALUE, 366_551) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java index 7ee40757fd..6c3db51577 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java @@ -81,7 +81,7 @@ public class GT_MTE_LargeTurbine_SCSteam extends GregtechMetaTileEntity_LargerTu } if (totalFlow <= 0) return 0; tEU = totalFlow; - addOutput(GT_ModHandler.getSteam(totalFlow)); + addOutput(GT_ModHandler.getSteam(totalFlow * 100)); if (totalFlow != realOptFlow) { float efficiency = 1.0f - Math.abs((totalFlow - (float) realOptFlow) / (float) realOptFlow); // if(totalFlow>aOptFlow){efficiency = 1.0f;} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java index ef7648bef4..e6e529ff3a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java @@ -554,7 +554,7 @@ public class RecipeLoader_Nuclear { new FluidStack(ELEMENT.getInstance().NEON.getPlasma(), 144), Materials.Bedrockium.getMolten(144)) .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.FORCE.getPlasma(), 1000)) - .duration(3 * SECONDS + 4 * TICKS) + .duration(1 * SECONDS + 12 * TICKS) .eut(TierEU.RECIPE_LuV) .metadata(FUSION_THRESHOLD, 100_000_000) .addTo(fusionRecipes); @@ -609,10 +609,10 @@ public class RecipeLoader_Nuclear { GT_Values.RA.stdBuilder() .fluidInputs( - new FluidStack(ELEMENT.STANDALONE.ADVANCED_NITINOL.getPlasma(), 144), + new FluidStack(ELEMENT.STANDALONE.ADVANCED_NITINOL.getPlasma(), 72), Materials.Tartarite.getMolten(2)) .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 1000)) - .duration(16 * TICKS) + .duration(8 * TICKS) .eut(TierEU.RECIPE_UV) .metadata(FUSION_THRESHOLD, 500_000_000) .addTo(fusionRecipes); |