From 6e89dccc7d9bea7f038f7e9b9b4df418ed214650 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Sun, 15 Sep 2024 13:18:59 +0800 Subject: [PATCH 01/20] initial test numbers --- .../common/config/GeneratorsConfig.java | 20 +++--- .../config/GeneratorsStorageConfig.java | 10 +-- .../common/tile/TileEntityBioGenerator.java | 2 +- .../mekanism/common/config/GeneralConfig.java | 2 +- .../mekanism/common/config/StorageConfig.java | 64 ++++++++--------- .../mekanism/common/config/UsageConfig.java | 68 +++++++++---------- 6 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java index b7c1570a834..417ee1e7be2 100644 --- a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java +++ b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java @@ -85,24 +85,24 @@ public class GeneratorsConfig extends BaseMekanismConfig { builder.pop(); GeneratorsConfigTranslations.SERVER_GENERATOR_SOLAR.applyToBuilder(builder).push("solar_generator"); - solarGeneration = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_SOLAR_GENERATION, "solarGeneration", 50L); - advancedSolarGeneration = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_SOLAR_GENERATION_ADVANCED, "advancedSolarGeneration", 300L); + solarGeneration = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_SOLAR_GENERATION, "solarGeneration", 2L); + advancedSolarGeneration = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_SOLAR_GENERATION_ADVANCED, "advancedSolarGeneration", 12L); builder.pop(); GeneratorsConfigTranslations.SERVER_GENERATOR_BIO.applyToBuilder(builder).push("bio_generator"); bioGeneration = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_GENERATOR_BIO_GENERATION, - "bioGeneration", 350L); + "bioGeneration", 30L); bioTankCapacity = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_BIO_TANK_CAPACITY.applyToBuilder(builder) - .defineInRange("tankCapacity", 24 * FluidType.BUCKET_VOLUME, 1, Integer.MAX_VALUE)); + .defineInRange("tankCapacity", 20, 1, Integer.MAX_VALUE)); builder.pop(); GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT.applyToBuilder(builder).push("heat_generator"); heatGeneration = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT_GENERATION, - "heatGeneration", 200L); + "heatGeneration", 5L); heatGenerationLava = CachedLongValue.define(this, builder, GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT_GEN_LAVA, - "heatGenerationLava", 30L, 0, Long.MAX_VALUE / (EnumUtils.DIRECTIONS.length + 1)); + "heatGenerationLava", 1L, 0, Long.MAX_VALUE / (EnumUtils.DIRECTIONS.length + 1)); heatGenerationNether = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT_GEN_NETHER, - "heatGenerationNether", 100L); + "heatGenerationNether", 10L); heatTankCapacity = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT_TANK_CAPACITY.applyToBuilder(builder) .defineInRange("tankCapacity", 24 * FluidType.BUCKET_VOLUME, 1, Integer.MAX_VALUE)); heatGenerationFluidRate = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT_FLUID_RATE.applyToBuilder(builder) @@ -111,7 +111,7 @@ public class GeneratorsConfig extends BaseMekanismConfig { GeneratorsConfigTranslations.SERVER_GENERATOR_GAS.applyToBuilder(builder).push("gas_generator"); gbgTankCapacity = CachedLongValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_TANK_CAPACITY.applyToBuilder(builder) - .defineInRange("tankCapacity", 18L * FluidType.BUCKET_VOLUME, 1, Long.MAX_VALUE)); + .defineInRange("tankCapacity", 1L * FluidType.BUCKET_VOLUME, 1, Long.MAX_VALUE)); etheneBurnTicks = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_ETHENE_BURN_TICKS.applyToBuilder(builder) .defineInRange("etheneBurnTicks", 2 * SharedConstants.TICKS_PER_SECOND, 1, Integer.MAX_VALUE)); etheneDensityMultiplier = CachedDoubleValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_ETHENE_DENSITY.applyToBuilder(builder) @@ -119,9 +119,9 @@ public class GeneratorsConfig extends BaseMekanismConfig { builder.pop(); GeneratorsConfigTranslations.SERVER_GENERATOR_WIND.applyToBuilder(builder).push("wind_generator"); - windGenerationMin = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_GENERATOR_WIND_GEN_MIN, "generationMin", 60L); + windGenerationMin = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_GENERATOR_WIND_GEN_MIN, "generationMin", 1L); //TODO: Should this be capped by the min generator? - windGenerationMax = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_GENERATOR_WIND_GEN_MAX, "generationMax", 480L); + windGenerationMax = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_GENERATOR_WIND_GEN_MAX, "generationMax", 5L); windGenerationMinY = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_WIND_GEN_MIN_Y.applyToBuilder(builder) .defineInRange("minY", 24, DimensionType.MIN_Y, DimensionType.MAX_Y - 1)); //Note: We just require that the maxY is greater than the minY, nothing goes badly if it is set above the max y of the world though diff --git a/src/generators/java/mekanism/generators/common/config/GeneratorsStorageConfig.java b/src/generators/java/mekanism/generators/common/config/GeneratorsStorageConfig.java index 2406aa3594f..a00bac219a1 100644 --- a/src/generators/java/mekanism/generators/common/config/GeneratorsStorageConfig.java +++ b/src/generators/java/mekanism/generators/common/config/GeneratorsStorageConfig.java @@ -19,15 +19,15 @@ public class GeneratorsStorageConfig extends BaseMekanismConfig { ModConfigSpec.Builder builder = new ModConfigSpec.Builder(); heatGenerator = CachedLongValue.definedMin(this, builder, GeneratorsConfigTranslations.ENERGY_STORAGE_GENERATOR_HEAT, "heatGenerator", - 160_000L, 1); + 12 * 20, 1); bioGenerator = CachedLongValue.definedMin(this, builder, GeneratorsConfigTranslations.ENERGY_STORAGE_GENERATOR_BIO, "bioGenerator", - 160_000L, 1); + 30 * 20, 1); solarGenerator = CachedLongValue.definedMin(this, builder, GeneratorsConfigTranslations.ENERGY_STORAGE_GENERATOR_SOLAR, "solarGenerator", - 96_000L, 1); + 2 * 20, 1); advancedSolarGenerator = CachedLongValue.definedMin(this, builder, GeneratorsConfigTranslations.ENERGY_STORAGE_GENERATOR_SOLAR_ADVANCED, "advancedSolarGenerator", - 200_000L, 1); + 12 * 20, 1); windGenerator = CachedLongValue.definedMin(this, builder, GeneratorsConfigTranslations.ENERGY_STORAGE_GENERATOR_WIND, "windGenerator", - 200_000L, 1); + 5 * 20, 1); configSpec = builder.build(); } diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index eeb0e1a9032..91c413ffec3 100644 --- a/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -59,7 +59,7 @@ protected IFluidTankHolder getInitialFluidTanks(IContentsListener listener) { @Override protected IInventorySlotHolder getInitialInventory(IContentsListener listener) { InventorySlotHelper builder = InventorySlotHelper.forSide(facingSupplier); - builder.addSlot(fuelSlot = FluidFuelInventorySlot.forFuel(bioFuelTank, stack -> stack.is(MekanismTags.Items.FUELS_BIO) ? 200 : stack.is(MekanismTags.Items.FUELS_BLOCK_BIO) ? 200 * 9 : 0, + builder.addSlot(fuelSlot = FluidFuelInventorySlot.forFuel(bioFuelTank, stack -> stack.is(MekanismTags.Items.FUELS_BIO) ? 1 : stack.is(MekanismTags.Items.FUELS_BLOCK_BIO) ? 9 : 0, GeneratorsFluids.BIOETHANOL::getFluidStack, listener, 17, 35), RelativeSide.FRONT, RelativeSide.LEFT, RelativeSide.BACK, RelativeSide.TOP, RelativeSide.BOTTOM); builder.addSlot(energySlot = EnergyInventorySlot.drain(getEnergyContainer(), listener, 143, 35), RelativeSide.RIGHT); diff --git a/src/main/java/mekanism/common/config/GeneralConfig.java b/src/main/java/mekanism/common/config/GeneralConfig.java index 4c60285277f..035a4562a48 100644 --- a/src/main/java/mekanism/common/config/GeneralConfig.java +++ b/src/main/java/mekanism/common/config/GeneralConfig.java @@ -193,7 +193,7 @@ public class GeneralConfig extends BaseMekanismConfig { .worldRestart() .define("blacklistForge", false)); forgeConversionRate = CachedDoubleValue.wrap(this, MekanismConfigTranslations.GENERAL_ENERGY_CONVERSION_FE.applyToBuilder(builder) - .defineInRange("feConversionRate", 2.5, 0.0001, 10_000 /* Inverse of min positive value */)); + .defineInRange("feConversionRate", 1, 0.0001, 10_000 /* Inverse of min positive value */)); blacklistFluxNetworks = CachedBooleanValue.wrap(this, MekanismConfigTranslations.GENERAL_ENERGY_CONVERSION_BLACKLIST_FN.applyToBuilder(builder) .worldRestart() .define("blacklistFluxNetworks", false)); diff --git a/src/main/java/mekanism/common/config/StorageConfig.java b/src/main/java/mekanism/common/config/StorageConfig.java index 06f51d5193b..967b9d4e9ff 100644 --- a/src/main/java/mekanism/common/config/StorageConfig.java +++ b/src/main/java/mekanism/common/config/StorageConfig.java @@ -49,76 +49,76 @@ public class StorageConfig extends BaseMekanismConfig { ModConfigSpec.Builder builder = new ModConfigSpec.Builder(); enrichmentChamber = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_ENRICHMENT_CHAMBER, "enrichmentChamber", - 20_000L, 1); + 1_000, 1); osmiumCompressor = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_COMPRESSOR, "osmiumCompressor", - 80_000L, 1); + 3_000L, 1); combiner = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_COMBINER, "combiner", - 40_000L, 1); + 1_000L, 1); crusher = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_CRUSHER, "crusher", - 20_000L, 1); + 1_600L, 1); metallurgicInfuser = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_METALLURGIC_INFUSER, "metallurgicInfuser", - 20_000L, 1); + 1_000L, 1); purificationChamber = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_PURIFICATION_CHAMBER, "purificationChamber", - 80_000L, 1); + 2_000L, 1); energizedSmelter = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_SMELTER, "energizedSmelter", - 20_000L, 1); + 1_000L, 1); digitalMiner = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_MINER, "digitalMiner", - 50_000L, 1); + 3_200L, 1); electricPump = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_PUMP, "electricPump", - 40_000L, 1); - chargepad = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_CHARGEPAD, "chargepad", 2_048_000L, 1); + 38L, 1); + chargepad = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_CHARGEPAD, "chargepad", 1_024L, 1); rotaryCondensentrator = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_CONDENSENTRATOR, "rotaryCondensentrator", - 20_000L, 1); + 8, 1); chemicalOxidizer = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_OXIDIZER, "chemicalOxidizer", - 80_000L, 1); + 1_500L, 1); chemicalInfuser = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_CHEMICAL_INFUSER, "chemicalInfuser", - 80_000L, 1); + 60, 1); chemicalInjectionChamber = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_INJECTION_CHAMBER, "chemicalInjectionChamber", - 160_000L, 1); + 3_000L, 1); electrolyticSeparator = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_SEPARATOR, "electrolyticSeparator", 160_000L, 1); precisionSawmill = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_SAWMILL, "precisionSawmill", - 20_000L, 1); + 1_000L, 1); chemicalDissolutionChamber = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_CDC, "chemicalDissolutionChamber", - 160_000L, 1); + 1_600L, 1); chemicalWasher = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_WASHER, "chemicalWasher", - 80_000L, 1); + 20L, 1); chemicalCrystallizer = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_CRYSTALLIZER, "chemicalCrystallizer", - 160_000L, 1); + 20L, 1); seismicVibrator = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_VIBRATOR, "seismicVibrator", 20_000L, 1); pressurizedReactionBase = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_PRC, "pressurizedReactionBase", 2_000L, 1); fluidicPlenisher = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_PLENISHER, "fluidicPlenisher", - 40_000L, 1); + 40L, 1); laser = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_LASER, "laser", - 2_000_000L, 1); + 2_000L, 1); laserAmplifier = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_LASER_AMPLIFIER, "laserAmplifier", - 5_000_000_000L, 1); + 5_000_000L, 1); laserTractorBeam = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_TRACTOR_BEAM, "laserTractorBeam", - 5_000_000_000L, 1); + 5_000_000L, 1); formulaicAssemblicator = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_ASSEMBLICATOR, "formulaicAssemblicator", - 40_000L, 1); + 200L, 1); teleporter = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_TELEPORTER, "teleporter", - 5_000_000L, 1); + 1_000L, 1); modificationStation = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_MODIFICATION_STATION, "modificationStation", - 40_000L, 1); + 100L, 1); isotopicCentrifuge = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_CENTRIFUGE, "isotopicCentrifuge", - 80_000L, 1); + 32L, 1); nutritionalLiquifier = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_LIQUIFIER, "nutritionalLiquifier", - 40_000L, 1); + 800L, 1); antiprotonicNucleosynthesizer = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_NUCLEOSYNTHESIZER, "antiprotonicNucleosynthesizer", - 1_000_000_000L, 1); + 6_000L, 1); pigmentExtractor = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_PIGMENT_EXTRACTOR, "pigmentExtractor", - 40_000L, 1); + 500L, 1); pigmentMixer = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_PIGMENT_MIXER, "pigmentMixer", - 80_000L, 1); + 20L, 1); paintingMachine = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_PAINTING, "paintingMachine", - 40_000L, 1); + 1_000L, 1); spsPort = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_SPS_PORT, "spsPort", 1_000_000_000L, 1); dimensionalStabilizer = CachedLongValue.definedMin(this, builder, MekanismConfigTranslations.ENERGY_STORAGE_DIMENSIONAL_STABILIZER, "dimensionalStabilizer", - 40_000L, 1); + 600L, 1); configSpec = builder.build(); } diff --git a/src/main/java/mekanism/common/config/UsageConfig.java b/src/main/java/mekanism/common/config/UsageConfig.java index 396c0bc3bad..2e61856e94c 100644 --- a/src/main/java/mekanism/common/config/UsageConfig.java +++ b/src/main/java/mekanism/common/config/UsageConfig.java @@ -47,42 +47,42 @@ public class UsageConfig extends BaseMekanismConfig { UsageConfig() { ModConfigSpec.Builder builder = new ModConfigSpec.Builder(); - enrichmentChamber = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_ENRICHMENT_CHAMBER, "enrichmentChamber", 50L); - osmiumCompressor = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_COMPRESSOR, "osmiumCompressor", 100L); - combiner = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_COMBINER, "combiner", 50L); - crusher = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CRUSHER, "crusher", 50L); - metallurgicInfuser = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_METALLURGIC_INFUSER, "metallurgicInfuser", 50L); - purificationChamber = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PURIFICATION_CHAMBER, "purificationChamber", 200L); - energizedSmelter = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_SMELTER, "energizedSmelter", 50L); - digitalMiner = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_MINER, "digitalMiner", 1_000L); - electricPump = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PUMP, "electricPump", 100L); - chargePad = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CHARGEPAD, "chargepad", 1_024_000L); - rotaryCondensentrator = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CONDENSENTRATOR, "rotaryCondensentrator", 50L); - chemicalOxidizer = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_OXIDIZER, "chemicalOxidizer", 200L); - chemicalInfuser = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CHEMICAL_INFUSER, "chemicalInfuser", 200L); - chemicalInjectionChamber = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_INJECTION_CHAMBER, "chemicalInjectionChamber", 400L); - precisionSawmill = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_SAWMILL, "precisionSawmill", 50L); - chemicalDissolutionChamber = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CDC, "chemicalDissolutionChamber", 400L); - chemicalWasher = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_WASHER, "chemicalWasher", 200L); - chemicalCrystallizer = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CRYSTALLIZER, "chemicalCrystallizer", 400L); - seismicVibrator = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_VIBRATOR, "seismicVibrator", 50L); - pressurizedReactionBase = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PRC, "pressurizedReactionBase", 5L); - fluidicPlenisher = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PLENISHER, "fluidicPlenisher", 100L); - laser = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_LASER, "laser", 10_000L); - formulaicAssemblicator = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_ASSEMBLICATOR, "formulaicAssemblicator", 100L); - modificationStation = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_MODIFICATION_STATION, "modificationStation", 400L); - isotopicCentrifuge = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CENTRIFUGE, "isotopicCentrifuge", 200L); - nutritionalLiquifier = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_LIQUIFIER, "nutritionalLiquifier", 200L); - antiprotonicNucleosynthesizer = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_NUCLEOSYNTHESIZER, "antiprotonicNucleosynthesizer", 100_000L); - pigmentExtractor = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PIGMENT_EXTRACTOR, "pigmentExtractor", 200L); - pigmentMixer = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PIGMENT_MIXER, "pigmentMixer", 200L); - paintingMachine = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PAINTING, "paintingMachine", 100L); - dimensionalStabilizer = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_DIMENSIONAL_STABILIZER, "dimensionalStabilizer", 5_000L); + enrichmentChamber = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_ENRICHMENT_CHAMBER, "enrichmentChamber", 5L); + osmiumCompressor = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_COMPRESSOR, "osmiumCompressor", 15L); + combiner = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_COMBINER, "combiner", 5L); + crusher = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CRUSHER, "crusher", 8L); + metallurgicInfuser = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_METALLURGIC_INFUSER, "metallurgicInfuser", 5L); + purificationChamber = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PURIFICATION_CHAMBER, "purificationChamber", 10L); + energizedSmelter = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_SMELTER, "energizedSmelter", 5L); + digitalMiner = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_MINER, "digitalMiner", 40L); + electricPump = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PUMP, "electricPump", 2L); + chargePad = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CHARGEPAD, "chargepad", 1_024L); + rotaryCondensentrator = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CONDENSENTRATOR, "rotaryCondensentrator", 2L); + chemicalOxidizer = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_OXIDIZER, "chemicalOxidizer", 15L); + chemicalInfuser = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CHEMICAL_INFUSER, "chemicalInfuser", 15L); + chemicalInjectionChamber = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_INJECTION_CHAMBER, "chemicalInjectionChamber", 15L); + precisionSawmill = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_SAWMILL, "precisionSawmill", 5L); + chemicalDissolutionChamber = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CDC, "chemicalDissolutionChamber", 16L); + chemicalWasher = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_WASHER, "chemicalWasher", 5L); + chemicalCrystallizer = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CRYSTALLIZER, "chemicalCrystallizer", 15L); + seismicVibrator = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_VIBRATOR, "seismicVibrator", 5L); + pressurizedReactionBase = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PRC, "pressurizedReactionBase", 2L); + fluidicPlenisher = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PLENISHER, "fluidicPlenisher", 2L); + laser = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_LASER, "laser", 20L); + formulaicAssemblicator = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_ASSEMBLICATOR, "formulaicAssemblicator", 5L); + modificationStation = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_MODIFICATION_STATION, "modificationStation", 10L); + isotopicCentrifuge = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_CENTRIFUGE, "isotopicCentrifuge", 8L); + nutritionalLiquifier = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_LIQUIFIER, "nutritionalLiquifier", 8L); + antiprotonicNucleosynthesizer = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_NUCLEOSYNTHESIZER, "antiprotonicNucleosynthesizer", 15L); + pigmentExtractor = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PIGMENT_EXTRACTOR, "pigmentExtractor", 5L); + pigmentMixer = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PIGMENT_MIXER, "pigmentMixer", 5L); + paintingMachine = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_PAINTING, "paintingMachine", 5L); + dimensionalStabilizer = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.ENERGY_USAGE_DIMENSIONAL_STABILIZER, "dimensionalStabilizer", 15L); MekanismConfigTranslations.USAGE_TELEPORTER.applyToBuilder(builder).push("teleporter"); - teleporterBase = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.USAGE_TELEPORTER_BASE, "base", 1_000L); - teleporterDistance = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.USAGE_TELEPORTER_DISTANCE, "distance", 10L); - teleporterDimensionPenalty = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.USAGE_TELEPORTER_PENALTY, "dimensionPenalty", 10_000L); + teleporterBase = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.USAGE_TELEPORTER_BASE, "base", 100L); + teleporterDistance = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.USAGE_TELEPORTER_DISTANCE, "distance", 2L); + teleporterDimensionPenalty = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.USAGE_TELEPORTER_PENALTY, "dimensionPenalty", 1000L); builder.pop(); configSpec = builder.build(); From a6dd00122c997f28b5e40b88233337be6c9815a8 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Sun, 15 Sep 2024 17:51:12 +0800 Subject: [PATCH 02/20] make heat gen numbers work adequately --- .../generators/common/config/GeneratorsConfig.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java index 417ee1e7be2..b0a42d90fd5 100644 --- a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java +++ b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java @@ -98,20 +98,20 @@ public class GeneratorsConfig extends BaseMekanismConfig { GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT.applyToBuilder(builder).push("heat_generator"); heatGeneration = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT_GENERATION, - "heatGeneration", 5L); + "heatGeneration", 100L); heatGenerationLava = CachedLongValue.define(this, builder, GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT_GEN_LAVA, - "heatGenerationLava", 1L, 0, Long.MAX_VALUE / (EnumUtils.DIRECTIONS.length + 1)); + "heatGenerationLava", 7L, 0, Long.MAX_VALUE / (EnumUtils.DIRECTIONS.length + 1)); heatGenerationNether = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT_GEN_NETHER, "heatGenerationNether", 10L); heatTankCapacity = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT_TANK_CAPACITY.applyToBuilder(builder) - .defineInRange("tankCapacity", 24 * FluidType.BUCKET_VOLUME, 1, Integer.MAX_VALUE)); + .defineInRange("tankCapacity", FluidType.BUCKET_VOLUME, 1, Integer.MAX_VALUE)); heatGenerationFluidRate = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT_FLUID_RATE.applyToBuilder(builder) - .define("heatGenerationFluidRate", 10, value -> value instanceof Integer i && i > 0 && i <= heatTankCapacity.getOrDefault())); + .define("heatGenerationFluidRate", 100, value -> value instanceof Integer i && i > 0 && i <= heatTankCapacity.getOrDefault())); builder.pop(); GeneratorsConfigTranslations.SERVER_GENERATOR_GAS.applyToBuilder(builder).push("gas_generator"); gbgTankCapacity = CachedLongValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_TANK_CAPACITY.applyToBuilder(builder) - .defineInRange("tankCapacity", 1L * FluidType.BUCKET_VOLUME, 1, Long.MAX_VALUE)); + .defineInRange("tankCapacity", FluidType.BUCKET_VOLUME, 1, Long.MAX_VALUE)); etheneBurnTicks = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_ETHENE_BURN_TICKS.applyToBuilder(builder) .defineInRange("etheneBurnTicks", 2 * SharedConstants.TICKS_PER_SECOND, 1, Integer.MAX_VALUE)); etheneDensityMultiplier = CachedDoubleValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_ETHENE_DENSITY.applyToBuilder(builder) From 79176a8e82fa62e9c18056a748112be35f26aacb Mon Sep 17 00:00:00 2001 From: Thiakil Date: Sun, 15 Sep 2024 18:02:52 +0800 Subject: [PATCH 03/20] biofuel recalculation --- .../generators/common/config/GeneratorsConfig.java | 2 +- .../common/tile/TileEntityBioGenerator.java | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java index b0a42d90fd5..05602296a9f 100644 --- a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java +++ b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java @@ -93,7 +93,7 @@ public class GeneratorsConfig extends BaseMekanismConfig { bioGeneration = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_GENERATOR_BIO_GENERATION, "bioGeneration", 30L); bioTankCapacity = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_BIO_TANK_CAPACITY.applyToBuilder(builder) - .defineInRange("tankCapacity", 20, 1, Integer.MAX_VALUE)); + .defineInRange("tankCapacity", 240, 1, Integer.MAX_VALUE)); builder.pop(); GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT.applyToBuilder(builder).push("heat_generator"); diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 91c413ffec3..e447df22e4c 100644 --- a/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -27,6 +27,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; import org.jetbrains.annotations.NotNull; @@ -40,11 +41,21 @@ public class TileEntityBioGenerator extends TileEntityGenerator { @WrappingComputerMethod(wrapper = ComputerIInventorySlotWrapper.class, methodNames = "getEnergyItem", docPlaceholder = "energy item") EnergyInventorySlot energySlot; private float lastFluidScale; + private static int BIO_FUEL_PER_ITEM = 60;//todo config? public TileEntityBioGenerator(BlockPos pos, BlockState state) { super(GeneratorsBlocks.BIO_GENERATOR, pos, state, MekanismGeneratorsConfig.generators.bioGeneration); } + private static int biofuelFromItem(@NotNull ItemStack stack) { + if (stack.is(MekanismTags.Items.FUELS_BIO)) { + return BIO_FUEL_PER_ITEM; + } else if (stack.is(MekanismTags.Items.FUELS_BLOCK_BIO)) { + return BIO_FUEL_PER_ITEM * 9; + } + return 0; + } + @NotNull @Override protected IFluidTankHolder getInitialFluidTanks(IContentsListener listener) { @@ -59,7 +70,7 @@ protected IFluidTankHolder getInitialFluidTanks(IContentsListener listener) { @Override protected IInventorySlotHolder getInitialInventory(IContentsListener listener) { InventorySlotHelper builder = InventorySlotHelper.forSide(facingSupplier); - builder.addSlot(fuelSlot = FluidFuelInventorySlot.forFuel(bioFuelTank, stack -> stack.is(MekanismTags.Items.FUELS_BIO) ? 1 : stack.is(MekanismTags.Items.FUELS_BLOCK_BIO) ? 9 : 0, + builder.addSlot(fuelSlot = FluidFuelInventorySlot.forFuel(bioFuelTank, TileEntityBioGenerator::biofuelFromItem, GeneratorsFluids.BIOETHANOL::getFluidStack, listener, 17, 35), RelativeSide.FRONT, RelativeSide.LEFT, RelativeSide.BACK, RelativeSide.TOP, RelativeSide.BOTTOM); builder.addSlot(energySlot = EnergyInventorySlot.drain(getEnergyContainer(), listener, 143, 35), RelativeSide.RIGHT); From ca2021b846407d4b86fca11ed3c1597ee055dc68 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Tue, 17 Sep 2024 20:34:43 +0800 Subject: [PATCH 04/20] biofuel recalculation --- .../generators/common/tile/TileEntityBioGenerator.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index e447df22e4c..48ab1ca4271 100644 --- a/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -41,7 +41,14 @@ public class TileEntityBioGenerator extends TileEntityGenerator { @WrappingComputerMethod(wrapper = ComputerIInventorySlotWrapper.class, methodNames = "getEnergyItem", docPlaceholder = "energy item") EnergyInventorySlot energySlot; private float lastFluidScale; - private static int BIO_FUEL_PER_ITEM = 60;//todo config? + /** + * Based on 8J/t crushing cost, and 30J/t Bio generation, this leads to rates of generation (over time) of + *

1 fuel: 1.33x Less + *

2 fuel: 1.5x More + *

3 fuel: 2.25x More + *

etc + */ + private static final int BIO_FUEL_PER_ITEM = 40; public TileEntityBioGenerator(BlockPos pos, BlockState state) { super(GeneratorsBlocks.BIO_GENERATOR, pos, state, MekanismGeneratorsConfig.generators.bioGeneration); From c7160c8ef5a46257067518e40bdf5f3709795cba Mon Sep 17 00:00:00 2001 From: Thiakil Date: Sun, 22 Sep 2024 15:49:25 +0800 Subject: [PATCH 05/20] make GBG able to fully burn hydrogen produced by one Separator --- .../generators/common/tile/TileEntityGasGenerator.java | 5 ++++- src/main/java/mekanism/common/config/GeneralConfig.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index eefa2f56386..d32f8fe25b7 100644 --- a/src/generators/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/generators/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -15,6 +15,7 @@ import mekanism.common.capabilities.holder.slot.IInventorySlotHolder; import mekanism.common.capabilities.holder.slot.InventorySlotHelper; import mekanism.common.config.MekanismConfig; +import mekanism.common.config.listener.ConfigBasedCachedLongSupplier; import mekanism.common.integration.computer.SpecialComputerMethodWrapper.ComputerChemicalTankWrapper; import mekanism.common.integration.computer.SpecialComputerMethodWrapper.ComputerIInventorySlotWrapper; import mekanism.common.integration.computer.annotation.ComputerMethod; @@ -36,6 +37,8 @@ public class TileEntityGasGenerator extends TileEntityGenerator { + /** max operations * Joules produced */ + private static final ConfigBasedCachedLongSupplier MAX_HYDROGEN_PRODUCTION = new ConfigBasedCachedLongSupplier(() -> 256 * MekanismConfig.general.FROM_H2.get(), MekanismConfig.general.FROM_H2); /** * The tank this block is storing fuel in. */ @@ -126,7 +129,7 @@ private long getToUse() { if (generationRate == 0L || fuelTank.isEmpty()) { return 0; } - long max = (long) Math.ceil(256 * (fuelTank.getStored() / (double) fuelTank.getCapacity())); + long max = (long) Math.ceil(MAX_HYDROGEN_PRODUCTION.getAsLong() * (fuelTank.getStored() / (double) fuelTank.getCapacity())); max = Math.min(maxBurnTicks * fuelTank.getStored() + burnTicks, max); max = Math.min(MathUtils.clampToLong(getEnergyContainer().getNeeded() / (double) generationRate), max); return max; diff --git a/src/main/java/mekanism/common/config/GeneralConfig.java b/src/main/java/mekanism/common/config/GeneralConfig.java index 035a4562a48..0ae0f8c823f 100644 --- a/src/main/java/mekanism/common/config/GeneralConfig.java +++ b/src/main/java/mekanism/common/config/GeneralConfig.java @@ -201,7 +201,7 @@ public class GeneralConfig extends BaseMekanismConfig { .worldRestart() .define("blacklistGrandPower", false)); FROM_H2 = CachedLongValue.define(this, builder, MekanismConfigTranslations.GENERAL_ENERGY_CONVERSION_HYDROGEN, - "hydrogenEnergyDensity", 200, 1, Long.MAX_VALUE / 100_000); + "hydrogenEnergyDensity", 2, 1, Long.MAX_VALUE / 100_000); maxEnergyPerSteam = CachedLongValue.definePositive(this, builder, MekanismConfigTranslations.GENERAL_ENERGY_CONVERSION_STEAM, "maxEnergyPerSteam", 10); builder.pop(); From 235eb91813128ccfcd921098252319ec217e9651 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Sun, 22 Sep 2024 17:21:29 +0800 Subject: [PATCH 06/20] make separator only use special behavior if processing hydrogen. All operations machines should now be like other machines in terms of power usage scale todo: make separator produce partial output when limited energy --- .../api/recipes/cache/CachedRecipe.java | 2 +- .../ElectroSeparatorEnergyContainer.java | 50 +++++++++++++++++++ .../TileEntityElectrolyticSeparator.java | 29 +++++++++-- 3 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java diff --git a/src/api/java/mekanism/api/recipes/cache/CachedRecipe.java b/src/api/java/mekanism/api/recipes/cache/CachedRecipe.java index 450323931d5..f5dda254d6e 100644 --- a/src/api/java/mekanism/api/recipes/cache/CachedRecipe.java +++ b/src/api/java/mekanism/api/recipes/cache/CachedRecipe.java @@ -409,7 +409,7 @@ protected void useEnergy(int operations) { // modify the source value, if we do the check here manually as well, then we can skip creating unnecessary objects useEnergy.accept(energy); } else { - useEnergy.accept(energy * operations); + useEnergy.accept(energy/* * operations*/);//todo scale this for Separator if less possible? } } diff --git a/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java b/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java new file mode 100644 index 00000000000..076176e1212 --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java @@ -0,0 +1,50 @@ +package mekanism.common.capabilities.energy; + +import java.util.function.Predicate; +import mekanism.api.AutomationType; +import mekanism.api.IContentsListener; +import mekanism.api.Upgrade; +import mekanism.api.annotations.NothingNullByDefault; +import mekanism.api.functions.LongObjectToLongFunction; +import mekanism.common.block.attribute.AttributeEnergy; +import mekanism.common.tile.machine.TileEntityElectrolyticSeparator; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +@NothingNullByDefault +public class ElectroSeparatorEnergyContainer extends MachineEnergyContainer { + + public static ElectroSeparatorEnergyContainer input(TileEntityElectrolyticSeparator tile, LongObjectToLongFunction baseEnergyCalculator, + @Nullable IContentsListener listener) { + AttributeEnergy electricBlock = validateBlock(tile); + return new ElectroSeparatorEnergyContainer(electricBlock.getStorage(), electricBlock.getUsage(), notExternal, alwaysTrue, tile, baseEnergyCalculator, listener); + } + + private final LongObjectToLongFunction baseEnergyCalculator; + + protected ElectroSeparatorEnergyContainer(long maxEnergy, long energyPerTick, Predicate<@NotNull AutomationType> canExtract, + Predicate<@NotNull AutomationType> canInsert, TileEntityElectrolyticSeparator tile, LongObjectToLongFunction baseEnergyCalculator, @Nullable IContentsListener listener) { + super(maxEnergy, energyPerTick, canExtract, canInsert, tile, listener); + this.baseEnergyCalculator = baseEnergyCalculator; + } + + @Override + public long getBaseEnergyPerTick() { + long base = baseEnergyCalculator.applyAsLong(super.getBaseEnergyPerTick(), tile); + //todo better check + if (tile.isMakingHydrogen()) { + base = (long) (base * Math.pow(2, tile.getComponent().getUpgrades(Upgrade.SPEED))); + } + return base; + } + + @Override + public void updateEnergyPerTick() { + if (tile.isMakingHydrogen()) { + //Energy upgrades only increase storage + this.currentEnergyPerTick = getBaseEnergyPerTick(); + } else { + super.updateEnergyPerTick(); + } + } +} diff --git a/src/main/java/mekanism/common/tile/machine/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/machine/TileEntityElectrolyticSeparator.java index b8fdb09d81f..d777e94a0f3 100644 --- a/src/main/java/mekanism/common/tile/machine/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/machine/TileEntityElectrolyticSeparator.java @@ -11,6 +11,7 @@ import mekanism.api.math.MathUtils; import mekanism.api.recipes.ElectrolysisRecipe; import mekanism.api.recipes.ElectrolysisRecipe.ElectrolysisRecipeOutput; +import mekanism.api.recipes.basic.BasicElectrolysisRecipe; import mekanism.api.recipes.cache.CachedRecipe; import mekanism.api.recipes.cache.CachedRecipe.OperationTracker.RecipeError; import mekanism.api.recipes.cache.OneInputCachedRecipe; @@ -22,7 +23,7 @@ import mekanism.client.recipe_viewer.type.IRecipeViewerRecipeType; import mekanism.client.recipe_viewer.type.RecipeViewerRecipeType; import mekanism.common.attachments.containers.ContainerType; -import mekanism.common.capabilities.energy.FixedUsageEnergyContainer; +import mekanism.common.capabilities.energy.ElectroSeparatorEnergyContainer; import mekanism.common.capabilities.fluid.BasicFluidTank; import mekanism.common.capabilities.holder.chemical.ChemicalTankHelper; import mekanism.common.capabilities.holder.chemical.IChemicalTankHolder; @@ -54,6 +55,7 @@ import mekanism.common.recipe.lookup.ISingleRecipeLookupHandler.FluidRecipeLookupHandler; import mekanism.common.recipe.lookup.cache.InputRecipeCache.SingleFluid; import mekanism.common.registries.MekanismBlocks; +import mekanism.common.registries.MekanismChemicals; import mekanism.common.registries.MekanismDataComponents; import mekanism.common.tile.TileEntityChemicalTank.GasMode; import mekanism.common.tile.component.TileComponentEjector; @@ -120,13 +122,14 @@ public class TileEntityElectrolyticSeparator extends TileEntityRecipeMachine outputHandler; private final IInputHandler<@NotNull FluidStack> inputHandler; - private FixedUsageEnergyContainer energyContainer; + private ElectroSeparatorEnergyContainer energyContainer; @WrappingComputerMethod(wrapper = ComputerIInventorySlotWrapper.class, methodNames = "getInputItem", docPlaceholder = "input item slot") FluidInventorySlot fluidSlot; @WrappingComputerMethod(wrapper = ComputerIInventorySlotWrapper.class, methodNames = "getLeftOutputItem", docPlaceholder = "left output item slot") @@ -193,7 +196,7 @@ public IChemicalTankHolder getInitialChemicalTanks(IContentsListener listener, I @Override protected IEnergyContainerHolder getInitialEnergyContainers(IContentsListener listener, IContentsListener recipeCacheListener, IContentsListener recipeCacheUnpauseListener) { EnergyContainerHelper builder = EnergyContainerHelper.forSideWithConfig(this); - builder.addContainer(energyContainer = FixedUsageEnergyContainer.input(this, BASE_ENERGY_CALCULATOR, recipeCacheUnpauseListener)); + builder.addContainer(energyContainer = ElectroSeparatorEnergyContainer.input(this, BASE_ENERGY_CALCULATOR, recipeCacheUnpauseListener)); return builder.build(); } @@ -215,9 +218,23 @@ protected IInventorySlotHolder getInitialInventory(IContentsListener listener, I public void onCachedRecipeChanged(@Nullable CachedRecipe cachedRecipe, int cacheIndex) { super.onCachedRecipeChanged(cachedRecipe, cacheIndex); recipeEnergyMultiplier = cachedRecipe == null ? 1L : cachedRecipe.getRecipe().getEnergyMultiplier(); + isMakingHydrogen = cachedRecipe != null && isHydrogenElectrolysis(cachedRecipe.getRecipe()); energyContainer.updateEnergyPerTick(); } + private static boolean isHydrogenElectrolysis(@NotNull ElectrolysisRecipe recipe) { + if (recipe instanceof BasicElectrolysisRecipe basicRecipe) { + return basicRecipe.getLeftChemicalOutput().is(MekanismChemicals.HYDROGEN) || basicRecipe.getRightChemicalOutput().is(MekanismChemicals.HYDROGEN); + } + //do it the slow way + for (ElectrolysisRecipeOutput electrolysisRecipeOutput : recipe.getOutputDefinition()) { + if (electrolysisRecipeOutput.left().is(MekanismChemicals.HYDROGEN) || electrolysisRecipeOutput.right().is(MekanismChemicals.HYDROGEN)) { + return true; + } + } + return false; + } + @Override protected boolean onUpdateServer() { boolean sendUpdatePacket = super.onUpdateServer(); @@ -314,7 +331,7 @@ public void recalculateUpgrades(Upgrade upgrade) { } } - public FixedUsageEnergyContainer getEnergyContainer() { + public ElectroSeparatorEnergyContainer getEnergyContainer() { return energyContainer; } @@ -420,4 +437,8 @@ void decrementRightOutputDumpingMode() throws ComputerException { markForSave(); } //End methods IComputerTile + + public boolean isMakingHydrogen() { + return isMakingHydrogen; + } } From 0b4764fdfc41a4265a2d2c7a5307ff89f7395d7d Mon Sep 17 00:00:00 2001 From: Thiakil Date: Mon, 23 Sep 2024 12:08:50 +0800 Subject: [PATCH 07/20] remove outdated todo --- .../capabilities/energy/ElectroSeparatorEnergyContainer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java b/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java index 076176e1212..2fb9500e028 100644 --- a/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java +++ b/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java @@ -31,7 +31,6 @@ protected ElectroSeparatorEnergyContainer(long maxEnergy, long energyPerTick, Pr @Override public long getBaseEnergyPerTick() { long base = baseEnergyCalculator.applyAsLong(super.getBaseEnergyPerTick(), tile); - //todo better check if (tile.isMakingHydrogen()) { base = (long) (base * Math.pow(2, tile.getComponent().getUpgrades(Upgrade.SPEED))); } From 03494e87fe7c8c1516fe5516ce63bc237a838e72 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Mon, 23 Sep 2024 14:25:24 +0800 Subject: [PATCH 08/20] scale only the separator by operations cost --- .../api/recipes/cache/CachedRecipe.java | 26 ++++++++++++++----- .../ElectroSeparatorEnergyContainer.java | 6 +---- .../TileEntityElectrolyticSeparator.java | 1 + 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/api/java/mekanism/api/recipes/cache/CachedRecipe.java b/src/api/java/mekanism/api/recipes/cache/CachedRecipe.java index f5dda254d6e..0c5c05c42a0 100644 --- a/src/api/java/mekanism/api/recipes/cache/CachedRecipe.java +++ b/src/api/java/mekanism/api/recipes/cache/CachedRecipe.java @@ -127,6 +127,12 @@ public abstract class CachedRecipe> { private IntConsumer operatingTicksChanged = ticks -> { }; + /** + * Whether multiple operations multiply the power usage. + * Currently only used for Hydrogen separating. + */ + private boolean multipleOperationsCost = false; + /** * @param recipe Recipe. * @param recheckAllErrors Returns {@code true} if processing should be continued even if an error is hit in order to gather all the errors. It is recommended to not @@ -252,6 +258,15 @@ public CachedRecipe setPostProcessOperations(Consumer return this; } + /** + * Sets whether the calculated operations increase the energy cost subtracted from the container. + * Currently only used for Hydrogen Separation. + */ + public CachedRecipe setOperationsCost(boolean value) { + this.multipleOperationsCost = value; + return this; + } + /** * Sets the callback that run when the set of known {@link RecipeError}s of this {@link CachedRecipe} changes. * @@ -320,7 +335,7 @@ public void process() { postProcessOperations.accept(tracker); //If we should continue checking try to cap the max at the max amount we have for energy that we didn't cap it at earlier // Note: We don't have to always try and cap it as if we shouldn't continue checking that means we are already stopped. - if (tracker.shouldContinueChecking() && tracker.capAtMaxForEnergy()) { + if (tracker.shouldContinueChecking() && (multipleOperationsCost && tracker.capAtMaxForEnergy())) { //If we lowered the maximum number of operations due to our available energy, then we add an error that we don't have // enough energy to run at our maximum rate tracker.addError(RecipeError.NOT_ENOUGH_ENERGY_REDUCED_RATE); @@ -404,13 +419,10 @@ protected void resetCache() { */ protected void useEnergy(int operations) { long energy = perTickEnergy.getAsLong(); - if (operations == 1) { - //While floating long will short circuit any calculations if multiplied by one given we require making a copy to ensure we don't - // modify the source value, if we do the check here manually as well, then we can skip creating unnecessary objects - useEnergy.accept(energy); - } else { - useEnergy.accept(energy/* * operations*/);//todo scale this for Separator if less possible? + if (this.multipleOperationsCost) { + energy = energy * operations; } + useEnergy.accept(energy); } /** diff --git a/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java b/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java index 2fb9500e028..cb6aea6083b 100644 --- a/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java +++ b/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java @@ -30,11 +30,7 @@ protected ElectroSeparatorEnergyContainer(long maxEnergy, long energyPerTick, Pr @Override public long getBaseEnergyPerTick() { - long base = baseEnergyCalculator.applyAsLong(super.getBaseEnergyPerTick(), tile); - if (tile.isMakingHydrogen()) { - base = (long) (base * Math.pow(2, tile.getComponent().getUpgrades(Upgrade.SPEED))); - } - return base; + return baseEnergyCalculator.applyAsLong(super.getBaseEnergyPerTick(), tile); } @Override diff --git a/src/main/java/mekanism/common/tile/machine/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/machine/TileEntityElectrolyticSeparator.java index d777e94a0f3..f01bdd653b2 100644 --- a/src/main/java/mekanism/common/tile/machine/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/machine/TileEntityElectrolyticSeparator.java @@ -316,6 +316,7 @@ public CachedRecipe createNewCachedRecipe(@NotNull Electroly .setErrorsChanged(this::onErrorsChanged) .setCanHolderFunction(this::canFunction) .setActive(this::setActive) + .setOperationsCost(isHydrogenElectrolysis(recipe)) .setEnergyRequirements(energyContainer::getEnergyPerTick, energyContainer) .setBaselineMaxOperations(() -> baselineMaxOperations) .setOnFinish(this::markForSave); From 41996138d36d3819bd747d818f09398df137a427 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Mon, 23 Sep 2024 18:22:44 +0800 Subject: [PATCH 09/20] trial machine buffers based on max usage per full operation or 4 ticks, whichever is higher --- .../ElectroSeparatorEnergyContainer.java | 12 ++++++++-- .../energy/FixedUsageEnergyContainer.java | 2 +- .../energy/MachineEnergyContainer.java | 22 ++++++++++++++++--- .../energy/MinerEnergyContainer.java | 2 +- .../energy/PRCEnergyContainer.java | 2 +- .../ResistiveHeaterEnergyContainer.java | 4 ++-- .../common/tile/base/TileEntityMekanism.java | 6 ++++- .../TileEntityElectrolyticSeparator.java | 5 +++++ .../TileEntityPressurizedReactionChamber.java | 1 + .../prefab/TileEntityProgressMachine.java | 2 +- 10 files changed, 46 insertions(+), 12 deletions(-) diff --git a/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java b/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java index cb6aea6083b..8987604a1b5 100644 --- a/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java +++ b/src/main/java/mekanism/common/capabilities/energy/ElectroSeparatorEnergyContainer.java @@ -17,7 +17,7 @@ public class ElectroSeparatorEnergyContainer extends MachineEnergyContainer baseEnergyCalculator, @Nullable IContentsListener listener) { AttributeEnergy electricBlock = validateBlock(tile); - return new ElectroSeparatorEnergyContainer(electricBlock.getStorage(), electricBlock.getUsage(), notExternal, alwaysTrue, tile, baseEnergyCalculator, listener); + return new ElectroSeparatorEnergyContainer(electricBlock.getUsage() * 4, electricBlock.getUsage(), notExternal, alwaysTrue, tile, baseEnergyCalculator, listener); } private final LongObjectToLongFunction baseEnergyCalculator; @@ -36,10 +36,18 @@ public long getBaseEnergyPerTick() { @Override public void updateEnergyPerTick() { if (tile.isMakingHydrogen()) { - //Energy upgrades only increase storage + //Energy upgrades do nothing this.currentEnergyPerTick = getBaseEnergyPerTick(); } else { super.updateEnergyPerTick(); } } + + @Override + public void updateMaxEnergy() { + super.updateMaxEnergy(); + if (tile.isMakingHydrogen()) { + setMaxEnergy(getMaxEnergy() * tile.getBaselineMaxOperations() * 4); + } + } } diff --git a/src/main/java/mekanism/common/capabilities/energy/FixedUsageEnergyContainer.java b/src/main/java/mekanism/common/capabilities/energy/FixedUsageEnergyContainer.java index c229f1516f5..199f0cd4e26 100644 --- a/src/main/java/mekanism/common/capabilities/energy/FixedUsageEnergyContainer.java +++ b/src/main/java/mekanism/common/capabilities/energy/FixedUsageEnergyContainer.java @@ -16,7 +16,7 @@ public class FixedUsageEnergyContainer extends public static FixedUsageEnergyContainer input(TILE tile, LongObjectToLongFunction baseEnergyCalculator, @Nullable IContentsListener listener) { AttributeEnergy electricBlock = validateBlock(tile); - return new FixedUsageEnergyContainer<>(electricBlock.getStorage(), electricBlock.getUsage(), notExternal, alwaysTrue, tile, baseEnergyCalculator, listener); + return new FixedUsageEnergyContainer<>(electricBlock.getUsage() * 4, electricBlock.getUsage(), notExternal, alwaysTrue, tile, baseEnergyCalculator, listener); } private final LongObjectToLongFunction baseEnergyCalculator; diff --git a/src/main/java/mekanism/common/capabilities/energy/MachineEnergyContainer.java b/src/main/java/mekanism/common/capabilities/energy/MachineEnergyContainer.java index 4e84a31e6a7..e22f1379b1a 100644 --- a/src/main/java/mekanism/common/capabilities/energy/MachineEnergyContainer.java +++ b/src/main/java/mekanism/common/capabilities/energy/MachineEnergyContainer.java @@ -10,6 +10,8 @@ import mekanism.common.block.attribute.AttributeEnergy; import mekanism.common.tile.base.TileEntityMekanism; import mekanism.common.tile.component.TileComponentUpgrade; +import mekanism.common.tile.factory.TileEntityFactory; +import mekanism.common.tile.prefab.TileEntityProgressMachine; import mekanism.common.util.MekanismUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -19,12 +21,12 @@ public class MachineEnergyContainer extends Bas public static MachineEnergyContainer input(TILE tile, @Nullable IContentsListener listener) { AttributeEnergy electricBlock = validateBlock(tile); - return new MachineEnergyContainer<>(electricBlock.getStorage(), electricBlock.getUsage(), notExternal, alwaysTrue, tile, listener); + return new MachineEnergyContainer<>(electricBlock.getUsage() * 4, electricBlock.getUsage(), notExternal, alwaysTrue, tile, listener); } public static MachineEnergyContainer internal(TILE tile, @Nullable IContentsListener listener) { AttributeEnergy electricBlock = validateBlock(tile); - return new MachineEnergyContainer<>(electricBlock.getStorage(), electricBlock.getUsage(), internalOnly, internalOnly, tile, listener); + return new MachineEnergyContainer<>(electricBlock.getUsage() * 4, electricBlock.getUsage(), internalOnly, internalOnly, tile, listener); } public static AttributeEnergy validateBlock(TileEntityMekanism tile) { @@ -50,6 +52,11 @@ protected MachineEnergyContainer(long maxEnergy, long energyPerTick, Predicate<@ currentEnergyPerTick = baseEnergyPerTick; } + @Override + protected long clampEnergy(long energy) { + return energy;//machines shouldn't clamp as buffer is dynamic + } + public boolean adjustableRates() { return false; } @@ -82,7 +89,16 @@ public void setEnergyPerTick(long energyPerTick) { } public void updateMaxEnergy() { - if (tile.supportsUpgrade(Upgrade.ENERGY)) { + if (tile.supportsUpgrade(Upgrade.SPEED)) { + int bufferMultipler = 4;//4 ticks by default + if (tile instanceof TileEntityProgressMachine progressMachine) { + bufferMultipler = Math.max(bufferMultipler, progressMachine.ticksRequired); + } + if (tile instanceof TileEntityFactory factory) { + bufferMultipler = factory.tier.processes * bufferMultipler; + } + setMaxEnergy(getEnergyPerTick() * bufferMultipler); + } else if (tile.supportsUpgrade(Upgrade.ENERGY)) { setMaxEnergy(MekanismUtils.getMaxEnergy(tile, getBaseMaxEnergy())); } } diff --git a/src/main/java/mekanism/common/capabilities/energy/MinerEnergyContainer.java b/src/main/java/mekanism/common/capabilities/energy/MinerEnergyContainer.java index c3d515f73db..d1278a3faed 100644 --- a/src/main/java/mekanism/common/capabilities/energy/MinerEnergyContainer.java +++ b/src/main/java/mekanism/common/capabilities/energy/MinerEnergyContainer.java @@ -14,7 +14,7 @@ public class MinerEnergyContainer extends MachineEnergyContainer canExtract, diff --git a/src/main/java/mekanism/common/capabilities/energy/ResistiveHeaterEnergyContainer.java b/src/main/java/mekanism/common/capabilities/energy/ResistiveHeaterEnergyContainer.java index a84b91a18fe..494093e3f92 100644 --- a/src/main/java/mekanism/common/capabilities/energy/ResistiveHeaterEnergyContainer.java +++ b/src/main/java/mekanism/common/capabilities/energy/ResistiveHeaterEnergyContainer.java @@ -18,11 +18,11 @@ @NothingNullByDefault public class ResistiveHeaterEnergyContainer extends MachineEnergyContainer { - public static final long USAGE_MULTIPLIER = 20 * SharedConstants.TICKS_PER_SECOND; + public static final long USAGE_MULTIPLIER = 4; public static ResistiveHeaterEnergyContainer input(TileEntityResistiveHeater tile, @Nullable IContentsListener listener) { AttributeEnergy electricBlock = validateBlock(tile); - return new ResistiveHeaterEnergyContainer(electricBlock.getStorage(), electricBlock.getUsage(), notExternal, alwaysTrue, tile, listener); + return new ResistiveHeaterEnergyContainer(electricBlock.getUsage() * USAGE_MULTIPLIER, electricBlock.getUsage(), notExternal, alwaysTrue, tile, listener); } private ResistiveHeaterEnergyContainer(long maxEnergy, long energyPerTick, Predicate<@NotNull AutomationType> canExtract, diff --git a/src/main/java/mekanism/common/tile/base/TileEntityMekanism.java b/src/main/java/mekanism/common/tile/base/TileEntityMekanism.java index 9db06594ea4..61a28c698e9 100644 --- a/src/main/java/mekanism/common/tile/base/TileEntityMekanism.java +++ b/src/main/java/mekanism/common/tile/base/TileEntityMekanism.java @@ -725,6 +725,9 @@ public void loadAdditional(@NotNull CompoundTag nbt, @NotNull HolderLookup.Provi for (ITileComponent component : components) { component.read(nbt, provider); } + if (supportsUpgrades()) { + recalculateUpgrades(Upgrade.SPEED);//force buffer to update + } readSustainedData(provider, nbt); for (ContainerType type : ContainerType.TYPES) { if (type.canHandle(this) && persists(type)) { @@ -1152,13 +1155,14 @@ public void recalculateUpgrades(Upgrade upgrade) { for (IEnergyContainer energyContainer : getEnergyContainers(null)) { if (energyContainer instanceof MachineEnergyContainer machineEnergy) { machineEnergy.updateEnergyPerTick(); + machineEnergy.updateMaxEnergy(); } } } else if (upgrade == Upgrade.ENERGY) { for (IEnergyContainer energyContainer : getEnergyContainers(null)) { if (energyContainer instanceof MachineEnergyContainer machineEnergy) { - machineEnergy.updateMaxEnergy(); machineEnergy.updateEnergyPerTick(); + machineEnergy.updateMaxEnergy(); } } } diff --git a/src/main/java/mekanism/common/tile/machine/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/machine/TileEntityElectrolyticSeparator.java index f01bdd653b2..951dbc57ce6 100644 --- a/src/main/java/mekanism/common/tile/machine/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/machine/TileEntityElectrolyticSeparator.java @@ -220,6 +220,7 @@ public void onCachedRecipeChanged(@Nullable CachedRecipe cac recipeEnergyMultiplier = cachedRecipe == null ? 1L : cachedRecipe.getRecipe().getEnergyMultiplier(); isMakingHydrogen = cachedRecipe != null && isHydrogenElectrolysis(cachedRecipe.getRecipe()); energyContainer.updateEnergyPerTick(); + energyContainer.updateMaxEnergy(); } private static boolean isHydrogenElectrolysis(@NotNull ElectrolysisRecipe recipe) { @@ -442,4 +443,8 @@ void decrementRightOutputDumpingMode() throws ComputerException { public boolean isMakingHydrogen() { return isMakingHydrogen; } + + public int getBaselineMaxOperations() { + return baselineMaxOperations; + } } diff --git a/src/main/java/mekanism/common/tile/machine/TileEntityPressurizedReactionChamber.java b/src/main/java/mekanism/common/tile/machine/TileEntityPressurizedReactionChamber.java index 207d58c9ba6..79b193ce47c 100644 --- a/src/main/java/mekanism/common/tile/machine/TileEntityPressurizedReactionChamber.java +++ b/src/main/java/mekanism/common/tile/machine/TileEntityPressurizedReactionChamber.java @@ -180,6 +180,7 @@ public void onCachedRecipeChanged(@Nullable CachedRecipe Date: Mon, 23 Sep 2024 18:24:30 +0800 Subject: [PATCH 10/20] ensure uncapped energy containers dont return less than 0 for getNeeded --- src/api/java/mekanism/api/energy/IEnergyContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/java/mekanism/api/energy/IEnergyContainer.java b/src/api/java/mekanism/api/energy/IEnergyContainer.java index 5bb501a3469..7aedc7072f7 100644 --- a/src/api/java/mekanism/api/energy/IEnergyContainer.java +++ b/src/api/java/mekanism/api/energy/IEnergyContainer.java @@ -124,7 +124,7 @@ default void setEmpty() { */ @Range(from = 0, to = Long.MAX_VALUE) default long getNeeded() { - return getMaxEnergy() - getEnergy(); + return Math.max(0L, getMaxEnergy() - getEnergy()); } @Override From b0701e3e1064e6ce631d298b9c8b92ea388e6a79 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Fri, 27 Sep 2024 21:49:17 +0800 Subject: [PATCH 11/20] make biofuel base recipes manual again --- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 147 ++++++------------ .../crushing/biofuel/acacia_sapling.json | 11 -- .../recipe/crushing/biofuel/allium.json | 11 -- .../recipe/crushing/biofuel/apple.json | 2 +- .../recipe/crushing/biofuel/azalea.json | 11 -- .../crushing/biofuel/azalea_leaves.json | 11 -- .../recipe/crushing/biofuel/baked_potato.json | 2 +- .../biofuel/{oak_leaves.json => bamboo.json} | 2 +- .../crushing/biofuel/beetroot_seeds.json | 11 -- .../biofuel/{vine.json => berries.json} | 4 +- .../recipe/crushing/biofuel/big_dripleaf.json | 2 +- .../recipe/crushing/biofuel/birch_leaves.json | 11 -- .../crushing/biofuel/birch_sapling.json | 11 -- .../recipe/crushing/biofuel/blue_orchid.json | 11 -- .../recipe/crushing/biofuel/bread.json | 2 +- .../crushing/biofuel/brown_mushroom.json | 11 -- .../biofuel/brown_mushroom_block.json | 11 -- .../recipe/crushing/biofuel/cake.json | 2 +- .../crushing/biofuel/cherry_leaves.json | 11 -- .../crushing/biofuel/cherry_sapling.json | 11 -- .../recipe/crushing/biofuel/cocoa_beans.json | 11 -- .../recipe/crushing/biofuel/cookie.json | 11 -- .../recipe/crushing/biofuel/cornflower.json | 11 -- .../crushing/biofuel/crimson_fungus.json | 11 -- .../crushing/biofuel/crimson_roots.json | 2 +- .../biofuel/{oak_sapling.json => crops.json} | 2 +- .../recipe/crushing/biofuel/dandelion.json | 11 -- .../crushing/biofuel/dark_oak_leaves.json | 11 -- .../crushing/biofuel/dark_oak_sapling.json | 11 -- .../recipe/crushing/biofuel/dried_kelp.json | 2 +- .../crushing/biofuel/dried_kelp_block.json | 2 +- .../recipe/crushing/biofuel/fern.json | 2 +- .../crushing/biofuel/flowering_azalea.json | 11 -- .../biofuel/flowering_azalea_leaves.json | 11 -- .../recipe/crushing/biofuel/fungus.json | 19 +++ .../recipe/crushing/biofuel/glow_berries.json | 11 -- .../recipe/crushing/biofuel/glow_lichen.json | 2 +- .../crushing/biofuel/hanging_roots.json | 2 +- .../recipe/crushing/biofuel/hay_block.json | 4 +- .../crushing/biofuel/jungle_leaves.json | 11 -- .../crushing/biofuel/jungle_sapling.json | 11 -- .../recipe/crushing/biofuel/large_fern.json | 2 +- .../biofuel/{cactus.json => leaves.json} | 6 +- .../crushing/biofuel/lily_of_the_valley.json | 11 -- .../recipe/crushing/biofuel/lily_pad.json | 4 +- .../crushing/biofuel/mangrove_leaves.json | 11 -- .../crushing/biofuel/mangrove_propagule.json | 11 -- .../crushing/biofuel/mangrove_roots.json | 11 -- .../recipe/crushing/biofuel/melon.json | 2 +- .../recipe/crushing/biofuel/melon_slice.json | 2 +- .../recipe/crushing/biofuel/moss_block.json | 2 +- .../recipe/crushing/biofuel/moss_carpet.json | 11 -- .../crushing/biofuel/mushroom_blocks.json | 22 +++ .../crushing/biofuel/mushroom_stem.json | 11 -- .../biofuel/{lilac.json => mushrooms.json} | 4 +- .../crushing/biofuel/nether_sprouts.json | 2 +- .../recipe/crushing/biofuel/nether_wart.json | 11 -- .../crushing/biofuel/nether_wart_block.json | 2 +- .../recipe/crushing/biofuel/orange_tulip.json | 11 -- .../recipe/crushing/biofuel/oxeye_daisy.json | 11 -- .../recipe/crushing/biofuel/pink_petals.json | 11 -- .../recipe/crushing/biofuel/pink_tulip.json | 11 -- .../crushing/biofuel/pitcher_plant.json | 11 -- .../recipe/crushing/biofuel/pitcher_pod.json | 2 +- ...acia_leaves.json => poisonous_potato.json} | 2 +- .../recipe/crushing/biofuel/poppy.json | 11 -- .../recipe/crushing/biofuel/potato.json | 11 -- .../recipe/crushing/biofuel/pumpkin.json | 2 +- .../recipe/crushing/biofuel/pumpkin_pie.json | 11 -- .../crushing/biofuel/pumpkin_seeds.json | 11 -- .../recipe/crushing/biofuel/red_mushroom.json | 11 -- .../crushing/biofuel/red_mushroom_block.json | 11 -- .../recipe/crushing/biofuel/red_tulip.json | 11 -- .../recipe/crushing/biofuel/rose_bush.json | 11 -- .../{azure_bluet.json => rotten_flesh.json} | 4 +- .../biofuel/{carrot.json => saplings.json} | 4 +- .../recipe/crushing/biofuel/sea_pickle.json | 2 +- .../recipe/crushing/biofuel/seagrass.json | 2 +- .../biofuel/{peony.json => seeds.json} | 4 +- .../recipe/crushing/biofuel/short_grass.json | 2 +- .../recipe/crushing/biofuel/shroomlight.json | 2 +- .../crushing/biofuel/small_dripleaf.json | 2 +- .../{beetroot.json => small_flowers.json} | 4 +- .../crushing/biofuel/spore_blossom.json | 2 +- .../crushing/biofuel/spruce_leaves.json | 11 -- .../crushing/biofuel/spruce_sapling.json | 11 -- .../recipe/crushing/biofuel/sugar_cane.json | 2 +- .../recipe/crushing/biofuel/sunflower.json | 11 -- .../crushing/biofuel/sweet_berries.json | 11 -- .../{melon_seeds.json => tall_flowers.json} | 2 +- .../recipe/crushing/biofuel/tall_grass.json | 2 +- .../recipe/crushing/biofuel/torchflower.json | 11 -- .../crushing/biofuel/torchflower_seeds.json | 2 +- .../crushing/biofuel/twisting_vines.json | 11 -- .../recipe/crushing/biofuel/vines.json | 22 +++ .../crushing/biofuel/warped_fungus.json | 11 -- .../recipe/crushing/biofuel/warped_roots.json | 2 +- .../crushing/biofuel/warped_wart_block.json | 4 +- .../crushing/biofuel/weeping_vines.json | 11 -- .../recipe/crushing/biofuel/wheat.json | 11 -- .../recipe/crushing/biofuel/wheat_seeds.json | 11 -- .../recipe/crushing/biofuel/white_tulip.json | 11 -- .../recipe/crushing/biofuel/wither_rose.json | 11 -- .../recipe/impl/CrusherRecipeProvider.java | 70 ++++++++- 104 files changed, 233 insertions(+), 771 deletions(-) delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/acacia_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/allium.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/azalea.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/azalea_leaves.json rename src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/{oak_leaves.json => bamboo.json} (79%) delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/beetroot_seeds.json rename src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/{vine.json => berries.json} (72%) delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/birch_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/birch_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/blue_orchid.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/brown_mushroom.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/brown_mushroom_block.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cherry_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cherry_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cocoa_beans.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cookie.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cornflower.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crimson_fungus.json rename src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/{oak_sapling.json => crops.json} (78%) delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dandelion.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dark_oak_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dark_oak_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/flowering_azalea.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/flowering_azalea_leaves.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/fungus.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/glow_berries.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/jungle_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/jungle_sapling.json rename src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/{cactus.json => leaves.json} (71%) delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lily_of_the_valley.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mangrove_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mangrove_propagule.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mangrove_roots.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/moss_carpet.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mushroom_blocks.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mushroom_stem.json rename src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/{lilac.json => mushrooms.json} (71%) delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/nether_wart.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/orange_tulip.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/oxeye_daisy.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pink_petals.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pink_tulip.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pitcher_plant.json rename src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/{acacia_leaves.json => poisonous_potato.json} (76%) delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/poppy.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/potato.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pumpkin_pie.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pumpkin_seeds.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/red_mushroom.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/red_mushroom_block.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/red_tulip.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/rose_bush.json rename src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/{azure_bluet.json => rotten_flesh.json} (68%) rename src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/{carrot.json => saplings.json} (70%) rename src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/{peony.json => seeds.json} (71%) rename src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/{beetroot.json => small_flowers.json} (68%) delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/spruce_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/spruce_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sunflower.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sweet_berries.json rename src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/{melon_seeds.json => tall_flowers.json} (78%) delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/torchflower.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/twisting_vines.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/vines.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_fungus.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/weeping_vines.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/wheat.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/wheat_seeds.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/white_tulip.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/wither_rose.json diff --git a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index a3fd12777a2..5c8f268f43b 100644 --- a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// Recipes 2024-08-20T15:23:02.5377889 Recipes +// Recipes 2024-09-27T21:39:14.6748705 Recipes 0fc9e539372429b3e5df0dc0595978c4fc45d201 data/mekanism/recipe/antiprotonic_nucleosynthesizer.json 6d20b08ca1cc993d4c39a761361dce522fe45a7a data/mekanism/recipe/atomic_disassembler.json 00928ea6e8b57d257c773343c0dc0d337c9d4f5f data/mekanism/recipe/bin/advanced.json @@ -420,107 +420,54 @@ e24bc3bf593ef401ec48ec119bfade472d9ccff7 data/mekanism/recipe/crafting_formula.j 009a33eb337938e2ed342cd8e8cd0a1de8dace55 data/mekanism/recipe/crushing/andesite/from_polished.json c99dc178281a41e89b1552ef5d0ae2e5620ad8ff data/mekanism/recipe/crushing/andesite/slab_from_polished_slab.json 3c5c59fe8d364b9a728dfe53f35786106847b9ef data/mekanism/recipe/crushing/andesite/stairs_from_polished_stairs.json -29c1767f68b7ce0df94e4374228284c04f847cd1 data/mekanism/recipe/crushing/biofuel/acacia_leaves.json -713f169961879ccb74dbbba90725c062e551b712 data/mekanism/recipe/crushing/biofuel/acacia_sapling.json -999cec5a97ae650c5c96465a298d1c9a79339d49 data/mekanism/recipe/crushing/biofuel/allium.json -38c135120bca5eea5f030a0f82fd665400370ebf data/mekanism/recipe/crushing/biofuel/apple.json -52606053aa01d45b620e2c0aa5bb849a63ea2729 data/mekanism/recipe/crushing/biofuel/azalea.json -945b0dc9539b195aa894a9858e51c82f06044ea4 data/mekanism/recipe/crushing/biofuel/azalea_leaves.json -ec347d02669c09d2c94bc1cb13ba2c103d8c2349 data/mekanism/recipe/crushing/biofuel/azure_bluet.json -36657b346b413bbb5b83c1191c1f6e910a4e5737 data/mekanism/recipe/crushing/biofuel/baked_potato.json -1d1a42bdaf8a78ce34ba6a5dbe72f6815d3f2746 data/mekanism/recipe/crushing/biofuel/beetroot.json -34cac08d5cabed652f40e8c395bb6ede5130d8c3 data/mekanism/recipe/crushing/biofuel/beetroot_seeds.json -d01d919b40ec57e056dddd711961dbf1718a3651 data/mekanism/recipe/crushing/biofuel/big_dripleaf.json -0b4f2b5587b6ffa9b84263e8430f7f1c9ae276aa data/mekanism/recipe/crushing/biofuel/birch_leaves.json -2a9e5351fa0976c83c101e314267ac9ffe9522ae data/mekanism/recipe/crushing/biofuel/birch_sapling.json -dee44e8c425842ad179c0a81003d002e82902b28 data/mekanism/recipe/crushing/biofuel/blue_orchid.json -597845ff9901189bdefe6405ef0e52179ddb6815 data/mekanism/recipe/crushing/biofuel/bread.json -24d144bef75ec8c77db9ed92f56fea8ea990774f data/mekanism/recipe/crushing/biofuel/brown_mushroom.json -c2dd7d36ef201e38f3f9ad8a3d8b578729f2818d data/mekanism/recipe/crushing/biofuel/brown_mushroom_block.json -596148c7ea6c77dea67cb9b848c65f824d453165 data/mekanism/recipe/crushing/biofuel/cactus.json -fe702cea1e7904f926956d7e9b0e480d51a4ab41 data/mekanism/recipe/crushing/biofuel/cake.json -17a0bb2c760d6fde7c8a78c9be5bb1f51ce9c0e0 data/mekanism/recipe/crushing/biofuel/carrot.json +5f19385ce27d830a06573e0dbc00c565ef36a848 data/mekanism/recipe/crushing/biofuel/apple.json +e6bee411ee35750387146c8b3f65fd4f1b0c8e5c data/mekanism/recipe/crushing/biofuel/baked_potato.json +1475a62f4faf03b4d56bfa876b8a70e236c766dc data/mekanism/recipe/crushing/biofuel/bamboo.json +17490606414914a176913ba2426816bc6a5d95fb data/mekanism/recipe/crushing/biofuel/berries.json +fa078f3e56a8999b80d8e1ff608c57b7a9a55744 data/mekanism/recipe/crushing/biofuel/big_dripleaf.json +ce372a62d214ed72ef101eefe1421d578fef6314 data/mekanism/recipe/crushing/biofuel/bread.json +42c38ac5040e073af1d776d1f054d97b7cd98c4b data/mekanism/recipe/crushing/biofuel/cake.json 49641a76562333a630ab47d8fcdd8a2e3c8af7c4 data/mekanism/recipe/crushing/biofuel/carved_pumpkin.json -2056dbacbd3baefe33c0accd19f29ace40e249d9 data/mekanism/recipe/crushing/biofuel/cherry_leaves.json -4331e6c7d5365c56c31dd6e9645d963b8693dff3 data/mekanism/recipe/crushing/biofuel/cherry_sapling.json -55eb336eab59ebc3734687f45545c21cc596da74 data/mekanism/recipe/crushing/biofuel/cocoa_beans.json -c96251fc69626cc6bd902a86fde495e09921f547 data/mekanism/recipe/crushing/biofuel/cookie.json -eaaf0f83ae382b739ca27a46c8d59a4ac158237f data/mekanism/recipe/crushing/biofuel/cornflower.json -572a2790e85b82c45affbc7a6800041a3da55ec1 data/mekanism/recipe/crushing/biofuel/crimson_fungus.json -c02645c76bfcb4ca23e879d689d592e52f50c1ee data/mekanism/recipe/crushing/biofuel/crimson_roots.json -9a16ed6146559d30229b3a2167c5e9e4ae0ab6ad data/mekanism/recipe/crushing/biofuel/dandelion.json -8a57b0998f6e258fcc88c9dbe46aef0ff145c4bd data/mekanism/recipe/crushing/biofuel/dark_oak_leaves.json -d25507a6a2922859731b6ba46b412618c564d787 data/mekanism/recipe/crushing/biofuel/dark_oak_sapling.json -4df24160a15b1b90cce332d13522d37680e6ad94 data/mekanism/recipe/crushing/biofuel/dried_kelp.json -6ca1222638d50c2bac47075721b9585b2d6b8953 data/mekanism/recipe/crushing/biofuel/dried_kelp_block.json -fa4524e15c8b39341cf13e32c74e9d1c5d093c5f data/mekanism/recipe/crushing/biofuel/fern.json -717a0ec6b9a38381170cb72792d8fb6c4888e65b data/mekanism/recipe/crushing/biofuel/flowering_azalea.json -02158cd03d3e60af0801fa7bb0ec71bf133df8a3 data/mekanism/recipe/crushing/biofuel/flowering_azalea_leaves.json -655577f87a2ed3ec2edcf98f87abd919f8c083d0 data/mekanism/recipe/crushing/biofuel/glow_berries.json -2eb280ad243d77d6b9e4d70099bb4f7a9384fec7 data/mekanism/recipe/crushing/biofuel/glow_lichen.json -366ac5170085a920555f50e2302429cc3759ca97 data/mekanism/recipe/crushing/biofuel/hanging_roots.json -2fb5f078cdeb4bb94b4e7cde9fcd0a0da178346b data/mekanism/recipe/crushing/biofuel/hay_block.json -fe4bc26db20d6b1d4c066afc03b601b5c9fdd066 data/mekanism/recipe/crushing/biofuel/jungle_leaves.json -fabc17126eafc0aba535585df42837f322e5ac0c data/mekanism/recipe/crushing/biofuel/jungle_sapling.json +0b32880464e9abdcfc4ad1cb3813bcd53939ea05 data/mekanism/recipe/crushing/biofuel/crimson_roots.json +5eae90012568bd9f4138e611c715ccf4d935e120 data/mekanism/recipe/crushing/biofuel/crops.json +f66b4de1132bd40e06ccc748944ba0fc92c14f10 data/mekanism/recipe/crushing/biofuel/dried_kelp.json +e62a8112ac9be2fabfcb2dbab5607256705f3be2 data/mekanism/recipe/crushing/biofuel/dried_kelp_block.json +7a88cb56ffe9f0bd5c307f589690fe8c3336621f data/mekanism/recipe/crushing/biofuel/fern.json +034bbce87fb1ac34fe7eff5939347fe0097aa92b data/mekanism/recipe/crushing/biofuel/fungus.json +2ee51cdbd046107cc45e06b59bb986cc133e8b9b data/mekanism/recipe/crushing/biofuel/glow_lichen.json +b331efd2f9cd783914aa4b90d66efe912f41c185 data/mekanism/recipe/crushing/biofuel/hanging_roots.json +bd608094045a0a2e1680580170a6fef4654c89e5 data/mekanism/recipe/crushing/biofuel/hay_block.json 49a4b33e46c1258a3628d5a21c1ef59d5ad8b247 data/mekanism/recipe/crushing/biofuel/kelp.json -617d27617afe800cf412f78111a9459484d588a9 data/mekanism/recipe/crushing/biofuel/large_fern.json -6e1aaac0d9393bf14c7db7ced7722c3a77cdfd3c data/mekanism/recipe/crushing/biofuel/lilac.json -27d8fa2aea5f1b898bfd29d6d51ebf78561bf22b data/mekanism/recipe/crushing/biofuel/lily_of_the_valley.json -588de3a714209e7fb0a863faca4299303c38bfce data/mekanism/recipe/crushing/biofuel/lily_pad.json -853941598710cbb2cd7b262750dc0dcee95525bb data/mekanism/recipe/crushing/biofuel/mangrove_leaves.json -ffc0f03d5d5364ace10109c1f68de54635325294 data/mekanism/recipe/crushing/biofuel/mangrove_propagule.json -135fea8029afd95df178b8fe66adb7dcbaa46eec data/mekanism/recipe/crushing/biofuel/mangrove_roots.json -e5814c55d94c5fc638bdf890fd18493f8fc7dc48 data/mekanism/recipe/crushing/biofuel/melon.json -a78a6c39fa6cfe28cb6724554b0640ea45a0a36c data/mekanism/recipe/crushing/biofuel/melon_seeds.json -91732f4526d9de49f9f52b34196e1b31d42d26d1 data/mekanism/recipe/crushing/biofuel/melon_slice.json -03b94897db89052d6bbd6a3b8d14ab99f4c6c974 data/mekanism/recipe/crushing/biofuel/moss_block.json -dc5f47b5b6e785e21aa18e1ed08b3752f071531e data/mekanism/recipe/crushing/biofuel/moss_carpet.json -bdd3a77346285fda12c34fa94fbc25be06f2c3a0 data/mekanism/recipe/crushing/biofuel/mushroom_stem.json -15beb97c57fdb6e2fb52046384211a12b7879b96 data/mekanism/recipe/crushing/biofuel/nether_sprouts.json -eb2ef0e6665e40b4a24a28027885d5ecd3fc0117 data/mekanism/recipe/crushing/biofuel/nether_wart.json -8263f51c6876a988c32b3b3e1f202d94524cc711 data/mekanism/recipe/crushing/biofuel/nether_wart_block.json -e66e76badc7df6d2962e5e73b7ea9556c52bee7d data/mekanism/recipe/crushing/biofuel/oak_leaves.json -c6d8d7eb255352f8739b1f9bf0f4aebe43b53721 data/mekanism/recipe/crushing/biofuel/oak_sapling.json -6a4bb80228e9e88c676565bcffe0f51b71108242 data/mekanism/recipe/crushing/biofuel/orange_tulip.json -4fe49b8feaa05d9888d60164e1513dce23261636 data/mekanism/recipe/crushing/biofuel/oxeye_daisy.json -7690f46db5ca9005b8b7f97270e4174810866662 data/mekanism/recipe/crushing/biofuel/peony.json -05bb87c286d6ec5769c5b6e19e8664a4d946baad data/mekanism/recipe/crushing/biofuel/pink_petals.json -1b475852c5ffabda991aad83aed493f46d32b9d2 data/mekanism/recipe/crushing/biofuel/pink_tulip.json -1cad2fd6ae1d7a4978bb17eb06edb4aca49e7593 data/mekanism/recipe/crushing/biofuel/pitcher_plant.json -ebe697c7b74519d5e258363a6b35226ce20bda47 data/mekanism/recipe/crushing/biofuel/pitcher_pod.json -18c7559b16f21beee951a96fd7b3e9f0f5224bff data/mekanism/recipe/crushing/biofuel/poppy.json -534e9a14c02df7fe0c3d50a4eef2e97389b36bef data/mekanism/recipe/crushing/biofuel/potato.json -f01b582b29ac102c3114d931939cffb21b29ba69 data/mekanism/recipe/crushing/biofuel/pumpkin.json -385f57f2b4ce395fca420329ed7ec5421e2be815 data/mekanism/recipe/crushing/biofuel/pumpkin_pie.json -960c1fe5589f9cf3d7a0f515507c89e6866f537e data/mekanism/recipe/crushing/biofuel/pumpkin_seeds.json -cb390d30454b1e73cf1c77b62e886adfe0924eb0 data/mekanism/recipe/crushing/biofuel/red_mushroom.json -eaee8379736a9dda3b7636433905454e4c9266d3 data/mekanism/recipe/crushing/biofuel/red_mushroom_block.json -d1e91c03c0108fbac95726d3968c94138932803b data/mekanism/recipe/crushing/biofuel/red_tulip.json -972031c432d3ceefd5b36652d26c9cca814e1884 data/mekanism/recipe/crushing/biofuel/rose_bush.json -a96ba94065f89ee0b1f13b8a57ff9aa9547fa52d data/mekanism/recipe/crushing/biofuel/seagrass.json -e13690c3f391d51b26f816bec2c30f8ee5cbb429 data/mekanism/recipe/crushing/biofuel/sea_pickle.json -30ace75ec0ef00520474191be309fe7bf09e6d1a data/mekanism/recipe/crushing/biofuel/short_grass.json -e8fa54bc0b72813be0471f7be6cf891b95543061 data/mekanism/recipe/crushing/biofuel/shroomlight.json -7bb2b0d39ee0b092d62f9f88f9a3dfcc200a196d data/mekanism/recipe/crushing/biofuel/small_dripleaf.json -e7a48926c195042873b0d385f131993677790120 data/mekanism/recipe/crushing/biofuel/spore_blossom.json -03e0927cc6b03e48726c8da044b13b6b60004d61 data/mekanism/recipe/crushing/biofuel/spruce_leaves.json -6176b4b89018ba28bcf241942e36b5c18db1539b data/mekanism/recipe/crushing/biofuel/spruce_sapling.json -0423c894c10a960c6c4a2d5fc753dc5c1b117a8b data/mekanism/recipe/crushing/biofuel/sugar_cane.json -f9c01374f290adc2b3228ac9d52a0eac4ce0eedf data/mekanism/recipe/crushing/biofuel/sunflower.json -cfe115559e835df7f8a00fc59198d63416604338 data/mekanism/recipe/crushing/biofuel/sweet_berries.json -da98c56729a2051bdd7f31a65f819f98ef102f10 data/mekanism/recipe/crushing/biofuel/tall_grass.json -9dd3ed9de5f7317437c445b23097358bbc87f92a data/mekanism/recipe/crushing/biofuel/torchflower.json -93c021330ee3d1db1b235d7e8bff889be78467c3 data/mekanism/recipe/crushing/biofuel/torchflower_seeds.json -5ac88dadd2096506d74bd0a31a69cc6a8f107ebf data/mekanism/recipe/crushing/biofuel/twisting_vines.json -3a67847d34dd346832e1af7e39eda7c6aa615290 data/mekanism/recipe/crushing/biofuel/vine.json -a3ec619a36a6755b4f1f2262f4c04559afb7cec7 data/mekanism/recipe/crushing/biofuel/warped_fungus.json -2327ffa93434aa28ad24e549c42456b61034ded2 data/mekanism/recipe/crushing/biofuel/warped_roots.json -6c7e8635d66f848439d39fbc14aa4f44d8bfcf86 data/mekanism/recipe/crushing/biofuel/warped_wart_block.json -1ca687b3006e5e8e5ac30484c84b78763b9890d4 data/mekanism/recipe/crushing/biofuel/weeping_vines.json -71f38ea81181a22acf67960da9d0bcec050eee2d data/mekanism/recipe/crushing/biofuel/wheat.json -0ef639626f715647d513c00136d8d16d9979f174 data/mekanism/recipe/crushing/biofuel/wheat_seeds.json -26a768a4af8be1ee1dc91221bdc1a748551236b9 data/mekanism/recipe/crushing/biofuel/white_tulip.json -93473ee554dd7e742b1afbe91c67296c7e84a82f data/mekanism/recipe/crushing/biofuel/wither_rose.json +7c41101a3115063fa26930e98e2e1265f8614d1a data/mekanism/recipe/crushing/biofuel/large_fern.json +19e57528a66775dd441346c9366328517a253d7e data/mekanism/recipe/crushing/biofuel/leaves.json +b331efd2f9cd783914aa4b90d66efe912f41c185 data/mekanism/recipe/crushing/biofuel/lily_pad.json +e88cc7e629e0a03d612e73818fc4bb4c341556b2 data/mekanism/recipe/crushing/biofuel/melon.json +19fed37b2c4e1c58fbf8356fa3b4848dfc6f7b4c data/mekanism/recipe/crushing/biofuel/melon_slice.json +4ccfe0b52c8a5209901ce4e35ba39d2453b8ef86 data/mekanism/recipe/crushing/biofuel/moss_block.json +b6d593b2d3e49c96e2cd3b9ed105592f98580967 data/mekanism/recipe/crushing/biofuel/mushrooms.json +f8b0615e7712076171c6b7625395fc761e6e1f17 data/mekanism/recipe/crushing/biofuel/mushroom_blocks.json +d092cf5f1294088fa8380cbc4d450e6ec54ef7a4 data/mekanism/recipe/crushing/biofuel/nether_sprouts.json +f12fdf86147c9769c646ee1f37162c99183e8a0e data/mekanism/recipe/crushing/biofuel/nether_wart_block.json +c012958819393463d6173ac88718ff9c85b59625 data/mekanism/recipe/crushing/biofuel/pitcher_pod.json +6e576f087b398236e14a8c9e949759e0cd6e0a86 data/mekanism/recipe/crushing/biofuel/poisonous_potato.json +7f54ac63f5856d2139cd1a6cd5a71fc6ef99f144 data/mekanism/recipe/crushing/biofuel/pumpkin.json +06240c36a88fb4e6ff0f15e4265116cd8b1c7718 data/mekanism/recipe/crushing/biofuel/rotten_flesh.json +5114fc3ab35ee5233adb14bcd3db79b1fb97f222 data/mekanism/recipe/crushing/biofuel/saplings.json +8eb81540ce521f6b79f82eb2f7e626e9a21d7d60 data/mekanism/recipe/crushing/biofuel/seagrass.json +49571caaf300dc73c5c55c7e02767f8bb058ceeb data/mekanism/recipe/crushing/biofuel/sea_pickle.json +f84088e7d193f23785e049e66852a1b72f23aede data/mekanism/recipe/crushing/biofuel/seeds.json +d5c4d37b10d3410584a84154b6ad0cbc5c4458b6 data/mekanism/recipe/crushing/biofuel/short_grass.json +adf51869508aa65214e5793fb122209682c97d7a data/mekanism/recipe/crushing/biofuel/shroomlight.json +aa31d80b42a8218f79041706218c4e7732cf6ac3 data/mekanism/recipe/crushing/biofuel/small_dripleaf.json +84593bd9156aafb83ae5f4438a671caac236bd66 data/mekanism/recipe/crushing/biofuel/small_flowers.json +2a04cc8aee7b6634222e203bd09d581d48f059b6 data/mekanism/recipe/crushing/biofuel/spore_blossom.json +b95552f5e2f0cf482524bd2f74b450906e80e8b9 data/mekanism/recipe/crushing/biofuel/sugar_cane.json +9d900f8de1478260c370a52ed24696e9da7d4995 data/mekanism/recipe/crushing/biofuel/tall_flowers.json +21ab164bf0c91ae3008bdb60337813f1a6064d46 data/mekanism/recipe/crushing/biofuel/tall_grass.json +1f877557fe1dae73012f3e0ab02f54de7332e2c9 data/mekanism/recipe/crushing/biofuel/torchflower_seeds.json +29a2fb4570dafc64305cc5eca18523e6761ae205 data/mekanism/recipe/crushing/biofuel/vines.json +61cafe715b49e82ec6ef78c1e2eb7923ee66a57b data/mekanism/recipe/crushing/biofuel/warped_roots.json +801972f577aa393be04d1df44f0374aee251b452 data/mekanism/recipe/crushing/biofuel/warped_wart_block.json 2d0fec36d3421b9d116344605a256df33bedb11d data/mekanism/recipe/crushing/blackstone/bricks_to_cracked_bricks.json a7d586cd59e80c8455ccb8be19c1d63376754f61 data/mekanism/recipe/crushing/blackstone/chiseled_bricks_to_bricks.json d7d123327172eb337d782d8993a32bcb1ef7306b data/mekanism/recipe/crushing/blackstone/from_cracked_bricks.json diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/acacia_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/acacia_sapling.json deleted file mode 100644 index e57fb66e69c..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/acacia_sapling.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:acacia_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/allium.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/allium.json deleted file mode 100644 index 96045c6fc35..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/allium.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:allium" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/apple.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/apple.json index 16097ea272d..0c9c1fc8e97 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/apple.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/apple.json @@ -5,7 +5,7 @@ "item": "minecraft:apple" }, "output": { - "count": 5, + "count": 2, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/azalea.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/azalea.json deleted file mode 100644 index 8071fffe525..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/azalea.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:azalea" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/azalea_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/azalea_leaves.json deleted file mode 100644 index d4853d3729f..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/azalea_leaves.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:azalea_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/baked_potato.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/baked_potato.json index 8b332ae36ca..aa1209739c2 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/baked_potato.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/baked_potato.json @@ -5,7 +5,7 @@ "item": "minecraft:baked_potato" }, "output": { - "count": 7, + "count": 2, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/oak_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/bamboo.json similarity index 79% rename from src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/oak_leaves.json rename to src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/bamboo.json index 3e1e737e888..6f0474edc66 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/oak_leaves.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/bamboo.json @@ -2,7 +2,7 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:oak_leaves" + "item": "minecraft:bamboo" }, "output": { "count": 2, diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/beetroot_seeds.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/beetroot_seeds.json deleted file mode 100644 index 2deae334570..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/beetroot_seeds.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:beetroot_seeds" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/vine.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/berries.json similarity index 72% rename from src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/vine.json rename to src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/berries.json index ca2d2ac7514..ae0c7b87a11 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/vine.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/berries.json @@ -2,10 +2,10 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:vine" + "tag": "c:foods/berry" }, "output": { - "count": 4, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/big_dripleaf.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/big_dripleaf.json index c6d932779d2..2f51ef0bf2f 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/big_dripleaf.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/big_dripleaf.json @@ -5,7 +5,7 @@ "item": "minecraft:big_dripleaf" }, "output": { - "count": 5, + "count": 2, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/birch_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/birch_leaves.json deleted file mode 100644 index f7c146f8603..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/birch_leaves.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:birch_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/birch_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/birch_sapling.json deleted file mode 100644 index 9651d36359c..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/birch_sapling.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:birch_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/blue_orchid.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/blue_orchid.json deleted file mode 100644 index ae31340433b..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/blue_orchid.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:blue_orchid" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/bread.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/bread.json index c175de667cc..10c2b95a9c7 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/bread.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/bread.json @@ -5,7 +5,7 @@ "item": "minecraft:bread" }, "output": { - "count": 7, + "count": 4, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/brown_mushroom.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/brown_mushroom.json deleted file mode 100644 index f4d89f0484b..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/brown_mushroom.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:brown_mushroom" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/brown_mushroom_block.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/brown_mushroom_block.json deleted file mode 100644 index 61b5df2ab50..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/brown_mushroom_block.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:brown_mushroom_block" - }, - "output": { - "count": 7, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cake.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cake.json index b1e43b9398e..47ed46ba51a 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cake.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cake.json @@ -5,7 +5,7 @@ "item": "minecraft:cake" }, "output": { - "count": 8, + "count": 6, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cherry_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cherry_leaves.json deleted file mode 100644 index 070c517584e..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cherry_leaves.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:cherry_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cherry_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cherry_sapling.json deleted file mode 100644 index 7863b387142..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cherry_sapling.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:cherry_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cocoa_beans.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cocoa_beans.json deleted file mode 100644 index b81bc41157a..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cocoa_beans.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:cocoa_beans" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cookie.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cookie.json deleted file mode 100644 index ba79842c3e9..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cookie.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:cookie" - }, - "output": { - "count": 7, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cornflower.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cornflower.json deleted file mode 100644 index 7cb87539746..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cornflower.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:cornflower" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crimson_fungus.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crimson_fungus.json deleted file mode 100644 index 61fa5769f66..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crimson_fungus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:crimson_fungus" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crimson_roots.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crimson_roots.json index 77a7f5a1835..ae67e155415 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crimson_roots.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crimson_roots.json @@ -5,7 +5,7 @@ "item": "minecraft:crimson_roots" }, "output": { - "count": 5, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/oak_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crops.json similarity index 78% rename from src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/oak_sapling.json rename to src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crops.json index 0ea711a3327..0bd50f61ccb 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/oak_sapling.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crops.json @@ -2,7 +2,7 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:oak_sapling" + "tag": "c:crops" }, "output": { "count": 2, diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dandelion.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dandelion.json deleted file mode 100644 index 5ad9e832986..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dandelion.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:dandelion" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dark_oak_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dark_oak_leaves.json deleted file mode 100644 index 4f3a0ec264a..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dark_oak_leaves.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:dark_oak_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dark_oak_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dark_oak_sapling.json deleted file mode 100644 index 4cbe61c080b..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dark_oak_sapling.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:dark_oak_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dried_kelp.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dried_kelp.json index 88adf5b2275..2857a991c49 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dried_kelp.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dried_kelp.json @@ -5,7 +5,7 @@ "item": "minecraft:dried_kelp" }, "output": { - "count": 2, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dried_kelp_block.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dried_kelp_block.json index 66e5fd1c1ef..5ac839cba8b 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dried_kelp_block.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/dried_kelp_block.json @@ -5,7 +5,7 @@ "item": "minecraft:dried_kelp_block" }, "output": { - "count": 4, + "count": 9, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/fern.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/fern.json index f72438a4ad1..71296b9b0ac 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/fern.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/fern.json @@ -5,7 +5,7 @@ "item": "minecraft:fern" }, "output": { - "count": 5, + "count": 2, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/flowering_azalea.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/flowering_azalea.json deleted file mode 100644 index 0eda416471e..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/flowering_azalea.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:flowering_azalea" - }, - "output": { - "count": 7, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/flowering_azalea_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/flowering_azalea_leaves.json deleted file mode 100644 index af2c8e04501..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/flowering_azalea_leaves.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:flowering_azalea_leaves" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/fungus.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/fungus.json new file mode 100644 index 00000000000..1a22cf0266d --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/fungus.json @@ -0,0 +1,19 @@ +{ + "type": "mekanism:crushing", + "input": { + "type": "neoforge:compound", + "children": [ + { + "item": "minecraft:crimson_fungus" + }, + { + "item": "minecraft:warped_fungus" + } + ], + "count": 1 + }, + "output": { + "count": 1, + "id": "mekanism:bio_fuel" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/glow_berries.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/glow_berries.json deleted file mode 100644 index bc53931a9ef..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/glow_berries.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:glow_berries" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/glow_lichen.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/glow_lichen.json index 7f0b2ae912e..bc5d73a1370 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/glow_lichen.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/glow_lichen.json @@ -5,7 +5,7 @@ "item": "minecraft:glow_lichen" }, "output": { - "count": 4, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/hanging_roots.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/hanging_roots.json index 602a5cdbdb7..f0537cd57bb 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/hanging_roots.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/hanging_roots.json @@ -5,7 +5,7 @@ "item": "minecraft:hanging_roots" }, "output": { - "count": 2, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/hay_block.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/hay_block.json index ebdfa6f2bf7..38a108bccfd 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/hay_block.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/hay_block.json @@ -2,10 +2,10 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:hay_block" + "item": "minecraft:hanging_roots" }, "output": { - "count": 7, + "count": 18, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/jungle_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/jungle_leaves.json deleted file mode 100644 index e74d2660a83..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/jungle_leaves.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:jungle_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/jungle_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/jungle_sapling.json deleted file mode 100644 index 323ac39e87b..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/jungle_sapling.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:jungle_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/large_fern.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/large_fern.json index 9d8dbbe5ac4..e68d6a0d059 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/large_fern.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/large_fern.json @@ -5,7 +5,7 @@ "item": "minecraft:large_fern" }, "output": { - "count": 5, + "count": 3, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cactus.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/leaves.json similarity index 71% rename from src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cactus.json rename to src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/leaves.json index e32e8215452..65a1d2315bc 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/cactus.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/leaves.json @@ -1,11 +1,11 @@ { "type": "mekanism:crushing", "input": { - "count": 1, - "item": "minecraft:cactus" + "count": 10, + "tag": "minecraft:leaves" }, "output": { - "count": 4, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lily_of_the_valley.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lily_of_the_valley.json deleted file mode 100644 index 3b3cbf62b9a..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lily_of_the_valley.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:lily_of_the_valley" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lily_pad.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lily_pad.json index 1bb2bf4773f..f0537cd57bb 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lily_pad.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lily_pad.json @@ -2,10 +2,10 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:lily_pad" + "item": "minecraft:hanging_roots" }, "output": { - "count": 5, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mangrove_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mangrove_leaves.json deleted file mode 100644 index a7306729430..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mangrove_leaves.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:mangrove_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mangrove_propagule.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mangrove_propagule.json deleted file mode 100644 index 87919a1d343..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mangrove_propagule.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:mangrove_propagule" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mangrove_roots.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mangrove_roots.json deleted file mode 100644 index 6496a058819..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mangrove_roots.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:mangrove_roots" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/melon.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/melon.json index b58fd6fc9aa..b6176be9be7 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/melon.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/melon.json @@ -5,7 +5,7 @@ "item": "minecraft:melon" }, "output": { - "count": 5, + "count": 6, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/melon_slice.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/melon_slice.json index 9166a2b2f75..1e8d377180f 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/melon_slice.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/melon_slice.json @@ -5,7 +5,7 @@ "item": "minecraft:melon_slice" }, "output": { - "count": 4, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/moss_block.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/moss_block.json index f8aa03d52e6..eca21e696ae 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/moss_block.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/moss_block.json @@ -5,7 +5,7 @@ "item": "minecraft:moss_block" }, "output": { - "count": 5, + "count": 2, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/moss_carpet.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/moss_carpet.json deleted file mode 100644 index 6ab959458e0..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/moss_carpet.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:moss_carpet" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mushroom_blocks.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mushroom_blocks.json new file mode 100644 index 00000000000..4751d15a0af --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mushroom_blocks.json @@ -0,0 +1,22 @@ +{ + "type": "mekanism:crushing", + "input": { + "type": "neoforge:compound", + "children": [ + { + "item": "minecraft:brown_mushroom_block" + }, + { + "item": "minecraft:red_mushroom_block" + }, + { + "item": "minecraft:mushroom_stem" + } + ], + "count": 1 + }, + "output": { + "count": 4, + "id": "mekanism:bio_fuel" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mushroom_stem.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mushroom_stem.json deleted file mode 100644 index ad0984ffe00..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mushroom_stem.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:mushroom_stem" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lilac.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mushrooms.json similarity index 71% rename from src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lilac.json rename to src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mushrooms.json index c2158e27e70..a4a88e5544d 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lilac.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/mushrooms.json @@ -2,10 +2,10 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:lilac" + "tag": "c:mushrooms" }, "output": { - "count": 5, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/nether_sprouts.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/nether_sprouts.json index 15ccb86afb6..b121edd6b3c 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/nether_sprouts.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/nether_sprouts.json @@ -5,7 +5,7 @@ "item": "minecraft:nether_sprouts" }, "output": { - "count": 4, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/nether_wart.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/nether_wart.json deleted file mode 100644 index 96625b33909..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/nether_wart.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:nether_wart" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/nether_wart_block.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/nether_wart_block.json index 512fea8e766..8be7ff15eb6 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/nether_wart_block.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/nether_wart_block.json @@ -5,7 +5,7 @@ "item": "minecraft:nether_wart_block" }, "output": { - "count": 7, + "count": 18, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/orange_tulip.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/orange_tulip.json deleted file mode 100644 index f739fe925bf..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/orange_tulip.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:orange_tulip" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/oxeye_daisy.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/oxeye_daisy.json deleted file mode 100644 index 90e5f70f590..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/oxeye_daisy.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:oxeye_daisy" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pink_petals.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pink_petals.json deleted file mode 100644 index 8f09088470f..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pink_petals.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:pink_petals" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pink_tulip.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pink_tulip.json deleted file mode 100644 index 259cd3a9117..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pink_tulip.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:pink_tulip" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pitcher_plant.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pitcher_plant.json deleted file mode 100644 index 7437d7e017e..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pitcher_plant.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:pitcher_plant" - }, - "output": { - "count": 7, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pitcher_pod.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pitcher_pod.json index 4ff07572446..9b9d74043ea 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pitcher_pod.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pitcher_pod.json @@ -5,7 +5,7 @@ "item": "minecraft:pitcher_pod" }, "output": { - "count": 2, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/acacia_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/poisonous_potato.json similarity index 76% rename from src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/acacia_leaves.json rename to src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/poisonous_potato.json index 3c838dd9503..fa985362f90 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/acacia_leaves.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/poisonous_potato.json @@ -2,7 +2,7 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:acacia_leaves" + "item": "minecraft:poisonous_potato" }, "output": { "count": 2, diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/poppy.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/poppy.json deleted file mode 100644 index 3585e333670..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/poppy.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:poppy" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/potato.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/potato.json deleted file mode 100644 index 78b766a8568..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/potato.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:potato" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pumpkin.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pumpkin.json index 2bb95afba72..acb61293ffb 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pumpkin.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pumpkin.json @@ -5,7 +5,7 @@ "item": "minecraft:pumpkin" }, "output": { - "count": 5, + "count": 6, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pumpkin_pie.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pumpkin_pie.json deleted file mode 100644 index e6b352aa7e5..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pumpkin_pie.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:pumpkin_pie" - }, - "output": { - "count": 8, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pumpkin_seeds.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pumpkin_seeds.json deleted file mode 100644 index 66d39897be4..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/pumpkin_seeds.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:pumpkin_seeds" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/red_mushroom.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/red_mushroom.json deleted file mode 100644 index d61945b5100..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/red_mushroom.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:red_mushroom" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/red_mushroom_block.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/red_mushroom_block.json deleted file mode 100644 index 57d1aca7f09..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/red_mushroom_block.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:red_mushroom_block" - }, - "output": { - "count": 7, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/red_tulip.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/red_tulip.json deleted file mode 100644 index 1055c1ad1ce..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/red_tulip.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:red_tulip" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/rose_bush.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/rose_bush.json deleted file mode 100644 index 31b05602d45..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/rose_bush.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:rose_bush" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/azure_bluet.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/rotten_flesh.json similarity index 68% rename from src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/azure_bluet.json rename to src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/rotten_flesh.json index 45f865f38a1..7988c3e7588 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/azure_bluet.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/rotten_flesh.json @@ -2,10 +2,10 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:azure_bluet" + "item": "minecraft:rotten_flesh" }, "output": { - "count": 5, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/carrot.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/saplings.json similarity index 70% rename from src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/carrot.json rename to src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/saplings.json index 93c4681f06c..0e760776d62 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/carrot.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/saplings.json @@ -2,10 +2,10 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:carrot" + "tag": "minecraft:saplings" }, "output": { - "count": 5, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sea_pickle.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sea_pickle.json index 8226e467cb6..e8824976afb 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sea_pickle.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sea_pickle.json @@ -5,7 +5,7 @@ "item": "minecraft:sea_pickle" }, "output": { - "count": 5, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/seagrass.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/seagrass.json index ce3f24da135..8ae0d881fd9 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/seagrass.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/seagrass.json @@ -5,7 +5,7 @@ "item": "minecraft:seagrass" }, "output": { - "count": 2, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/peony.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/seeds.json similarity index 71% rename from src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/peony.json rename to src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/seeds.json index 13742a42d56..329207ea276 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/peony.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/seeds.json @@ -2,10 +2,10 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:peony" + "tag": "c:seeds" }, "output": { - "count": 5, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/short_grass.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/short_grass.json index e85a40d3c6d..bfaf36e43ef 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/short_grass.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/short_grass.json @@ -5,7 +5,7 @@ "item": "minecraft:short_grass" }, "output": { - "count": 2, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/shroomlight.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/shroomlight.json index 39621f3b2a7..5b65593aa83 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/shroomlight.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/shroomlight.json @@ -5,7 +5,7 @@ "item": "minecraft:shroomlight" }, "output": { - "count": 5, + "count": 4, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/small_dripleaf.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/small_dripleaf.json index e35b60e8f7d..a7f560d5bed 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/small_dripleaf.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/small_dripleaf.json @@ -5,7 +5,7 @@ "item": "minecraft:small_dripleaf" }, "output": { - "count": 2, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/beetroot.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/small_flowers.json similarity index 68% rename from src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/beetroot.json rename to src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/small_flowers.json index 91b4258affe..f96f27df1b2 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/beetroot.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/small_flowers.json @@ -2,10 +2,10 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:beetroot" + "tag": "minecraft:small_flowers" }, "output": { - "count": 5, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/spore_blossom.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/spore_blossom.json index c8c15b5300f..426aec41326 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/spore_blossom.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/spore_blossom.json @@ -5,7 +5,7 @@ "item": "minecraft:spore_blossom" }, "output": { - "count": 5, + "count": 2, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/spruce_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/spruce_leaves.json deleted file mode 100644 index e34ec496fc9..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/spruce_leaves.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:spruce_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/spruce_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/spruce_sapling.json deleted file mode 100644 index b718af4dcfb..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/spruce_sapling.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:spruce_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sugar_cane.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sugar_cane.json index 0428878e6b4..13666a8b5a7 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sugar_cane.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sugar_cane.json @@ -5,7 +5,7 @@ "item": "minecraft:sugar_cane" }, "output": { - "count": 4, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sunflower.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sunflower.json deleted file mode 100644 index 5681dfab1ae..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sunflower.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:sunflower" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sweet_berries.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sweet_berries.json deleted file mode 100644 index 87920833982..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/sweet_berries.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:sweet_berries" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/melon_seeds.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/tall_flowers.json similarity index 78% rename from src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/melon_seeds.json rename to src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/tall_flowers.json index 433a083fe33..5e006dda3ab 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/melon_seeds.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/tall_flowers.json @@ -2,7 +2,7 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:melon_seeds" + "tag": "minecraft:tall_flowers" }, "output": { "count": 2, diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/tall_grass.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/tall_grass.json index a0c6062c437..4ad9759b6bf 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/tall_grass.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/tall_grass.json @@ -5,7 +5,7 @@ "item": "minecraft:tall_grass" }, "output": { - "count": 4, + "count": 2, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/torchflower.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/torchflower.json deleted file mode 100644 index b2aae6bd818..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/torchflower.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:torchflower" - }, - "output": { - "count": 7, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/torchflower_seeds.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/torchflower_seeds.json index 1b20ca61b1b..f28be34e1cc 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/torchflower_seeds.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/torchflower_seeds.json @@ -5,7 +5,7 @@ "item": "minecraft:torchflower_seeds" }, "output": { - "count": 2, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/twisting_vines.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/twisting_vines.json deleted file mode 100644 index 4da9cd2a805..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/twisting_vines.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:twisting_vines" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/vines.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/vines.json new file mode 100644 index 00000000000..832e7b5d84d --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/vines.json @@ -0,0 +1,22 @@ +{ + "type": "mekanism:crushing", + "input": { + "type": "neoforge:compound", + "children": [ + { + "item": "minecraft:vine" + }, + { + "item": "minecraft:twisting_vines" + }, + { + "item": "minecraft:weeping_vines" + } + ], + "count": 1 + }, + "output": { + "count": 1, + "id": "mekanism:bio_fuel" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_fungus.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_fungus.json deleted file mode 100644 index 70a2e47acda..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_fungus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:warped_fungus" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_roots.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_roots.json index 6cd2822be52..3883d107b66 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_roots.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_roots.json @@ -5,7 +5,7 @@ "item": "minecraft:warped_roots" }, "output": { - "count": 5, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_wart_block.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_wart_block.json index 9f2de503db1..4ae627a2211 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_wart_block.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_wart_block.json @@ -1,11 +1,11 @@ { "type": "mekanism:crushing", "input": { - "count": 1, + "count": 4, "item": "minecraft:warped_wart_block" }, "output": { - "count": 7, + "count": 1, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/weeping_vines.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/weeping_vines.json deleted file mode 100644 index 2c177bfbbe6..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/weeping_vines.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:weeping_vines" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/wheat.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/wheat.json deleted file mode 100644 index 65d68d33db1..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/wheat.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:wheat" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/wheat_seeds.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/wheat_seeds.json deleted file mode 100644 index 42da2f496d7..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/wheat_seeds.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:wheat_seeds" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/white_tulip.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/white_tulip.json deleted file mode 100644 index 9352208463d..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/white_tulip.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:white_tulip" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/wither_rose.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/wither_rose.json deleted file mode 100644 index d11162b1e1f..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/wither_rose.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:wither_rose" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/main/java/mekanism/common/recipe/impl/CrusherRecipeProvider.java b/src/datagen/main/java/mekanism/common/recipe/impl/CrusherRecipeProvider.java index 065a3587beb..b46af2e599a 100644 --- a/src/datagen/main/java/mekanism/common/recipe/impl/CrusherRecipeProvider.java +++ b/src/datagen/main/java/mekanism/common/recipe/impl/CrusherRecipeProvider.java @@ -11,9 +11,12 @@ import net.minecraft.core.HolderLookup; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; import net.minecraft.world.item.HoneycombItem; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.neoforged.neoforge.common.Tags; @@ -23,7 +26,7 @@ class CrusherRecipeProvider implements ISubRecipeProvider { @Override public void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries) { String basePath = "crushing/"; - RecipeProviderUtil.addCrusherBioFuelRecipes(consumer, basePath + "biofuel/", mod -> mod.equals("minecraft") || mod.startsWith(Mekanism.MODID), null); + addCrusherBioFuelRecipes(consumer, basePath + "biofuel/"); addCrusherDewaxingRecipes(consumer, basePath + "dewax/"); addCrusherStoneRecipes(consumer, basePath + "stone/"); addCrusherTuffRecipes(consumer, basePath + "tuff/"); @@ -512,4 +515,69 @@ private void addCrusherDewaxingRecipes(RecipeOutput consumer, String basePath) { ).build(consumer, Mekanism.rl(basePath + RegistryUtils.getPath(result.asItem()))); } } + + private void addCrusherBioFuelRecipes(RecipeOutput consumer, String basePath) { + biofuel(consumer, basePath, "apple", 2, 1, Items.APPLE); + biofuel(consumer, basePath, "baked_potato", 2, 1, Items.BAKED_POTATO); + biofuel(consumer, basePath, "bamboo", 2, 1, Items.BAMBOO); + biofuel(consumer, basePath, "berries", 1, 1, Tags.Items.FOODS_BERRY); + biofuel(consumer, basePath, "big_dripleaf", 2, 1, Items.BIG_DRIPLEAF); + biofuel(consumer, basePath, "bread", 4, 1, Items.BREAD); + biofuel(consumer, basePath, "cake", 6, 1, Items.CAKE); + biofuel(consumer, basePath, "carved_pumpkin", 5, 1, Items.CARVED_PUMPKIN);//pumpkin minus 4 seeds (sawmill) + biofuel(consumer, basePath, "crimson_roots", 1, 1, Items.CRIMSON_ROOTS); + biofuel(consumer, basePath, "crops", 2, 1, Tags.Items.CROPS); + biofuel(consumer, basePath, "dried_kelp", 1, 1, Items.DRIED_KELP); + biofuel(consumer, basePath, "dried_kelp_block", 9, 1, Items.DRIED_KELP_BLOCK); + biofuel(consumer, basePath, "fern", 2, 1, Items.FERN); + biofuel(consumer, basePath, "fungus", 1, 1, Items.CRIMSON_FUNGUS, Items.WARPED_FUNGUS); + biofuel(consumer, basePath, "glow_lichen", 1, 1, Items.GLOW_LICHEN); + biofuel(consumer, basePath, "hanging_roots", 1, 1, Items.HANGING_ROOTS); + biofuel(consumer, basePath, "hay_block", 9 * 2, 1, Items.HANGING_ROOTS); + biofuel(consumer, basePath, "kelp", 2, 1, Items.KELP); + biofuel(consumer, basePath, "large_fern", 3, 1, Items.LARGE_FERN); + biofuel(consumer, basePath, "leaves", 1, 10, ItemTags.LEAVES); + biofuel(consumer, basePath, "lily_pad", 1, 1, Items.HANGING_ROOTS); + biofuel(consumer, basePath, "melon", 6, 1, Items.MELON); + biofuel(consumer, basePath, "melon_slice", 1, 1, Items.MELON_SLICE); + biofuel(consumer, basePath, "moss_block", 2, 1, Items.MOSS_BLOCK); + biofuel(consumer, basePath, "mushroom_blocks", 4, 1, Items.BROWN_MUSHROOM_BLOCK, Items.RED_MUSHROOM_BLOCK, Items.MUSHROOM_STEM); + biofuel(consumer, basePath, "mushrooms", 1, 1, Tags.Items.MUSHROOMS); + biofuel(consumer, basePath, "nether_sprouts", 1, 1, Items.NETHER_SPROUTS); + biofuel(consumer, basePath, "nether_wart_block", 9 * 2, 1, Items.NETHER_WART_BLOCK); + biofuel(consumer, basePath, "pitcher_pod", 1, 1, Items.PITCHER_POD); + biofuel(consumer, basePath, "poisonous_potato", 2, 1, Items.POISONOUS_POTATO); + biofuel(consumer, basePath, "pumpkin", 6, 1, Items.PUMPKIN); + biofuel(consumer, basePath, "rotten_flesh", 1, 1, Items.ROTTEN_FLESH); + biofuel(consumer, basePath, "saplings", 1, 1, ItemTags.SAPLINGS); + biofuel(consumer, basePath, "sea_pickle", 1, 1, Items.SEA_PICKLE); + biofuel(consumer, basePath, "seagrass", 1, 1, Items.SEAGRASS); + biofuel(consumer, basePath, "seeds", 1, 1, Tags.Items.SEEDS); + biofuel(consumer, basePath, "short_grass", 1, 1, Items.SHORT_GRASS); + biofuel(consumer, basePath, "shroomlight", 4, 1, Items.SHROOMLIGHT); + biofuel(consumer, basePath, "small_dripleaf", 1, 1, Items.SMALL_DRIPLEAF); + biofuel(consumer, basePath, "small_flowers", 1, 1, ItemTags.SMALL_FLOWERS); + biofuel(consumer, basePath, "spore_blossom", 2, 1, Items.SPORE_BLOSSOM); + biofuel(consumer, basePath, "sugar_cane", 1, 1, Items.SUGAR_CANE); + biofuel(consumer, basePath, "tall_flowers", 2, 1, ItemTags.TALL_FLOWERS); + biofuel(consumer, basePath, "tall_grass", 2, 1, Items.TALL_GRASS); + biofuel(consumer, basePath, "torchflower_seeds", 1, 1, Items.TORCHFLOWER_SEEDS); + biofuel(consumer, basePath, "vines", 1, 1, Items.VINE, Items.TWISTING_VINES, Items.WEEPING_VINES); + biofuel(consumer, basePath, "warped_roots", 1, 1, Items.WARPED_ROOTS); + biofuel(consumer, basePath, "warped_wart_block", 1, 4, Items.WARPED_WART_BLOCK); + } + + private static void biofuel(RecipeOutput consumer, String basePath, String filename, int countOutput, int countInput, ItemLike... items) { + ItemStackToItemStackRecipeBuilder.crushing( + IngredientCreatorAccess.item().from(countInput, items), + MekanismItems.BIO_FUEL.getItemStack(countOutput) + ).build(consumer, Mekanism.rl(basePath + filename)); + } + + private static void biofuel(RecipeOutput consumer, String basePath, String filename, int countOutput, int countInput, TagKey tag) { + ItemStackToItemStackRecipeBuilder.crushing( + IngredientCreatorAccess.item().from(tag, countInput), + MekanismItems.BIO_FUEL.getItemStack(countOutput) + ).build(consumer, Mekanism.rl(basePath + filename)); + } } \ No newline at end of file From d54ec9f4ef59c052978f99af37b7fad77ff2daef Mon Sep 17 00:00:00 2001 From: Thiakil Date: Fri, 27 Sep 2024 21:54:00 +0800 Subject: [PATCH 12/20] remove compat biofuel recipes from compostable, most should be covered by tags --- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 95 +------------------ .../compat/biomesoplenty/biofuel/barley.json | 17 ---- .../biomesoplenty/biofuel/blue_hydrangea.json | 17 ---- .../compat/biomesoplenty/biofuel/bramble.json | 17 ---- .../biomesoplenty/biofuel/bramble_leaves.json | 17 ---- .../biofuel/burning_blossom.json | 17 ---- .../compat/biomesoplenty/biofuel/bush.json | 17 ---- .../compat/biomesoplenty/biofuel/cattail.json | 17 ---- .../compat/biomesoplenty/biofuel/clover.json | 17 ---- .../biomesoplenty/biofuel/cypress_leaves.json | 17 ---- .../biofuel/cypress_sapling.json | 17 ---- .../biomesoplenty/biofuel/dead_branch.json | 17 ---- .../biomesoplenty/biofuel/dead_grass.json | 17 ---- .../biomesoplenty/biofuel/dead_leaves.json | 17 ---- .../biomesoplenty/biofuel/dead_sapling.json | 17 ---- .../biomesoplenty/biofuel/desert_grass.json | 17 ---- .../biomesoplenty/biofuel/dune_grass.json | 17 ---- .../biofuel/empyreal_leaves.json | 17 ---- .../biofuel/empyreal_sapling.json | 17 ---- .../biomesoplenty/biofuel/endbloom.json | 17 ---- .../biomesoplenty/biofuel/enderphyte.json | 17 ---- .../biomesoplenty/biofuel/fir_leaves.json | 17 ---- .../biomesoplenty/biofuel/fir_sapling.json | 17 ---- .../biofuel/flowering_oak_leaves.json | 17 ---- .../biofuel/flowering_oak_sapling.json | 17 ---- .../biomesoplenty/biofuel/glowflower.json | 17 ---- .../biofuel/glowing_moss_block.json | 17 ---- .../biofuel/glowing_moss_carpet.json | 17 ---- .../biomesoplenty/biofuel/glowshroom.json | 17 ---- .../biofuel/glowshroom_block.json | 17 ---- .../biomesoplenty/biofuel/goldenrod.json | 17 ---- .../biofuel/hellbark_leaves.json | 17 ---- .../biofuel/hellbark_sapling.json | 17 ---- .../biomesoplenty/biofuel/high_grass.json | 17 ---- .../biofuel/high_grass_plant.json | 17 ---- .../biofuel/huge_clover_petal.json | 17 ---- .../biomesoplenty/biofuel/huge_lily_pad.json | 17 ---- .../biomesoplenty/biofuel/icy_iris.json | 17 ---- .../biofuel/jacaranda_leaves.json | 17 ---- .../biofuel/jacaranda_sapling.json | 17 ---- .../biomesoplenty/biofuel/lavender.json | 17 ---- .../biomesoplenty/biofuel/lumaloop.json | 17 ---- .../biomesoplenty/biofuel/lumaloop_plant.json | 17 ---- .../biomesoplenty/biofuel/magic_leaves.json | 17 ---- .../biomesoplenty/biofuel/magic_sapling.json | 17 ---- .../biofuel/mahogany_leaves.json | 17 ---- .../biofuel/mahogany_sapling.json | 17 ---- .../biomesoplenty/biofuel/orange_cosmos.json | 17 ---- .../biofuel/orange_maple_leaf_pile.json | 17 ---- .../biofuel/orange_maple_leaves.json | 17 ---- .../biofuel/orange_maple_sapling.json | 17 ---- .../biomesoplenty/biofuel/origin_leaves.json | 17 ---- .../biomesoplenty/biofuel/origin_sapling.json | 17 ---- .../biomesoplenty/biofuel/palm_leaves.json | 17 ---- .../biomesoplenty/biofuel/palm_sapling.json | 17 ---- .../biomesoplenty/biofuel/pine_leaves.json | 17 ---- .../biomesoplenty/biofuel/pine_sapling.json | 17 ---- .../biomesoplenty/biofuel/pink_daffodil.json | 17 ---- .../biomesoplenty/biofuel/pink_hibiscus.json | 17 ---- .../biofuel/rainbow_birch_leaves.json | 17 ---- .../biofuel/rainbow_birch_sapling.json | 17 ---- .../biofuel/red_maple_leaf_pile.json | 17 ---- .../biofuel/red_maple_leaves.json | 17 ---- .../biofuel/red_maple_sapling.json | 17 ---- .../biomesoplenty/biofuel/redwood_leaves.json | 17 ---- .../biofuel/redwood_sapling.json | 17 ---- .../compat/biomesoplenty/biofuel/reed.json | 17 ---- .../compat/biomesoplenty/biofuel/rose.json | 17 ---- .../biofuel/snowblossom_leaves.json | 17 ---- .../biofuel/snowblossom_sapling.json | 17 ---- .../biomesoplenty/biofuel/spanish_moss.json | 17 ---- .../biofuel/spanish_moss_plant.json | 17 ---- .../compat/biomesoplenty/biofuel/sprout.json | 17 ---- .../biomesoplenty/biofuel/tall_lavender.json | 17 ---- .../biofuel/tall_white_lavender.json | 17 ---- .../biomesoplenty/biofuel/tiny_cactus.json | 17 ---- .../biomesoplenty/biofuel/toadstool.json | 17 ---- .../biofuel/toadstool_block.json | 17 ---- .../biomesoplenty/biofuel/tundra_shrub.json | 17 ---- .../biomesoplenty/biofuel/umbran_leaves.json | 17 ---- .../biomesoplenty/biofuel/umbran_sapling.json | 17 ---- .../compat/biomesoplenty/biofuel/violet.json | 17 ---- .../biomesoplenty/biofuel/watergrass.json | 17 ---- .../biomesoplenty/biofuel/waterlily.json | 17 ---- .../biomesoplenty/biofuel/white_lavender.json | 17 ---- .../biomesoplenty/biofuel/white_petals.json | 17 ---- .../biomesoplenty/biofuel/wildflower.json | 17 ---- .../biomesoplenty/biofuel/willow_leaves.json | 17 ---- .../biomesoplenty/biofuel/willow_sapling.json | 17 ---- .../biomesoplenty/biofuel/willow_vine.json | 17 ---- .../biomesoplenty/biofuel/wilted_lily.json | 17 ---- .../biofuel/yellow_maple_leaf_pile.json | 17 ---- .../biofuel/yellow_maple_leaves.json | 17 ---- .../biofuel/yellow_maple_sapling.json | 17 ---- .../common/recipe/RecipeProviderUtil.java | 23 ----- .../recipe/compat/CompatRecipeProvider.java | 3 - 96 files changed, 1 insertion(+), 1701 deletions(-) delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/barley.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/blue_hydrangea.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/bramble.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/bramble_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/burning_blossom.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/bush.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/cattail.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/clover.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/cypress_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/cypress_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_branch.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_grass.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/desert_grass.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dune_grass.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/empyreal_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/empyreal_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/endbloom.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/enderphyte.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/fir_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/fir_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/flowering_oak_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/flowering_oak_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowflower.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowing_moss_block.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowing_moss_carpet.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowshroom.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowshroom_block.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/goldenrod.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/hellbark_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/hellbark_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/high_grass.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/high_grass_plant.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/huge_clover_petal.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/huge_lily_pad.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/icy_iris.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/jacaranda_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/jacaranda_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/lavender.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/lumaloop.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/lumaloop_plant.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/magic_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/magic_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/mahogany_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/mahogany_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_cosmos.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_leaf_pile.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/origin_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/origin_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/palm_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/palm_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pine_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pine_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pink_daffodil.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pink_hibiscus.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/rainbow_birch_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/rainbow_birch_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_leaf_pile.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/redwood_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/redwood_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/reed.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/rose.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/snowblossom_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/snowblossom_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/spanish_moss.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/spanish_moss_plant.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/sprout.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tall_lavender.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tall_white_lavender.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tiny_cactus.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/toadstool.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/toadstool_block.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tundra_shrub.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/umbran_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/umbran_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/violet.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/watergrass.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/waterlily.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/white_lavender.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/white_petals.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/wildflower.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_sapling.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_vine.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/wilted_lily.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_leaf_pile.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_leaves.json delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_sapling.json diff --git a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 5c8f268f43b..5e1434b419c 100644 --- a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// Recipes 2024-09-27T21:39:14.6748705 Recipes +// Recipes 2024-09-27T21:50:36.7803603 Recipes 0fc9e539372429b3e5df0dc0595978c4fc45d201 data/mekanism/recipe/antiprotonic_nucleosynthesizer.json 6d20b08ca1cc993d4c39a761361dce522fe45a7a data/mekanism/recipe/atomic_disassembler.json 00928ea6e8b57d257c773343c0dc0d337c9d4f5f data/mekanism/recipe/bin/advanced.json @@ -162,99 +162,6 @@ e5b6aed38f8592958e8e8c80e4ea901f1cd73015 data/mekanism/recipe/compat/ae2/ender_p d114c75e5271110e1b492a4420edb70073153a29 data/mekanism/recipe/compat/ae2/sand_to_silicon.json b4b99913b86c9fcf6dff1abf7b2c3a31d3756b68 data/mekanism/recipe/compat/ae2/sky_stone_dust_to_sky_stone.json e80d4d620c6682327cf89c7869bdd6cf4a3896e2 data/mekanism/recipe/compat/ae2/sky_stone_to_dust.json -f619f801ea61c801661d595b9c08ca3c6928866b data/mekanism/recipe/compat/biomesoplenty/biofuel/barley.json -37ecd30819e28883595ad61fcd1d060967d05c08 data/mekanism/recipe/compat/biomesoplenty/biofuel/blue_hydrangea.json -af2b875a52972b0db230147e8d85cf8d7f5f5950 data/mekanism/recipe/compat/biomesoplenty/biofuel/bramble.json -4fdd8eeadf30e8e1bbc38cbad414514c64410c4c data/mekanism/recipe/compat/biomesoplenty/biofuel/bramble_leaves.json -afb44bb1cf5b5f656231e0460c72578faee86e76 data/mekanism/recipe/compat/biomesoplenty/biofuel/burning_blossom.json -f639667f91c13f3d593829fc18125bb9926f81c0 data/mekanism/recipe/compat/biomesoplenty/biofuel/bush.json -13ef327eaa9aeaaeb4cfa0c327744acc5c345099 data/mekanism/recipe/compat/biomesoplenty/biofuel/cattail.json -a230c2baf1c93fbd7fc69f6de3c8989f684d8f62 data/mekanism/recipe/compat/biomesoplenty/biofuel/clover.json -ac36fd79d9d785c0cdcf8168327cf91ca237e0f2 data/mekanism/recipe/compat/biomesoplenty/biofuel/cypress_leaves.json -b6c9fb2cbd25f1c3d799e765a84f8746db412970 data/mekanism/recipe/compat/biomesoplenty/biofuel/cypress_sapling.json -a76f6fe5b30b69215dd523132432c5f656176e62 data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_branch.json -059c7cc9d2bad6af8eaad1bec20618d1bce90ab7 data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_grass.json -0d88c9b568debd97feafe058945418652c427d62 data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_leaves.json -ed125a9ebc119b0d94706628f4e2427f8816fe04 data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_sapling.json -7d4b028c755c3e60bb3539e1f3bac3dca904488a data/mekanism/recipe/compat/biomesoplenty/biofuel/desert_grass.json -12e8c1665876bdab7ac6e8ac7d592c0c07f6ed54 data/mekanism/recipe/compat/biomesoplenty/biofuel/dune_grass.json -51469af1db62f4437e4d284efe66163fc3260745 data/mekanism/recipe/compat/biomesoplenty/biofuel/empyreal_leaves.json -0a539f06827b3b106d8e89e2fdd2847d48dc3ded data/mekanism/recipe/compat/biomesoplenty/biofuel/empyreal_sapling.json -e57d5741596eef6c6f07a8639d1a78d875e7440a data/mekanism/recipe/compat/biomesoplenty/biofuel/endbloom.json -9b336baee367d7b0e39f3497a5f214b534e70bdd data/mekanism/recipe/compat/biomesoplenty/biofuel/enderphyte.json -34f583bfcf14df30dee1d3a196f3d080d507208d data/mekanism/recipe/compat/biomesoplenty/biofuel/fir_leaves.json -4891b8fbbbb17ea8d071f1437ac2afd4680dd30c data/mekanism/recipe/compat/biomesoplenty/biofuel/fir_sapling.json -b78984c04d5062e75ae5b016d91821022f9125dd data/mekanism/recipe/compat/biomesoplenty/biofuel/flowering_oak_leaves.json -b09e9f05f6d4ee6cfa262751ff1fd22a74800697 data/mekanism/recipe/compat/biomesoplenty/biofuel/flowering_oak_sapling.json -7a16550dba9306a7b65217d3f1b86a891201ac78 data/mekanism/recipe/compat/biomesoplenty/biofuel/glowflower.json -e25afa39abfb5e7bd546c73320d71f57040029a0 data/mekanism/recipe/compat/biomesoplenty/biofuel/glowing_moss_block.json -a876ad5fdabd612a841ae2c847e96451fc5e1470 data/mekanism/recipe/compat/biomesoplenty/biofuel/glowing_moss_carpet.json -f1cadd6a6b5280bdcf57d0cc8058be7b3999f58b data/mekanism/recipe/compat/biomesoplenty/biofuel/glowshroom.json -40f6e9835d025eb29ea7f8aa38d06c4316e98578 data/mekanism/recipe/compat/biomesoplenty/biofuel/glowshroom_block.json -586982325fcaa2ef9a92d95767deec2cb6b8148c data/mekanism/recipe/compat/biomesoplenty/biofuel/goldenrod.json -9df81e46d7068616c45204a1336b2e3de20a1b5d data/mekanism/recipe/compat/biomesoplenty/biofuel/hellbark_leaves.json -c525861552afae924da2b14b56f52a5a8782ba5a data/mekanism/recipe/compat/biomesoplenty/biofuel/hellbark_sapling.json -a81cebc469db0e61d979df4617d53812bac013fc data/mekanism/recipe/compat/biomesoplenty/biofuel/high_grass.json -a92480957d6d83a9b1def92eaac36c1caa7e410b data/mekanism/recipe/compat/biomesoplenty/biofuel/high_grass_plant.json -32a633a5f2288a66dd408a8841a9b479bb5df2a5 data/mekanism/recipe/compat/biomesoplenty/biofuel/huge_clover_petal.json -8c7fefc8c389cc468fc0847921c0cab336c92d79 data/mekanism/recipe/compat/biomesoplenty/biofuel/huge_lily_pad.json -c6694538e020f0dff41e2fc583e39cdd8e615156 data/mekanism/recipe/compat/biomesoplenty/biofuel/icy_iris.json -523a8110663f8b420925b114d06478f974a754a3 data/mekanism/recipe/compat/biomesoplenty/biofuel/jacaranda_leaves.json -91df340ebbe815cf9e126539e69180732d1e2007 data/mekanism/recipe/compat/biomesoplenty/biofuel/jacaranda_sapling.json -b96fe2fe0cd68833ff1489504f36d02a8ef41587 data/mekanism/recipe/compat/biomesoplenty/biofuel/lavender.json -92bbc8b377900bf8208fad16010083ba2508f6ca data/mekanism/recipe/compat/biomesoplenty/biofuel/lumaloop.json -4822166f90ad3f9a28a75a734548493780eeb5a8 data/mekanism/recipe/compat/biomesoplenty/biofuel/lumaloop_plant.json -6f947cf1f33829ee661b496163d8c967faa7cef4 data/mekanism/recipe/compat/biomesoplenty/biofuel/magic_leaves.json -189d250da825d3558183eddb3099ca50d1a497f7 data/mekanism/recipe/compat/biomesoplenty/biofuel/magic_sapling.json -f4cee7f6c66c3853a5557481243afedba92355fa data/mekanism/recipe/compat/biomesoplenty/biofuel/mahogany_leaves.json -b190bc2a8996e31287eb22e6c0ce8ca89191fc17 data/mekanism/recipe/compat/biomesoplenty/biofuel/mahogany_sapling.json -113666f76190e3f834195d652c94afea9e4707d6 data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_cosmos.json -c98b7540e7b8a8c092a20b0ab5625bac2ccc253e data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_leaf_pile.json -0f1d9aeb7bb9a7934403e727dd0ff26da3d8510b data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_leaves.json -f6403a8488465f8a89ab7d81ed09f0f9adbca7e4 data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_sapling.json -06405ca59e6b2ef10f4e64533286f21d459ff2df data/mekanism/recipe/compat/biomesoplenty/biofuel/origin_leaves.json -a1791317d7e8f0e90563a3e93618e270bbeb7809 data/mekanism/recipe/compat/biomesoplenty/biofuel/origin_sapling.json -886d26f05fc4c457fe68385e977257678c7fb6ac data/mekanism/recipe/compat/biomesoplenty/biofuel/palm_leaves.json -dbdafc85ece5efecc6ccd0bda47e793bc1f589ae data/mekanism/recipe/compat/biomesoplenty/biofuel/palm_sapling.json -beeb2b2be438409fcb84e4b25c0508b72fdbc436 data/mekanism/recipe/compat/biomesoplenty/biofuel/pine_leaves.json -9044e31c753c81606bb3f528e4b8f2c9b867c2b5 data/mekanism/recipe/compat/biomesoplenty/biofuel/pine_sapling.json -c495619343c8d2a7f6254d88661845c028d936cb data/mekanism/recipe/compat/biomesoplenty/biofuel/pink_daffodil.json -3196b3fa92f85880ea3676961cbf0fd1ba5a684e data/mekanism/recipe/compat/biomesoplenty/biofuel/pink_hibiscus.json -2c17892ab80378e0ef9c6d8b7c8a362c32178f61 data/mekanism/recipe/compat/biomesoplenty/biofuel/rainbow_birch_leaves.json -feb6e1220bb2eea386514202b0fb5e4c8fe04ac8 data/mekanism/recipe/compat/biomesoplenty/biofuel/rainbow_birch_sapling.json -09d8844fcbd78cbcf6840ed71a7ea5b3fb72470d data/mekanism/recipe/compat/biomesoplenty/biofuel/redwood_leaves.json -44da021f428a7dc8bf9fe4c779401282ee239b85 data/mekanism/recipe/compat/biomesoplenty/biofuel/redwood_sapling.json -fc08ecec381bb340406e6144d5aaeff0820518bc data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_leaf_pile.json -61b95ef2d12499d1b88340a0119ea797d77ee3a9 data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_leaves.json -fc96ac33d60f8dfa8318ad6627b8a0763210fa4b data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_sapling.json -38ac2a9669171cdec97f9184edbda671a5ad24bd data/mekanism/recipe/compat/biomesoplenty/biofuel/reed.json -5418f18ab215bb1c20962983a3b244efa77120eb data/mekanism/recipe/compat/biomesoplenty/biofuel/rose.json -322d3472002ba08dbc4be6c8642d65601441912f data/mekanism/recipe/compat/biomesoplenty/biofuel/snowblossom_leaves.json -cdb0770d450e256467044578a545949220a6ba13 data/mekanism/recipe/compat/biomesoplenty/biofuel/snowblossom_sapling.json -5890b6195e1892293f03624eeb20e1860b1c1b08 data/mekanism/recipe/compat/biomesoplenty/biofuel/spanish_moss.json -6af66914d543876a2064de7ab70c6d1c9b8edbbf data/mekanism/recipe/compat/biomesoplenty/biofuel/spanish_moss_plant.json -441363a0a1b9b7f2ef7a5ada6d81e0924fed5af1 data/mekanism/recipe/compat/biomesoplenty/biofuel/sprout.json -6c4a9c434e8a27d4357480e4dac2d7edbd5c624c data/mekanism/recipe/compat/biomesoplenty/biofuel/tall_lavender.json -ee9e7357f36df140155d0cdf42e59a744caeb647 data/mekanism/recipe/compat/biomesoplenty/biofuel/tall_white_lavender.json -c107af0e26878b04e68b88b5d7dc018eef88eb8d data/mekanism/recipe/compat/biomesoplenty/biofuel/tiny_cactus.json -3b0a6bc81144a45d119488eeb737658785c99623 data/mekanism/recipe/compat/biomesoplenty/biofuel/toadstool.json -5ab5c15136a33f1691d05661a09ad6a8e3a2f81c data/mekanism/recipe/compat/biomesoplenty/biofuel/toadstool_block.json -8798b3bbe8de3bbc67acd0578af553cf78bba525 data/mekanism/recipe/compat/biomesoplenty/biofuel/tundra_shrub.json -a0c8787399fceef770647da3747b0a259d5bc77c data/mekanism/recipe/compat/biomesoplenty/biofuel/umbran_leaves.json -71547b33ed8ed6eb48d01ce7cfab3d36f7614086 data/mekanism/recipe/compat/biomesoplenty/biofuel/umbran_sapling.json -1f1ee5949119b8d50b92370e9a06431891d68d67 data/mekanism/recipe/compat/biomesoplenty/biofuel/violet.json -62db7c4b568cc5463f763854f22241ca15508c3c data/mekanism/recipe/compat/biomesoplenty/biofuel/watergrass.json -e260056a5be5fa843bb3a826690ca32df0e2fa15 data/mekanism/recipe/compat/biomesoplenty/biofuel/waterlily.json -0d1f723312257e2ed3156773583db1b48ec4ff1f data/mekanism/recipe/compat/biomesoplenty/biofuel/white_lavender.json -9c57119729f3a6c9311abac90fcaa94409908aaf data/mekanism/recipe/compat/biomesoplenty/biofuel/white_petals.json -3eb1924ddb327fa5e8a7846f279010ed907fc0cf data/mekanism/recipe/compat/biomesoplenty/biofuel/wildflower.json -1f9ddc4b6fb9de5958cf3c4180b265a3c6938aac data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_leaves.json -15f2c58145aafa07bef45c1593927778e1fdfdda data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_sapling.json -a9e66585b415a8b6bb702d653aed06f972a58f8d data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_vine.json -705cc3eb583fe11e2eb32ecfbd3455f0b4bed652 data/mekanism/recipe/compat/biomesoplenty/biofuel/wilted_lily.json -940a6313273cb7f2ae67d4248caf907d3d6e46a8 data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_leaf_pile.json -e4e4a2b8267e5d7a60e73c7c17bef0908a0a6959 data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_leaves.json -ef26a7825b3d75ca1bd26aa4f97a8a6b656c14e0 data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_sapling.json 7ab457ea52eb36531fa89cb16c362646e467b921 data/mekanism/recipe/compat/biomesoplenty/dye/cyan.json 7743f778a7019d3dadfe1ffad830b3ac5d65db9d data/mekanism/recipe/compat/biomesoplenty/dye/gray.json 11d205e4f307d75bcc487c60eb833875eb8af964 data/mekanism/recipe/compat/biomesoplenty/dye/green.json diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/barley.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/barley.json deleted file mode 100644 index 59755e9e94c..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/barley.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:barley" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/blue_hydrangea.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/blue_hydrangea.json deleted file mode 100644 index 50ca1632baa..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/blue_hydrangea.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:blue_hydrangea" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/bramble.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/bramble.json deleted file mode 100644 index 207a33d085d..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/bramble.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:bramble" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/bramble_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/bramble_leaves.json deleted file mode 100644 index 2446a54afa1..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/bramble_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:bramble_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/burning_blossom.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/burning_blossom.json deleted file mode 100644 index 706d3449a66..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/burning_blossom.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:burning_blossom" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/bush.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/bush.json deleted file mode 100644 index ddaa0ce9dac..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/bush.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:bush" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/cattail.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/cattail.json deleted file mode 100644 index a0682db874f..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/cattail.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:cattail" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/clover.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/clover.json deleted file mode 100644 index 7771590b011..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/clover.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:clover" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/cypress_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/cypress_leaves.json deleted file mode 100644 index 1c83377026c..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/cypress_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:cypress_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/cypress_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/cypress_sapling.json deleted file mode 100644 index c9046e6b13a..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/cypress_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:cypress_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_branch.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_branch.json deleted file mode 100644 index 563f120beef..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_branch.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:dead_branch" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_grass.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_grass.json deleted file mode 100644 index 148e402cbb1..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_grass.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:dead_grass" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_leaves.json deleted file mode 100644 index e0420ce3d97..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:dead_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_sapling.json deleted file mode 100644 index 17e9fa4f65f..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dead_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:dead_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/desert_grass.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/desert_grass.json deleted file mode 100644 index 5339d6d23d3..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/desert_grass.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:desert_grass" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dune_grass.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dune_grass.json deleted file mode 100644 index 4c6f9fc0163..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/dune_grass.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:dune_grass" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/empyreal_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/empyreal_leaves.json deleted file mode 100644 index f0bbb8924ab..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/empyreal_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:empyreal_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/empyreal_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/empyreal_sapling.json deleted file mode 100644 index cda848dce5d..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/empyreal_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:empyreal_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/endbloom.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/endbloom.json deleted file mode 100644 index 6f76c479373..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/endbloom.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:endbloom" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/enderphyte.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/enderphyte.json deleted file mode 100644 index 432ccf25906..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/enderphyte.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:enderphyte" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/fir_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/fir_leaves.json deleted file mode 100644 index 50603002cb0..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/fir_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:fir_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/fir_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/fir_sapling.json deleted file mode 100644 index 41f849624d7..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/fir_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:fir_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/flowering_oak_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/flowering_oak_leaves.json deleted file mode 100644 index def1f7c8ce3..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/flowering_oak_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:flowering_oak_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/flowering_oak_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/flowering_oak_sapling.json deleted file mode 100644 index a794e4a41c7..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/flowering_oak_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:flowering_oak_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowflower.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowflower.json deleted file mode 100644 index 0ced9ff0475..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowflower.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:glowflower" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowing_moss_block.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowing_moss_block.json deleted file mode 100644 index d7ecc8e208f..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowing_moss_block.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:glowing_moss_block" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowing_moss_carpet.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowing_moss_carpet.json deleted file mode 100644 index cf8bf28a405..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowing_moss_carpet.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:glowing_moss_carpet" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowshroom.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowshroom.json deleted file mode 100644 index 2a0ba33f246..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowshroom.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:glowshroom" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowshroom_block.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowshroom_block.json deleted file mode 100644 index 3103e361720..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/glowshroom_block.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:glowshroom_block" - }, - "output": { - "count": 7, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/goldenrod.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/goldenrod.json deleted file mode 100644 index ade158a103c..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/goldenrod.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:goldenrod" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/hellbark_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/hellbark_leaves.json deleted file mode 100644 index 7aeb47a06e8..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/hellbark_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:hellbark_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/hellbark_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/hellbark_sapling.json deleted file mode 100644 index cd66e799a63..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/hellbark_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:hellbark_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/high_grass.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/high_grass.json deleted file mode 100644 index aba65ad42f1..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/high_grass.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:high_grass" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/high_grass_plant.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/high_grass_plant.json deleted file mode 100644 index 2aeeac7ef2b..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/high_grass_plant.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:high_grass_plant" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/huge_clover_petal.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/huge_clover_petal.json deleted file mode 100644 index a5ea21d7d99..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/huge_clover_petal.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:huge_clover_petal" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/huge_lily_pad.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/huge_lily_pad.json deleted file mode 100644 index e64e0258de9..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/huge_lily_pad.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:huge_lily_pad" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/icy_iris.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/icy_iris.json deleted file mode 100644 index a3452f855cd..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/icy_iris.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:icy_iris" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/jacaranda_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/jacaranda_leaves.json deleted file mode 100644 index d2b7699954e..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/jacaranda_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:jacaranda_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/jacaranda_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/jacaranda_sapling.json deleted file mode 100644 index 0b6d8b1537d..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/jacaranda_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:jacaranda_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/lavender.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/lavender.json deleted file mode 100644 index c39c72397b6..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/lavender.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:lavender" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/lumaloop.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/lumaloop.json deleted file mode 100644 index 9a02902e777..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/lumaloop.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:lumaloop" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/lumaloop_plant.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/lumaloop_plant.json deleted file mode 100644 index 8e6b8c7da99..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/lumaloop_plant.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:lumaloop_plant" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/magic_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/magic_leaves.json deleted file mode 100644 index b091083648b..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/magic_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:magic_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/magic_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/magic_sapling.json deleted file mode 100644 index 1cc6278718f..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/magic_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:magic_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/mahogany_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/mahogany_leaves.json deleted file mode 100644 index 483c66769f8..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/mahogany_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:mahogany_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/mahogany_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/mahogany_sapling.json deleted file mode 100644 index 7ed29d943dc..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/mahogany_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:mahogany_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_cosmos.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_cosmos.json deleted file mode 100644 index 415ec5e4b8b..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_cosmos.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:orange_cosmos" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_leaf_pile.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_leaf_pile.json deleted file mode 100644 index dda34323163..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_leaf_pile.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:orange_maple_leaf_pile" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_leaves.json deleted file mode 100644 index 0cf3dabd653..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:orange_maple_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_sapling.json deleted file mode 100644 index b40681b4608..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/orange_maple_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:orange_maple_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/origin_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/origin_leaves.json deleted file mode 100644 index ab630df28e1..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/origin_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:origin_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/origin_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/origin_sapling.json deleted file mode 100644 index 59d6d8116f6..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/origin_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:origin_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/palm_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/palm_leaves.json deleted file mode 100644 index c3866c11b04..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/palm_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:palm_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/palm_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/palm_sapling.json deleted file mode 100644 index 2903af0c0d8..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/palm_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:palm_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pine_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pine_leaves.json deleted file mode 100644 index 4f80140d704..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pine_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:pine_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pine_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pine_sapling.json deleted file mode 100644 index 02648cd6bdd..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pine_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:pine_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pink_daffodil.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pink_daffodil.json deleted file mode 100644 index 455a2272fc3..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pink_daffodil.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:pink_daffodil" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pink_hibiscus.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pink_hibiscus.json deleted file mode 100644 index 24a413c9b4c..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/pink_hibiscus.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:pink_hibiscus" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/rainbow_birch_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/rainbow_birch_leaves.json deleted file mode 100644 index 60594340269..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/rainbow_birch_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:rainbow_birch_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/rainbow_birch_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/rainbow_birch_sapling.json deleted file mode 100644 index dcc7935f91a..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/rainbow_birch_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:rainbow_birch_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_leaf_pile.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_leaf_pile.json deleted file mode 100644 index 04c2151cd5a..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_leaf_pile.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:red_maple_leaf_pile" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_leaves.json deleted file mode 100644 index ddfe3eae363..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:red_maple_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_sapling.json deleted file mode 100644 index fc4b415bb75..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/red_maple_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:red_maple_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/redwood_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/redwood_leaves.json deleted file mode 100644 index 496f5b36fc8..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/redwood_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:redwood_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/redwood_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/redwood_sapling.json deleted file mode 100644 index 4a79d5bd4d2..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/redwood_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:redwood_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/reed.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/reed.json deleted file mode 100644 index 0d14eb07327..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/reed.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:reed" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/rose.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/rose.json deleted file mode 100644 index f5d048ac004..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/rose.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:rose" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/snowblossom_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/snowblossom_leaves.json deleted file mode 100644 index 594de5c90c1..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/snowblossom_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:snowblossom_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/snowblossom_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/snowblossom_sapling.json deleted file mode 100644 index b8531707707..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/snowblossom_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:snowblossom_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/spanish_moss.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/spanish_moss.json deleted file mode 100644 index 16d7a4d33be..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/spanish_moss.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:spanish_moss" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/spanish_moss_plant.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/spanish_moss_plant.json deleted file mode 100644 index ecad5e3a6bb..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/spanish_moss_plant.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:spanish_moss_plant" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/sprout.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/sprout.json deleted file mode 100644 index 893e05ac8fa..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/sprout.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:sprout" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tall_lavender.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tall_lavender.json deleted file mode 100644 index 0c3f2e7cd36..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tall_lavender.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:tall_lavender" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tall_white_lavender.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tall_white_lavender.json deleted file mode 100644 index abb8f398f38..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tall_white_lavender.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:tall_white_lavender" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tiny_cactus.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tiny_cactus.json deleted file mode 100644 index 13a79d30c4d..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tiny_cactus.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:tiny_cactus" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/toadstool.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/toadstool.json deleted file mode 100644 index efa61842c87..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/toadstool.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:toadstool" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/toadstool_block.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/toadstool_block.json deleted file mode 100644 index d0326525e49..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/toadstool_block.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:toadstool_block" - }, - "output": { - "count": 7, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tundra_shrub.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tundra_shrub.json deleted file mode 100644 index e2aca300b6f..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/tundra_shrub.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:tundra_shrub" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/umbran_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/umbran_leaves.json deleted file mode 100644 index 047301d69b0..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/umbran_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:umbran_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/umbran_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/umbran_sapling.json deleted file mode 100644 index e4606cd4c9f..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/umbran_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:umbran_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/violet.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/violet.json deleted file mode 100644 index 955369bd0db..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/violet.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:violet" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/watergrass.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/watergrass.json deleted file mode 100644 index 230f4edfea6..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/watergrass.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:watergrass" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/waterlily.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/waterlily.json deleted file mode 100644 index 34f1adbd33b..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/waterlily.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:waterlily" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/white_lavender.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/white_lavender.json deleted file mode 100644 index f8b7d5ebfbd..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/white_lavender.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:white_lavender" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/white_petals.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/white_petals.json deleted file mode 100644 index 1d2e0604081..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/white_petals.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:white_petals" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/wildflower.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/wildflower.json deleted file mode 100644 index 274eac3d176..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/wildflower.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:wildflower" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_leaves.json deleted file mode 100644 index 2a570de0f48..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:willow_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_sapling.json deleted file mode 100644 index f55bcdc050c..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:willow_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_vine.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_vine.json deleted file mode 100644 index 956b07f9637..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/willow_vine.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:willow_vine" - }, - "output": { - "count": 4, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/wilted_lily.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/wilted_lily.json deleted file mode 100644 index 1f61e75fef6..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/wilted_lily.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:wilted_lily" - }, - "output": { - "count": 5, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_leaf_pile.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_leaf_pile.json deleted file mode 100644 index 6e1497a19ef..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_leaf_pile.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:yellow_maple_leaf_pile" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_leaves.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_leaves.json deleted file mode 100644 index c1c05dafa5c..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_leaves.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:yellow_maple_leaves" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_sapling.json b/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_sapling.json deleted file mode 100644 index 08693c80b42..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/compat/biomesoplenty/biofuel/yellow_maple_sapling.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "biomesoplenty:yellow_maple_sapling" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/main/java/mekanism/common/recipe/RecipeProviderUtil.java b/src/datagen/main/java/mekanism/common/recipe/RecipeProviderUtil.java index d97d521aa19..4ccf95532e4 100644 --- a/src/datagen/main/java/mekanism/common/recipe/RecipeProviderUtil.java +++ b/src/datagen/main/java/mekanism/common/recipe/RecipeProviderUtil.java @@ -1,7 +1,5 @@ package mekanism.common.recipe; -import it.unimi.dsi.fastutil.objects.Object2FloatMap; -import java.util.function.Predicate; import mekanism.api.annotations.NothingNullByDefault; import mekanism.api.datagen.recipe.MekanismRecipeBuilder; import mekanism.api.datagen.recipe.RecipeCriterion; @@ -11,7 +9,6 @@ import mekanism.common.Mekanism; import mekanism.common.recipe.builder.ExtendedCookingRecipeBuilder; import mekanism.common.registries.MekanismItems; -import mekanism.common.util.RegistryUtils; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; @@ -22,7 +19,6 @@ import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.ComposterBlock; import net.neoforged.neoforge.common.conditions.ICondition; import org.jetbrains.annotations.Nullable; @@ -48,25 +44,6 @@ public static void addSmeltingBlastingRecipes(RecipeOutput consumer, Ingredient smeltingRecipe.build(consumer, smeltingLocation); } - public static void addCrusherBioFuelRecipes(RecipeOutput consumer, String basePath, Predicate shouldHandle, @Nullable ICondition condition) { - //Generate baseline recipes from Composter recipe set - //TODO - 1.21: Move these to being "generated" recipes at runtime (maybe behind a config option) that uses the compostable datamap? - for (Object2FloatMap.Entry chance : ComposterBlock.COMPOSTABLES.object2FloatEntrySet()) { - Item input = chance.getKey().asItem(); - ResourceLocation name = RegistryUtils.getName(input); - if (shouldHandle.test(name.getNamespace())) { - ItemStackToItemStackRecipeBuilder builder = ItemStackToItemStackRecipeBuilder.crushing( - IngredientCreatorAccess.item().from(input), - MekanismItems.BIO_FUEL.getItemStack(Math.round(chance.getFloatValue() * 8)) - ); - if (condition != null) { - builder.addCondition(condition); - } - builder.build(consumer, Mekanism.rl(basePath + name.getPath())); - } - } - } - public static void addPrecisionSawmillWoodTypeRecipes(RecipeOutput consumer, String basePath, ItemLike planks, @Nullable ItemLike boat, @Nullable ItemLike chestBoat, ItemLike door, ItemLike fenceGate, @Nullable TagKey log, ItemLike pressurePlate, ItemLike trapdoor, @Nullable ItemLike hangingSign, String name) { diff --git a/src/datagen/main/java/mekanism/common/recipe/compat/CompatRecipeProvider.java b/src/datagen/main/java/mekanism/common/recipe/compat/CompatRecipeProvider.java index 55998a1b2da..fdb9423d8fe 100644 --- a/src/datagen/main/java/mekanism/common/recipe/compat/CompatRecipeProvider.java +++ b/src/datagen/main/java/mekanism/common/recipe/compat/CompatRecipeProvider.java @@ -4,7 +4,6 @@ import java.util.List; import mekanism.api.annotations.NothingNullByDefault; import mekanism.common.recipe.ISubRecipeProvider; -import mekanism.common.recipe.RecipeProviderUtil; import net.minecraft.core.Holder; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; @@ -46,8 +45,6 @@ protected CompatRecipeProvider(String modid, String... secondaryMods) { public final void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries) { String basePath = getBasePath(); registerRecipes(consumer, basePath, registries); - //Check if there are any biofuel recipes that should be added for the mod - RecipeProviderUtil.addCrusherBioFuelRecipes(consumer, basePath + "biofuel/", mod -> mod.equals(modid), allModsLoaded); } protected abstract void registerRecipes(RecipeOutput consumer, String basePath, HolderLookup.Provider registries); From dd0b08d4f849669900990fce4181a7c7d37a385b Mon Sep 17 00:00:00 2001 From: Thiakil Date: Sat, 28 Sep 2024 19:33:20 +0800 Subject: [PATCH 13/20] rewrite Gas Generator consumption, remove generators' max output restrictions --- .../attribute/ChemicalAttributes.java | 62 +++++---- src/api/java/mekanism/api/text/APILang.java | 3 +- .../mekanism/api/text/ITooltipHelper.java | 4 + .../2ca94f3a6e22cb9eec299788405fc6e4ad158c09 | 8 +- .../c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 | 6 +- .../mekanism/assets/mekanism/lang/en_ud.json | 3 +- .../mekanism/assets/mekanism/lang/en_us.json | 3 +- .../data/mekanism/computer_help/methods.csv | 3 +- .../data/mekanism/computer_help/methods.json | 11 +- .../de34ee0556eec16c961269bcb7ec3070f0579cfd | 6 +- .../assets/mekanismgenerators/lang/en_ud.json | 10 +- .../assets/mekanismgenerators/lang/en_us.json | 10 +- .../client/lang/MekanismLangProvider.java | 3 +- .../client/gui/GuiBioGenerator.java | 7 +- .../client/gui/GuiGasGenerator.java | 8 +- .../client/gui/GuiHeatGenerator.java | 5 +- .../client/gui/GuiSolarGenerator.java | 7 +- .../client/gui/GuiWindGenerator.java | 7 +- .../generators/common/MekanismGenerators.java | 15 +-- .../common/config/GeneratorsConfig.java | 16 ++- .../config/GeneratorsConfigTranslations.java | 10 +- .../registries/GeneratorsBlockTypes.java | 2 +- .../TileEntityAdvancedSolarGenerator.java | 3 +- .../common/tile/TileEntityBioGenerator.java | 2 +- .../common/tile/TileEntityGasGenerator.java | 125 +++++++----------- .../common/tile/TileEntityGenerator.java | 26 +--- .../common/tile/TileEntityHeatGenerator.java | 2 +- .../common/tile/TileEntitySolarGenerator.java | 9 +- .../common/tile/TileEntityWindGenerator.java | 2 +- .../chemical/attribute/CrTFuelAttribute.java | 14 +- .../common/registries/MekanismChemicals.java | 6 +- .../common/util/text/TooltipHelper.java | 12 ++ 32 files changed, 176 insertions(+), 234 deletions(-) diff --git a/src/api/java/mekanism/api/chemical/attribute/ChemicalAttributes.java b/src/api/java/mekanism/api/chemical/attribute/ChemicalAttributes.java index 155a4ad4d83..15986cf4912 100644 --- a/src/api/java/mekanism/api/chemical/attribute/ChemicalAttributes.java +++ b/src/api/java/mekanism/api/chemical/attribute/ChemicalAttributes.java @@ -4,7 +4,6 @@ import java.util.function.Consumer; import java.util.function.IntSupplier; import java.util.function.LongSupplier; -import mekanism.api.MekanismAPI; import mekanism.api.chemical.Chemical; import mekanism.api.math.MathUtils; import mekanism.api.providers.IChemicalProvider; @@ -13,6 +12,7 @@ import mekanism.api.text.EnumColor; import mekanism.api.text.ITooltipHelper; import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.Range; /** * @since 10.7.0 Previously was GasAttributes @@ -194,65 +194,57 @@ public Chemical getCooledChemical() { } /** - * Defines a fuel which can be processed by a Gas-Burning Generator to produce energy. Fuels have two primary values: 'burn ticks', defining how many ticks one mB of - * fuel can be burned for before being depleted, and 'energyDensity', defining how much energy is stored in one mB of fuel. + * Defines a fuel which can be processed by a Gas-Burning Generator to produce energy. + * Fuels have two primary values: + * - 'max burn per tick', defining how many mB per tick can be burnt (max amount burned when tank is full) + * - 'energy density', defining how much energy is stored in one mB of fuel. * * @author aidancbrady */ public static class Fuel extends ChemicalAttribute { - private final IntSupplier burnTicks; + private final IntSupplier maxBurnPerTick; private final LongSupplier energyDensity; /** - * @param burnTicks The number of ticks one mB of fuel can be burned for before being depleted; must be greater than zero. - * @param energyDensity The energy density in one mB of fuel; must be greater than zero. + * @param maxBurnPerTick how many mB per tick can be burnt; must be greater than zero. + * @param energyDensity The energy density in one mB of fuel; must be greater than zero. * - * @since 10.4.0 + * @since 10.7.8 */ - public Fuel(int burnTicks, long energyDensity) { - if (burnTicks <= 0) { - throw new IllegalArgumentException("Fuel attributes must burn for at least one tick! Burn Ticks: " + burnTicks); + public Fuel(int maxBurnPerTick, long energyDensity) { + if (maxBurnPerTick <= 0) { + throw new IllegalArgumentException("Fuel attributes must be able to burn at least 1 per tick. maxBurnPerTick: " + maxBurnPerTick); } else if (energyDensity <= 0) { throw new IllegalArgumentException("Fuel attributes must have an energy density greater than zero!"); - } else if (energyDensity / burnTicks == 0L) { - throw new IllegalArgumentException("Energy density per tick must be greater than zero! (integer division)"); } - this.burnTicks = () -> burnTicks; + this.maxBurnPerTick = () -> maxBurnPerTick; this.energyDensity = () -> energyDensity; } /** - * @param burnTicks Supplier for the number of ticks one mB of fuel can be burned for before being depleted. The supplier should return values greater than - * zero. - * @param energyDensity Supplier for the energy density of one mB of fuel. The supplier should return values be greater than zero. + * @param maxBurnPerTick Supplier for how many mB per tick can be burnt. The supplier should return values greater than zero. + * @param energyDensity Supplier for the energy density of one mB of fuel. The supplier should return values be greater than zero. */ - public Fuel(IntSupplier burnTicks, LongSupplier energyDensity) { - this.burnTicks = burnTicks; + public Fuel(IntSupplier maxBurnPerTick, LongSupplier energyDensity) { + this.maxBurnPerTick = maxBurnPerTick; this.energyDensity = energyDensity; } /** * Gets the number of ticks this fuel burns for. */ - public int getBurnTicks() { - return burnTicks.getAsInt(); + @Range(from = 1, to = Integer.MAX_VALUE) + public int getMaxBurnPerTick() { + return Math.max(maxBurnPerTick.getAsInt(), 1); } /** * Gets the amount of energy produced per tick of this fuel. */ - public long getEnergyPerTick() { - int ticks = getBurnTicks(); - //If we have less than one tick, the density is invalid - if (ticks < 1) { - MekanismAPI.logger.warn("Invalid tick count ({}) for Fuel attribute, this number should be at least 1.", ticks); - return 0; - } else if (ticks == 1) { - //Single tick, no division necessary - return energyDensity.getAsLong(); - } - return energyDensity.getAsLong() / ticks; + @Range(from = 1, to = Integer.MAX_VALUE) + public long getEnergyDensity() { + return Math.max(energyDensity.getAsLong(), 1); } @Override @@ -265,9 +257,15 @@ public List addTooltipText(List list) { @Override public void collectTooltips(Consumer adder) { ITooltipHelper tooltipHelper = ITooltipHelper.INSTANCE; - adder.accept(APILang.CHEMICAL_ATTRIBUTE_FUEL_BURN_TICKS.translateColored(EnumColor.GRAY, EnumColor.INDIGO, tooltipHelper.getFormattedNumber(getBurnTicks()))); + adder.accept(APILang.CHEMICAL_ATTRIBUTE_FUEL_MAX_BURN.translateColored(EnumColor.GRAY, EnumColor.INDIGO, tooltipHelper.getFluidDisplay(getMaxBurnPerTick(), true))); adder.accept(APILang.CHEMICAL_ATTRIBUTE_FUEL_ENERGY_DENSITY.translateColored(EnumColor.GRAY, EnumColor.INDIGO, tooltipHelper.getEnergyPerMBDisplayShort(energyDensity.getAsLong()))); + adder.accept(APILang.CHEMICAL_ATTRIBUTE_FUEL_ENERGY_MAX_TOTAL.translateColored(EnumColor.GRAY, EnumColor.INDIGO, + tooltipHelper.getEnergyDisplay(getMaxJoulesPerTick(), true))); + } + + public long getMaxJoulesPerTick() { + return getMaxBurnPerTick() * energyDensity.getAsLong(); } } } diff --git a/src/api/java/mekanism/api/text/APILang.java b/src/api/java/mekanism/api/text/APILang.java index 85cd0bbbab8..77db599f329 100644 --- a/src/api/java/mekanism/api/text/APILang.java +++ b/src/api/java/mekanism/api/text/APILang.java @@ -68,8 +68,9 @@ public enum APILang implements ILangEntry { CHEMICAL_ATTRIBUTE_RADIATION("chemical", "attribute.radiation"), CHEMICAL_ATTRIBUTE_COOLANT_EFFICIENCY("chemical", "attribute.coolant.efficiency"), CHEMICAL_ATTRIBUTE_COOLANT_ENTHALPY("chemical", "attribute.coolant.heat_capacity"), - CHEMICAL_ATTRIBUTE_FUEL_BURN_TICKS("chemical", "attribute.fuel.burn_ticks"), + CHEMICAL_ATTRIBUTE_FUEL_MAX_BURN("chemical", "attribute.fuel.max_burn"), CHEMICAL_ATTRIBUTE_FUEL_ENERGY_DENSITY("chemical", "attribute.fuel.energy_density"), + CHEMICAL_ATTRIBUTE_FUEL_ENERGY_MAX_TOTAL("chemical", "attribute.fuel.energy_max_total"), //Security PUBLIC("security", "public"), TRUSTED("security", "trusted"), diff --git a/src/api/java/mekanism/api/text/ITooltipHelper.java b/src/api/java/mekanism/api/text/ITooltipHelper.java index 01172733196..0a790957933 100644 --- a/src/api/java/mekanism/api/text/ITooltipHelper.java +++ b/src/api/java/mekanism/api/text/ITooltipHelper.java @@ -20,4 +20,8 @@ public interface ITooltipHelper { String getFormattedNumber(long number); Component getPercent(double ratio); + + Component getEnergyDisplay(long joules, boolean perTick); + + Component getFluidDisplay(long joules, boolean perTick); } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 b/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 index c2c464f3ea9..4052c08c1d8 100644 --- a/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 +++ b/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 @@ -1,6 +1,6 @@ -// 1.21.1 2024-08-26T11:19:54.2186095 ComputerHelp: mekanism +// 1.21.1 2024-09-28T16:18:21.461812 ComputerHelp: mekanism 740491ca25c3ff0efd50f10d2427e4ceccb0c1e1 data/mekanism/computer_help/enums.csv e43ab1d9e5ae68f834035609a85af3c6ce4161a4 data/mekanism/computer_help/enums.json -7af50c5e4ca7a140661622533860cafbed24c64d data/mekanism/computer_help/jekyll.md -0442f235be0f36db5728aaf942c99e9c8638f662 data/mekanism/computer_help/methods.csv -366f1717990ae1860dc4739af4a8f441cd0acad5 data/mekanism/computer_help/methods.json +97c621e01371f5f8975eaeef2521df3b4a200fa8 data/mekanism/computer_help/jekyll.md +cd82498b05210190c44d7e482d2da8ffb73c38e6 data/mekanism/computer_help/methods.csv +75981639ca0ab0f259fd7aed04801ff1dcaa9fd7 data/mekanism/computer_help/methods.json diff --git a/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 b/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 index 0787aa9ffec..3e69749cff2 100644 --- a/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 +++ b/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 @@ -1,5 +1,5 @@ -// 1.21.1 2024-08-24T23:59:23.1423828 Languages: en_us for mod: mekanism +// 1.21.1 2024-09-28T17:55:28.2639264 Languages: en_us for mod: mekanism 8d915354d84b3a4d60c65f9280fdd7ceca016c35 assets/mekanism/lang/en_au.json 8d915354d84b3a4d60c65f9280fdd7ceca016c35 assets/mekanism/lang/en_gb.json -28d2fb3189f404bc44f12679cf7835e080185937 assets/mekanism/lang/en_ud.json -52699badc3d935f327983b454e5299e066efd880 assets/mekanism/lang/en_us.json +e8e7aa6fa397d2e555cb9e31777f89de420d383a assets/mekanism/lang/en_ud.json +506a8c522b8d62f87b5f3aa648923361c5985f1e assets/mekanism/lang/en_us.json diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json index bd296e74c3c..6173dcd434f 100644 --- a/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json +++ b/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json @@ -584,8 +584,9 @@ "chemical.mekanism.aqua": "ʇuǝɯᵷᴉԀ ɐnbⱯ", "chemical.mekanism.attribute.coolant.efficiency": "%s :ʎɔuǝᴉɔᴉɟɟƎ ʇuɐꞁooƆ - ", "chemical.mekanism.attribute.coolant.heat_capacity": "%s :ʎdꞁɐɥʇuƎ ꞁɐɯɹǝɥ⟘ - ", - "chemical.mekanism.attribute.fuel.burn_ticks": "ʇ %s :ǝɯᴉ⟘ uɹnᗺ - ", "chemical.mekanism.attribute.fuel.energy_density": "%s :ʎʇᴉsuǝᗡ ʎᵷɹǝuƎ - ", + "chemical.mekanism.attribute.fuel.energy_max_total": "%s :ʇndʇnO ɯnɯᴉxɐW - ", + "chemical.mekanism.attribute.fuel.max_burn": "%s :uɹnᗺ ɯnɯᴉxɐW - ", "chemical.mekanism.attribute.radiation": "%s :ʎʇᴉʌᴉʇɔɐoᴉpɐᴚ - ", "chemical.mekanism.bio": "ssɐɯoᴉᗺ", "chemical.mekanism.black": "ʇuǝɯᵷᴉԀ ʞɔɐꞁᗺ", diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json index 3c10ae75f97..f3b1d6a357c 100644 --- a/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json +++ b/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json @@ -585,8 +585,9 @@ "chemical.mekanism.aqua": "Aqua Pigment", "chemical.mekanism.attribute.coolant.efficiency": " - Coolant Efficiency: %1$s", "chemical.mekanism.attribute.coolant.heat_capacity": " - Thermal Enthalpy: %1$s", - "chemical.mekanism.attribute.fuel.burn_ticks": " - Burn Time: %1$s t", "chemical.mekanism.attribute.fuel.energy_density": " - Energy Density: %1$s", + "chemical.mekanism.attribute.fuel.energy_max_total": " - Maximum Output: %1$s", + "chemical.mekanism.attribute.fuel.max_burn": " - Maximum Burn: %1$s", "chemical.mekanism.attribute.radiation": " - Radioactivity: %1$s", "chemical.mekanism.bio": "Biomass", "chemical.mekanism.black": "Black Pigment", diff --git a/src/datagen/generated/mekanism/data/mekanism/computer_help/methods.csv b/src/datagen/generated/mekanism/data/mekanism/computer_help/methods.csv index ca6d867ce9a..88cbe06f0fc 100644 --- a/src/datagen/generated/mekanism/data/mekanism/computer_help/methods.csv +++ b/src/datagen/generated/mekanism/data/mekanism/computer_help/methods.csv @@ -409,14 +409,13 @@ Fusion Reactor Multiblock (formed),isIgnited,,boolean,,false,Checks if a reactio Fusion Reactor Multiblock (formed),setInjectionRate,rate: Number (int),,,false, Fusion Reactor Port,getMode,,boolean,,false,"true -> output, false -> input" Fusion Reactor Port,setMode,output: boolean,,,false,"true -> output, false -> input" -Gas Generator,getBurnRate,,Number (double),,false, +Gas Generator,getBurnRate,,Number (long),,false, Gas Generator,getEnergyItem,,Table (ItemStack),,false,Get the contents of the energy item slot. Gas Generator,getFuel,,Table (ChemicalStack),,false,Get the contents of the fuel tank. Gas Generator,getFuelCapacity,,Number (long),,false,Get the capacity of the fuel tank. Gas Generator,getFuelFilledPercentage,,Number (double),,false,Get the filled percentage of the fuel tank. Gas Generator,getFuelItem,,Table (ItemStack),,false,Get the contents of the fuel item slot. Gas Generator,getFuelNeeded,,Number (long),,false,Get the amount needed to fill the fuel tank. -Generator,getMaxOutput,,Number (long),,false, Generator,getProductionRate,,Number (long),,false,Get the amount of energy produced by this generator in the last tick. Generic Mekanism Machine,getComparatorLevel,,Number (int),COMPARATOR,false, Generic Mekanism Machine,getDirection,,String (Direction),DIRECTIONAL,false, diff --git a/src/datagen/generated/mekanism/data/mekanism/computer_help/methods.json b/src/datagen/generated/mekanism/data/mekanism/computer_help/methods.json index 199d49bf751..37d7357bede 100644 --- a/src/datagen/generated/mekanism/data/mekanism/computer_help/methods.json +++ b/src/datagen/generated/mekanism/data/mekanism/computer_help/methods.json @@ -3573,8 +3573,8 @@ { "methodName": "getBurnRate", "returns": { - "type": "Number (double)", - "java_type": "double" + "type": "Number (long)", + "java_type": "long" } }, { @@ -3627,13 +3627,6 @@ } ], "Generator": [ - { - "methodName": "getMaxOutput", - "returns": { - "type": "Number (long)", - "java_type": "long" - } - }, { "description": "Get the amount of energy produced by this generator in the last tick.", "methodName": "getProductionRate", diff --git a/src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd b/src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd index 2d37dacde82..e411e99d909 100644 --- a/src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd +++ b/src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd @@ -1,5 +1,5 @@ -// 1.21.1 2024-08-23T17:24:34.4599421 Languages: en_us for mod: mekanismgenerators +// 1.21.1 2024-09-28T16:48:23.0059666 Languages: en_us for mod: mekanismgenerators b934b9aafaf6b98813ecd472c8a8f012383b4aa0 assets/mekanismgenerators/lang/en_au.json b934b9aafaf6b98813ecd472c8a8f012383b4aa0 assets/mekanismgenerators/lang/en_gb.json -ff07046efc0743fcef50a9decdf7b5764990474c assets/mekanismgenerators/lang/en_ud.json -e7bf6e6f698aa975da87cb3c80cdb134ac01ae65 assets/mekanismgenerators/lang/en_us.json +fc4def4f3fa896b8d1a342fa874a6534b58a10f6 assets/mekanismgenerators/lang/en_ud.json +f5c1a38cfff668a61c54e11ab8a5653dc9c1c3c2 assets/mekanismgenerators/lang/en_us.json diff --git a/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json b/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json index aa8e7cd2c91..b26bee8c3dc 100644 --- a/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json +++ b/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json @@ -110,10 +110,12 @@ "configuration.mekanismgenerators.server.generator.bio.tooltip": "sɹoʇɐɹǝuǝ⅁ oᴉᗺ ᵷuᴉɹnᵷᴉɟuoɔ ɹoɟ sᵷuᴉʇʇǝS", "configuration.mekanismgenerators.server.generator.gas": "ɹoʇɐɹǝuǝ⅁ ᵷuᴉuɹnᗺ-sɐ⅁", "configuration.mekanismgenerators.server.generator.gas.button": "ɹoʇɐɹǝuǝ⅁ ᵷuᴉuɹnᗺ-sɐ⅁ ʇᴉpƎ", - "configuration.mekanismgenerators.server.generator.gas.ethene.burn_ticks": "sʞɔᴉ⟘ uɹnᗺ ǝuǝɥʇƎ", - "configuration.mekanismgenerators.server.generator.gas.ethene.burn_ticks.tooltip": "˙ɹoʇɐɹǝuǝ⅁ ᵷuᴉuɹnᗺ-sɐ⅁ ǝɥʇ uᴉ ɹoɟ suɹnq ǝuǝɥʇƎ ɟo ᗺɯ ɥɔɐǝ sʞɔᴉʇ ɟo ɹǝqɯnu ǝɥ⟘", - "configuration.mekanismgenerators.server.generator.gas.ethene.density": "ɹǝᴉꞁdᴉʇꞁnW ʎʇᴉsuǝᗡ ʎᵷɹǝuƎ ǝuǝɥʇƎ", - "configuration.mekanismgenerators.server.generator.gas.ethene.density.tooltip": "˙(ɹǝᴉꞁdᴉʇꞁnWʎʇᴉsuǝp * uoᴉʇɐɹǝuǝ⅁oᴉq * ᘔ + uǝᵷoɹpʎH ᗺɯ ⥝) ǝuǝɥʇƎ ɟo ʎʇᴉsuǝp ʎᵷɹǝuǝ ǝɥʇ ᵷuᴉʇɐꞁnɔꞁɐɔ ɹoɟ ɹǝᴉꞁdᴉʇꞁnW", + "configuration.mekanismgenerators.server.generator.gas.ethene.density2": "ʎʇᴉsuǝᗡ ʎᵷɹǝuƎ ǝuǝɥʇƎ", + "configuration.mekanismgenerators.server.generator.gas.ethene.density2.tooltip": "˙ǝʇɐɹǝuǝᵷ ǝuǝɥʇƎ ɟo ᗺɯ⥝ pꞁnoɥs sǝꞁnoՐ ʎuɐɯ ʍoH", + "configuration.mekanismgenerators.server.generator.gas.ethene.max_per_tick": "ʞɔᴉ⟘ ɹǝd pǝuɹnᗺ ǝuǝɥʇƎ xɐW", + "configuration.mekanismgenerators.server.generator.gas.ethene.max_per_tick.tooltip": "˙sᴉ ʞuɐʇ ꞁǝnɟ ǝɥʇ ꞁꞁnɟ ʍoɥ uo ᵷuᴉpuǝdǝp ʞɔᴉʇ ɥɔɐǝ ɯnɯᴉxɐɯ ʇɐ pǝuɹnq ǝq ꞁꞁᴉʍ sᴉɥʇ ɟo uoᴉʇɔɐɹɟ Ɐ ˙(ꞁꞁnɟ ʞuɐʇ uǝɥʍ) ʞɔᴉʇ ɐ uᴉ uɹnq oʇ ǝuǝɥʇƎ ɟo ᗺɯ ɯnɯᴉxɐW", + "configuration.mekanismgenerators.server.generator.gas.hydrogen.max_per_tick": "ʞɔᴉ⟘ ɹǝd pǝuɹnᗺ uǝᵷoɹpʎH xɐW", + "configuration.mekanismgenerators.server.generator.gas.hydrogen.max_per_tick.tooltip": "˙sᴉ ʞuɐʇ ꞁǝnɟ ǝɥʇ ꞁꞁnɟ ʍoɥ uo ᵷuᴉpuǝdǝp ʞɔᴉʇ ɥɔɐǝ ɯnɯᴉxɐɯ ʇɐ pǝuɹnq ǝq ꞁꞁᴉʍ sᴉɥʇ ɟo uoᴉʇɔɐɹɟ Ɐ ˙(ꞁꞁnɟ ʞuɐʇ uǝɥʍ) ʞɔᴉʇ ɐ uᴉ uɹnq oʇ uǝᵷoɹpʎH ɟo ᗺɯ ɯnɯᴉxɐW", "configuration.mekanismgenerators.server.generator.gas.tank_capacity": "ʎʇᴉɔɐdɐƆ ʞuɐ⟘", "configuration.mekanismgenerators.server.generator.gas.tank_capacity.tooltip": "˙ɹoʇɐɹǝuǝ⅁ ᵷuᴉuɹnᗺ-sɐ⅁ ǝɥʇ uᴉ ʞuɐʇ ꞁɐɔᴉɯǝɥɔ ǝɥʇ ɟo ᗺɯ uᴉ ʎʇᴉɔɐdɐɔ ǝɥ⟘", "configuration.mekanismgenerators.server.generator.gas.tooltip": "sɹoʇɐɹǝuǝ⅁ ᵷuᴉuɹnᗺ-sɐ⅁ ᵷuᴉɹnᵷᴉɟuoɔ ɹoɟ sᵷuᴉʇʇǝS", diff --git a/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json b/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json index 006074be5f0..0d61b36d163 100644 --- a/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json +++ b/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json @@ -110,10 +110,12 @@ "configuration.mekanismgenerators.server.generator.bio.tooltip": "Settings for configuring Bio Generators", "configuration.mekanismgenerators.server.generator.gas": "Gas-Burning Generator", "configuration.mekanismgenerators.server.generator.gas.button": "Edit Gas-Burning Generator", - "configuration.mekanismgenerators.server.generator.gas.ethene.burn_ticks": "Ethene Burn Ticks", - "configuration.mekanismgenerators.server.generator.gas.ethene.burn_ticks.tooltip": "The number of ticks each mB of Ethene burns for in the Gas-Burning Generator.", - "configuration.mekanismgenerators.server.generator.gas.ethene.density": "Ethene Energy Density Multiplier", - "configuration.mekanismgenerators.server.generator.gas.ethene.density.tooltip": "Multiplier for calculating the energy density of Ethene (1 mB Hydrogen + 2 * bioGeneration * densityMultiplier).", + "configuration.mekanismgenerators.server.generator.gas.ethene.density2": "Ethene Energy Density", + "configuration.mekanismgenerators.server.generator.gas.ethene.density2.tooltip": "How many Joules should 1mB of Ethene generate.", + "configuration.mekanismgenerators.server.generator.gas.ethene.max_per_tick": "Max Ethene Burned per Tick", + "configuration.mekanismgenerators.server.generator.gas.ethene.max_per_tick.tooltip": "Maximum mB of Ethene to burn in a tick (when tank full). A fraction of this will be burned at maximum each tick depending on how full the fuel tank is.", + "configuration.mekanismgenerators.server.generator.gas.hydrogen.max_per_tick": "Max Hydrogen Burned per Tick", + "configuration.mekanismgenerators.server.generator.gas.hydrogen.max_per_tick.tooltip": "Maximum mB of Hydrogen to burn in a tick (when tank full). A fraction of this will be burned at maximum each tick depending on how full the fuel tank is.", "configuration.mekanismgenerators.server.generator.gas.tank_capacity": "Tank Capacity", "configuration.mekanismgenerators.server.generator.gas.tank_capacity.tooltip": "The capacity in mB of the chemical tank in the Gas-Burning Generator.", "configuration.mekanismgenerators.server.generator.gas.tooltip": "Settings for configuring Gas-Burning Generators", diff --git a/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java b/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java index 1d8dd9cf477..4f174c2c578 100644 --- a/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java +++ b/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java @@ -894,8 +894,9 @@ private void addMisc() { add(APILang.CHEMICAL_ATTRIBUTE_RADIATION, " - Radioactivity: %1$s"); add(APILang.CHEMICAL_ATTRIBUTE_COOLANT_EFFICIENCY, " - Coolant Efficiency: %1$s"); add(APILang.CHEMICAL_ATTRIBUTE_COOLANT_ENTHALPY, " - Thermal Enthalpy: %1$s"); - add(APILang.CHEMICAL_ATTRIBUTE_FUEL_BURN_TICKS, " - Burn Time: %1$s t"); + add(APILang.CHEMICAL_ATTRIBUTE_FUEL_MAX_BURN, " - Maximum Burn: %1$s"); add(APILang.CHEMICAL_ATTRIBUTE_FUEL_ENERGY_DENSITY, " - Energy Density: %1$s"); + add(APILang.CHEMICAL_ATTRIBUTE_FUEL_ENERGY_MAX_TOTAL, " - Maximum Output: %1$s"); //Colors for (EnumColor color : EnumUtils.COLORS) { add(color.getLangEntry(), color.getEnglishName()); diff --git a/src/generators/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/generators/java/mekanism/generators/client/gui/GuiBioGenerator.java index fe8c2d3f24d..7f08e12753f 100644 --- a/src/generators/java/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/src/generators/java/mekanism/generators/client/gui/GuiBioGenerator.java @@ -8,7 +8,6 @@ import mekanism.client.gui.element.bar.GuiFluidBar; import mekanism.client.gui.element.bar.GuiVerticalPowerBar; import mekanism.client.gui.element.tab.GuiEnergyTab; -import mekanism.common.MekanismLang; import mekanism.common.inventory.container.tile.MekanismTileContainer; import mekanism.common.util.text.EnergyDisplay; import mekanism.common.util.text.TextUtils; @@ -35,11 +34,11 @@ protected void addGuiElements() { addRenderableWidget(new GuiInnerScreen(this, 48, 23, 80, 40, () -> List.of( EnergyDisplay.of(tile.getEnergyContainer().getEnergy()).getTextComponent(), GeneratorsLang.STORED_BIO_FUEL.translate(TextUtils.format(tile.bioFuelTank.getFluidAmount())), - GeneratorsLang.OUTPUT_RATE_SHORT.translate(EnergyDisplay.of(tile.getMaxOutput())) + GeneratorsLang.PRODUCING_AMOUNT.translate(tile.getActive() ? EnergyDisplay.of(MekanismGeneratorsConfig.generators.bioGeneration.get()) : EnergyDisplay.ZERO) ))); addRenderableWidget(new GuiEnergyTab(this, () -> List.of( - GeneratorsLang.PRODUCING_AMOUNT.translate(tile.getActive() ? EnergyDisplay.of(MekanismGeneratorsConfig.generators.bioGeneration.get()) : EnergyDisplay.ZERO), - MekanismLang.MAX_OUTPUT.translate(EnergyDisplay.of(tile.getMaxOutput()))))); + GeneratorsLang.PRODUCING_AMOUNT.translate(tile.getActive() ? EnergyDisplay.of(MekanismGeneratorsConfig.generators.bioGeneration.get()) : EnergyDisplay.ZERO) + ))); addRenderableWidget(new GuiVerticalPowerBar(this, tile.getEnergyContainer(), 164, 15)); addRenderableWidget(new GuiFluidBar(this, GuiFluidBar.getProvider(tile.bioFuelTank, tile.getFluidTanks(null)), 7, 15, 4, 52, false)); } diff --git a/src/generators/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/generators/java/mekanism/generators/client/gui/GuiGasGenerator.java index a9baec5a9f7..3d9e1af7e2a 100644 --- a/src/generators/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/generators/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -9,7 +9,6 @@ import mekanism.client.gui.element.gauge.GaugeType; import mekanism.client.gui.element.gauge.GuiChemicalGauge; import mekanism.client.gui.element.tab.GuiEnergyTab; -import mekanism.common.MekanismLang; import mekanism.common.inventory.container.tile.MekanismTileContainer; import mekanism.common.util.text.EnergyDisplay; import mekanism.generators.common.GeneratorsLang; @@ -32,10 +31,11 @@ protected void addGuiElements() { addRenderableWidget(GuiSideHolder.create(this, -26, 6, 98, true, true, SpecialColors.TAB_ARMOR_SLOTS)); super.addGuiElements(); addRenderableWidget(new GuiEnergyTab(this, () -> { - long productionAmount = MathUtils.clampToLong(tile.getGenerationRate() * tile.getUsed() * tile.getMaxBurnTicks()); + long fuelDensity = tile.getCachedFuel() != null ? tile.getCachedFuel().getEnergyDensity() : 0; + long productionAmount = MathUtils.clampToLong(fuelDensity * tile.getUsed()); return List.of( - GeneratorsLang.PRODUCING_AMOUNT.translate(EnergyDisplay.of(productionAmount)), - MekanismLang.MAX_OUTPUT.translate(EnergyDisplay.of(tile.getMaxOutput()))); + GeneratorsLang.PRODUCING_AMOUNT.translate(EnergyDisplay.of(productionAmount)) + ); })); addRenderableWidget(new GuiChemicalGauge(() -> tile.fuelTank, () -> tile.getChemicalTanks(null), GaugeType.WIDE, this, 55, 18)); addRenderableWidget(new GuiVerticalPowerBar(this, tile.getEnergyContainer(), 164, 15)); diff --git a/src/generators/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/generators/java/mekanism/generators/client/gui/GuiHeatGenerator.java index fda319dc548..6d90004af77 100644 --- a/src/generators/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/generators/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -33,8 +33,9 @@ protected void addGuiElements() { //Add the side holder before the slots, as it holds a couple of the slots addRenderableWidget(GuiSideHolder.create(this, -26, 6, 98, true, true, SpecialColors.TAB_ARMOR_SLOTS)); super.addGuiElements(); - addRenderableWidget(new GuiEnergyTab(this, () -> List.of(GeneratorsLang.PRODUCING_AMOUNT.translate(EnergyDisplay.of(tile.getProductionRate())), - MekanismLang.MAX_OUTPUT.translate(EnergyDisplay.of(tile.getMaxOutput()))))); + addRenderableWidget(new GuiEnergyTab(this, () -> List.of( + GeneratorsLang.PRODUCING_AMOUNT.translate(EnergyDisplay.of(tile.getProductionRate())) + ))); addRenderableWidget(new GuiFluidGauge(() -> tile.lavaTank, () -> tile.getFluidTanks(null), GaugeType.WIDE, this, 55, 18)); addRenderableWidget(new GuiVerticalPowerBar(this, tile.getEnergyContainer(), 164, 15)); addRenderableWidget(new GuiHeatTab(this, () -> { diff --git a/src/generators/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/generators/java/mekanism/generators/client/gui/GuiSolarGenerator.java index 6f553fd2b95..27b66f3661d 100644 --- a/src/generators/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/generators/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -7,7 +7,6 @@ import mekanism.client.gui.element.GuiSideHolder; import mekanism.client.gui.element.bar.GuiVerticalPowerBar; import mekanism.client.gui.element.tab.GuiEnergyTab; -import mekanism.common.MekanismLang; import mekanism.common.inventory.container.tile.MekanismTileContainer; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.text.EnergyDisplay; @@ -34,11 +33,9 @@ protected void addGuiElements() { super.addGuiElements(); addRenderableWidget(new GuiInnerScreen(this, 48, 23, 80, 40, () -> List.of( EnergyDisplay.of(tile.getEnergyContainer()).getTextComponent(), - GeneratorsLang.PRODUCING_AMOUNT.translate(EnergyDisplay.of(tile.getProductionRate())), - GeneratorsLang.OUTPUT_RATE_SHORT.translate(EnergyDisplay.of(tile.getMaxOutput())) + GeneratorsLang.PRODUCING_AMOUNT.translate(EnergyDisplay.of(tile.getProductionRate())) ))); - addRenderableWidget(new GuiEnergyTab(this, () -> List.of(GeneratorsLang.PRODUCING_AMOUNT.translate(EnergyDisplay.of(tile.getProductionRate())), - MekanismLang.MAX_OUTPUT.translate(EnergyDisplay.of(tile.getMaxOutput()))))); + addRenderableWidget(new GuiEnergyTab(this, () -> List.of(GeneratorsLang.PRODUCING_AMOUNT.translate(EnergyDisplay.of(tile.getProductionRate()))))); addRenderableWidget(new GuiVerticalPowerBar(this, tile.getEnergyContainer(), 164, 15)); addRenderableWidget(new GuiStateTexture(this, 18, 35, tile::canSeeSun, MekanismGenerators.rl(ResourceType.GUI.getPrefix() + "sees_sun.png"), MekanismGenerators.rl(ResourceType.GUI.getPrefix() + "no_sun.png"))); diff --git a/src/generators/java/mekanism/generators/client/gui/GuiWindGenerator.java b/src/generators/java/mekanism/generators/client/gui/GuiWindGenerator.java index 1d6da9502ec..2ee7d18725c 100644 --- a/src/generators/java/mekanism/generators/client/gui/GuiWindGenerator.java +++ b/src/generators/java/mekanism/generators/client/gui/GuiWindGenerator.java @@ -10,7 +10,6 @@ import mekanism.client.gui.element.GuiSideHolder; import mekanism.client.gui.element.bar.GuiVerticalPowerBar; import mekanism.client.gui.element.tab.GuiEnergyTab; -import mekanism.common.MekanismLang; import mekanism.common.inventory.container.tile.MekanismTileContainer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -41,7 +40,6 @@ protected void addGuiElements() { list.add(EnergyDisplay.of(tile.getEnergyContainer()).getTextComponent()); long amount = tile.getCurrentGeneration(); list.add(GeneratorsLang.POWER.translate(MekanismUtils.getEnergyDisplayShort(amount))); - list.add(GeneratorsLang.OUTPUT_RATE_SHORT.translate(EnergyDisplay.of(tile.getMaxOutput()))); if (!tile.getActive()) { ILangEntry reason = tile.isBlacklistDimension() ? GeneratorsLang.NO_WIND : GeneratorsLang.SKY_BLOCKED; list.add(reason.translateColored(EnumColor.DARK_RED)); @@ -49,9 +47,8 @@ protected void addGuiElements() { return list; })); addRenderableWidget(new GuiEnergyTab(this, () -> List.of( - GeneratorsLang.PRODUCING_AMOUNT.translate(tile.getActive() ? EnergyDisplay.of(tile.getCurrentGeneration()) : EnergyDisplay.ZERO), - MekanismLang.MAX_OUTPUT.translate(EnergyDisplay.of(tile.getMaxOutput()))) - )); + GeneratorsLang.PRODUCING_AMOUNT.translate(tile.getActive() ? EnergyDisplay.of(tile.getCurrentGeneration()) : EnergyDisplay.ZERO) + ))); addRenderableWidget(new GuiVerticalPowerBar(this, tile.getEnergyContainer(), 164, 15)); addRenderableWidget(new GuiStateTexture(this, 18, 35, tile::getActive, MekanismGenerators.rl(ResourceType.GUI.getPrefix() + "wind_on.png"), MekanismGenerators.rl(ResourceType.GUI.getPrefix() + "wind_off.png"))); diff --git a/src/generators/java/mekanism/generators/common/MekanismGenerators.java b/src/generators/java/mekanism/generators/common/MekanismGenerators.java index 0366ea918e2..dfd0825ad26 100644 --- a/src/generators/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/generators/java/mekanism/generators/common/MekanismGenerators.java @@ -2,12 +2,10 @@ import mekanism.api.MekanismIMC; import mekanism.api.chemical.attribute.ChemicalAttributes.Fuel; -import mekanism.api.math.MathUtils; import mekanism.common.Mekanism; import mekanism.common.base.IModModule; import mekanism.common.command.builders.BuildCommand; import mekanism.common.config.MekanismConfig; -import mekanism.common.config.listener.ConfigBasedCachedLongSupplier; import mekanism.common.lib.Version; import mekanism.common.lib.multiblock.MultiblockManager; import mekanism.common.recipe.ClearConfigurationRecipe; @@ -27,11 +25,11 @@ import mekanism.generators.common.registries.GeneratorsBuilders.FissionReactorBuilder; import mekanism.generators.common.registries.GeneratorsBuilders.FusionReactorBuilder; import mekanism.generators.common.registries.GeneratorsBuilders.TurbineBuilder; +import mekanism.generators.common.registries.GeneratorsChemicals; import mekanism.generators.common.registries.GeneratorsContainerTypes; import mekanism.generators.common.registries.GeneratorsCreativeTabs; import mekanism.generators.common.registries.GeneratorsDataComponents; import mekanism.generators.common.registries.GeneratorsFluids; -import mekanism.generators.common.registries.GeneratorsChemicals; import mekanism.generators.common.registries.GeneratorsItems; import mekanism.generators.common.registries.GeneratorsModules; import mekanism.generators.common.registries.GeneratorsSounds; @@ -47,12 +45,6 @@ public class MekanismGenerators implements IModModule { public static final String MODID = "mekanismgenerators"; - private static final ConfigBasedCachedLongSupplier ETHENE_ENERGY_DENSITY = new ConfigBasedCachedLongSupplier(() -> { - long bioGeneration = MekanismGeneratorsConfig.generators.bioGeneration.get(); - double etheneDensity = MekanismGeneratorsConfig.generators.etheneDensityMultiplier.get(); - long energy = MathUtils.clampToLong(MathUtils.multiplyClamped(bioGeneration, 2) * etheneDensity); - return energy + MekanismConfig.general.FROM_H2.get(); - }, MekanismConfig.general.FROM_H2, MekanismGeneratorsConfig.generators.bioGeneration, MekanismGeneratorsConfig.generators.etheneDensityMultiplier); public static MekanismGenerators instance; @@ -101,8 +93,9 @@ public static ResourceLocation rl(String path) { private void commonSetup(FMLCommonSetupEvent event) { event.enqueueWork(() -> { - //Add fuel attribute to ethene - MekanismChemicals.ETHENE.get().addAttribute(new Fuel(MekanismGeneratorsConfig.generators.etheneBurnTicks, ETHENE_ENERGY_DENSITY)); + //Add fuel attribute to ethene+hydrogen + MekanismChemicals.HYDROGEN.get().addAttribute(new Fuel(MekanismGeneratorsConfig.generators.hydrogenMaxBurnPerTick, MekanismConfig.general.FROM_H2)); + MekanismChemicals.ETHENE.get().addAttribute(new Fuel(MekanismGeneratorsConfig.generators.etheneMaxBurnPerTick, MekanismGeneratorsConfig.generators.etheneDensity)); //Register dispenser behaviors GeneratorsFluids.FLUIDS.registerBucketDispenserBehavior(); //Register extended build commands (in enqueue as it is not thread safe) diff --git a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java index 05602296a9f..46404a23a39 100644 --- a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java +++ b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java @@ -9,7 +9,6 @@ import mekanism.common.util.EnumUtils; import mekanism.generators.common.content.fission.FissionReactorMultiblockData; import mekanism.generators.common.content.fusion.FusionReactorMultiblockData; -import net.minecraft.SharedConstants; import net.minecraft.world.level.dimension.DimensionType; import net.neoforged.fml.config.ModConfig.Type; import net.neoforged.neoforge.common.ModConfigSpec; @@ -31,8 +30,9 @@ public class GeneratorsConfig extends BaseMekanismConfig { public final CachedIntValue heatGenerationFluidRate; public final CachedLongValue gbgTankCapacity; - public final CachedIntValue etheneBurnTicks; - public final CachedDoubleValue etheneDensityMultiplier; + public final CachedIntValue etheneMaxBurnPerTick; + public final CachedIntValue hydrogenMaxBurnPerTick; + public final CachedLongValue etheneDensity; public final CachedLongValue solarGeneration; public final CachedIntValue turbineBladesPerCoil; @@ -112,10 +112,12 @@ public class GeneratorsConfig extends BaseMekanismConfig { GeneratorsConfigTranslations.SERVER_GENERATOR_GAS.applyToBuilder(builder).push("gas_generator"); gbgTankCapacity = CachedLongValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_TANK_CAPACITY.applyToBuilder(builder) .defineInRange("tankCapacity", FluidType.BUCKET_VOLUME, 1, Long.MAX_VALUE)); - etheneBurnTicks = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_ETHENE_BURN_TICKS.applyToBuilder(builder) - .defineInRange("etheneBurnTicks", 2 * SharedConstants.TICKS_PER_SECOND, 1, Integer.MAX_VALUE)); - etheneDensityMultiplier = CachedDoubleValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_ETHENE_DENSITY.applyToBuilder(builder) - .defineInRange("etheneDensityMultiplier", 40D, 1, Integer.MAX_VALUE)); + etheneMaxBurnPerTick = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_ETHENE_MAX_BURN_PER_TICK.applyToBuilder(builder) + .defineInRange("etheneMaxBurnPerTick", 10, 1, Integer.MAX_VALUE)); + etheneDensity = CachedLongValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_ETHENE_DENSITY.applyToBuilder(builder) + .defineInRange("etheneDensity", 8L, 1, Integer.MAX_VALUE)); + hydrogenMaxBurnPerTick = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_HYDROGEN_MAX_BURN_PER_TICK.applyToBuilder(builder) + .defineInRange("hydrogenMaxBurnPerTick", 10, 1, Integer.MAX_VALUE)); builder.pop(); GeneratorsConfigTranslations.SERVER_GENERATOR_WIND.applyToBuilder(builder).push("wind_generator"); diff --git a/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java b/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java index 4980ee59a66..063041a3932 100644 --- a/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java +++ b/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java @@ -36,10 +36,12 @@ public enum GeneratorsConfigTranslations implements IConfigTranslation { SERVER_GENERATOR_GAS("server.generator.gas", "Gas-Burning Generator", "Settings for configuring Gas-Burning Generators", true), SERVER_GENERATOR_GAS_TANK_CAPACITY("server.generator.gas.tank_capacity", "Tank Capacity", "The capacity in mB of the chemical tank in the Gas-Burning Generator."), - SERVER_GENERATOR_GAS_ETHENE_BURN_TICKS("server.generator.gas.ethene.burn_ticks", "Ethene Burn Ticks", - "The number of ticks each mB of Ethene burns for in the Gas-Burning Generator."), - SERVER_GENERATOR_GAS_ETHENE_DENSITY("server.generator.gas.ethene.density", "Ethene Energy Density Multiplier", - "Multiplier for calculating the energy density of Ethene (1 mB Hydrogen + 2 * bioGeneration * densityMultiplier)."), + SERVER_GENERATOR_GAS_ETHENE_MAX_BURN_PER_TICK("server.generator.gas.ethene.max_per_tick", "Max Ethene Burned per Tick", + "Maximum mB of Ethene to burn in a tick (when tank full). A fraction of this will be burned at maximum each tick depending on how full the fuel tank is."), + SERVER_GENERATOR_GAS_HYDROGEN_MAX_BURN_PER_TICK("server.generator.gas.hydrogen.max_per_tick", "Max Hydrogen Burned per Tick", + "Maximum mB of Hydrogen to burn in a tick (when tank full). A fraction of this will be burned at maximum each tick depending on how full the fuel tank is."), + SERVER_GENERATOR_GAS_ETHENE_DENSITY("server.generator.gas.ethene.density2", "Ethene Energy Density", + "How many Joules should 1mB of Ethene generate."), SERVER_GENERATOR_WIND("server.generator.wind", "Wind Generator", "Settings for configuring Wind Generators", true), SERVER_GENERATOR_WIND_GEN_MIN("server.generator.wind.gen.min", "Min Energy Generation", "Minimum energy generation in Joules/t that the Wind Generator can produce."), diff --git a/src/generators/java/mekanism/generators/common/registries/GeneratorsBlockTypes.java b/src/generators/java/mekanism/generators/common/registries/GeneratorsBlockTypes.java index 53401bde2c5..dd3eb1b5bcc 100644 --- a/src/generators/java/mekanism/generators/common/registries/GeneratorsBlockTypes.java +++ b/src/generators/java/mekanism/generators/common/registries/GeneratorsBlockTypes.java @@ -119,7 +119,7 @@ public boolean handle(Level level, BlockPos pos, BlockState state, DATA d public static final Generator GAS_BURNING_GENERATOR = GeneratorBuilder .createGenerator(() -> GeneratorsTileEntityTypes.GAS_BURNING_GENERATOR, GeneratorsLang.DESCRIPTION_GAS_BURNING_GENERATOR) .withGui(() -> GeneratorsContainerTypes.GAS_BURNING_GENERATOR) - .withEnergyConfig(() -> 1_000 * MekanismConfig.general.FROM_H2.get()) + .withEnergyConfig(() -> MekanismGeneratorsConfig.generators.hydrogenMaxBurnPerTick.getAsLong() * MekanismConfig.general.FROM_H2.get()) .withCustomShape(BlockShapes.GAS_BURNING_GENERATOR) .with(AttributeCustomSelectionBox.JSON) .withSound(GeneratorsSounds.GAS_BURNING_GENERATOR) diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index c49feb05cad..0585ffb2b9d 100644 --- a/src/generators/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/generators/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -19,7 +19,7 @@ public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator i private final SolarCheck[] solarChecks = new SolarCheck[8]; public TileEntityAdvancedSolarGenerator(BlockPos pos, BlockState state) { - super(GeneratorsBlocks.ADVANCED_SOLAR_GENERATOR, pos, state, MekanismGeneratorsConfig.generators.advancedSolarGeneration); + super(GeneratorsBlocks.ADVANCED_SOLAR_GENERATOR, pos, state); } @Override @@ -52,7 +52,6 @@ protected void recheckSettings() { } totalPeak += solarChecks[i].getPeakMultiplier(); } - updateMaxOutputRaw(MathUtils.clampToLong(getConfiguredMax() * (totalPeak / 9))); } @Override diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 48ab1ca4271..6464920baf7 100644 --- a/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -51,7 +51,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator { private static final int BIO_FUEL_PER_ITEM = 40; public TileEntityBioGenerator(BlockPos pos, BlockState state) { - super(GeneratorsBlocks.BIO_GENERATOR, pos, state, MekanismGeneratorsConfig.generators.bioGeneration); + super(GeneratorsBlocks.BIO_GENERATOR, pos, state); } private static int biofuelFromItem(@NotNull ItemStack stack) { diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index d32f8fe25b7..e1883b72b2c 100644 --- a/src/generators/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/generators/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -4,6 +4,7 @@ import mekanism.api.AutomationType; import mekanism.api.IContentsListener; import mekanism.api.RelativeSide; +import mekanism.api.chemical.Chemical; import mekanism.api.chemical.ChemicalStack; import mekanism.api.chemical.IChemicalTank; import mekanism.api.chemical.attribute.ChemicalAttributes.Fuel; @@ -14,16 +15,12 @@ import mekanism.common.capabilities.holder.chemical.IChemicalTankHolder; import mekanism.common.capabilities.holder.slot.IInventorySlotHolder; import mekanism.common.capabilities.holder.slot.InventorySlotHelper; -import mekanism.common.config.MekanismConfig; -import mekanism.common.config.listener.ConfigBasedCachedLongSupplier; import mekanism.common.integration.computer.SpecialComputerMethodWrapper.ComputerChemicalTankWrapper; import mekanism.common.integration.computer.SpecialComputerMethodWrapper.ComputerIInventorySlotWrapper; import mekanism.common.integration.computer.annotation.ComputerMethod; import mekanism.common.integration.computer.annotation.WrappingComputerMethod; import mekanism.common.inventory.container.MekanismContainer; import mekanism.common.inventory.container.slot.SlotOverlay; -import mekanism.common.inventory.container.sync.SyncableDouble; -import mekanism.common.inventory.container.sync.SyncableInt; import mekanism.common.inventory.container.sync.SyncableLong; import mekanism.common.inventory.slot.EnergyInventorySlot; import mekanism.common.inventory.slot.chemical.ChemicalInventorySlot; @@ -37,18 +34,16 @@ public class TileEntityGasGenerator extends TileEntityGenerator { - /** max operations * Joules produced */ - private static final ConfigBasedCachedLongSupplier MAX_HYDROGEN_PRODUCTION = new ConfigBasedCachedLongSupplier(() -> 256 * MekanismConfig.general.FROM_H2.get(), MekanismConfig.general.FROM_H2); /** * The tank this block is storing fuel in. */ @WrappingComputerMethod(wrapper = ComputerChemicalTankWrapper.class, methodNames = {"getFuel", "getFuelCapacity", "getFuelNeeded", "getFuelFilledPercentage"}, docPlaceholder = "fuel tank") public IChemicalTank fuelTank; - private long burnTicks; - private int maxBurnTicks; - private long generationRate = 0; - private double gasUsedLastTick; + @Nullable + private Fuel cachedFuel = null; + + private long gasUsedLastTick; @WrappingComputerMethod(wrapper = ComputerIInventorySlotWrapper.class, methodNames = "getFuelItem", docPlaceholder = "fuel item slot") ChemicalInventorySlot fuelSlot; @@ -56,7 +51,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator { EnergyInventorySlot energySlot; public TileEntityGasGenerator(BlockPos pos, BlockState state) { - super(GeneratorsBlocks.GAS_BURNING_GENERATOR, pos, state, MekanismConfig.general.FROM_H2); + super(GeneratorsBlocks.GAS_BURNING_GENERATOR, pos, state); } @NotNull @@ -83,69 +78,37 @@ protected boolean onUpdateServer() { boolean sendUpdatePacket = super.onUpdateServer(); energySlot.drainContainer(); fuelSlot.fillTank(); + gasUsedLastTick = 0; - if (!fuelTank.isEmpty() && canFunction() && getEnergyContainer().insert(generationRate, Action.SIMULATE, AutomationType.INTERNAL) == 0L) { - setActive(true); - if (!fuelTank.isEmpty()) { - Fuel fuel = fuelTank.getType().get(Fuel.class); - if (fuel != null) { - //Ensure valid data - maxBurnTicks = Math.max(1, fuel.getBurnTicks()); - generationRate = fuel.getEnergyPerTick(); - } - } + if (!fuelTank.isEmpty() && canFunction() && cachedFuel != null) { - long toUse = getToUse(); - long toUseGeneration = MathUtils.multiplyClamped(generationRate, toUse); - updateMaxOutputRaw(Math.max(MekanismConfig.general.FROM_H2.get(), toUseGeneration)); + //how full the tank is, poor-man's "pressure" measurement + double fullness = fuelTank.getStored() / (double) fuelTank.getCapacity(); - long total = burnTicks + fuelTank.getStored() * maxBurnTicks; - total -= toUse; - getEnergyContainer().insert(toUseGeneration, Action.EXECUTE, AutomationType.INTERNAL); - if (!fuelTank.isEmpty()) { - //TODO: Improve this as it is sort of hacky - fuelTank.setStack(fuelTank.getStack().copyWithAmount(total / maxBurnTicks)); - } - burnTicks = total % maxBurnTicks; - gasUsedLastTick = toUse / (double) maxBurnTicks; - } else { - if (fuelTank.isEmpty() && burnTicks == 0) { - reset(); + //maximum amount that can be produced AND stored + long maxJoulesThisTick; + long energyDensity = cachedFuel.getEnergyDensity(); + maxJoulesThisTick = energyDensity * Math.min((long) Math.ceil(cachedFuel.getMaxBurnPerTick() * fullness), fuelTank.getStored()); + if (maxJoulesThisTick > 0) { + maxJoulesThisTick -= getEnergyContainer().insert(maxJoulesThisTick, Action.SIMULATE, AutomationType.INTERNAL); } - gasUsedLastTick = 0; - setActive(false); - } - return sendUpdatePacket; - } - - private void reset() { - burnTicks = 0; - maxBurnTicks = 0; - generationRate = 0L; - updateMaxOutputRaw(MekanismConfig.general.FROM_H2.get()); - } - private long getToUse() { - if (generationRate == 0L || fuelTank.isEmpty()) { - return 0; + if (maxJoulesThisTick > 0) { + //calculate the mB for this amount of energy, rounded up + long mbThisTick = Math.ceilDiv(maxJoulesThisTick, energyDensity); + getEnergyContainer().insert(maxJoulesThisTick, Action.EXECUTE, AutomationType.INTERNAL); + fuelTank.extract(mbThisTick, Action.EXECUTE, AutomationType.INTERNAL); + gasUsedLastTick = mbThisTick; + } } - long max = (long) Math.ceil(MAX_HYDROGEN_PRODUCTION.getAsLong() * (fuelTank.getStored() / (double) fuelTank.getCapacity())); - max = Math.min(maxBurnTicks * fuelTank.getStored() + burnTicks, max); - max = Math.min(MathUtils.clampToLong(getEnergyContainer().getNeeded() / (double) generationRate), max); - return max; - } - public long getGenerationRate() { - return generationRate; + setActive(gasUsedLastTick != 0); + return sendUpdatePacket; } @ComputerMethod(nameOverride = "getBurnRate") - public double getUsed() { - return Math.round(gasUsedLastTick * 100) / 100D; - } - - public int getMaxBurnTicks() { - return maxBurnTicks; + public long getUsed() { + return gasUsedLastTick; } @Override @@ -161,20 +124,25 @@ protected boolean makesComparatorDirty(ContainerType type) { @Override public void addContainerTrackers(MekanismContainer container) { super.addContainerTrackers(container); - container.track(SyncableLong.create(this::getGenerationRate, value -> generationRate = value)); - container.track(syncableMaxOutput()); - container.track(SyncableDouble.create(this::getUsed, value -> gasUsedLastTick = value)); - container.track(SyncableInt.create(this::getMaxBurnTicks, value -> maxBurnTicks = value)); + container.track(SyncableLong.create(this::getUsed, value -> gasUsedLastTick = value)); + } + + @Nullable + public Fuel getCachedFuel() { + return this.cachedFuel; } //Methods relating to IComputerTile @Override long getProductionRate() { - return MathUtils.clampToLong(getGenerationRate() * getUsed() * getMaxBurnTicks()); + if (cachedFuel == null) { + return 0; + } + return MathUtils.clampToLong(cachedFuel.getEnergyDensity() * getUsed()); } //End methods IComputerTile - //Implementation of gas tank that on no longer being empty updates the output rate of this generator + //Implementation of gas tank that on no longer being empty updates the cached fuel private class FuelTank extends VariableCapacityChemicalTank { protected FuelTank(@Nullable IContentsListener listener) { @@ -183,24 +151,21 @@ protected FuelTank(@Nullable IContentsListener listener) { @Override public void setStack(@NotNull ChemicalStack stack) { - boolean wasEmpty = isEmpty(); + Chemical oldChemical = getType(); super.setStack(stack); - recheckOutput(stack, wasEmpty); + recheckOutput(stack, oldChemical); } @Override public void setStackUnchecked(@NotNull ChemicalStack stack) { - boolean wasEmpty = isEmpty(); + Chemical oldChemical = getType(); super.setStackUnchecked(stack); - recheckOutput(stack, wasEmpty); + recheckOutput(stack, oldChemical); } - private void recheckOutput(@NotNull ChemicalStack stack, boolean wasEmpty) { - if (wasEmpty && !stack.isEmpty()) { - Fuel fuel = getType().get(Fuel.class); - if (fuel != null) { - updateMaxOutputRaw(fuel.getEnergyPerTick()); - } + private void recheckOutput(@NotNull ChemicalStack stack, Chemical oldChemical) { + if (oldChemical != getType() && !stack.isEmpty()) { + cachedFuel = getType().get(Fuel.class); } } } diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntityGenerator.java index 1530b1f5c57..4e5d867dcb2 100644 --- a/src/generators/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/generators/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -2,10 +2,8 @@ import java.util.ArrayList; import java.util.List; -import java.util.function.LongSupplier; import mekanism.api.IContentsListener; import mekanism.api.RelativeSide; -import mekanism.api.math.MathUtils; import mekanism.api.providers.IBlockProvider; import mekanism.common.capabilities.energy.BasicEnergyContainer; import mekanism.common.capabilities.energy.MachineEnergyContainer; @@ -13,8 +11,6 @@ import mekanism.common.capabilities.holder.energy.IEnergyContainerHolder; import mekanism.common.integration.computer.annotation.ComputerMethod; import mekanism.common.integration.energy.BlockEnergyCapabilityCache; -import mekanism.common.inventory.container.sync.ISyncableData; -import mekanism.common.inventory.container.sync.SyncableLong; import mekanism.common.tile.base.TileEntityMekanism; import mekanism.common.util.CableUtils; import net.minecraft.core.BlockPos; @@ -30,18 +26,13 @@ public abstract class TileEntityGenerator extends TileEntityMekanism { @Nullable private List outputCaches; - /** - * Output per tick this generator can transfer. - */ - private long maxOutput; private BasicEnergyContainer energyContainer; /** * Generator -- a block that produces energy. It has a certain amount of fuel it can store as well as an output rate. */ - public TileEntityGenerator(IBlockProvider blockProvider, BlockPos pos, BlockState state, @NotNull LongSupplier maxOutput) { + public TileEntityGenerator(IBlockProvider blockProvider, BlockPos pos, BlockState state) { super(blockProvider, pos, state); - updateMaxOutputRaw(maxOutput.getAsLong()); } protected RelativeSide[] getEnergySides() { @@ -70,7 +61,7 @@ protected boolean onUpdateServer() { outputCaches.add(BlockEnergyCapabilityCache.create((ServerLevel) level, worldPosition.relative(side), side.getOpposite())); } } - CableUtils.emit(outputCaches, energyContainer, getMaxOutput()); + CableUtils.emit(outputCaches, energyContainer); } return sendUpdatePacket; } @@ -81,19 +72,6 @@ protected void invalidateDirectionCaches(Direction newDirection) { outputCaches = null; } - @ComputerMethod - public long getMaxOutput() { - return maxOutput; - } - - protected void updateMaxOutputRaw(long maxOutput) { - this.maxOutput = MathUtils.multiplyClamped(maxOutput, 2); - } - - protected ISyncableData syncableMaxOutput() { - return SyncableLong.create(this::getMaxOutput, value -> maxOutput = value); - } - public BasicEnergyContainer getEnergyContainer() { return energyContainer; } diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index ebe0f6dcff0..973b9fed507 100644 --- a/src/generators/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/generators/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -76,7 +76,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator { EnergyInventorySlot energySlot; public TileEntityHeatGenerator(BlockPos pos, BlockState state) { - super(GeneratorsBlocks.HEAT_GENERATOR, pos, state, MAX_PRODUCTION); + super(GeneratorsBlocks.HEAT_GENERATOR, pos, state); } @NotNull diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 1a3c714b262..77de3cde17b 100644 --- a/src/generators/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/generators/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -1,6 +1,5 @@ package mekanism.generators.common.tile; -import java.util.function.LongSupplier; import mekanism.api.Action; import mekanism.api.AutomationType; import mekanism.api.IContentsListener; @@ -38,11 +37,11 @@ public class TileEntitySolarGenerator extends TileEntityGenerator { protected SolarCheck solarCheck; public TileEntitySolarGenerator(BlockPos pos, BlockState state) { - this(GeneratorsBlocks.SOLAR_GENERATOR, pos, state, MekanismGeneratorsConfig.generators.solarGeneration); + this(GeneratorsBlocks.SOLAR_GENERATOR, pos, state); } - protected TileEntitySolarGenerator(IBlockProvider blockProvider, BlockPos pos, BlockState state, @NotNull LongSupplier maxOutput) { - super(blockProvider, pos, state, maxOutput); + protected TileEntitySolarGenerator(IBlockProvider blockProvider, BlockPos pos, BlockState state) { + super(blockProvider, pos, state); } @NotNull @@ -85,7 +84,6 @@ protected void recheckSettings() { return; } solarCheck = new SolarCheck(level, worldPosition); - updateMaxOutputRaw(MathUtils.clampToLong(getConfiguredMax() * solarCheck.getPeakMultiplier())); } protected boolean checkCanSeeSun() { @@ -131,7 +129,6 @@ public long getProductionRate() { public void addContainerTrackers(MekanismContainer container) { super.addContainerTrackers(container); container.track(SyncableBoolean.create(this::canSeeSun, value -> seesSun = value)); - container.track(syncableMaxOutput()); container.track(SyncableLong.create(this::getProductionRate, value -> lastProductionAmount = value)); } diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index c8ec19e48ea..eef1df57cd5 100644 --- a/src/generators/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/generators/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -37,7 +37,7 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou EnergyInventorySlot energySlot; public TileEntityWindGenerator(BlockPos pos, BlockState state) { - super(GeneratorsBlocks.WIND_GENERATOR, pos, state, MekanismGeneratorsConfig.generators.windGenerationMax); + super(GeneratorsBlocks.WIND_GENERATOR, pos, state); } @NotNull diff --git a/src/main/java/mekanism/common/integration/crafttweaker/chemical/attribute/CrTFuelAttribute.java b/src/main/java/mekanism/common/integration/crafttweaker/chemical/attribute/CrTFuelAttribute.java index 2c9e2fdd7cb..c472a0559c4 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/chemical/attribute/CrTFuelAttribute.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/chemical/attribute/CrTFuelAttribute.java @@ -33,20 +33,20 @@ public static ChemicalAttributes.Fuel create(int burnTicks, long energyDensity) } /** - * Gets the number of ticks this fuel burns for. + * Gets the max mb to burn per tick */ @ZenCodeType.Method - @ZenCodeType.Getter("burnTicks") - public static int getBurnTicks(ChemicalAttributes.Fuel _this) { - return _this.getBurnTicks(); + @ZenCodeType.Getter("maxBurnPerTick") + public static int getMaxBurnPerTick(ChemicalAttributes.Fuel _this) { + return _this.getMaxBurnPerTick(); } /** * Gets the amount of energy produced per tick of this fuel. */ @ZenCodeType.Method - @ZenCodeType.Getter("energyPerTick") - public static long getEnergyPerTick(ChemicalAttributes.Fuel _this) { - return _this.getEnergyPerTick(); + @ZenCodeType.Getter("maxJoulesPerTick") + public static long getMaxJoulesPerTick(ChemicalAttributes.Fuel _this) { + return _this.getMaxJoulesPerTick(); } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/registries/MekanismChemicals.java b/src/main/java/mekanism/common/registries/MekanismChemicals.java index 8392901fbb2..0e03969696f 100644 --- a/src/main/java/mekanism/common/registries/MekanismChemicals.java +++ b/src/main/java/mekanism/common/registries/MekanismChemicals.java @@ -6,16 +6,14 @@ import mekanism.api.chemical.Chemical; import mekanism.api.chemical.ChemicalBuilder; import mekanism.api.chemical.attribute.ChemicalAttributes.CooledCoolant; -import mekanism.api.chemical.attribute.ChemicalAttributes.Fuel; import mekanism.api.chemical.attribute.ChemicalAttributes.HeatedCoolant; import mekanism.api.chemical.attribute.ChemicalAttributes.Radiation; import mekanism.api.providers.IChemicalProvider; import mekanism.api.text.EnumColor; import mekanism.common.ChemicalConstants; import mekanism.common.Mekanism; -import mekanism.common.config.MekanismConfig; -import mekanism.common.registration.impl.DeferredChemical; import mekanism.common.registration.impl.ChemicalDeferredRegister; +import mekanism.common.registration.impl.DeferredChemical; import mekanism.common.registration.impl.SlurryRegistryObject; import mekanism.common.resource.PrimaryResource; import mekanism.common.util.EnumUtils; @@ -36,7 +34,7 @@ private MekanismChemicals() { public static final DeferredChemical REDSTONE = CHEMICALS.registerInfuse("redstone", 0xB30505); public static final DeferredChemical CARBON = CHEMICALS.registerInfuse("carbon", 0x2C2C2C); - public static final DeferredChemical HYDROGEN = CHEMICALS.registerGas(ChemicalConstants.HYDROGEN, new Fuel(() -> 1, MekanismConfig.general.FROM_H2)); + public static final DeferredChemical HYDROGEN = CHEMICALS.registerGas(ChemicalConstants.HYDROGEN); public static final DeferredChemical OXYGEN = CHEMICALS.registerGas(ChemicalConstants.OXYGEN); public static final DeferredChemical STEAM = CHEMICALS.register("steam", () -> new Chemical(ChemicalBuilder.builder(Mekanism.rl("liquid/steam")).gaseous())); public static final DeferredChemical WATER_VAPOR = CHEMICALS.register("water_vapor", () -> new Chemical(ChemicalBuilder.builder(Mekanism.rl("liquid/steam")).gaseous())); diff --git a/src/main/java/mekanism/common/util/text/TooltipHelper.java b/src/main/java/mekanism/common/util/text/TooltipHelper.java index b41d0b407a1..e7f1f536d46 100644 --- a/src/main/java/mekanism/common/util/text/TooltipHelper.java +++ b/src/main/java/mekanism/common/util/text/TooltipHelper.java @@ -31,4 +31,16 @@ public String getFormattedNumber(long number) { public Component getPercent(double ratio) { return TextUtils.getPercent(ratio); } + + @Override + public Component getEnergyDisplay(long joules, boolean perTick) { + Component energyDisplay = MekanismUtils.getEnergyDisplayShort(joules); + return perTick ? MekanismLang.GENERIC_PER_TICK.translate(energyDisplay) : energyDisplay; + } + + @Override + public Component getFluidDisplay(long mb, boolean perTick) { + Component formattedMb = Component.literal(getFormattedNumber(mb)); + return perTick ? MekanismLang.GENERIC_PER_TICK.translate(formattedMb) : formattedMb; + } } \ No newline at end of file From 9c16c1ee1cc4ca3a035c4aa742b773f62c5e8e48 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Sat, 28 Sep 2024 20:53:28 +0800 Subject: [PATCH 14/20] fix bad bio recipes --- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 13 +++++---- .../crushing/biofuel/carved_pumpkin.json | 2 +- .../recipe/crushing/biofuel/crops.json | 27 +++++++++++++++++-- .../recipe/crushing/biofuel/hay_block.json | 2 +- .../recipe/crushing/biofuel/lily_pad.json | 2 +- .../crushing/biofuel/poisonous_potato.json | 11 -------- .../crushing/biofuel/warped_wart_block.json | 4 +-- .../recipe/impl/CrusherRecipeProvider.java | 11 ++++---- .../common/config/GeneratorsConfig.java | 7 +++-- .../config/GeneratorsConfigTranslations.java | 1 + .../common/tile/TileEntityBioGenerator.java | 12 ++------- 11 files changed, 49 insertions(+), 43 deletions(-) delete mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/poisonous_potato.json diff --git a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 5e1434b419c..1f29e899dde 100644 --- a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// Recipes 2024-09-27T21:50:36.7803603 Recipes +// Recipes 2024-09-28T20:48:51.0384944 Recipes 0fc9e539372429b3e5df0dc0595978c4fc45d201 data/mekanism/recipe/antiprotonic_nucleosynthesizer.json 6d20b08ca1cc993d4c39a761361dce522fe45a7a data/mekanism/recipe/atomic_disassembler.json 00928ea6e8b57d257c773343c0dc0d337c9d4f5f data/mekanism/recipe/bin/advanced.json @@ -334,20 +334,20 @@ e6bee411ee35750387146c8b3f65fd4f1b0c8e5c data/mekanism/recipe/crushing/biofuel/b fa078f3e56a8999b80d8e1ff608c57b7a9a55744 data/mekanism/recipe/crushing/biofuel/big_dripleaf.json ce372a62d214ed72ef101eefe1421d578fef6314 data/mekanism/recipe/crushing/biofuel/bread.json 42c38ac5040e073af1d776d1f054d97b7cd98c4b data/mekanism/recipe/crushing/biofuel/cake.json -49641a76562333a630ab47d8fcdd8a2e3c8af7c4 data/mekanism/recipe/crushing/biofuel/carved_pumpkin.json +c646108a5cccc0838e36fbc4f27194057b2e0673 data/mekanism/recipe/crushing/biofuel/carved_pumpkin.json 0b32880464e9abdcfc4ad1cb3813bcd53939ea05 data/mekanism/recipe/crushing/biofuel/crimson_roots.json -5eae90012568bd9f4138e611c715ccf4d935e120 data/mekanism/recipe/crushing/biofuel/crops.json +8d51513c868317d29239de87a80529544ef2d4f3 data/mekanism/recipe/crushing/biofuel/crops.json f66b4de1132bd40e06ccc748944ba0fc92c14f10 data/mekanism/recipe/crushing/biofuel/dried_kelp.json e62a8112ac9be2fabfcb2dbab5607256705f3be2 data/mekanism/recipe/crushing/biofuel/dried_kelp_block.json 7a88cb56ffe9f0bd5c307f589690fe8c3336621f data/mekanism/recipe/crushing/biofuel/fern.json 034bbce87fb1ac34fe7eff5939347fe0097aa92b data/mekanism/recipe/crushing/biofuel/fungus.json 2ee51cdbd046107cc45e06b59bb986cc133e8b9b data/mekanism/recipe/crushing/biofuel/glow_lichen.json b331efd2f9cd783914aa4b90d66efe912f41c185 data/mekanism/recipe/crushing/biofuel/hanging_roots.json -bd608094045a0a2e1680580170a6fef4654c89e5 data/mekanism/recipe/crushing/biofuel/hay_block.json +558f70f2a0cc89046355abf465723a7ebd00452d data/mekanism/recipe/crushing/biofuel/hay_block.json 49a4b33e46c1258a3628d5a21c1ef59d5ad8b247 data/mekanism/recipe/crushing/biofuel/kelp.json 7c41101a3115063fa26930e98e2e1265f8614d1a data/mekanism/recipe/crushing/biofuel/large_fern.json 19e57528a66775dd441346c9366328517a253d7e data/mekanism/recipe/crushing/biofuel/leaves.json -b331efd2f9cd783914aa4b90d66efe912f41c185 data/mekanism/recipe/crushing/biofuel/lily_pad.json +29c28524ad936949844cd7865689276d9b19cce7 data/mekanism/recipe/crushing/biofuel/lily_pad.json e88cc7e629e0a03d612e73818fc4bb4c341556b2 data/mekanism/recipe/crushing/biofuel/melon.json 19fed37b2c4e1c58fbf8356fa3b4848dfc6f7b4c data/mekanism/recipe/crushing/biofuel/melon_slice.json 4ccfe0b52c8a5209901ce4e35ba39d2453b8ef86 data/mekanism/recipe/crushing/biofuel/moss_block.json @@ -356,7 +356,6 @@ f8b0615e7712076171c6b7625395fc761e6e1f17 data/mekanism/recipe/crushing/biofuel/m d092cf5f1294088fa8380cbc4d450e6ec54ef7a4 data/mekanism/recipe/crushing/biofuel/nether_sprouts.json f12fdf86147c9769c646ee1f37162c99183e8a0e data/mekanism/recipe/crushing/biofuel/nether_wart_block.json c012958819393463d6173ac88718ff9c85b59625 data/mekanism/recipe/crushing/biofuel/pitcher_pod.json -6e576f087b398236e14a8c9e949759e0cd6e0a86 data/mekanism/recipe/crushing/biofuel/poisonous_potato.json 7f54ac63f5856d2139cd1a6cd5a71fc6ef99f144 data/mekanism/recipe/crushing/biofuel/pumpkin.json 06240c36a88fb4e6ff0f15e4265116cd8b1c7718 data/mekanism/recipe/crushing/biofuel/rotten_flesh.json 5114fc3ab35ee5233adb14bcd3db79b1fb97f222 data/mekanism/recipe/crushing/biofuel/saplings.json @@ -374,7 +373,7 @@ b95552f5e2f0cf482524bd2f74b450906e80e8b9 data/mekanism/recipe/crushing/biofuel/s 1f877557fe1dae73012f3e0ab02f54de7332e2c9 data/mekanism/recipe/crushing/biofuel/torchflower_seeds.json 29a2fb4570dafc64305cc5eca18523e6761ae205 data/mekanism/recipe/crushing/biofuel/vines.json 61cafe715b49e82ec6ef78c1e2eb7923ee66a57b data/mekanism/recipe/crushing/biofuel/warped_roots.json -801972f577aa393be04d1df44f0374aee251b452 data/mekanism/recipe/crushing/biofuel/warped_wart_block.json +d1898bc5a5a1fe084eb3fefd55f996ce45feeb60 data/mekanism/recipe/crushing/biofuel/warped_wart_block.json 2d0fec36d3421b9d116344605a256df33bedb11d data/mekanism/recipe/crushing/blackstone/bricks_to_cracked_bricks.json a7d586cd59e80c8455ccb8be19c1d63376754f61 data/mekanism/recipe/crushing/blackstone/chiseled_bricks_to_bricks.json d7d123327172eb337d782d8993a32bcb1ef7306b data/mekanism/recipe/crushing/blackstone/from_cracked_bricks.json diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/carved_pumpkin.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/carved_pumpkin.json index 5e266abf635..73974d631f4 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/carved_pumpkin.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/carved_pumpkin.json @@ -5,7 +5,7 @@ "item": "minecraft:carved_pumpkin" }, "output": { - "count": 5, + "count": 2, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crops.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crops.json index 0bd50f61ccb..ae014b658b6 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crops.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/crops.json @@ -1,8 +1,31 @@ { "type": "mekanism:crushing", "input": { - "count": 1, - "tag": "c:crops" + "type": "neoforge:compound", + "children": [ + { + "item": "minecraft:carrot" + }, + { + "item": "minecraft:cactus" + }, + { + "item": "minecraft:potato" + }, + { + "item": "minecraft:poisonous_potato" + }, + { + "item": "minecraft:wheat" + }, + { + "item": "minecraft:beetroot" + }, + { + "item": "minecraft:nether_wart" + } + ], + "count": 1 }, "output": { "count": 2, diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/hay_block.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/hay_block.json index 38a108bccfd..81d8578227d 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/hay_block.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/hay_block.json @@ -2,7 +2,7 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:hanging_roots" + "item": "minecraft:hay_block" }, "output": { "count": 18, diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lily_pad.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lily_pad.json index f0537cd57bb..40d747a6437 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lily_pad.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/lily_pad.json @@ -2,7 +2,7 @@ "type": "mekanism:crushing", "input": { "count": 1, - "item": "minecraft:hanging_roots" + "item": "minecraft:lily_pad" }, "output": { "count": 1, diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/poisonous_potato.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/poisonous_potato.json deleted file mode 100644 index fa985362f90..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/poisonous_potato.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "mekanism:crushing", - "input": { - "count": 1, - "item": "minecraft:poisonous_potato" - }, - "output": { - "count": 2, - "id": "mekanism:bio_fuel" - } -} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_wart_block.json b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_wart_block.json index 4ae627a2211..654f07c5a43 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_wart_block.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/crushing/biofuel/warped_wart_block.json @@ -1,11 +1,11 @@ { "type": "mekanism:crushing", "input": { - "count": 4, + "count": 1, "item": "minecraft:warped_wart_block" }, "output": { - "count": 1, + "count": 4, "id": "mekanism:bio_fuel" } } \ No newline at end of file diff --git a/src/datagen/main/java/mekanism/common/recipe/impl/CrusherRecipeProvider.java b/src/datagen/main/java/mekanism/common/recipe/impl/CrusherRecipeProvider.java index b46af2e599a..da19fa9643c 100644 --- a/src/datagen/main/java/mekanism/common/recipe/impl/CrusherRecipeProvider.java +++ b/src/datagen/main/java/mekanism/common/recipe/impl/CrusherRecipeProvider.java @@ -524,20 +524,20 @@ private void addCrusherBioFuelRecipes(RecipeOutput consumer, String basePath) { biofuel(consumer, basePath, "big_dripleaf", 2, 1, Items.BIG_DRIPLEAF); biofuel(consumer, basePath, "bread", 4, 1, Items.BREAD); biofuel(consumer, basePath, "cake", 6, 1, Items.CAKE); - biofuel(consumer, basePath, "carved_pumpkin", 5, 1, Items.CARVED_PUMPKIN);//pumpkin minus 4 seeds (sawmill) + biofuel(consumer, basePath, "carved_pumpkin", 2, 1, Items.CARVED_PUMPKIN);//pumpkin minus 4 seeds (sawmill) biofuel(consumer, basePath, "crimson_roots", 1, 1, Items.CRIMSON_ROOTS); - biofuel(consumer, basePath, "crops", 2, 1, Tags.Items.CROPS); + biofuel(consumer, basePath, "crops", 2, 1, Items.CARROT, Items.CACTUS, Items.POTATO, Items.POISONOUS_POTATO, Items.WHEAT, Items.BEETROOT, Items.NETHER_WART); biofuel(consumer, basePath, "dried_kelp", 1, 1, Items.DRIED_KELP); biofuel(consumer, basePath, "dried_kelp_block", 9, 1, Items.DRIED_KELP_BLOCK); biofuel(consumer, basePath, "fern", 2, 1, Items.FERN); biofuel(consumer, basePath, "fungus", 1, 1, Items.CRIMSON_FUNGUS, Items.WARPED_FUNGUS); biofuel(consumer, basePath, "glow_lichen", 1, 1, Items.GLOW_LICHEN); biofuel(consumer, basePath, "hanging_roots", 1, 1, Items.HANGING_ROOTS); - biofuel(consumer, basePath, "hay_block", 9 * 2, 1, Items.HANGING_ROOTS); + biofuel(consumer, basePath, "hay_block", 9 * 2, 1, Items.HAY_BLOCK); biofuel(consumer, basePath, "kelp", 2, 1, Items.KELP); biofuel(consumer, basePath, "large_fern", 3, 1, Items.LARGE_FERN); biofuel(consumer, basePath, "leaves", 1, 10, ItemTags.LEAVES); - biofuel(consumer, basePath, "lily_pad", 1, 1, Items.HANGING_ROOTS); + biofuel(consumer, basePath, "lily_pad", 1, 1, Items.LILY_PAD); biofuel(consumer, basePath, "melon", 6, 1, Items.MELON); biofuel(consumer, basePath, "melon_slice", 1, 1, Items.MELON_SLICE); biofuel(consumer, basePath, "moss_block", 2, 1, Items.MOSS_BLOCK); @@ -546,7 +546,6 @@ private void addCrusherBioFuelRecipes(RecipeOutput consumer, String basePath) { biofuel(consumer, basePath, "nether_sprouts", 1, 1, Items.NETHER_SPROUTS); biofuel(consumer, basePath, "nether_wart_block", 9 * 2, 1, Items.NETHER_WART_BLOCK); biofuel(consumer, basePath, "pitcher_pod", 1, 1, Items.PITCHER_POD); - biofuel(consumer, basePath, "poisonous_potato", 2, 1, Items.POISONOUS_POTATO); biofuel(consumer, basePath, "pumpkin", 6, 1, Items.PUMPKIN); biofuel(consumer, basePath, "rotten_flesh", 1, 1, Items.ROTTEN_FLESH); biofuel(consumer, basePath, "saplings", 1, 1, ItemTags.SAPLINGS); @@ -564,7 +563,7 @@ private void addCrusherBioFuelRecipes(RecipeOutput consumer, String basePath) { biofuel(consumer, basePath, "torchflower_seeds", 1, 1, Items.TORCHFLOWER_SEEDS); biofuel(consumer, basePath, "vines", 1, 1, Items.VINE, Items.TWISTING_VINES, Items.WEEPING_VINES); biofuel(consumer, basePath, "warped_roots", 1, 1, Items.WARPED_ROOTS); - biofuel(consumer, basePath, "warped_wart_block", 1, 4, Items.WARPED_WART_BLOCK); + biofuel(consumer, basePath, "warped_wart_block", 4, 1, Items.WARPED_WART_BLOCK); } private static void biofuel(RecipeOutput consumer, String basePath, String filename, int countOutput, int countInput, ItemLike... items) { diff --git a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java index 46404a23a39..63d91b1636a 100644 --- a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java +++ b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java @@ -21,6 +21,7 @@ public class GeneratorsConfig extends BaseMekanismConfig { public final CachedLongValue advancedSolarGeneration; public final CachedLongValue bioGeneration; + public final CachedIntValue bioFuelPerItem; public final CachedIntValue bioTankCapacity; public final CachedLongValue heatGeneration; @@ -91,9 +92,11 @@ public class GeneratorsConfig extends BaseMekanismConfig { GeneratorsConfigTranslations.SERVER_GENERATOR_BIO.applyToBuilder(builder).push("bio_generator"); bioGeneration = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_GENERATOR_BIO_GENERATION, - "bioGeneration", 30L); + "bioGeneration", 25L); + bioFuelPerItem = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_BIO_GENERATION.applyToBuilder(builder).defineInRange( + "bioFuelPerItem", 64, 1, Integer.MAX_VALUE)); bioTankCapacity = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_BIO_TANK_CAPACITY.applyToBuilder(builder) - .defineInRange("tankCapacity", 240, 1, Integer.MAX_VALUE)); + .defineInRange("tankCapacity", 200, 1, Integer.MAX_VALUE)); builder.pop(); GeneratorsConfigTranslations.SERVER_GENERATOR_HEAT.applyToBuilder(builder).push("heat_generator"); diff --git a/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java b/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java index 063041a3932..e4cd4dcd013 100644 --- a/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java +++ b/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java @@ -20,6 +20,7 @@ public enum GeneratorsConfigTranslations implements IConfigTranslation { SERVER_GENERATOR_BIO("server.generator.bio", "Bio Generator", "Settings for configuring Bio Generators", true), SERVER_GENERATOR_BIO_GENERATION("server.generator.bio.gen", "Energy Generation", "Energy produced by the Bio Generator in Joules/t."), + SERVER_GENERATOR_BIO_FUEL_PER_ITEM("server.generator.bio.fuel_per_item", "Fluid Per Biofuel Item", "How many mB one item of Biofuel adds to the generator's tank. Effectively defines how many ticks an item burns for and the total energy output of the Biofuel item."), SERVER_GENERATOR_BIO_TANK_CAPACITY("server.generator.bio.tank_capacity", "Tank Capacity", "The capacity in mB of the fluid tank in the Bio Generator."), SERVER_GENERATOR_HEAT("server.generator.heat", "Heat Generator", "Settings for configuring Heat Generators", true), diff --git a/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 6464920baf7..6da7d551fb9 100644 --- a/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/generators/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -41,14 +41,6 @@ public class TileEntityBioGenerator extends TileEntityGenerator { @WrappingComputerMethod(wrapper = ComputerIInventorySlotWrapper.class, methodNames = "getEnergyItem", docPlaceholder = "energy item") EnergyInventorySlot energySlot; private float lastFluidScale; - /** - * Based on 8J/t crushing cost, and 30J/t Bio generation, this leads to rates of generation (over time) of - *

1 fuel: 1.33x Less - *

2 fuel: 1.5x More - *

3 fuel: 2.25x More - *

etc - */ - private static final int BIO_FUEL_PER_ITEM = 40; public TileEntityBioGenerator(BlockPos pos, BlockState state) { super(GeneratorsBlocks.BIO_GENERATOR, pos, state); @@ -56,9 +48,9 @@ public TileEntityBioGenerator(BlockPos pos, BlockState state) { private static int biofuelFromItem(@NotNull ItemStack stack) { if (stack.is(MekanismTags.Items.FUELS_BIO)) { - return BIO_FUEL_PER_ITEM; + return MekanismGeneratorsConfig.generators.bioFuelPerItem.getAsInt(); } else if (stack.is(MekanismTags.Items.FUELS_BLOCK_BIO)) { - return BIO_FUEL_PER_ITEM * 9; + return 9 * MekanismGeneratorsConfig.generators.bioFuelPerItem.getAsInt(); } return 0; } From d81875a49af51f0d5d48b126947b06497e65e7c5 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Sat, 28 Sep 2024 20:53:46 +0800 Subject: [PATCH 15/20] lang for bio fuel per item config --- .../.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd | 6 +++--- .../assets/mekanismgenerators/lang/en_ud.json | 2 ++ .../assets/mekanismgenerators/lang/en_us.json | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd b/src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd index e411e99d909..7dc1320d7ab 100644 --- a/src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd +++ b/src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd @@ -1,5 +1,5 @@ -// 1.21.1 2024-09-28T16:48:23.0059666 Languages: en_us for mod: mekanismgenerators +// 1.21.1 2024-09-28T20:40:59.7178889 Languages: en_us for mod: mekanismgenerators b934b9aafaf6b98813ecd472c8a8f012383b4aa0 assets/mekanismgenerators/lang/en_au.json b934b9aafaf6b98813ecd472c8a8f012383b4aa0 assets/mekanismgenerators/lang/en_gb.json -fc4def4f3fa896b8d1a342fa874a6534b58a10f6 assets/mekanismgenerators/lang/en_ud.json -f5c1a38cfff668a61c54e11ab8a5653dc9c1c3c2 assets/mekanismgenerators/lang/en_us.json +fc699e688f7fb076b632288c99ca2b44e55be7b0 assets/mekanismgenerators/lang/en_ud.json +d05cfc0888cff96fde1fd4a4cfb3903db20c7b5a assets/mekanismgenerators/lang/en_us.json diff --git a/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json b/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json index b26bee8c3dc..4b5bded23c5 100644 --- a/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json +++ b/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json @@ -103,6 +103,8 @@ "configuration.mekanismgenerators.server.fusion.water_heating_ratio.tooltip": "˙uoᴉʇɐɹǝuǝᵷ ɯɐǝʇs puɐ 'ʇɐǝɥ xɐɯ ʇɔɐdɯᴉ ꞁꞁᴉM ˙ǝsn uᴉ sᴉ ᵷuᴉꞁooɔ ɹǝʇɐʍ uǝɥʍ ɹǝʇɐʍ oʇ pǝʇɐdᴉssᴉp sᴉ ʇɐɥʇ ᵷuᴉsɐɔ ǝɥʇ ɯoɹɟ ʇɐǝɥ ǝɥʇ ɟo uoᴉʇɔɐɹɟ ǝɥ⟘", "configuration.mekanismgenerators.server.generator.bio": "ɹoʇɐɹǝuǝ⅁ oᴉᗺ", "configuration.mekanismgenerators.server.generator.bio.button": "ɹoʇɐɹǝuǝ⅁ oᴉᗺ ʇᴉpƎ", + "configuration.mekanismgenerators.server.generator.bio.fuel_per_item": "ɯǝʇI ꞁǝnɟoᴉᗺ ɹǝԀ pᴉnꞁℲ", + "configuration.mekanismgenerators.server.generator.bio.fuel_per_item.tooltip": "˙ɯǝʇᴉ ꞁǝnɟoᴉᗺ ǝɥʇ ɟo ʇndʇno ʎᵷɹǝuǝ ꞁɐʇoʇ ǝɥʇ puɐ ɹoɟ suɹnq ɯǝʇᴉ uɐ sʞɔᴉʇ ʎuɐɯ ʍoɥ sǝuᴉɟǝp ʎꞁǝʌᴉʇɔǝɟɟƎ ˙ʞuɐʇ s,ɹoʇɐɹǝuǝᵷ ǝɥʇ oʇ sppɐ ꞁǝnɟoᴉᗺ ɟo ɯǝʇᴉ ǝuo ᗺɯ ʎuɐɯ ʍoH", "configuration.mekanismgenerators.server.generator.bio.gen": "uoᴉʇɐɹǝuǝ⅁ ʎᵷɹǝuƎ", "configuration.mekanismgenerators.server.generator.bio.gen.tooltip": "˙ʇ/sǝꞁnoՐ uᴉ ɹoʇɐɹǝuǝ⅁ oᴉᗺ ǝɥʇ ʎq pǝɔnpoɹd ʎᵷɹǝuƎ", "configuration.mekanismgenerators.server.generator.bio.tank_capacity": "ʎʇᴉɔɐdɐƆ ʞuɐ⟘", diff --git a/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json b/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json index 0d61b36d163..382a5a0e3ac 100644 --- a/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json +++ b/src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json @@ -103,6 +103,8 @@ "configuration.mekanismgenerators.server.fusion.water_heating_ratio.tooltip": "The fraction of the heat from the casing that is dissipated to water when water cooling is in use. Will impact max heat, and steam generation.", "configuration.mekanismgenerators.server.generator.bio": "Bio Generator", "configuration.mekanismgenerators.server.generator.bio.button": "Edit Bio Generator", + "configuration.mekanismgenerators.server.generator.bio.fuel_per_item": "Fluid Per Biofuel Item", + "configuration.mekanismgenerators.server.generator.bio.fuel_per_item.tooltip": "How many mB one item of Biofuel adds to the generator's tank. Effectively defines how many ticks an item burns for and the total energy output of the Biofuel item.", "configuration.mekanismgenerators.server.generator.bio.gen": "Energy Generation", "configuration.mekanismgenerators.server.generator.bio.gen.tooltip": "Energy produced by the Bio Generator in Joules/t.", "configuration.mekanismgenerators.server.generator.bio.tank_capacity": "Tank Capacity", From 5f6767be16588c1469f9cff6e55647a8f661c398 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Sat, 28 Sep 2024 21:24:41 +0800 Subject: [PATCH 16/20] GBG numbers --- .../.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 8 ++++---- .../mekanism/recipe/reaction/substrate/ethene_oxygen.json | 2 +- .../mekanism/recipe/reaction/substrate/water_ethene.json | 2 +- .../recipe/reaction/substrate/water_hydrogen.json | 2 +- .../recipe/impl/PressurizedReactionRecipeProvider.java | 6 +++--- .../generators/common/config/GeneratorsConfig.java | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 1f29e899dde..1c569e63f2f 100644 --- a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// Recipes 2024-09-28T20:48:51.0384944 Recipes +// Recipes 2024-09-28T21:18:11.069003 Recipes 0fc9e539372429b3e5df0dc0595978c4fc45d201 data/mekanism/recipe/antiprotonic_nucleosynthesizer.json 6d20b08ca1cc993d4c39a761361dce522fe45a7a data/mekanism/recipe/atomic_disassembler.json 00928ea6e8b57d257c773343c0dc0d337c9d4f5f data/mekanism/recipe/bin/advanced.json @@ -1564,9 +1564,9 @@ e781128e8c33fa234d5da120398b6e9837d8c04f data/mekanism/recipe/qio_redstone_adapt 2b7ce3b2bb4e86637fd2fee4bca41fd87d5a86d8 data/mekanism/recipe/reaction/coal_gasification/blocks_coals.json 9974c701c660270de36fb0c56c59007e522989f9 data/mekanism/recipe/reaction/coal_gasification/coals.json 6ea7ba9b0765c7e9d5a3fc549e8c2f760688d1bb data/mekanism/recipe/reaction/coal_gasification/dusts_coals.json -a7669ad974ce355dd861ce9caaa2242870188241 data/mekanism/recipe/reaction/substrate/ethene_oxygen.json -525a30d20ec8cfd0f53ff44480bea4b8af04fad7 data/mekanism/recipe/reaction/substrate/water_ethene.json -a791cd8b77c9485e318d632ece8fa235ed70fa5a data/mekanism/recipe/reaction/substrate/water_hydrogen.json +376613ed4577a2db6c71e787782427c16d22eb59 data/mekanism/recipe/reaction/substrate/ethene_oxygen.json +b6c57a0d6134c4261065f7da4997f0386746ddbe data/mekanism/recipe/reaction/substrate/water_ethene.json +a96576009497b67d2f08beeb3a48a53ff75764f5 data/mekanism/recipe/reaction/substrate/water_hydrogen.json f4178d5e581cc83ff244f02dd0a92b7a252aeff9 data/mekanism/recipe/reaction/wood_gasification/dusts_wood.json f5a27bb88078a08571f7799afff5373eafc4a732 data/mekanism/recipe/reaction/wood_gasification/logs.json bad6a8d73da87b0794e393ec6751cefd63c22875 data/mekanism/recipe/reaction/wood_gasification/planks.json diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/reaction/substrate/ethene_oxygen.json b/src/datagen/generated/mekanism/data/mekanism/recipe/reaction/substrate/ethene_oxygen.json index 605e01b2391..6683a9e0b99 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/reaction/substrate/ethene_oxygen.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/reaction/substrate/ethene_oxygen.json @@ -5,7 +5,7 @@ "chemical": "mekanism:oxygen" }, "duration": 60, - "energy_required": 1000, + "energy_required": 10, "fluid_input": { "amount": 50, "tag": "c:ethene" diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/reaction/substrate/water_ethene.json b/src/datagen/generated/mekanism/data/mekanism/recipe/reaction/substrate/water_ethene.json index ea6c697ff6a..34ec079dd74 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/reaction/substrate/water_ethene.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/reaction/substrate/water_ethene.json @@ -9,7 +9,7 @@ "id": "mekanism:oxygen" }, "duration": 400, - "energy_required": 200, + "energy_required": 2, "fluid_input": { "amount": 200, "tag": "minecraft:water" diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/reaction/substrate/water_hydrogen.json b/src/datagen/generated/mekanism/data/mekanism/recipe/reaction/substrate/water_hydrogen.json index c00c9c7d79e..1a8c74ef733 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/reaction/substrate/water_hydrogen.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/reaction/substrate/water_hydrogen.json @@ -5,7 +5,7 @@ "chemical": "mekanism:hydrogen" }, "chemical_output": { - "amount": 100, + "amount": 300, "id": "mekanism:ethene" }, "duration": 100, diff --git a/src/datagen/main/java/mekanism/common/recipe/impl/PressurizedReactionRecipeProvider.java b/src/datagen/main/java/mekanism/common/recipe/impl/PressurizedReactionRecipeProvider.java index e20df161d41..ef27b9f1794 100644 --- a/src/datagen/main/java/mekanism/common/recipe/impl/PressurizedReactionRecipeProvider.java +++ b/src/datagen/main/java/mekanism/common/recipe/impl/PressurizedReactionRecipeProvider.java @@ -138,7 +138,7 @@ private void addSubstrateRecipes(RecipeOutput consumer, String basePath) { IngredientCreatorAccess.chemicalStack().from(MekanismChemicals.OXYGEN, 10), 60, MekanismItems.HDPE_PELLET.getItemStack() - ).energyRequired(1_000) + ).energyRequired(10) .build(consumer, Mekanism.rl(basePath + "ethene_oxygen")); //Water + ethene PressurizedReactionRecipeBuilder.reaction( @@ -148,7 +148,7 @@ private void addSubstrateRecipes(RecipeOutput consumer, String basePath) { 400, MekanismItems.SUBSTRATE.getItemStack(8), MekanismChemicals.OXYGEN.getStack(10) - ).energyRequired(200) + ).energyRequired(2) .build(consumer, Mekanism.rl(basePath + "water_ethene")); //Water + hydrogen PressurizedReactionRecipeBuilder.reaction( @@ -157,7 +157,7 @@ private void addSubstrateRecipes(RecipeOutput consumer, String basePath) { IngredientCreatorAccess.chemicalStack().from(MekanismChemicals.HYDROGEN, 100), 100, MekanismItems.SUBSTRATE.getItemStack(), - MekanismChemicals.ETHENE.getStack(100) + MekanismChemicals.ETHENE.getStack(300) ).build(consumer, Mekanism.rl(basePath + "water_hydrogen")); } } \ No newline at end of file diff --git a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java index 63d91b1636a..34cdc210eb5 100644 --- a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java +++ b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java @@ -116,11 +116,11 @@ public class GeneratorsConfig extends BaseMekanismConfig { gbgTankCapacity = CachedLongValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_TANK_CAPACITY.applyToBuilder(builder) .defineInRange("tankCapacity", FluidType.BUCKET_VOLUME, 1, Long.MAX_VALUE)); etheneMaxBurnPerTick = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_ETHENE_MAX_BURN_PER_TICK.applyToBuilder(builder) - .defineInRange("etheneMaxBurnPerTick", 10, 1, Integer.MAX_VALUE)); + .defineInRange("etheneMaxBurnPerTick", 5, 1, Integer.MAX_VALUE)); etheneDensity = CachedLongValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_ETHENE_DENSITY.applyToBuilder(builder) - .defineInRange("etheneDensity", 8L, 1, Integer.MAX_VALUE)); + .defineInRange("etheneDensity", 16L, 1, Integer.MAX_VALUE)); hydrogenMaxBurnPerTick = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_GENERATOR_GAS_HYDROGEN_MAX_BURN_PER_TICK.applyToBuilder(builder) - .defineInRange("hydrogenMaxBurnPerTick", 10, 1, Integer.MAX_VALUE)); + .defineInRange("hydrogenMaxBurnPerTick", 512, 1, Integer.MAX_VALUE)); builder.pop(); GeneratorsConfigTranslations.SERVER_GENERATOR_WIND.applyToBuilder(builder).push("wind_generator"); From 581302f5aa5e9a20e15df7f29aaa42ee9b6484a1 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Tue, 1 Oct 2024 20:26:35 +0800 Subject: [PATCH 17/20] dont display empty decimals from unit conversions --- .../mekanism/common/util/UnitDisplayUtils.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/common/util/UnitDisplayUtils.java b/src/main/java/mekanism/common/util/UnitDisplayUtils.java index fdd7634ecad..9a6174572a7 100644 --- a/src/main/java/mekanism/common/util/UnitDisplayUtils.java +++ b/src/main/java/mekanism/common/util/UnitDisplayUtils.java @@ -43,11 +43,11 @@ private static Component getDisplayBase(double value, Unit unit, int decimalPlac if (value == 0) { if (isShort) { if (spaceBetweenSymbol) { - return TextComponentUtil.build(value + " ", unit.getSymbol(false)); + return TextComponentUtil.build("0 ", unit.getSymbol(false)); } - return TextComponentUtil.build(value, unit.getSymbol(false)); + return TextComponentUtil.build("0", unit.getSymbol(false)); } - return TextComponentUtil.build(value, unit.getLabel(false)); + return TextComponentUtil.build("0", unit.getLabel(false)); } boolean singular = Mth.equal(value, 1); boolean negative = value < 0; @@ -357,10 +357,14 @@ private Component getDisplay(double value, Unit unit, int decimalPlaces, boolean if (spaceBetweenSymbol || !isShort) { name = " " + name; } + String roundedStr = Double.toString(rounded); + if (roundedStr.endsWith(".0")) { + roundedStr = roundedStr.substring(0, roundedStr.length() - 2); + } if (isShort) { - return TextComponentUtil.build(rounded + name, unit.getSymbol(singular)); + return TextComponentUtil.build(roundedStr + name, unit.getSymbol(singular)); } - return TextComponentUtil.build(rounded + name, unit.getLabel(singular)); + return TextComponentUtil.build(roundedStr + name, unit.getLabel(singular)); } } } \ No newline at end of file From 8a14c096282f6b25b2f682fa6a4a81a5b96715d4 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Tue, 1 Oct 2024 20:27:46 +0800 Subject: [PATCH 18/20] use multiblock method to get turbine generation rate --- .../generators/client/gui/GuiIndustrialTurbine.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/generators/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/generators/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index 92e35f85b8d..aa48ce2dfc7 100644 --- a/src/generators/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/generators/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -15,7 +15,6 @@ import mekanism.client.gui.element.tab.GuiEnergyTab; import mekanism.client.gui.tooltip.TooltipUtils; import mekanism.common.MekanismLang; -import mekanism.common.config.MekanismConfig; import mekanism.common.inventory.container.tile.MekanismTileContainer; import mekanism.common.util.text.EnergyDisplay; import mekanism.common.util.text.TextUtils; @@ -24,7 +23,6 @@ import mekanism.generators.common.GeneratorsLang; import mekanism.generators.common.config.MekanismGeneratorsConfig; import mekanism.generators.common.content.turbine.TurbineMultiblockData; -import mekanism.generators.common.content.turbine.TurbineValidator; import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; @@ -101,10 +99,7 @@ public double getLevel() { TurbineMultiblockData multiblock = tile.getMultiblock(); if (multiblock.isFormed()) { storing = EnergyDisplay.of(multiblock.energyContainer); - double steamPerBlade = MekanismConfig.general.maxEnergyPerSteam.get() / (double) TurbineValidator.MAX_BLADES; - int bladesSupported = multiblock.coils * MekanismGeneratorsConfig.generators.turbineBladesPerCoil.get(); - int generationLimiter = Math.min(multiblock.blades, bladesSupported); - producing = EnergyDisplay.of(MathUtils.clampToLong(steamPerBlade * (multiblock.clientFlow * generationLimiter))); + producing = EnergyDisplay.of(multiblock.getProductionRate()); } else { storing = EnergyDisplay.ZERO; producing = EnergyDisplay.ZERO; From 26a5ce817d085b9c0768f4ff982eb1a258ad15fe Mon Sep 17 00:00:00 2001 From: Thiakil Date: Tue, 1 Oct 2024 21:00:08 +0800 Subject: [PATCH 19/20] move max floaw calculation to a method and remove dupes --- .../content/turbine/TurbineMultiblockData.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/generators/java/mekanism/generators/common/content/turbine/TurbineMultiblockData.java b/src/generators/java/mekanism/generators/common/content/turbine/TurbineMultiblockData.java index 7e427b4f1bb..950af199b7d 100644 --- a/src/generators/java/mekanism/generators/common/content/turbine/TurbineMultiblockData.java +++ b/src/generators/java/mekanism/generators/common/content/turbine/TurbineMultiblockData.java @@ -145,8 +145,7 @@ public boolean tick(Level world) { if (energyMultiplier < Mth.EPSILON) { clientFlow = 0; } else { - double rate = lowerVolume * (getDispersers() * MekanismGeneratorsConfig.generators.turbineDisperserChemicalFlow.get()); - rate = Math.min(rate, vents * MekanismGeneratorsConfig.generators.turbineVentChemicalFlow.get()); + double rate = getMaxFlowRateDouble(); double proportion = stored / (double) getSteamCapacity(); double origRate = rate; rate = Math.min(Math.min(stored, rate), (energyNeeded / energyMultiplier)) * proportion; @@ -203,6 +202,12 @@ public void updateVentData(List vents) { this.vents = this.ventData.size(); } + private double getMaxFlowRateDouble() { + double rate = lowerVolume * (getDispersers() * MekanismGeneratorsConfig.generators.turbineDisperserChemicalFlow.get()); + rate = Math.min(rate, vents * MekanismGeneratorsConfig.generators.turbineVentChemicalFlow.get()); + return rate; + } + @Override public void readUpdateTag(CompoundTag tag, HolderLookup.Provider provider) { super.readUpdateTag(tag, provider); @@ -263,15 +268,13 @@ public long getProductionRate() { public long getMaxProduction() { double energyMultiplier = ((double) MekanismConfig.general.maxEnergyPerSteam.get() / TurbineValidator.MAX_BLADES) * (Math.min(blades, coils * MekanismGeneratorsConfig.generators.turbineBladesPerCoil.get())); - double rate = lowerVolume * (getDispersers() * MekanismGeneratorsConfig.generators.turbineDisperserChemicalFlow.get()); - rate = Math.min(rate, vents * MekanismGeneratorsConfig.generators.turbineVentChemicalFlow.get()); + double rate = getMaxFlowRateDouble(); return MathUtils.clampToLong(energyMultiplier * rate); } @ComputerMethod public long getMaxFlowRate() { - double rate = lowerVolume * (getDispersers() * MekanismGeneratorsConfig.generators.turbineDisperserChemicalFlow.get()); - rate = Math.min(rate, vents * MekanismGeneratorsConfig.generators.turbineVentChemicalFlow.get()); + double rate = getMaxFlowRateDouble(); return MathUtils.clampToLong(rate); } From 3d5d295c8be47a63bf92b0b722060e0c774bd578 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Sat, 16 Nov 2024 11:16:16 +0800 Subject: [PATCH 20/20] tweak turbine generation amounts --- .../common/config/GeneratorsConfig.java | 18 +++++++++++------- .../config/GeneratorsConfigTranslations.java | 2 ++ .../turbine/TurbineMultiblockData.java | 19 +++++++++++-------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java index 34cdc210eb5..2620fdeee66 100644 --- a/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java +++ b/src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java @@ -42,6 +42,8 @@ public class GeneratorsConfig extends BaseMekanismConfig { public final CachedLongValue turbineEnergyCapacityPerVolume; public final CachedLongValue turbineChemicalPerTank; public final CachedIntValue condenserRate; + public final CachedLongValue turbineJoulesPerSteam; + public final CachedIntValue turbineSteamDivisor; public final CachedLongValue energyPerFusionFuel; public final CachedLongValue windGenerationMin; @@ -139,21 +141,23 @@ public class GeneratorsConfig extends BaseMekanismConfig { turbineBladesPerCoil = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_TURBINE_BLADES.applyToBuilder(builder) .defineInRange("bladesPerCoil", 4, 1, 12)); turbineVentChemicalFlow = CachedDoubleValue.wrap(this, GeneratorsConfigTranslations.SERVER_TURBINE_RATE_VENT.applyToBuilder(builder) - .defineInRange("ventChemicalFlow", 32D * FluidType.BUCKET_VOLUME, 0.1, 1_024 * FluidType.BUCKET_VOLUME)); + .defineInRange("ventChemicalFlow", 3.2D * FluidType.BUCKET_VOLUME, 0.1, 1_024 * FluidType.BUCKET_VOLUME)); turbineDisperserChemicalFlow = CachedDoubleValue.wrap(this, GeneratorsConfigTranslations.SERVER_TURBINE_RATE_DISPERSER.applyToBuilder(builder) .defineInRange("disperserChemicalFlow", 1_280D, 0.1, 1_024 * FluidType.BUCKET_VOLUME)); condenserRate = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_TURBINE_RATE_CONDENSER.applyToBuilder(builder) .defineInRange("condenserRate", 64 * FluidType.BUCKET_VOLUME, 1, 2_000 * FluidType.BUCKET_VOLUME)); turbineEnergyCapacityPerVolume = CachedLongValue.define(this, builder, GeneratorsConfigTranslations.SERVER_TURBINE_ENERGY_CAPACITY, - "energyCapacityPerVolume", 16_000_000L, 1L, 1_000_000_000_000L); + "energyCapacityPerVolume", 100L, 1L, 1_000_000_000_000L); //Note: We use maxVolume as it still is a large number, and we have no reason to go higher even if some things we technically could int maxTurbine = 17 * 17 * 18; turbineChemicalPerTank = CachedLongValue.wrap(this, GeneratorsConfigTranslations.SERVER_TURBINE_CHEMICAL_CAPACITY.applyToBuilder(builder) - .defineInRange("chemicalPerTank", 64L * FluidType.BUCKET_VOLUME, 1, Long.MAX_VALUE / maxTurbine)); + .defineInRange("chemicalPerTank", 2 * FluidType.BUCKET_VOLUME, 1, Long.MAX_VALUE / maxTurbine)); + turbineJoulesPerSteam = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_TURBINE_JOULES_PER_STEAM, "joulesPerSteam", 5); + turbineSteamDivisor = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_TURBINE_STEAM_DIVISOR.applyToBuilder(builder).defineInRange("steamDivisor", 100, 1, Integer.MAX_VALUE)); builder.pop(); GeneratorsConfigTranslations.SERVER_FISSION.applyToBuilder(builder).push("fission_reactor"); - energyPerFissionFuel = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_FISSION_FUEL_ENERGY, "energyPerFissionFuel", 1_000_000L); + energyPerFissionFuel = CachedLongValue.definePositive(this, builder, GeneratorsConfigTranslations.SERVER_FISSION_FUEL_ENERGY, "energyPerFissionFuel", 20_000L); fissionCasingHeatCapacity = CachedDoubleValue.wrap(this, GeneratorsConfigTranslations.SERVER_FISSION__CASING_HEAT_CAPACITY.applyToBuilder(builder) .defineInRange("casingHeatCapacity", 1_000D, 1, 1_000_000)); fissionSurfaceAreaTarget = CachedDoubleValue.wrap(this, GeneratorsConfigTranslations.SERVER_FISSION_SURFACE_AREA.applyToBuilder(builder) @@ -163,12 +167,12 @@ public class GeneratorsConfig extends BaseMekanismConfig { burnPerAssembly = CachedLongValue.wrap(this, GeneratorsConfigTranslations.SERVER_FISSION_BURN_PER_ASSEMBLY.applyToBuilder(builder) .defineInRange("burnPerAssembly", 1L, 1, 1_000_000)); maxFuelPerAssembly = CachedLongValue.wrap(this, GeneratorsConfigTranslations.SERVER_FISSION_FUEL_CAPACITY.applyToBuilder(builder) - .defineInRange("maxFuelPerAssembly", 8L * FluidType.BUCKET_VOLUME, 1, Long.MAX_VALUE / 4_096)); + .defineInRange("maxFuelPerAssembly", 100, 1, Long.MAX_VALUE / 4_096)); int maxVolume = 18 * 18 * 18; fissionCooledCoolantPerTank = CachedIntValue.wrap(this, GeneratorsConfigTranslations.SERVER_FISSION_COOLED_COOLANT_CAPACITY.applyToBuilder(builder) - .defineInRange("cooledCoolantPerTank", 100 * FluidType.BUCKET_VOLUME, 1, Integer.MAX_VALUE / maxVolume)); + .defineInRange("cooledCoolantPerTank", 100, 1, Integer.MAX_VALUE / maxVolume)); fissionHeatedCoolantPerTank = CachedLongValue.wrap(this, GeneratorsConfigTranslations.SERVER_FISSION_HEATED_COOLANT_CAPACITY.applyToBuilder(builder) - .defineInRange("heatedCoolantPerTank", 1_000L * FluidType.BUCKET_VOLUME, 1_000, Long.MAX_VALUE / maxVolume)); + .defineInRange("heatedCoolantPerTank", 100, 1, Long.MAX_VALUE / maxVolume)); fissionExcessWasteRatio = CachedDoubleValue.wrap(this, GeneratorsConfigTranslations.SERVER_FISSION_EXCESS_WASTE.applyToBuilder(builder) .defineInRange("excessWaste", 0.9D, 0.001D, 1D)); diff --git a/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java b/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java index e4cd4dcd013..238560d3c63 100644 --- a/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java +++ b/src/generators/java/mekanism/generators/common/config/GeneratorsConfigTranslations.java @@ -62,6 +62,8 @@ public enum GeneratorsConfigTranslations implements IConfigTranslation { "Amount of energy in Joules that each block of the turbine contributes to the total energy capacity. Max = volume * energyCapacityPerVolume"), SERVER_TURBINE_CHEMICAL_CAPACITY("server.turbine.capacity.chemical", "Chemical Per Tank", "Amount of chemical (mB) that each block of the turbine's steam cavity contributes to the volume. Max = volume * chemicalPerTank"), + SERVER_TURBINE_JOULES_PER_STEAM("server.turbine.energy_conversion.steam", "Joules Per Steam", "Maximum Joules per tick generated per Steam unit in the Industrial Turbine."), + SERVER_TURBINE_STEAM_DIVISOR("server.turbine.energy_conversion.steam_divisor", "Steam Divisor", "Divisor for Steam rate to create a Steam unit. The Steam flow will be divided by this amount and then multiplied by the Joules Per Steam amount to calculate the generation rate."), SERVER_FISSION("server.fission", "Fission Reactor", "Settings for configuring Fission Reactors", "Edit Reactor Settings"), SERVER_FISSION_FUEL_ENERGY("server.fission.fuel_energy", "Energy Per Fissile Fuel", diff --git a/src/generators/java/mekanism/generators/common/content/turbine/TurbineMultiblockData.java b/src/generators/java/mekanism/generators/common/content/turbine/TurbineMultiblockData.java index 950af199b7d..118dbce9e0b 100644 --- a/src/generators/java/mekanism/generators/common/content/turbine/TurbineMultiblockData.java +++ b/src/generators/java/mekanism/generators/common/content/turbine/TurbineMultiblockData.java @@ -140,7 +140,7 @@ public boolean tick(Level world) { long energyNeeded = energyContainer.getNeeded(); if (stored > 0 && energyNeeded > 0L) { - double energyMultiplier = (MekanismConfig.general.maxEnergyPerSteam.get() / (double) TurbineValidator.MAX_BLADES) + double energyMultiplier = (MekanismGeneratorsConfig.generators.turbineJoulesPerSteam.get() / (double) TurbineValidator.MAX_BLADES) * (Math.min(blades, coils * MekanismGeneratorsConfig.generators.turbineBladesPerCoil.get())); if (energyMultiplier < Mth.EPSILON) { clientFlow = 0; @@ -148,13 +148,16 @@ public boolean tick(Level world) { double rate = getMaxFlowRateDouble(); double proportion = stored / (double) getSteamCapacity(); double origRate = rate; - rate = Math.min(Math.min(stored, rate), (energyNeeded / energyMultiplier)) * proportion; - clientFlow = MathUtils.clampToLong(rate); - if (clientFlow > 0) { + rate = Math.min(Math.min(stored, rate), (energyNeeded / energyMultiplier) * MekanismGeneratorsConfig.generators.turbineSteamDivisor.getAsInt()) * proportion; + long amountGenerated = MathUtils.clampToLong(energyMultiplier * (rate / MekanismGeneratorsConfig.generators.turbineSteamDivisor.getAsInt())); + if (rate > Mth.EPSILON && amountGenerated > 0) { + clientFlow = MathUtils.clampToLong(rate); flowRate = rate / origRate; - energyContainer.insert(MathUtils.clampToLong(energyMultiplier * rate), Action.EXECUTE, AutomationType.INTERNAL); + energyContainer.insert(amountGenerated, Action.EXECUTE, AutomationType.INTERNAL); chemicalTank.shrinkStack(clientFlow, Action.EXECUTE); ventTank.setStack(new FluidStack(Fluids.WATER, Math.min(MathUtils.clampToInt(rate), condensers * MekanismGeneratorsConfig.generators.condenserRate.get()))); + } else { + clientFlow = 0; } } } else { @@ -259,14 +262,14 @@ protected int getMultiblockRedstoneLevel() { @ComputerMethod public long getProductionRate() { - double energyMultiplier = ((double) MekanismConfig.general.maxEnergyPerSteam.get() / TurbineValidator.MAX_BLADES) + double energyMultiplier = ((double) MekanismGeneratorsConfig.generators.turbineJoulesPerSteam.get() / TurbineValidator.MAX_BLADES) * (Math.min(blades, coils * MekanismGeneratorsConfig.generators.turbineBladesPerCoil.get())); - return MathUtils.clampToLong(energyMultiplier * clientFlow); + return MathUtils.clampToLong(energyMultiplier * clientFlow / MekanismGeneratorsConfig.generators.turbineSteamDivisor.getAsInt()); } @ComputerMethod public long getMaxProduction() { - double energyMultiplier = ((double) MekanismConfig.general.maxEnergyPerSteam.get() / TurbineValidator.MAX_BLADES) + double energyMultiplier = ((double) MekanismGeneratorsConfig.generators.turbineJoulesPerSteam.get() / TurbineValidator.MAX_BLADES) * (Math.min(blades, coils * MekanismGeneratorsConfig.generators.turbineBladesPerCoil.get())); double rate = getMaxFlowRateDouble(); return MathUtils.clampToLong(energyMultiplier * rate);