From f16ad703e1490351815fd0ece9f9c0915fc2f4d0 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Sun, 1 Sep 2024 21:44:22 -0400 Subject: [PATCH] renamed a bunch of recipe maps --- .../single/BlockEntityMacerator.java | 5 +- .../java/trinsdar/gt4r/data/Machines.java | 61 ++++---- .../java/trinsdar/gt4r/data/RecipeMaps.java | 66 ++++----- .../loader/machines/AlloySmelterLoader.java | 29 ++-- .../gt4r/loader/machines/AssemblyLoader.java | 133 +++++++++--------- .../gt4r/loader/machines/BathingLoader.java | 12 +- .../gt4r/loader/machines/BendingLoader.java | 14 +- .../gt4r/loader/machines/CannerLoader.java | 22 +-- .../loader/machines/CentrifugingLoader.java | 50 ++++--- .../machines/ChemicalReactorLoader.java | 42 +++--- .../loader/machines/CompressorLoader.java | 80 +++++------ .../gt4r/loader/machines/CutterLoader.java | 9 +- .../loader/machines/DistillingLoader.java | 16 +-- .../loader/machines/ElectrolyzerLoader.java | 16 +-- .../gt4r/loader/machines/ExtractorLoader.java | 44 +++--- .../gt4r/loader/machines/ExtruderLoader.java | 52 ++++--- .../loader/machines/FermentingLoader.java | 9 +- .../loader/machines/FluidCanningLoader.java | 22 ++- .../machines/FluidSolidifierLoader.java | 8 +- .../loader/machines/ForgeHammerLoader.java | 29 ++-- .../gt4r/loader/machines/LatheLoader.java | 6 +- .../gt4r/loader/machines/MaceratorLoader.java | 88 ++++++------ .../gt4r/loader/machines/MassFabLoader.java | 4 +- .../gt4r/loader/machines/SiftingLoader.java | 18 ++- .../loader/machines/ThermalCentrifuge.java | 4 +- .../gt4r/loader/machines/WasherLoader.java | 4 +- .../gt4r/loader/machines/WiremillLoader.java | 16 +-- .../gt4r/loader/multi/IndustrialSawmill.java | 6 +- 28 files changed, 416 insertions(+), 449 deletions(-) diff --git a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityMacerator.java b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityMacerator.java index c4c81aa1..ec3247c3 100644 --- a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityMacerator.java +++ b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityMacerator.java @@ -1,8 +1,6 @@ package trinsdar.gt4r.blockentity.single; -import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.machine.MachineRecipeHandler; -import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.recipe.map.IRecipeMap; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; @@ -10,7 +8,6 @@ import trinsdar.gt4r.machine.UpgradeableMachine; import static muramasa.antimatter.machine.Tier.LV; -import static muramasa.antimatter.machine.Tier.MV; public class BlockEntityMacerator extends BlockEntityUpgradeableMachine { public BlockEntityMacerator(UpgradeableMachine type, BlockPos pos, BlockState state) { @@ -18,7 +15,7 @@ public BlockEntityMacerator(UpgradeableMachine type, BlockPos pos, BlockState st recipeHandler.set(() -> new MachineRecipeHandler<>(this){ @Override protected IRecipeMap getRecipeMap() { - if (tile.getMachineTier() == LV) return RecipeMaps.MACERATING; + if (tile.getMachineTier() == LV) return RecipeMaps.MACERATOR; return super.getRecipeMap(); } }); diff --git a/common/src/main/java/trinsdar/gt4r/data/Machines.java b/common/src/main/java/trinsdar/gt4r/data/Machines.java index bf490c4c..3c44ede5 100644 --- a/common/src/main/java/trinsdar/gt4r/data/Machines.java +++ b/common/src/main/java/trinsdar/gt4r/data/Machines.java @@ -7,7 +7,6 @@ import io.github.gregtechintergalactical.gtcore.machine.LockerMachine; import io.github.gregtechintergalactical.gtcore.machine.MaterialMachine; import io.github.gregtechintergalactical.gtcore.machine.WorkbenchMachine; -import muramasa.antimatter.blockentity.single.BlockEntityBatteryBuffer; import muramasa.antimatter.blockentity.single.BlockEntityTransformer; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.machine.Tier; @@ -20,13 +19,11 @@ import muramasa.antimatter.blockentity.single.BlockEntityDigitalTransformer; import muramasa.antimatter.util.Utils; import net.minecraft.ChatFormatting; -import net.minecraft.sounds.SoundEvents; import trinsdar.gt4r.GT4RRef; import trinsdar.gt4r.block.BlockBatBox; import trinsdar.gt4r.block.BlockRedstoneMachine; import trinsdar.gt4r.machine.*; import trinsdar.gt4r.blockentity.multi.*; -import trinsdar.gt4r.blockentity.multi.BlockEntityDistillationTower; import trinsdar.gt4r.blockentity.single.*; import trinsdar.gt4r.blockentity.single.BlockEntityQuantumChest; @@ -42,38 +39,38 @@ public class Machines { - public static UpgradeableMachine ALLOY_SMELTER = new UpgradeableMachine(GT4RRef.ID, "alloy_smelter").setMap(ALLOY_SMELTING).setTiers(LV).addFlags(GUI, ITEM); - public static UpgradeableMachine ASSEMBLER = new UpgradeableMachine(GT4RRef.ID, "assembler").setMap(ASSEMBLING).setTiers(LV).addFlags(GUI, ITEM).custom(); - public static UpgradeableMachine BENDER = new UpgradeableMachine(GT4RRef.ID, "plate_bender").setMap(BENDING).setTiers(LV).addFlags(GUI, ITEM); - public static UpgradeableMachine CANNER = new UpgradeableMachine(GT4RRef.ID, "canner").setMap(CANNING).setTiers(LV).addFlags(GUI, ITEM); - public static UpgradeableMachine COMPRESSOR = new UpgradeableMachine(GT4RRef.ID, "compressor").setMap(COMPRESSING).setTiers(LV).addFlags(GUI, ITEM); - public static UpgradeableMachine CUTTER = new UpgradeableMachine(GT4RRef.ID, "cutter").setMap(CUTTING).setTiers(LV).addFlags(GUI, ITEM); - public static UpgradeableMachine FURNACE = new UpgradeableMachine(GT4RRef.ID, "furnace").setMap(SMELTING).setTiers(LV).addFlags(GUI, ITEM); - public static UpgradeableMachine EXTRACTOR = new UpgradeableMachine(GT4RRef.ID, "extractor").setMap(EXTRACTING).setTiers(LV).addFlags(GUI, ITEM); - public static UpgradeableMachine EXTRUDER = new UpgradeableMachine(GT4RRef.ID, "extruder").setTiers(MV).setMap(EXTRUDING).addFlags(GUI, ITEM).custom(); - public static UpgradeableMachine LATHE = new UpgradeableMachine(GT4RRef.ID, "lathe").setMap(LATHING).setTiers(LV).addFlags(GUI, ITEM); - public static UpgradeableMachine MACERATOR = new UpgradeableMachine(GT4RRef.ID, "macerator").setTiers(LV, MV).setMap(UNIVERSAL_MACERATING).addFlags(GUI, ITEM).setTile(BlockEntityMacerator::new).custom().overlayTexture(Textures.TIER_SPECIFIC_OVERLAY_HANDLER).setTierSpecificLang(); - public static UpgradeableMachine RECYCLER = new UpgradeableMachine(GT4RRef.ID, "recycler").setMap(RECYCLING).setTiers(LV).addFlags(GUI, ITEM); - public static UpgradeableMachine SCANNER = new UpgradeableMachine(GT4RRef.ID, "scanner").setTiers(HV).setMap(SCANNING).addFlags(GUI, ITEM, FLUID); - public static UpgradeableMachine WIRE_MILL = new UpgradeableMachine(GT4RRef.ID, "wire_mill").setMap(WIRE_MILLING).setTiers(LV).addFlags(GUI, ITEM).custom(); - public static UpgradeableMachine CENTRIFUGE = new UpgradeableMachine(GT4RRef.ID, "centrifuge").setMap(CENTRIFUGING).setTiers(LV).addFlags(GUI, ITEM, FLUID); - public static UpgradeableMachine ELECTROLYZER = new UpgradeableMachine(GT4RRef.ID, "electrolyzer").setMap(ELECTROLYZING).addFlags(GUI, ITEM, FLUID).setTiers(LV, MV).setTierSpecificLang(); - public static UpgradeableMachine CHEMICAL_REACTOR = new UpgradeableMachine(GT4RRef.ID, "chemical_reactor").setTiers(MV).setMap(CHEMICAL_REACTING).addFlags(GUI, ITEM, FLUID); - public static UpgradeableMachine FLUID_CANNER = new UpgradeableMachine(GT4RRef.ID, "fluid_canner").setMap(FLUID_CANNING).setTiers(LV).addFlags(GUI, ITEM, FLUID); - public static UpgradeableMachine DISASSEMBLER = new UpgradeableMachine(GT4RRef.ID, "disassembler").setMap(DISASSEMBLING).setTiers(LV).addFlags(GUI, ITEM).custom(); - public static UpgradeableMachine MASS_FABRICATOR = new UpgradeableMachine(GT4RRef.ID, "mass_fabricator").setTiers(EV).setMap(MASS_FABRICATING).addFlags(GUI, ITEM, FLUID); - public static UpgradeableMachine REPLICATOR = new UpgradeableMachine(GT4RRef.ID, "replicator").setTiers(EV).setMap(REPLICATING).addFlags(GUI, ITEM, FLUID); - public static UpgradeableMachine FORGE_HAMMER = new UpgradeableMachine(GT4RRef.ID, "forge_hammer").setMap(HAMMERING).setTiers(LV).addFlags(GUI, ITEM).setTile(BlockEntityForgeHammer::new); - public static UpgradeableMachine ORE_WASHER = new UpgradeableMachine(GT4RRef.ID, "ore_washer").setMap(ORE_WASHING).setTiers(LV).addFlags(GUI, ITEM, FLUID); - public static UpgradeableMachine THERMAL_CENTRIFUGE = new UpgradeableMachine(GT4RRef.ID, "thermal_centrifuge").setTiers(MV).setMap(THERMAL_CENTRIFUGING).addFlags(GUI, ITEM, FLUID); + public static UpgradeableMachine ALLOY_SMELTER = new UpgradeableMachine(GT4RRef.ID, "alloy_smelter").setMap(RecipeMaps.ALLOY_SMELTER).setTiers(LV).addFlags(GUI, ITEM); + public static UpgradeableMachine ASSEMBLER = new UpgradeableMachine(GT4RRef.ID, "assembler").setMap(RecipeMaps.ASSEMBLER).setTiers(LV).addFlags(GUI, ITEM).custom(); + public static UpgradeableMachine BENDER = new UpgradeableMachine(GT4RRef.ID, "plate_bender").setMap(PLATE_BENDER).setTiers(LV).addFlags(GUI, ITEM); + public static UpgradeableMachine CANNER = new UpgradeableMachine(GT4RRef.ID, "canner").setMap(RecipeMaps.CANNER).setTiers(LV).addFlags(GUI, ITEM); + public static UpgradeableMachine COMPRESSOR = new UpgradeableMachine(GT4RRef.ID, "compressor").setMap(RecipeMaps.COMPRESSOR).setTiers(LV).addFlags(GUI, ITEM); + public static UpgradeableMachine CUTTER = new UpgradeableMachine(GT4RRef.ID, "cutter").setMap(PLATE_CUTTER).setTiers(LV).addFlags(GUI, ITEM); + public static UpgradeableMachine FURNACE = new UpgradeableMachine(GT4RRef.ID, "furnace").setMap(RecipeMaps.FURNACE).setTiers(LV).addFlags(GUI, ITEM); + public static UpgradeableMachine EXTRACTOR = new UpgradeableMachine(GT4RRef.ID, "extractor").setMap(RecipeMaps.EXTRACTOR).setTiers(LV).addFlags(GUI, ITEM); + public static UpgradeableMachine EXTRUDER = new UpgradeableMachine(GT4RRef.ID, "extruder").setTiers(MV).setMap(RecipeMaps.EXTRUDER).addFlags(GUI, ITEM).custom(); + public static UpgradeableMachine LATHE = new UpgradeableMachine(GT4RRef.ID, "lathe").setMap(RecipeMaps.LATHE).setTiers(LV).addFlags(GUI, ITEM); + public static UpgradeableMachine MACERATOR = new UpgradeableMachine(GT4RRef.ID, "macerator").setTiers(LV, MV).setMap(UNIVERSAL_MACERATOR).addFlags(GUI, ITEM).setTile(BlockEntityMacerator::new).custom().overlayTexture(Textures.TIER_SPECIFIC_OVERLAY_HANDLER).setTierSpecificLang(); + public static UpgradeableMachine RECYCLER = new UpgradeableMachine(GT4RRef.ID, "recycler").setMap(RecipeMaps.RECYCLER).setTiers(LV).addFlags(GUI, ITEM); + public static UpgradeableMachine SCANNER = new UpgradeableMachine(GT4RRef.ID, "scanner").setTiers(HV).setMap(RecipeMaps.SCANNER).addFlags(GUI, ITEM, FLUID); + public static UpgradeableMachine WIRE_MILL = new UpgradeableMachine(GT4RRef.ID, "wire_mill").setMap(RecipeMaps.WIRE_MILL).setTiers(LV).addFlags(GUI, ITEM).custom(); + public static UpgradeableMachine CENTRIFUGE = new UpgradeableMachine(GT4RRef.ID, "centrifuge").setMap(RecipeMaps.CENTRIFUGE).setTiers(LV).addFlags(GUI, ITEM, FLUID); + public static UpgradeableMachine ELECTROLYZER = new UpgradeableMachine(GT4RRef.ID, "electrolyzer").setMap(RecipeMaps.ELECTROLYZER).addFlags(GUI, ITEM, FLUID).setTiers(LV, MV).setTierSpecificLang(); + public static UpgradeableMachine CHEMICAL_REACTOR = new UpgradeableMachine(GT4RRef.ID, "chemical_reactor").setTiers(MV).setMap(RecipeMaps.CHEMICAL_REACTOR).addFlags(GUI, ITEM, FLUID); + public static UpgradeableMachine FLUID_CANNER = new UpgradeableMachine(GT4RRef.ID, "fluid_canner").setMap(RecipeMaps.FLUID_CANNER).setTiers(LV).addFlags(GUI, ITEM, FLUID); + public static UpgradeableMachine DISASSEMBLER = new UpgradeableMachine(GT4RRef.ID, "disassembler").setMap(RecipeMaps.DISASSEMBLER).setTiers(LV).addFlags(GUI, ITEM).custom(); + public static UpgradeableMachine MASS_FABRICATOR = new UpgradeableMachine(GT4RRef.ID, "mass_fabricator").setTiers(EV).setMap(RecipeMaps.MASS_FABRICATOR).addFlags(GUI, ITEM, FLUID); + public static UpgradeableMachine REPLICATOR = new UpgradeableMachine(GT4RRef.ID, "replicator").setTiers(EV).setMap(RecipeMaps.REPLICATOR).addFlags(GUI, ITEM, FLUID); + public static UpgradeableMachine FORGE_HAMMER = new UpgradeableMachine(GT4RRef.ID, "forge_hammer").setMap(RecipeMaps.FORGE_HAMMER).setTiers(LV).addFlags(GUI, ITEM).setTile(BlockEntityForgeHammer::new); + public static UpgradeableMachine ORE_WASHER = new UpgradeableMachine(GT4RRef.ID, "ore_washer").setMap(RecipeMaps.ORE_WASHER).setTiers(LV).addFlags(GUI, ITEM, FLUID); + public static UpgradeableMachine THERMAL_CENTRIFUGE = new UpgradeableMachine(GT4RRef.ID, "thermal_centrifuge").setTiers(MV).setMap(RecipeMaps.THERMAL_CENTRIFUGE).addFlags(GUI, ITEM, FLUID); public static UpgradeableMachine FLUID_PRESS = new UpgradeableMachine(GT4RRef.ID, "fluid_press").setMap(RecipeMaps.FLUID_PRESS).setTiers(LV).addFlags(GUI, ITEM, FLUID); - public static UpgradeableMachine FLUID_SOLIDIFIER = new UpgradeableMachine(GT4RRef.ID, "fluid_solidifier").setMap(FLUID_SOLIDIFYING).setTiers(LV).addFlags(GUI, ITEM, FLUID); + public static UpgradeableMachine FLUID_SOLIDIFIER = new UpgradeableMachine(GT4RRef.ID, "fluid_solidifier").setMap(RecipeMaps.FLUID_SOLIDIFIER).setTiers(LV).addFlags(GUI, ITEM, FLUID); public static BasicMachine PUMP = new BasicMachine(GT4RRef.ID, "pump").addFlags(GUI, ITEM, FLUID).setTiers(LV).setTile(BlockEntityPump::new).baseTexture(Textures.BASE_HANDLER); - public static UpgradeableMachine SIFTER = new UpgradeableMachine(GT4RRef.ID, "sifter").setMap(SIFTING).setTiers(LV).addFlags(GUI, ITEM); + public static UpgradeableMachine SIFTER = new UpgradeableMachine(GT4RRef.ID, "sifter").setMap(RecipeMaps.SIFTER).setTiers(LV).addFlags(GUI, ITEM); public static UpgradeableMachine SMELTER = new UpgradeableMachine(GT4RRef.ID, "smelter").setTiers(MV).setMap(RecipeMaps.SMELTER).addFlags(GUI, ITEM, FLUID); - public static UpgradeableMachine BATH = new UpgradeableMachine(GT4RRef.ID, "bath").setMap(BATHING).setTiers(LV).addFlags(GUI, ITEM); - public static UpgradeableMachine DISTILLERY = new UpgradeableMachine(GT4RRef.ID, "distillery").setMap(BASIC_DISTILLING).setTiers(LV).addFlags(GUI, ITEM, FLUID); - public static UpgradeableMachine FERMENTER = new UpgradeableMachine(GT4RRef.ID, "fermenter").setMap(FERMENTING).setTiers(LV).addFlags(GUI, ITEM, FLUID); + public static UpgradeableMachine BATH = new UpgradeableMachine(GT4RRef.ID, "bath").setMap(RecipeMaps.BATH).setTiers(LV).addFlags(GUI, ITEM); + public static UpgradeableMachine DISTILLERY = new UpgradeableMachine(GT4RRef.ID, "distillery").setMap(RecipeMaps.DISTILLERY).setTiers(LV).addFlags(GUI, ITEM, FLUID); + public static UpgradeableMachine FERMENTER = new UpgradeableMachine(GT4RRef.ID, "fermenter").setMap(RecipeMaps.FERMENTER).setTiers(LV).addFlags(GUI, ITEM, FLUID); public static NonSolidMachine DUSTBIN = new NonSolidMachine(GT4RRef.ID, "dustbin").setMap(RecipeMaps.DUSTBIN).addFlags(GUI, ITEM).setTiers(LV).custom().baseTexture(Textures.DUSTBIN_HANDLER).covers(emptyFactory).frontCovers().setTile(BlockEntityDustBin::new); public static SteamMachine SOLID_FUEL_BOILER = new SteamMachine(GT4RRef.ID, "solid_fuel_boiler").setMap(SOLID_FUEL_BOILERS).setTiers(BRONZE, STEEL).addFlags(GUI, STEAM, ITEM, FLUID, CELL).baseTexture(Textures.BOILER_HANDLER).setTile(BlockEntityCoalBoiler::new).noCovers(); diff --git a/common/src/main/java/trinsdar/gt4r/data/RecipeMaps.java b/common/src/main/java/trinsdar/gt4r/data/RecipeMaps.java index f3135e64..0b6587b5 100644 --- a/common/src/main/java/trinsdar/gt4r/data/RecipeMaps.java +++ b/common/src/main/java/trinsdar/gt4r/data/RecipeMaps.java @@ -38,41 +38,41 @@ public class RecipeMaps { public static RecipeMap SOLID_FUEL_BOILERS = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "solid_fuel_boilers", new RecipeBuilder())); - public static RecipeMap ALLOY_SMELTING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "alloy_smelter", new SteamBuilder(STEAM_ALLOY_SMELTER))); - public static RecipeMap ASSEMBLING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "assembler", new RecipeBuilder())); - public static RecipeMap AUTOCLAVING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "autoclave", new RecipeBuilder())); - public static RecipeMap BATHING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "bath", new RecipeBuilder())); - public static RecipeMap BENDING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "plate_bender", new RecipeBuilder())); - public static RecipeMap CANNING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "canner", new RecipeBuilder())); - public static RecipeMap CENTRIFUGING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "centrifuge", new RecipeBuilder())); - public static RecipeMap COMPRESSING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "compressor", new SteamBuilder(STEAM_COMPRESSOR))); - public static RecipeMap CUTTING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "plate_cutter", new RecipeBuilder())); - public static RecipeMap SMELTING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "furnace", new RecipeBuilder()).setProxy(RecipeProxies.FURNACE_PROXY.apply(4, 60))); - public static RecipeMap EXTRACTING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "extractor", new SteamBuilder(STEAM_EXTRACTOR))); - public static RecipeMap EXTRUDING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "extruder", new RecipeBuilder())); - public static RecipeMap LATHING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "lathe", new RecipeBuilder())); - public static RecipeMap UNIVERSAL_MACERATING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "universal_macerator", new UniversalMaceratorBuilder()).setGuiTier(MV)); - public static RecipeMap MACERATING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "macerator", new SteamBuilder(STEAM_MACERATOR))); - public static RecipeMap RECYCLING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "recycler", new RecipeBuilder())); - public static RecipeMap SCANNING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "scanner", new RecipeBuilder())); - public static RecipeMap WIRE_MILLING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "wire_mill", new RecipeBuilder())); - public static RecipeMap ELECTROLYZING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "electrolyzer", new RecipeBuilder())); - public static RecipeMap THERMAL_CENTRIFUGING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "thermal_centrifuge", new RecipeBuilder())); - public static RecipeMap ORE_WASHING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "ore_washer", new RecipeBuilder())); - public static RecipeMap CHEMICAL_REACTING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "chemical_reactor", new RecipeBuilder())); - public static RecipeMap FLUID_CANNING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "fluid_canner", new RecipeBuilder())); - public static RecipeMap DISASSEMBLING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "disassembler", new RecipeBuilder())); - public static RecipeMap MASS_FABRICATING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "mass_fabricator", new RecipeBuilder())); - public static RecipeMap REPLICATING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "replicator", new RecipeBuilder())); + public static RecipeMap ALLOY_SMELTER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "alloy_smelter", new SteamBuilder(STEAM_ALLOY_SMELTER))); + public static RecipeMap ASSEMBLER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "assembler", new RecipeBuilder())); + public static RecipeMap AUTOCLAVE = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "autoclave", new RecipeBuilder())); + public static RecipeMap BATH = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "bath", new RecipeBuilder())); + public static RecipeMap CANNER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "canner", new RecipeBuilder())); + public static RecipeMap CENTRIFUGE = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "centrifuge", new RecipeBuilder())); + public static RecipeMap CHEMICAL_REACTOR = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "chemical_reactor", new RecipeBuilder())); + public static RecipeMap COMPRESSOR = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "compressor", new SteamBuilder(STEAM_COMPRESSOR))); + public static RecipeMap DISASSEMBLER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "disassembler", new RecipeBuilder())); + public static RecipeMap DISTILLERY = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "distillery", new RecipeBuilder())); + public static RecipeMap DUSTBIN = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "dustbin", new RecipeBuilder())); + public static RecipeMap ELECTROLYZER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "electrolyzer", new RecipeBuilder())); + public static RecipeMap EXTRACTOR = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "extractor", new SteamBuilder(STEAM_EXTRACTOR))); + public static RecipeMap EXTRUDER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "extruder", new RecipeBuilder())); + public static RecipeMap FERMENTER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "fermenter", new RecipeBuilder())); + public static RecipeMap FLUID_CANNER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "fluid_canner", new RecipeBuilder())); public static RecipeMap FLUID_PRESS = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "fluid_press", new RecipeBuilder())); - public static RecipeMap FLUID_SOLIDIFYING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "fluid_solidifier", new RecipeBuilder())); - public static RecipeMap HAMMERING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "forge_hammer", new SteamBuilder(STEAM_FORGE_HAMMER))); - public static RecipeMap SIFTING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "sifter", new SteamBuilder(STEAM_SIFTER))); + public static RecipeMap FLUID_SOLIDIFIER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "fluid_solidifier", new RecipeBuilder())); + public static RecipeMap FORGE_HAMMER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "forge_hammer", new SteamBuilder(STEAM_FORGE_HAMMER))); + public static RecipeMap FURNACE = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "furnace", new RecipeBuilder()).setProxy(RecipeProxies.FURNACE_PROXY.apply(4, 60))); + public static RecipeMap LATHE = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "lathe", new RecipeBuilder())); + public static RecipeMap MACERATOR = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "macerator", new SteamBuilder(STEAM_MACERATOR))); + public static RecipeMap MASS_FABRICATOR = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "mass_fabricator", new RecipeBuilder())); + public static RecipeMap ORE_WASHER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "ore_washer", new RecipeBuilder())); + public static RecipeMap PLATE_BENDER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "plate_bender", new RecipeBuilder())); + public static RecipeMap PLATE_CUTTER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "plate_cutter", new RecipeBuilder())); + public static RecipeMap RECYCLER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "recycler", new RecipeBuilder())); + public static RecipeMap REPLICATOR = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "replicator", new RecipeBuilder())); + public static RecipeMap SCANNER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "scanner", new RecipeBuilder())); + public static RecipeMap SIFTER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "sifter", new SteamBuilder(STEAM_SIFTER))); public static RecipeMap SMELTER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "smelter", new RecipeBuilder())); - public static RecipeMap BASIC_DISTILLING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "distillery", new RecipeBuilder())); - public static RecipeMap DUSTBIN = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "dustbin", new RecipeBuilder())); - public static RecipeMap FERMENTING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "fermenter", new RecipeBuilder())); public static RecipeMap SMELTER_COILS = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "smelter_coils", new RecipeBuilder())).setIcon(() -> GT4RData.CupronickelHeatingCoil); + public static RecipeMap THERMAL_CENTRIFUGE = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "thermal_centrifuge", new RecipeBuilder())); + public static RecipeMap UNIVERSAL_MACERATOR = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "universal_macerator", new UniversalMaceratorBuilder()).setGuiTier(MV)); + public static RecipeMap WIRE_MILL = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "wire_mill", new RecipeBuilder())); public static RecipeMap COKING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "coke_oven", new RecipeBuilder())); public static RecipeMap PYROLYSING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT4RRef.ID, "pyrolysis_oven", new RecipeBuilder())); @@ -118,7 +118,7 @@ public static class UniversalMaceratorBuilder extends RecipeBuilder{ @Override public IRecipe add(String domain, String id) { IRecipe recipe = super.add(domain, id); - var recipeBuilder = MACERATING.RB().hide().ii(recipe.getInputItems()); + var recipeBuilder = MACERATOR.RB().hide().ii(recipe.getInputItems()); if (recipe.hasOutputItems() && recipe.getOutputItems().length > 0) { recipeBuilder.io(recipe.getOutputItems(false)[0]); } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/AlloySmelterLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/AlloySmelterLoader.java index 079c2c43..c4ad6697 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/AlloySmelterLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/AlloySmelterLoader.java @@ -1,27 +1,24 @@ package trinsdar.gt4r.loader.machines; import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; -import muramasa.antimatter.AntimatterConfig; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.material.Material; -import muramasa.antimatter.material.MaterialTags; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import trinsdar.gt4r.data.GT4RData; import trinsdar.gt4r.data.GT4RMaterialTags; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.antimatter.material.MaterialTags.RUBBERTOOLS; import static trinsdar.gt4r.data.Materials.*; -import static trinsdar.gt4r.data.RecipeMaps.ALLOY_SMELTING; +import static trinsdar.gt4r.data.RecipeMaps.ALLOY_SMELTER; public class AlloySmelterLoader { public static void init(){ - ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Tetrahedrite, 3), INGOT.getMaterialIngredient(Tin, 1)).io(INGOT.get(Bronze, 3)).add("bronze_ingot_from_tetra", 150, 16); - ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Tetrahedrite, 3), INGOT.getMaterialIngredient(Zinc, 1)).io(INGOT.get(Brass, 3)).add("brass_ingot_from_tetra",150, 16); - ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Tetrahedrite, 3), DUST.getMaterialIngredient(Tin, 1)).io(INGOT.get(Bronze, 3)).add("bronze_ingot_from_tetra_1",150, 16); - ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Tetrahedrite, 3), DUST.getMaterialIngredient(Zinc, 1)).io(INGOT.get(Brass, 3)).add("brass_ingot_from_tetra_1",150, 16); + ALLOY_SMELTER.RB().ii(DUST.getMaterialIngredient(Tetrahedrite, 3), INGOT.getMaterialIngredient(Tin, 1)).io(INGOT.get(Bronze, 3)).add("bronze_ingot_from_tetra", 150, 16); + ALLOY_SMELTER.RB().ii(DUST.getMaterialIngredient(Tetrahedrite, 3), INGOT.getMaterialIngredient(Zinc, 1)).io(INGOT.get(Brass, 3)).add("brass_ingot_from_tetra",150, 16); + ALLOY_SMELTER.RB().ii(DUST.getMaterialIngredient(Tetrahedrite, 3), DUST.getMaterialIngredient(Tin, 1)).io(INGOT.get(Bronze, 3)).add("bronze_ingot_from_tetra_1",150, 16); + ALLOY_SMELTER.RB().ii(DUST.getMaterialIngredient(Tetrahedrite, 3), DUST.getMaterialIngredient(Zinc, 1)).io(INGOT.get(Brass, 3)).add("brass_ingot_from_tetra_1",150, 16); addAlloyRecipes(Copper, 3, Tin, 1, Bronze, 4, 200); addAlloyRecipes(Copper, 3, Zinc, 1, Brass, 4, 200); addAlloyRecipes(Copper, 1, Nickel, 1, Cupronickel, 2, 100); @@ -30,8 +27,8 @@ public static void init(){ addAlloyRecipes(Lead, 4, Antimony, 1, BatteryAlloy, 5, 250); addAlloyRecipes(AntimatterMaterials.Gold, 1, Silver, 1, Electrum, 2, 100); addAlloyRecipes(Magnesium, 1, Aluminium, 2, Magnalium, 3, 150); - ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Redstone, 4), DUST.getMaterialIngredient(Copper, 1)).io(INGOT.get(RedAlloy, 1)).add("red_alloy_ingot", 50, 16); - ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Redstone, 4), INGOT.getMaterialIngredient(Copper, 1)).io(INGOT.get(RedAlloy, 1)).add("red_alloy_ingot_1", 50, 16); + ALLOY_SMELTER.RB().ii(DUST.getMaterialIngredient(Redstone, 4), DUST.getMaterialIngredient(Copper, 1)).io(INGOT.get(RedAlloy, 1)).add("red_alloy_ingot", 50, 16); + ALLOY_SMELTER.RB().ii(DUST.getMaterialIngredient(Redstone, 4), INGOT.getMaterialIngredient(Copper, 1)).io(INGOT.get(RedAlloy, 1)).add("red_alloy_ingot_1", 50, 16); //TODO compat for bluepower //ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Nikolite, 4), DUST.getMaterialIngredient(Copper)).io(INGOT.get(BlueAlloy, 1)).add(50, 16); //ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Nikolite, 4), INGOT.getMaterialIngredient(Copper)).io(INGOT.get(BlueAlloy, 1)).add(50, 16); @@ -39,9 +36,9 @@ public static void init(){ AntimatterMaterialTypes.PLATE.all().forEach(m -> { if (!m.has(GT4RMaterialTags.NEEDS_BLAST_FURNACE) && m.has(AntimatterMaterialTypes.INGOT)){ int euTick = m.has(RUBBERTOOLS) ? 16 : 32; - ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(m, ingotCount), RecipeIngredient.of(GTCoreItems.MoldPlate, 1).setNoConsume()).io(PLATE.get(m, 1)).add(m.getId() + "_plate", m.getMass() * ingotCount, euTick); + ALLOY_SMELTER.RB().ii(INGOT.getMaterialIngredient(m, ingotCount), RecipeIngredient.of(GTCoreItems.MoldPlate, 1).setNoConsume()).io(PLATE.get(m, 1)).add(m.getId() + "_plate", m.getMass() * ingotCount, euTick); if (m.has(RUBBERTOOLS) && m.has(DUST)){ - ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(m, ingotCount), RecipeIngredient.of(GTCoreItems.MoldPlate, 1).setNoConsume()).io(PLATE.get(m, 1)).add(m.getId() + "_plate_1", m.getMass() * ingotCount, euTick); + ALLOY_SMELTER.RB().ii(DUST.getMaterialIngredient(m, ingotCount), RecipeIngredient.of(GTCoreItems.MoldPlate, 1).setNoConsume()).io(PLATE.get(m, 1)).add(m.getId() + "_plate_1", m.getMass() * ingotCount, euTick); } } }); @@ -49,9 +46,9 @@ public static void init(){ } private static void addAlloyRecipes(Material input1, int count1, Material input2, int count2, Material output, int countO, int duration){ - ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(input1, count1), INGOT.getMaterialIngredient(input2, count2)).io(INGOT.get(output, countO)).add(output.getId() + "_ingot", duration, 16); - ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(input1, count1), INGOT.getMaterialIngredient(input2, count2)).io(INGOT.get(output, countO)).add(output.getId() + "_ingot_1", duration, 16); - ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(input1, count1), DUST.getMaterialIngredient(input2, count2)).io(INGOT.get(output, countO)).add(output.getId() + "_ingot_2", duration, 16); - ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(input1, count1), DUST.getMaterialIngredient(input2, count2)).io(INGOT.get(output, countO)).add(output.getId() + "_ingot_3", duration, 16); + ALLOY_SMELTER.RB().ii(INGOT.getMaterialIngredient(input1, count1), INGOT.getMaterialIngredient(input2, count2)).io(INGOT.get(output, countO)).add(output.getId() + "_ingot", duration, 16); + ALLOY_SMELTER.RB().ii(DUST.getMaterialIngredient(input1, count1), INGOT.getMaterialIngredient(input2, count2)).io(INGOT.get(output, countO)).add(output.getId() + "_ingot_1", duration, 16); + ALLOY_SMELTER.RB().ii(INGOT.getMaterialIngredient(input1, count1), DUST.getMaterialIngredient(input2, count2)).io(INGOT.get(output, countO)).add(output.getId() + "_ingot_2", duration, 16); + ALLOY_SMELTER.RB().ii(DUST.getMaterialIngredient(input1, count1), DUST.getMaterialIngredient(input2, count2)).io(INGOT.get(output, countO)).add(output.getId() + "_ingot_3", duration, 16); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/AssemblyLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/AssemblyLoader.java index e6709e5a..92bc9d50 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/AssemblyLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/AssemblyLoader.java @@ -12,8 +12,8 @@ import net.minecraft.world.item.Items; import net.minecraft.resources.ResourceLocation; import muramasa.antimatter.data.ForgeCTags; -import trinsdar.gt4r.data.GT4RData; import trinsdar.gt4r.data.GT4RMaterialTags; +import trinsdar.gt4r.data.RecipeMaps; import trinsdar.gt4r.data.TierMaps; import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*; @@ -27,7 +27,6 @@ import static trinsdar.gt4r.data.GT4RData.*; import static trinsdar.gt4r.data.Machines.*; import static trinsdar.gt4r.data.Materials.*; -import static trinsdar.gt4r.data.RecipeMaps.ASSEMBLING; public class AssemblyLoader { public static void init() { @@ -38,80 +37,80 @@ public static void init() { sizes.forEach(size -> { Item wireItem = t.getBlockItem(size); Item cableItem = cable.getBlockItem(size); - ASSEMBLING.RB().ii(of(wireItem,1), PLATE.getMaterialIngredient(Rubber, getRubberAmount(size))).io(new ItemStack(cableItem,1)).add(t.getMaterial().getId() + "_cable_" + size.getId(),size.getCableThickness()* 20L,8); + RecipeMaps.ASSEMBLER.RB().ii(of(wireItem,1), PLATE.getMaterialIngredient(Rubber, getRubberAmount(size))).io(new ItemStack(cableItem,1)).add(t.getMaterial().getId() + "_cable_" + size.getId(),size.getCableThickness()* 20L,8); }); }); GT4RMaterialTags.HULL.all().forEach(m -> { - ASSEMBLING.RB().ii(of(MachineParts, 1), of(PLATE.getMaterialTag(m), 6)).io(GT4RMaterialTags.HULL.get(m, 1)).add(m.getId() + "_hull",400, 8); + RecipeMaps.ASSEMBLER.RB().ii(of(MachineParts, 1), of(PLATE.getMaterialTag(m), 6)).io(GT4RMaterialTags.HULL.get(m, 1)).add(m.getId() + "_hull",400, 8); }); - ASSEMBLING.RB().ii(of(getTag("forge", "rods/wooden"), 1), of(getTag("minecraft", "coals"), 1)).io(new ItemStack(Items.TORCH, 4)).add("torch",400, 1); - ASSEMBLING.RB().ii(of(getTag("forge", "string"), 1), of(getTag("forge", "slimeballs"), 1)).io(new ItemStack(Items.LEAD, 2)).add("lead", 200, 2); - ASSEMBLING.RB().ii(of(new ItemStack(CompressedCoalBall, 8)), of(Items.BRICKS, 1)).io(new ItemStack(CoalChunk)).add("coal_chunk", 400, 4); - ASSEMBLING.RB().ii(of(CircuitBoardAdvanced, 1), of(AdvCircuitParts, 2)).io(new ItemStack(CircuitAdv, 1)).add("circuit_advanced", 1600, 2); - ASSEMBLING.RB().ii(of(CircuitBoardProcessor, 1), of(CircuitDataStorage, 1)).io(new ItemStack(CircuitDataControl, 2)).add("circuit_data_control", 3200, 4); - ASSEMBLING.RB().ii(of(CircuitBoardProcessor, 1), of(LapotronCrystal, 1)).io(new ItemStack(CircuitEnergyFlow, 1)).add("circuit_energy_flow", 3200, 4); - ASSEMBLING.RB().ii(of(CircuitDataControl, 1), of(CircuitDataStorage, 8)).io(new ItemStack(DataOrb, 1)).add("data_orb",12800, 16); - ASSEMBLING.RB().ii(of(CarbonFibre, 2), TierMaps.INT_CIRCUITS.get(2)).io(new ItemStack(CarbonMesh)).add("carbon_mesh",800, 2); - ASSEMBLING.RB().ii(of(CarbonMesh, 16), TierMaps.INT_CIRCUITS.get(16)).io(new ItemStack(LavaFilter)).add("lava_filter",1600, 8); - ASSEMBLING.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), of(PUMP.getItem(LV), 1)).io(new ItemStack(PumpModule)).add("pump_module",800, 16); - ASSEMBLING.RB().ii(of(PLATES_IRON_ALUMINIUM, 2), of(Items.IRON_BARS, 2)).io(new ItemStack(Drain)).add("drain",800, 16); - ASSEMBLING.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), of(Items.LEVER, 1)).io(new ItemStack(RedstoneMachineController)).add("redstone_machine_controller",800, 16); - ASSEMBLING.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), of(Items.CRAFTING_TABLE, 1)).io(new ItemStack(CraftingModule)).add("crafting_module",800, 16); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(Aluminium, 2), of(CIRCUITS_BASIC, 1)).io(new ItemStack(MachineParts, 3)).add("machine_parts",800, 16); + RecipeMaps.ASSEMBLER.RB().ii(of(getTag("forge", "rods/wooden"), 1), of(getTag("minecraft", "coals"), 1)).io(new ItemStack(Items.TORCH, 4)).add("torch",400, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(getTag("forge", "string"), 1), of(getTag("forge", "slimeballs"), 1)).io(new ItemStack(Items.LEAD, 2)).add("lead", 200, 2); + RecipeMaps.ASSEMBLER.RB().ii(of(new ItemStack(CompressedCoalBall, 8)), of(Items.BRICKS, 1)).io(new ItemStack(CoalChunk)).add("coal_chunk", 400, 4); + RecipeMaps.ASSEMBLER.RB().ii(of(CircuitBoardAdvanced, 1), of(AdvCircuitParts, 2)).io(new ItemStack(CircuitAdv, 1)).add("circuit_advanced", 1600, 2); + RecipeMaps.ASSEMBLER.RB().ii(of(CircuitBoardProcessor, 1), of(CircuitDataStorage, 1)).io(new ItemStack(CircuitDataControl, 2)).add("circuit_data_control", 3200, 4); + RecipeMaps.ASSEMBLER.RB().ii(of(CircuitBoardProcessor, 1), of(LapotronCrystal, 1)).io(new ItemStack(CircuitEnergyFlow, 1)).add("circuit_energy_flow", 3200, 4); + RecipeMaps.ASSEMBLER.RB().ii(of(CircuitDataControl, 1), of(CircuitDataStorage, 8)).io(new ItemStack(DataOrb, 1)).add("data_orb",12800, 16); + RecipeMaps.ASSEMBLER.RB().ii(of(CarbonFibre, 2), TierMaps.INT_CIRCUITS.get(2)).io(new ItemStack(CarbonMesh)).add("carbon_mesh",800, 2); + RecipeMaps.ASSEMBLER.RB().ii(of(CarbonMesh, 16), TierMaps.INT_CIRCUITS.get(16)).io(new ItemStack(LavaFilter)).add("lava_filter",1600, 8); + RecipeMaps.ASSEMBLER.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), of(PUMP.getItem(LV), 1)).io(new ItemStack(PumpModule)).add("pump_module",800, 16); + RecipeMaps.ASSEMBLER.RB().ii(of(PLATES_IRON_ALUMINIUM, 2), of(Items.IRON_BARS, 2)).io(new ItemStack(Drain)).add("drain",800, 16); + RecipeMaps.ASSEMBLER.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), of(Items.LEVER, 1)).io(new ItemStack(RedstoneMachineController)).add("redstone_machine_controller",800, 16); + RecipeMaps.ASSEMBLER.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), of(Items.CRAFTING_TABLE, 1)).io(new ItemStack(CraftingModule)).add("crafting_module",800, 16); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(Aluminium, 2), of(CIRCUITS_BASIC, 1)).io(new ItemStack(MachineParts, 3)).add("machine_parts",800, 16); //ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(Aluminium, 4), of(MACHINE_HULLS_BASIC, 1), of(BatteryRE, 1)).io(new ItemStack(WATERMILL.getItem(ULV), 2)).add(6400, 8); - ASSEMBLING.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), PLATE.getMaterialIngredient(RedAlloy, 2)).io(new ItemStack(CircuitBoardBasic)).add("circuit_board_basic",800, 1); - ASSEMBLING.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), PLATE.getMaterialIngredient(Electrum, 2)).io(new ItemStack(CircuitBoardBasic, 2)).add("circuit_board_basic_1",800, 1); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(Plastic, 1), PLATE.getMaterialIngredient(RedAlloy, 2)).io(new ItemStack(CircuitBoardBasic)).add("circuit_board_basic_2",800, 1); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(Plastic, 1), PLATE.getMaterialIngredient(Electrum, 2)).io(new ItemStack(CircuitBoardBasic, 2)).add("circuit_board_basic_3",800, 1); - ASSEMBLING.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), of(Items.IRON_TRAPDOOR, 1)).io(new ItemStack(Shutter, 1)).add("shutter",400, 16); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(Iron, 5), of(ForgeCTags.CHESTS, 1)).io(new ItemStack(Items.HOPPER, 1)).add("hopper",800, 2); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(WroughtIron, 2), of(CIRCUITS_BASIC, 1)).io(new ItemStack(MachineParts, 4)).add("machine_parts_2",800, 16); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(Plastic, 2), of(CIRCUITS_BASIC, 1)).io(new ItemStack(MachineParts, 2)).add("machine_parts_1",800, 16); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(Electrum, 2), of(CIRCUITS_BASIC, 1)).io(new ItemStack(CircuitBoardAdvanced)).add("circuit_board_advanced",1600,2); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(Electrum, 4), PLATE.getMaterialIngredient(Silicon, 1)).io(new ItemStack(CircuitBoardAdvanced, 2)).add("circuit_board_advanced_1",1600,2); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(Platinum, 1), of(CIRCUITS_ADVANCED, 1)).io(new ItemStack(CircuitBoardProcessor)).add("circuit_board_processor",1600,2); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(Magnalium, 2), of(MACHINE_HULLS_BASIC, 1), of(BatteryRE, 1).setIgnoreNbt()).io(new ItemStack(WINDMILL.getItem(ULV), 1)).add("windmill",6400, 8); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(TungstenSteel, 1), of(REINFORCED_STONE, 1)).io(new ItemStack(TUNGSTENSTEEL_REINFORCED_STONE)).add("tungstensteel_reinforced_stone",400, 4); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(TungstenSteel, 1), of(IRIDIUM_REINFORCED_STONE, 1)).io(new ItemStack(IRIDIUM_TUNGSTENSTEEL_REINFORCED_STONE)).add("iridium_tungstensteel_reinforced_stone",400, 4); - ASSEMBLING.RB().ii(of(IridiumReinforcedPlate, 1), of(REINFORCED_STONE, 1)).io(new ItemStack(IRIDIUM_REINFORCED_STONE)).add("iridium_reinforced_stone",400, 4); - ASSEMBLING.RB().ii(of(IridiumReinforcedPlate, 1), of(TUNGSTENSTEEL_REINFORCED_STONE, 1)).io(new ItemStack(IRIDIUM_TUNGSTENSTEEL_REINFORCED_STONE)).add("iridium_tungstensteel_reinforced_stone_1",400, 4); - ASSEMBLING.RB().ii(GEM.getMaterialIngredient(Emerald, 8), of(CIRCUITS_ADVANCED, 1)).io(new ItemStack(CircuitDataStorage, 4)).add("circuit_data_storage",6400, 8); - ASSEMBLING.RB().ii(GEM.getMaterialIngredient(Olivine, 8), of(CIRCUITS_ADVANCED, 1)).io(new ItemStack(CircuitDataStorage, 4)).add("circuit_data_storage_1",6400, 8); - ASSEMBLING.RB().ii(of(Items.ENDER_PEARL, 1), DUST.getMaterialIngredient(Blaze, 1)).io(new ItemStack(Items.ENDER_EYE)).add("ender_eye",400, 2); - ASSEMBLING.RB().ii(of(Items.ENDER_PEARL, 5), ROD.getMaterialIngredient(Blaze, 1)).io(new ItemStack(Items.ENDER_EYE, 5)).add("ender_eye_1",2500, 2); + RecipeMaps.ASSEMBLER.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), PLATE.getMaterialIngredient(RedAlloy, 2)).io(new ItemStack(CircuitBoardBasic)).add("circuit_board_basic",800, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), PLATE.getMaterialIngredient(Electrum, 2)).io(new ItemStack(CircuitBoardBasic, 2)).add("circuit_board_basic_1",800, 1); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(Plastic, 1), PLATE.getMaterialIngredient(RedAlloy, 2)).io(new ItemStack(CircuitBoardBasic)).add("circuit_board_basic_2",800, 1); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(Plastic, 1), PLATE.getMaterialIngredient(Electrum, 2)).io(new ItemStack(CircuitBoardBasic, 2)).add("circuit_board_basic_3",800, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), of(Items.IRON_TRAPDOOR, 1)).io(new ItemStack(Shutter, 1)).add("shutter",400, 16); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(Iron, 5), of(ForgeCTags.CHESTS, 1)).io(new ItemStack(Items.HOPPER, 1)).add("hopper",800, 2); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(WroughtIron, 2), of(CIRCUITS_BASIC, 1)).io(new ItemStack(MachineParts, 4)).add("machine_parts_2",800, 16); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(Plastic, 2), of(CIRCUITS_BASIC, 1)).io(new ItemStack(MachineParts, 2)).add("machine_parts_1",800, 16); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(Electrum, 2), of(CIRCUITS_BASIC, 1)).io(new ItemStack(CircuitBoardAdvanced)).add("circuit_board_advanced",1600,2); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(Electrum, 4), PLATE.getMaterialIngredient(Silicon, 1)).io(new ItemStack(CircuitBoardAdvanced, 2)).add("circuit_board_advanced_1",1600,2); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(Platinum, 1), of(CIRCUITS_ADVANCED, 1)).io(new ItemStack(CircuitBoardProcessor)).add("circuit_board_processor",1600,2); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(Magnalium, 2), of(MACHINE_HULLS_BASIC, 1), of(BatteryRE, 1).setIgnoreNbt()).io(new ItemStack(WINDMILL.getItem(ULV), 1)).add("windmill",6400, 8); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(TungstenSteel, 1), of(REINFORCED_STONE, 1)).io(new ItemStack(TUNGSTENSTEEL_REINFORCED_STONE)).add("tungstensteel_reinforced_stone",400, 4); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(TungstenSteel, 1), of(IRIDIUM_REINFORCED_STONE, 1)).io(new ItemStack(IRIDIUM_TUNGSTENSTEEL_REINFORCED_STONE)).add("iridium_tungstensteel_reinforced_stone",400, 4); + RecipeMaps.ASSEMBLER.RB().ii(of(IridiumReinforcedPlate, 1), of(REINFORCED_STONE, 1)).io(new ItemStack(IRIDIUM_REINFORCED_STONE)).add("iridium_reinforced_stone",400, 4); + RecipeMaps.ASSEMBLER.RB().ii(of(IridiumReinforcedPlate, 1), of(TUNGSTENSTEEL_REINFORCED_STONE, 1)).io(new ItemStack(IRIDIUM_TUNGSTENSTEEL_REINFORCED_STONE)).add("iridium_tungstensteel_reinforced_stone_1",400, 4); + RecipeMaps.ASSEMBLER.RB().ii(GEM.getMaterialIngredient(Emerald, 8), of(CIRCUITS_ADVANCED, 1)).io(new ItemStack(CircuitDataStorage, 4)).add("circuit_data_storage",6400, 8); + RecipeMaps.ASSEMBLER.RB().ii(GEM.getMaterialIngredient(Olivine, 8), of(CIRCUITS_ADVANCED, 1)).io(new ItemStack(CircuitDataStorage, 4)).add("circuit_data_storage_1",6400, 8); + RecipeMaps.ASSEMBLER.RB().ii(of(Items.ENDER_PEARL, 1), DUST.getMaterialIngredient(Blaze, 1)).io(new ItemStack(Items.ENDER_EYE)).add("ender_eye",400, 2); + RecipeMaps.ASSEMBLER.RB().ii(of(Items.ENDER_PEARL, 5), ROD.getMaterialIngredient(Blaze, 1)).io(new ItemStack(Items.ENDER_EYE, 5)).add("ender_eye_1",2500, 2); //Todo when gt4r makes it to 1.19 //ASSEMBLING.RB().ii(DUST.getMaterialIngredient(Flint, 5), of(Items.TNT, 1)).io(new ItemStack(ITNT, 5)).add(800, 2); - ASSEMBLING.RB().ii(DUST.getMaterialIngredient(Phosphor, 1), of(getTag("forge", "rods/wooden"), 1)).io(new ItemStack(Match, 4)).add("match",400, 1); - ASSEMBLING.RB().ii(of(Match, 64), of(Items.PAPER, 2)).io(new ItemStack(MatchBook)).add("match_book",400, 1); - ASSEMBLING.RB().ii(of(Items.GUNPOWDER, 4), of(ForgeCTags.SAND, 1)).io(new ItemStack(Items.TNT, 1)).add("tnt",400, 1); - ASSEMBLING.RB().ii(DUST.getMaterialIngredient(Glowstone, 1), of(DUSTS_LAPIS_LAZ, 1)).io(new ItemStack(AdvCircuitParts, 2)).add("adv_circuit_parts",800,2); - ASSEMBLING.RB().ii(DUST.getMaterialIngredient(Redstone, 4), DUST.getMaterialIngredient(Glowstone, 4)).io(new ItemStack(Items.REDSTONE_LAMP)).add("redstone_lamp",400, 1); - ASSEMBLING.RB().ii(of(getTag("forge", "rods/wooden"), 1), DUST.getMaterialIngredient(Redstone, 1)).io(new ItemStack(Items.REDSTONE_TORCH)).add("redstone_torch",400, 1); - ASSEMBLING.RB().ii(INGOT.getMaterialIngredient(Iron, 4), DUST.getMaterialIngredient(Redstone, 1)).io(new ItemStack(Items.COMPASS)).add("compass",400, 4); - ASSEMBLING.RB().ii(INGOT.getMaterialIngredient(Gold, 4), DUST.getMaterialIngredient(Redstone, 1)).io(new ItemStack(Items.CLOCK)).add("clock",400, 4); - ASSEMBLING.RB().ii(of(getTag("forge", "rods/wooden"), 1), of(StickyResin, 1)).io(new ItemStack(Items.TORCH, 6)).add("torch_1",400, 1); - ASSEMBLING.RB().ii(of(Items.COAL, 8), GEM.getMaterialIngredient(Flint, 1)).io(new ItemStack(CompressedCoalBall)).add("compressed_coal_ball",400, 4); - ASSEMBLING.RB().ii(of(getTag("forge", "rods/wooden"), 1), of(ForgeCTags.COBBLESTONE, 1)).io(new ItemStack(Items.LEVER, 1)).add("lever",400, 1); - ASSEMBLING.RB().ii(of(CircuitBoardBasic, 1), of(CABLE_COPPER.getBlockItem(PipeSize.VTINY), 3)).io(new ItemStack(CircuitBasic)).add("circuit_basic",800, 1); - ASSEMBLING.RB().ii(of(CompressedCoalBall, 8), of(BLOCK.getMaterialTag(Iron), 1)).io(new ItemStack(CoalChunk)).add("coal_chunk_2",400, 4); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(Carbon, 4), of(MACHINE_HULLS_BASIC, 1), of(BatteryRE, 1).setIgnoreNbt()).io(new ItemStack(WINDMILL.getItem(ULV), 1)).add("windmill_1",6400, 8); + RecipeMaps.ASSEMBLER.RB().ii(DUST.getMaterialIngredient(Phosphor, 1), of(getTag("forge", "rods/wooden"), 1)).io(new ItemStack(Match, 4)).add("match",400, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(Match, 64), of(Items.PAPER, 2)).io(new ItemStack(MatchBook)).add("match_book",400, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(Items.GUNPOWDER, 4), of(ForgeCTags.SAND, 1)).io(new ItemStack(Items.TNT, 1)).add("tnt",400, 1); + RecipeMaps.ASSEMBLER.RB().ii(DUST.getMaterialIngredient(Glowstone, 1), of(DUSTS_LAPIS_LAZ, 1)).io(new ItemStack(AdvCircuitParts, 2)).add("adv_circuit_parts",800,2); + RecipeMaps.ASSEMBLER.RB().ii(DUST.getMaterialIngredient(Redstone, 4), DUST.getMaterialIngredient(Glowstone, 4)).io(new ItemStack(Items.REDSTONE_LAMP)).add("redstone_lamp",400, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(getTag("forge", "rods/wooden"), 1), DUST.getMaterialIngredient(Redstone, 1)).io(new ItemStack(Items.REDSTONE_TORCH)).add("redstone_torch",400, 1); + RecipeMaps.ASSEMBLER.RB().ii(INGOT.getMaterialIngredient(Iron, 4), DUST.getMaterialIngredient(Redstone, 1)).io(new ItemStack(Items.COMPASS)).add("compass",400, 4); + RecipeMaps.ASSEMBLER.RB().ii(INGOT.getMaterialIngredient(Gold, 4), DUST.getMaterialIngredient(Redstone, 1)).io(new ItemStack(Items.CLOCK)).add("clock",400, 4); + RecipeMaps.ASSEMBLER.RB().ii(of(getTag("forge", "rods/wooden"), 1), of(StickyResin, 1)).io(new ItemStack(Items.TORCH, 6)).add("torch_1",400, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(Items.COAL, 8), GEM.getMaterialIngredient(Flint, 1)).io(new ItemStack(CompressedCoalBall)).add("compressed_coal_ball",400, 4); + RecipeMaps.ASSEMBLER.RB().ii(of(getTag("forge", "rods/wooden"), 1), of(ForgeCTags.COBBLESTONE, 1)).io(new ItemStack(Items.LEVER, 1)).add("lever",400, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(CircuitBoardBasic, 1), of(CABLE_COPPER.getBlockItem(PipeSize.VTINY), 3)).io(new ItemStack(CircuitBasic)).add("circuit_basic",800, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(CompressedCoalBall, 8), of(BLOCK.getMaterialTag(Iron), 1)).io(new ItemStack(CoalChunk)).add("coal_chunk_2",400, 4); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(Carbon, 4), of(MACHINE_HULLS_BASIC, 1), of(BatteryRE, 1).setIgnoreNbt()).io(new ItemStack(WINDMILL.getItem(ULV), 1)).add("windmill_1",6400, 8); //missing - ASSEMBLING.RB().ii(of(AdvancedAlloy, 1), of(getForgelikeItemTag("stone"), 8)).io(new ItemStack(REINFORCED_STONE, 8)).add("reinforced_stone",400, 4); - ASSEMBLING.RB().ii(of(PLATE.getMaterialTag(Wood), 8), DUST.getMaterialIngredient(Redstone, 1)).io(new ItemStack(Items.NOTE_BLOCK)).add("note_block",800, 1); - ASSEMBLING.RB().ii(of(PLATE.getMaterialTag(Wood), 8), GEM.getMaterialIngredient(Diamond, 1)).io(new ItemStack(Items.JUKEBOX)).add("jukebox",1600, 1); - ASSEMBLING.RB().ii(of(AdvancedAlloy, 2), of(ForgeCTags.GLASS, 7)).io(new ItemStack(REINFORCED_GLASS, 7)).add("reinforced_glass",400, 4); - ASSEMBLING.RB().ii(of(getTag("minecraft", "planks"), 8), DUST.getMaterialIngredient(Redstone, 1)).io(new ItemStack(Items.NOTE_BLOCK)).add("note_block_1",800, 1); - ASSEMBLING.RB().ii(of(getTag("minecraft", "planks"), 8), GEM.getMaterialIngredient(Diamond, 1)).io(new ItemStack(Items.JUKEBOX)).add("jukebox_1",1600, 1); - ASSEMBLING.RB().ii(of(CompressedCoalBall, 8), of(getForgelikeItemTag("obsidian"), 1)).io(new ItemStack(CoalChunk)).add("coal_chunk_3",400, 4); - ASSEMBLING.RB().ii(of(CABLE_TIN.getBlockItem(PipeSize.VTINY), 1), PLATE.getMaterialIngredient(BatteryAlloy, 1)).io(new ItemStack(BatteryHullSmall)).add("battery_hull_small",800, 1); - ASSEMBLING.RB().ii(of(CABLE_COPPER.getBlockItem(PipeSize.VTINY), 2), PLATE.getMaterialIngredient(BatteryAlloy, 3)).io(new ItemStack(BatteryHullMedium)).add("battery_hull_medium",1600, 2); - ASSEMBLING.RB().ii(of(CABLE_GOLD.getBlockItem(PipeSize.VTINY), 4), PLATE.getMaterialIngredient(BatteryAlloy, 9)).io(new ItemStack(BatteryHullLarge)).add("battery_hull_large",6400, 4); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(Invar, 2), GEM.getMaterialIngredient(Flint, 1)).io(new ItemStack(LighterEmpty)).add("lighter_empty",256, 16); - ASSEMBLING.RB().ii(PLATE.getMaterialIngredient(Zinc, 4), of(CarbonMesh, 4)).io(new ItemStack(ItemFilter)).add("item_filter",1600, 32); - ASSEMBLING.RB().ii(TRANSFORMER.getItem(HV), TransformerUpgrade).io(HVTransformerUpgrade).add("hv_transformer_upgrade", 3200, 4); - ASSEMBLING.RB().ii(of(PLATES_STEELS, 2), of(STEAM_TURBINE.getItem(LV))).io(SteamUpgrade).add("steam_upgrade",1600, 32); - ASSEMBLING.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), of(2, DUST.getMaterialTag(Plastic), DUST.getMaterialTag(Wood))).io(MufflerUpgrade).add("muffler_upgrade",1600, 2); + RecipeMaps.ASSEMBLER.RB().ii(of(AdvancedAlloy, 1), of(getForgelikeItemTag("stone"), 8)).io(new ItemStack(REINFORCED_STONE, 8)).add("reinforced_stone",400, 4); + RecipeMaps.ASSEMBLER.RB().ii(of(PLATE.getMaterialTag(Wood), 8), DUST.getMaterialIngredient(Redstone, 1)).io(new ItemStack(Items.NOTE_BLOCK)).add("note_block",800, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(PLATE.getMaterialTag(Wood), 8), GEM.getMaterialIngredient(Diamond, 1)).io(new ItemStack(Items.JUKEBOX)).add("jukebox",1600, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(AdvancedAlloy, 2), of(ForgeCTags.GLASS, 7)).io(new ItemStack(REINFORCED_GLASS, 7)).add("reinforced_glass",400, 4); + RecipeMaps.ASSEMBLER.RB().ii(of(getTag("minecraft", "planks"), 8), DUST.getMaterialIngredient(Redstone, 1)).io(new ItemStack(Items.NOTE_BLOCK)).add("note_block_1",800, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(getTag("minecraft", "planks"), 8), GEM.getMaterialIngredient(Diamond, 1)).io(new ItemStack(Items.JUKEBOX)).add("jukebox_1",1600, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(CompressedCoalBall, 8), of(getForgelikeItemTag("obsidian"), 1)).io(new ItemStack(CoalChunk)).add("coal_chunk_3",400, 4); + RecipeMaps.ASSEMBLER.RB().ii(of(CABLE_TIN.getBlockItem(PipeSize.VTINY), 1), PLATE.getMaterialIngredient(BatteryAlloy, 1)).io(new ItemStack(BatteryHullSmall)).add("battery_hull_small",800, 1); + RecipeMaps.ASSEMBLER.RB().ii(of(CABLE_COPPER.getBlockItem(PipeSize.VTINY), 2), PLATE.getMaterialIngredient(BatteryAlloy, 3)).io(new ItemStack(BatteryHullMedium)).add("battery_hull_medium",1600, 2); + RecipeMaps.ASSEMBLER.RB().ii(of(CABLE_GOLD.getBlockItem(PipeSize.VTINY), 4), PLATE.getMaterialIngredient(BatteryAlloy, 9)).io(new ItemStack(BatteryHullLarge)).add("battery_hull_large",6400, 4); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(Invar, 2), GEM.getMaterialIngredient(Flint, 1)).io(new ItemStack(LighterEmpty)).add("lighter_empty",256, 16); + RecipeMaps.ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(Zinc, 4), of(CarbonMesh, 4)).io(new ItemStack(ItemFilter)).add("item_filter",1600, 32); + RecipeMaps.ASSEMBLER.RB().ii(TRANSFORMER.getItem(HV), TransformerUpgrade).io(HVTransformerUpgrade).add("hv_transformer_upgrade", 3200, 4); + RecipeMaps.ASSEMBLER.RB().ii(of(PLATES_STEELS, 2), of(STEAM_TURBINE.getItem(LV))).io(SteamUpgrade).add("steam_upgrade",1600, 32); + RecipeMaps.ASSEMBLER.RB().ii(of(PLATES_IRON_ALUMINIUM, 1), of(2, DUST.getMaterialTag(Plastic), DUST.getMaterialTag(Wood))).io(MufflerUpgrade).add("muffler_upgrade",1600, 2); } public static int getRubberAmount(PipeSize size){ diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/BathingLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/BathingLoader.java index fca17356..4727f2c1 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/BathingLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/BathingLoader.java @@ -14,7 +14,7 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static trinsdar.gt4r.data.Materials.*; -import static trinsdar.gt4r.data.RecipeMaps.BATHING; +import static trinsdar.gt4r.data.RecipeMaps.BATH; public class BathingLoader { public static void init(){ @@ -26,10 +26,10 @@ public static void init(){ addBathRecipe(m, Mercury, i(1.0, 0.7, 0.4), AntimatterMaterialTypes.CRUSHED_PURIFIED.get(m, 1), AntimatterMaterialTypes.DUST.get(GT4RMaterialTags.BATHING_MERCURY.getMapping(m), 1), stoneDust); }); //addBathRecipe(Zinc, SodiumPersulfate, i(100, 70, 40), CRUSHED_PURIFIED.get(Zinc, 1), DUST.get(Zinc, 1), stoneDust); - BATHING.RB().ii(RecipeIngredient.of(DUST.getMaterialTag(Wood), 1)).fi(Water.getLiquid(100)).io(new ItemStack(Items.PAPER)).outputChances(1.0).add("paper",200); - BATHING.RB().ii(RecipeIngredient.of(Items.SUGAR_CANE, 1)).fi(Water.getLiquid(100)).io(new ItemStack(Items.PAPER)).outputChances(1.0).add("paper_1",100); - BATHING.RB().ii(RecipeIngredient.of(TagUtils.getItemTag(new ResourceLocation("minecraft", "wool")), 1)).fi(Chlorine.getGas(125)).io(new ItemStack(Items.WHITE_WOOL)).outputChances(1.0).add("white_wool",12); - BATHING.RB().ii(GEM.getMaterialIngredient(Diamond, 1)).fi(Netherite.getLiquid(switchValues(36, 2250))).io(GEM.get(NetherizedDiamond, 1)).add("netherized_diamond",144); + BATH.RB().ii(RecipeIngredient.of(DUST.getMaterialTag(Wood), 1)).fi(Water.getLiquid(100)).io(new ItemStack(Items.PAPER)).outputChances(1.0).add("paper",200); + BATH.RB().ii(RecipeIngredient.of(Items.SUGAR_CANE, 1)).fi(Water.getLiquid(100)).io(new ItemStack(Items.PAPER)).outputChances(1.0).add("paper_1",100); + BATH.RB().ii(RecipeIngredient.of(TagUtils.getItemTag(new ResourceLocation("minecraft", "wool")), 1)).fi(Chlorine.getGas(125)).io(new ItemStack(Items.WHITE_WOOL)).outputChances(1.0).add("white_wool",12); + BATH.RB().ii(GEM.getMaterialIngredient(Diamond, 1)).fi(Netherite.getLiquid(switchValues(36, 2250))).io(GEM.get(NetherizedDiamond, 1)).add("netherized_diamond",144); } private static long switchValues(long forge, long fabric){ @@ -41,6 +41,6 @@ private static double[] i(double... doubles){ } private static void addBathRecipe(Material input, Material liquid, double[] chances, ItemStack... outputs){ - BATHING.RB().ii(RecipeIngredient.of(CRUSHED.getMaterialTag(input), 1)).fi(liquid.getLiquid(1000)).io(outputs).outputChances(chances).add(input.getId() + "_in_" + liquid.getId(),800); + BATH.RB().ii(RecipeIngredient.of(CRUSHED.getMaterialTag(input), 1)).fi(liquid.getLiquid(1000)).io(outputs).outputChances(chances).add(input.getId() + "_in_" + liquid.getId(),800); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/BendingLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/BendingLoader.java index 17bc6226..9a4ffe8d 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/BendingLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/BendingLoader.java @@ -10,27 +10,27 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static trinsdar.gt4r.data.Materials.Tin; -import static trinsdar.gt4r.data.RecipeMaps.BENDING; +import static trinsdar.gt4r.data.RecipeMaps.PLATE_BENDER; public class BendingLoader { public static void init() { AntimatterMaterialTypes.PLATE.all().forEach(t -> { long duration = Math.max(t.getMass(), 1); if (!t.has(INGOT)) return; - BENDING.RB().ii(INGOT.getMaterialIngredient(t,1), TierMaps.INT_CIRCUITS.get(1)).io(PLATE.get(t,1)).add(t.getId() + "_plate", duration, 24); + PLATE_BENDER.RB().ii(INGOT.getMaterialIngredient(t,1), TierMaps.INT_CIRCUITS.get(1)).io(PLATE.get(t,1)).add(t.getId() + "_plate", duration, 24); }); AntimatterMaterialTypes.PLATE_DENSE.all().forEach(t -> { long duration = Math.max(t.getMass(), 1); if (!t.has(INGOT)) return; - BENDING.RB().ii(INGOT.getMaterialIngredient(t,9), TierMaps.INT_CIRCUITS.get(9)).io(PLATE_DENSE.get(t,1)).add(t.getId() + "_dense_plate", duration, 24); + PLATE_BENDER.RB().ii(INGOT.getMaterialIngredient(t,9), TierMaps.INT_CIRCUITS.get(9)).io(PLATE_DENSE.get(t,1)).add(t.getId() + "_dense_plate", duration, 24); }); AntimatterMaterialTypes.RING.all().forEach(m -> { long duration = Math.max(m.getMass(), 1); if (!m.has(ROD)) return; - BENDING.RB().ii(ROD.getMaterialIngredient(m, 1), TierMaps.INT_CIRCUITS.get(1)).io(RING.get(m, 2)).add(m.getId() + "_ring", duration, 24); + PLATE_BENDER.RB().ii(ROD.getMaterialIngredient(m, 1), TierMaps.INT_CIRCUITS.get(1)).io(RING.get(m, 2)).add(m.getId() + "_ring", duration, 24); }); - BENDING.RB().ii(RecipeIngredient.of(GT4RData.MixedMetal, 1)).io(new ItemStack(GT4RData.AdvancedAlloy)).add("advanced_alloy",100, 8); - BENDING.RB().ii(PLATE.getMaterialIngredient(Tin, 2)).io(new ItemStack(GT4RData.CellTin)).add("tin_cell",200, 8); - BENDING.RB().ii(PLATE.getMaterialIngredient(Iron, 3)).io(new ItemStack(Items.BUCKET)).add("bucket",200, 4); + PLATE_BENDER.RB().ii(RecipeIngredient.of(GT4RData.MixedMetal, 1)).io(new ItemStack(GT4RData.AdvancedAlloy)).add("advanced_alloy",100, 8); + PLATE_BENDER.RB().ii(PLATE.getMaterialIngredient(Tin, 2)).io(new ItemStack(GT4RData.CellTin)).add("tin_cell",200, 8); + PLATE_BENDER.RB().ii(PLATE.getMaterialIngredient(Iron, 3)).io(new ItemStack(Items.BUCKET)).add("bucket",200, 4); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/CannerLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/CannerLoader.java index 88005b1f..f70a2dab 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/CannerLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/CannerLoader.java @@ -9,19 +9,19 @@ import static trinsdar.gt4r.data.Materials.Cadmium; import static trinsdar.gt4r.data.Materials.Lithium; import static trinsdar.gt4r.data.Materials.Sodium; -import static trinsdar.gt4r.data.RecipeMaps.CANNING; +import static trinsdar.gt4r.data.RecipeMaps.CANNER; public class CannerLoader { public static void init(){ - CANNING.RB().ii(of(BatteryHullSmall, 1), DUST.getMaterialIngredient(Cadmium, 2)).io(new ItemStack(BatterySmallCadmium)).add("battery_small_cadmium",100, 2); - CANNING.RB().ii(of(BatteryHullSmall, 1), DUST.getMaterialIngredient(Lithium, 2)).io(new ItemStack(BatterySmallLithium)).add("battery_small_lithium",100, 2); - CANNING.RB().ii(of(BatteryHullSmall, 1), DUST.getMaterialIngredient(Sodium, 2)).io(new ItemStack(BatterySmallSodium)).add("battery_small_sodium",100, 2); - CANNING.RB().ii(of(BatteryHullSmall, 1), DUST.getMaterialIngredient(Redstone, 2)).io(new ItemStack(BatteryRE)).add("battery_re",100, 2); - CANNING.RB().ii(of(BatteryHullMedium, 1), DUST.getMaterialIngredient(Cadmium, 8)).io(new ItemStack(BatteryMediumCadmium)).add("battery_medium_cadmium",400, 2); - CANNING.RB().ii(of(BatteryHullMedium, 1), DUST.getMaterialIngredient(Lithium, 8)).io(new ItemStack(BatteryMediumLithium)).add("battery_medium_lithium",400, 2); - CANNING.RB().ii(of(BatteryHullMedium, 1), DUST.getMaterialIngredient(Sodium, 8)).io(new ItemStack(BatteryMediumSodium)).add("battery_medium_sodium",400, 2); - CANNING.RB().ii(of(BatteryHullLarge, 1), DUST.getMaterialIngredient(Cadmium, 32)).io(new ItemStack(BatteryLargeCadmium)).add("battery_large_cadmium",1600, 2); - CANNING.RB().ii(of(BatteryHullLarge, 1), DUST.getMaterialIngredient(Lithium, 32)).io(new ItemStack(BatteryLargeLithium)).add("battery_large_lithium",1600, 2); - CANNING.RB().ii(of(BatteryHullLarge, 1), DUST.getMaterialIngredient(Sodium, 32)).io(new ItemStack(BatteryLargeSodium)).add("battery_large_sodium",1600, 2); + CANNER.RB().ii(of(BatteryHullSmall, 1), DUST.getMaterialIngredient(Cadmium, 2)).io(new ItemStack(BatterySmallCadmium)).add("battery_small_cadmium",100, 2); + CANNER.RB().ii(of(BatteryHullSmall, 1), DUST.getMaterialIngredient(Lithium, 2)).io(new ItemStack(BatterySmallLithium)).add("battery_small_lithium",100, 2); + CANNER.RB().ii(of(BatteryHullSmall, 1), DUST.getMaterialIngredient(Sodium, 2)).io(new ItemStack(BatterySmallSodium)).add("battery_small_sodium",100, 2); + CANNER.RB().ii(of(BatteryHullSmall, 1), DUST.getMaterialIngredient(Redstone, 2)).io(new ItemStack(BatteryRE)).add("battery_re",100, 2); + CANNER.RB().ii(of(BatteryHullMedium, 1), DUST.getMaterialIngredient(Cadmium, 8)).io(new ItemStack(BatteryMediumCadmium)).add("battery_medium_cadmium",400, 2); + CANNER.RB().ii(of(BatteryHullMedium, 1), DUST.getMaterialIngredient(Lithium, 8)).io(new ItemStack(BatteryMediumLithium)).add("battery_medium_lithium",400, 2); + CANNER.RB().ii(of(BatteryHullMedium, 1), DUST.getMaterialIngredient(Sodium, 8)).io(new ItemStack(BatteryMediumSodium)).add("battery_medium_sodium",400, 2); + CANNER.RB().ii(of(BatteryHullLarge, 1), DUST.getMaterialIngredient(Cadmium, 32)).io(new ItemStack(BatteryLargeCadmium)).add("battery_large_cadmium",1600, 2); + CANNER.RB().ii(of(BatteryHullLarge, 1), DUST.getMaterialIngredient(Lithium, 32)).io(new ItemStack(BatteryLargeLithium)).add("battery_large_lithium",1600, 2); + CANNER.RB().ii(of(BatteryHullLarge, 1), DUST.getMaterialIngredient(Sodium, 32)).io(new ItemStack(BatteryLargeSodium)).add("battery_large_sodium",1600, 2); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/CentrifugingLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/CentrifugingLoader.java index 01b72176..462db838 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/CentrifugingLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/CentrifugingLoader.java @@ -9,7 +9,6 @@ import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.recipe.map.RecipeBuilder; import muramasa.antimatter.util.AntimatterPlatformUtils; -import net.minecraft.world.level.material.Fluids; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -18,7 +17,6 @@ import trinsdar.gt4r.data.GT4RData; import java.util.List; -import java.util.stream.Collectors; import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.Plantball; import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.StickyResin; @@ -29,31 +27,31 @@ import static net.minecraft.world.item.Items.DIRT; import static net.minecraft.world.level.block.Blocks.GRASS_BLOCK; import static trinsdar.gt4r.data.Materials.*; -import static trinsdar.gt4r.data.RecipeMaps.CENTRIFUGING; +import static trinsdar.gt4r.data.RecipeMaps.CENTRIFUGE; public class CentrifugingLoader { public static void init() { AntimatterMaterialTypes.DUST_IMPURE.all().forEach(dust -> { Material oreByProduct1 = dust.getByProducts().size() > 0 ? dust.getByProducts().get(0) : dust; - CENTRIFUGING.RB().ii(of(DUST_IMPURE.get(dust),1)).io(new ItemStack(DUST.get(dust), 1), DUST_TINY.get(oreByProduct1, 1)).add(dust.getId() + "_impure_dust",400, 2); + CENTRIFUGE.RB().ii(of(DUST_IMPURE.get(dust),1)).io(new ItemStack(DUST.get(dust), 1), DUST_TINY.get(oreByProduct1, 1)).add(dust.getId() + "_impure_dust",400, 2); }); AntimatterMaterialTypes.DUST_PURE.all().forEach(dust -> { Material oreByProduct = dust.getByProducts().size() > 1 ? dust.getByProducts().get(1) : dust.getByProducts().size() > 0 ? dust.getByProducts().get(0) : dust; - CENTRIFUGING.RB().ii(of(DUST_PURE.get(dust),1)).io(new ItemStack(DUST.get(dust), 1), DUST_TINY.get(oreByProduct, 1)).add(dust.getId() + "_pure_dust",400, 2); + CENTRIFUGE.RB().ii(of(DUST_PURE.get(dust),1)).io(new ItemStack(DUST.get(dust), 1), DUST_TINY.get(oreByProduct, 1)).add(dust.getId() + "_pure_dust",400, 2); }); ItemStack[] itemStacks = AntimatterMaterials.Lava.getProcessInto().stream().filter(t -> t.m.has(AntimatterMaterialTypes.DUST_TINY)).map(t -> new ItemStack(AntimatterMaterialTypes.DUST_TINY.get(t.m), t.s)) .toArray(ItemStack[]::new); - CENTRIFUGING.RB().fi(Lava.getLiquid(100)).io(itemStacks).outputChances(0.2, 0.1, 0.025, 0.025, 0.01).add("lava",200, 16); - CENTRIFUGING.RB().fi(FluidPlatformUtils.createFluidStack(GT4RData.PAHOEHOE_LAVA.getFluid(), 100 * TesseractGraphWrappers.dropletMultiplier)).io(itemStacks).outputChances(0.2, 0.1, 0.025, 0.025, 0.01).add("pahoehoe_lava", 200, 8); + CENTRIFUGE.RB().fi(Lava.getLiquid(100)).io(itemStacks).outputChances(0.2, 0.1, 0.025, 0.025, 0.01).add("lava",200, 16); + CENTRIFUGE.RB().fi(FluidPlatformUtils.createFluidStack(GT4RData.PAHOEHOE_LAVA.getFluid(), 100 * TesseractGraphWrappers.dropletMultiplier)).io(itemStacks).outputChances(0.2, 0.1, 0.025, 0.025, 0.01).add("pahoehoe_lava", 200, 8); add(EnderEye, 10, 792); - CENTRIFUGING.RB().ii(of(MAGMA_CREAM, 1)).io(new ItemStack(SLIME_BALL), new ItemStack(BLAZE_POWDER)).add("magma_cream",156,16); - CENTRIFUGING.RB().ii(of(DIRT, 64)).io(new ItemStack(Items.SAND, 32), new ItemStack(CLAY_BALL, 2), new ItemStack(Plantball, 4)).add("dirt",3125, 16); - CENTRIFUGING.RB().ii(of(GRASS_BLOCK, 64)).io(new ItemStack(Items.SAND, 32), new ItemStack(CLAY_BALL, 2), new ItemStack(Plantball, 6)).add("grass",3125, 16); - CENTRIFUGING.RB().ii(of(MYCELIUM, 64)).io(new ItemStack(Items.SAND, 32), new ItemStack(CLAY_BALL, 8), new ItemStack(BROWN_MUSHROOM, 16), new ItemStack(RED_MUSHROOM, 16)).add("mycelium",3906, 16); + CENTRIFUGE.RB().ii(of(MAGMA_CREAM, 1)).io(new ItemStack(SLIME_BALL), new ItemStack(BLAZE_POWDER)).add("magma_cream",156,16); + CENTRIFUGE.RB().ii(of(DIRT, 64)).io(new ItemStack(Items.SAND, 32), new ItemStack(CLAY_BALL, 2), new ItemStack(Plantball, 4)).add("dirt",3125, 16); + CENTRIFUGE.RB().ii(of(GRASS_BLOCK, 64)).io(new ItemStack(Items.SAND, 32), new ItemStack(CLAY_BALL, 2), new ItemStack(Plantball, 6)).add("grass",3125, 16); + CENTRIFUGE.RB().ii(of(MYCELIUM, 64)).io(new ItemStack(Items.SAND, 32), new ItemStack(CLAY_BALL, 8), new ItemStack(BROWN_MUSHROOM, 16), new ItemStack(RED_MUSHROOM, 16)).add("mycelium",3906, 16); add(Lapis,20, 1792); - CENTRIFUGING.RB().ii(of(StickyResin, 8)).io(DUST.get(Rubber, 21), DUST.get(Plastic, 7), new ItemStack(Plantball, 4)).add("sticky_resin",1250,10); - CENTRIFUGING.RB().ii(of(DUST.getMaterialTag(Netherrack), 64)).io(new ItemStack(GOLD_NUGGET, 4), new ItemStack(REDSTONE, 4), new ItemStack(GUNPOWDER, 8), DUST.get(Coal, 4), DUST.get(Sulfur, 4), DUST.get(Phosphor, 2)).add("netherrack",3125,16); + CENTRIFUGE.RB().ii(of(StickyResin, 8)).io(DUST.get(Rubber, 21), DUST.get(Plastic, 7), new ItemStack(Plantball, 4)).add("sticky_resin",1250,10); + CENTRIFUGE.RB().ii(of(DUST.getMaterialTag(Netherrack), 64)).io(new ItemStack(GOLD_NUGGET, 4), new ItemStack(REDSTONE, 4), new ItemStack(GUNPOWDER, 8), DUST.get(Coal, 4), DUST.get(Sulfur, 4), DUST.get(Phosphor, 2)).add("netherrack",3125,16); add(Granite, 16, 1500); add(Diorite, 16,2250, 16); add(Electrum, 16, 312); @@ -66,16 +64,16 @@ public static void init() { add(Kanthal, 16, 1040); add(TungstenSteel, 16, 1900); add(Nichrome, 16, 2240); - CENTRIFUGING.RB().ii(of(Items.SOUL_SAND, 16)).io(new ItemStack(Items.SAND, 1), DUST.get(Saltpeter,4), DUST.get(Coal, 1)).fo(Oil.getLiquid(1000)).add("soul_sand",750, 16); - CENTRIFUGING.RB().ii(of(Items.SOUL_SOIL, 16)).io(new ItemStack(DIRT, 1), DUST.get(Saltpeter,4), DUST.get(Coal, 1)).fo(Oil.getLiquid(1000)).add("soul_soil",750, 16); - CENTRIFUGING.RB().ii(of(GTCoreTags.RUBBER_LOGS, 16)).io(DUST.get(Carbon, 8), new ItemStack(StickyResin, 8), new ItemStack(Plantball, 6)).fo(Methane.getGas(4000)).add("rubber_log",1562, 16); - CENTRIFUGING.RB().fi(Hydrogen.getGas(4000)).fo(Deuterium.getGas(1000)).add("hydrogen",300, 20); - CENTRIFUGING.RB().fi(Deuterium.getGas(4000)).fo(Tritium.getGas(1000)).add("deuterium",300, 20); - CENTRIFUGING.RB().fi(Helium.getGas(16000)).fo(Helium3.getGas(1000)).add("helium",900, 20); + CENTRIFUGE.RB().ii(of(Items.SOUL_SAND, 16)).io(new ItemStack(Items.SAND, 1), DUST.get(Saltpeter,4), DUST.get(Coal, 1)).fo(Oil.getLiquid(1000)).add("soul_sand",750, 16); + CENTRIFUGE.RB().ii(of(Items.SOUL_SOIL, 16)).io(new ItemStack(DIRT, 1), DUST.get(Saltpeter,4), DUST.get(Coal, 1)).fo(Oil.getLiquid(1000)).add("soul_soil",750, 16); + CENTRIFUGE.RB().ii(of(GTCoreTags.RUBBER_LOGS, 16)).io(DUST.get(Carbon, 8), new ItemStack(StickyResin, 8), new ItemStack(Plantball, 6)).fo(Methane.getGas(4000)).add("rubber_log",1562, 16); + CENTRIFUGE.RB().fi(Hydrogen.getGas(4000)).fo(Deuterium.getGas(1000)).add("hydrogen",300, 20); + CENTRIFUGE.RB().fi(Deuterium.getGas(4000)).fo(Tritium.getGas(1000)).add("deuterium",300, 20); + CENTRIFUGE.RB().fi(Helium.getGas(16000)).fo(Helium3.getGas(1000)).add("helium",900, 20); add(Glowstone, 16,1562, 16); add(Redstone, 20, 1750); - CENTRIFUGING.RB().ii(of(MAGMA_BLOCK, 64)).fo(Lava.getLiquid(64000)).add("magma_block",187, 16); - CENTRIFUGING.RB().ii(of(ROTTEN_FLESH, 16)).io(new ItemStack(LEATHER, 4), new ItemStack(SLIME_BALL)).fo(Methane.getGas(4000)).add("rotten_flesh",375, 16); + CENTRIFUGE.RB().ii(of(MAGMA_BLOCK, 64)).fo(Lava.getLiquid(64000)).add("magma_block",187, 16); + CENTRIFUGE.RB().ii(of(ROTTEN_FLESH, 16)).io(new ItemStack(LEATHER, 4), new ItemStack(SLIME_BALL)).fo(Methane.getGas(4000)).add("rotten_flesh",375, 16); addMethaneRecipe(PORKCHOP, 12); addMethaneRecipe(BEEF, 12); addMethaneRecipe(CHICKEN, 12); @@ -111,10 +109,10 @@ public static void init() { addMethaneRecipe(ENCHANTED_GOLDEN_APPLE, 1, new ItemStack(GOLD_INGOT, 64)); addMethaneRecipe(GOLDEN_CARROT, 1, new ItemStack(GOLD_NUGGET, 6)); addMethaneRecipe(GLISTERING_MELON_SLICE, 8, new ItemStack(GOLD_NUGGET, 6)); - CENTRIFUGING.RB().ii(of(DUST.getMaterialTag(Endstone), 64)).io(new ItemStack(Items.SAND, 48), DUST.get(Tungsten, 1)).fo(Helium.getGas(4000), Helium3.getGas(4000)).add("endstone_dust",19500,16); + CENTRIFUGE.RB().ii(of(DUST.getMaterialTag(Endstone), 64)).io(new ItemStack(Items.SAND, 48), DUST.get(Tungsten, 1)).fo(Helium.getGas(4000), Helium3.getGas(4000)).add("endstone_dust",19500,16); add(RedGarnet, 16, 937); add(YellowGarnet, 16, 1093); - CENTRIFUGING.RB().ii(of(DUST.getMaterialTag(DarkAsh), 2)).io(DUST.get(Ash, 2)).add("dark_ash",78, 16); + CENTRIFUGE.RB().ii(of(DUST.getMaterialTag(DarkAsh), 2)).io(DUST.get(Ash, 2)).add("dark_ash",78, 16); //add(RedRock, 16, 2400); // 8 calcite, 4 flint, 4 clay add(Marble, 16, 329); add(AntimatterMaterials.Basalt, 16, 1500); @@ -126,11 +124,11 @@ public static void init() { } private static void addMethaneRecipe(Item input, int inputAmount){ - CENTRIFUGING.RB().ii(of(input, inputAmount)).fo(Methane.getGas(1000)).add(AntimatterPlatformUtils.getIdFromItem(input).getPath() + "_into_methane",2250, 16); + CENTRIFUGE.RB().ii(of(input, inputAmount)).fo(Methane.getGas(1000)).add(AntimatterPlatformUtils.getIdFromItem(input).getPath() + "_into_methane",2250, 16); } private static void addMethaneRecipe(Item input, int inputAmount, ItemStack extra){ - CENTRIFUGING.RB().ii(of(input, inputAmount)).io(extra).fo(Methane.getGas(1000)).add(AntimatterPlatformUtils.getIdFromItem(input).getPath() + "_into_methane",2250, 16); + CENTRIFUGE.RB().ii(of(input, inputAmount)).io(extra).fo(Methane.getGas(1000)).add(AntimatterPlatformUtils.getIdFromItem(input).getPath() + "_into_methane",2250, 16); } private static void add(Material mat, long euT, int duration) { @@ -144,7 +142,7 @@ private static void add(Material dust, int count, long euT, int duration) { }).toList(); List itemStacks = dust.getProcessInto().stream().filter(t -> t.m.has(AntimatterMaterialTypes.DUST)).map(t -> new ItemStack(AntimatterMaterialTypes.DUST.get(t.m), t.s)) .toList(); - RecipeBuilder rb = CENTRIFUGING.RB(); + RecipeBuilder rb = CENTRIFUGE.RB(); if ((dust.has(AntimatterMaterialTypes.LIQUID) || dust.has(AntimatterMaterialTypes.GAS)) && !dust.has(AntimatterMaterialTypes.DUST)){ rb.fi(getFluid(dust,count * 1000)); } else { diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/ChemicalReactorLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/ChemicalReactorLoader.java index abbc7ad2..9f9dc0f5 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/ChemicalReactorLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/ChemicalReactorLoader.java @@ -7,7 +7,7 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static trinsdar.gt4r.data.Materials.*; -import static trinsdar.gt4r.data.RecipeMaps.CHEMICAL_REACTING; +import static trinsdar.gt4r.data.RecipeMaps.CHEMICAL_REACTOR; public class ChemicalReactorLoader { public static void init() { @@ -16,25 +16,25 @@ public static void init() { //CHEMICAL_REACTING.RB().ii(RecipeIngredient.of(Items.APPLE, 1), INGOT.getMaterialIngredient(Gold, 8)).io(new ItemStack(Items.GOLDEN_APPLE)).add(50, 30); //CHEMICAL_REACTING.RB().ii(RecipeIngredient.of(Items.ENDER_PEARL, 1), DUST.getMaterialIngredient(Blaze, 1)).io(new ItemStack(Items.ENDER_EYE)).add(50, 30); //CHEMICAL_REACTING.RB().ii(RecipeIngredient.of(Tags.Items.SLIMEBALLS, 1), DUST.getMaterialIngredient(Blaze)).io(new ItemStack(Items.MAGMA_CREAM)).add(50, 30); - CHEMICAL_REACTING.RB().ii(DUST.getMaterialIngredient(Calcium, 1), DUST.getMaterialIngredient(Carbon, 1)).io(DUST.get(Calcite, 2)).add("calcite_dust",250, 30); - CHEMICAL_REACTING.RB().ii(DUST.getMaterialIngredient(Carbon, 1)).fi(Hydrogen.getGas(4000)).fo(Methane.getGas(5000)).add("methane",3500, 30); - CHEMICAL_REACTING.RB().ii(DUST.getMaterialIngredient(Carbon, 1)).fi(Nitrogen.getGas(1000)).fo(NitroCarbon.getLiquid(2000)).add("nitro_carbon",1500, 30); - CHEMICAL_REACTING.RB().fi(Glyceryl.getLiquid(1000), CoalFuel.getLiquid(4000)).fo(NitroCoalFuel.getLiquid(5000)).add("nitro_coal_fuel",250,30); - CHEMICAL_REACTING.RB().fi(Glyceryl.getLiquid(1000), Diesel.getLiquid(4000)).fo(NitroDiesel.getLiquid(5000)).add("nitro_diesel",1000,30); - CHEMICAL_REACTING.RB().fi(Nitrogen.getGas(1000), Oxygen.getGas(2000)).fo(NitrogenDioxide.getGas(3000)).add("nitrogen_dioxide",1250, 30); - CHEMICAL_REACTING.RB().fi(Oxygen.getGas(2000)).ii(DUST.getMaterialIngredient(SodiumSulfide, 1)).fo(SodiumPersulfate.getLiquid(3000)).add("sodium_peroxide",2000, 30); - CHEMICAL_REACTING.RB().fi(NitroCarbon.getLiquid(1000), Water.getLiquid(1000)).fo(Glyceryl.getLiquid(2000)).add("glyceryl",583, 30); - CHEMICAL_REACTING.RB().ii(DUST.getMaterialIngredient(Sodium, 1), DUST.getMaterialIngredient(Sulfur, 1)).io(DUST.get(SodiumSulfide, 2)).add("sodium_sulfide",100, 30); - CHEMICAL_REACTING.RB().ii(DUST.getMaterialIngredient(Sulfur, 1)).fi(Water.getLiquid(2000)).fo(SulfuricAcid.getLiquid(3000)).add("sulfuric_acid",1150, 30); - CHEMICAL_REACTING.RB().fi(Hydrogen.getGas(2000), Oxygen.getGas(1000)).ii(TierMaps.INT_CIRCUITS.get(1)).fo(Water.getLiquid(3000)).add("water",10, 30); - CHEMICAL_REACTING.RB().ii(DUST.getMaterialIngredient(Sodium, 2)).fi(NitrogenDioxide.getGas(5000)).io(new ItemStack(Items.GUNPOWDER, 5)).add("gunpowder",34, 30); - CHEMICAL_REACTING.RB().ii(DUST.getMaterialIngredient(Potassium, 1)).fi(NitricAcid.getLiquid(1000)).io(DUST.get(Saltpeter, 1)).add("saltpeter",20, 30); - CHEMICAL_REACTING.RB().fi(NitrogenDioxide.getGas(3000), Water.getLiquid(1000)).fo(NitricAcid.getLiquid(2000), NitricOxide.getGas(1000)).add("nitric_acid",20, 30); - CHEMICAL_REACTING.RB().ii(DUST.getMaterialIngredient(Silicon, 1)).fi(Oxygen.getGas(2000)).io(DUST.get(SiliconDioxide, 3)).add("silicon_dioxide",50,30); - CHEMICAL_REACTING.RB().fi(NitricOxide.getGas(1000), Oxygen.getGas(1000)).fo(NitrogenDioxide.getGas(1000)).add("nitrogen_dioxide_2",20, 30); - CHEMICAL_REACTING.RB().fi(Oxygen.getGas(500), Hydrogen.getGas(1000)).fo(DistilledWater.getLiquid(1500)).add("distilled_water",5, 30); - CHEMICAL_REACTING.RB().fi(FishOil.getLiquid(6000), Ethanol.getLiquid(1000)).ii(DUST_TINY.getMaterialIngredient(SodiumHydroxide, 1)).fo(BioDiesel.getLiquid(6000), Glycerol.getLiquid(1000)).add("biodiesel",600, 30); - CHEMICAL_REACTING.RB().fi(SeedOil.getLiquid(6000), Ethanol.getLiquid(1000)).ii(DUST_TINY.getMaterialIngredient(SodiumHydroxide, 1)).fo(BioDiesel.getLiquid(6000), Glycerol.getLiquid(1000)).add("biodiesel_1",600, 30); - CHEMICAL_REACTING.RB().fi(Water.getLiquid(3000)).ii(DUST.getMaterialIngredient(Sodium, 1)).fo(Hydrogen.getGas(1000)).io(DUST.get(SodiumHydroxide, 3)).add("sodium_hydroxide",600, 30); + CHEMICAL_REACTOR.RB().ii(DUST.getMaterialIngredient(Calcium, 1), DUST.getMaterialIngredient(Carbon, 1)).io(DUST.get(Calcite, 2)).add("calcite_dust",250, 30); + CHEMICAL_REACTOR.RB().ii(DUST.getMaterialIngredient(Carbon, 1)).fi(Hydrogen.getGas(4000)).fo(Methane.getGas(5000)).add("methane",3500, 30); + CHEMICAL_REACTOR.RB().ii(DUST.getMaterialIngredient(Carbon, 1)).fi(Nitrogen.getGas(1000)).fo(NitroCarbon.getLiquid(2000)).add("nitro_carbon",1500, 30); + CHEMICAL_REACTOR.RB().fi(Glyceryl.getLiquid(1000), CoalFuel.getLiquid(4000)).fo(NitroCoalFuel.getLiquid(5000)).add("nitro_coal_fuel",250,30); + CHEMICAL_REACTOR.RB().fi(Glyceryl.getLiquid(1000), Diesel.getLiquid(4000)).fo(NitroDiesel.getLiquid(5000)).add("nitro_diesel",1000,30); + CHEMICAL_REACTOR.RB().fi(Nitrogen.getGas(1000), Oxygen.getGas(2000)).fo(NitrogenDioxide.getGas(3000)).add("nitrogen_dioxide",1250, 30); + CHEMICAL_REACTOR.RB().fi(Oxygen.getGas(2000)).ii(DUST.getMaterialIngredient(SodiumSulfide, 1)).fo(SodiumPersulfate.getLiquid(3000)).add("sodium_peroxide",2000, 30); + CHEMICAL_REACTOR.RB().fi(NitroCarbon.getLiquid(1000), Water.getLiquid(1000)).fo(Glyceryl.getLiquid(2000)).add("glyceryl",583, 30); + CHEMICAL_REACTOR.RB().ii(DUST.getMaterialIngredient(Sodium, 1), DUST.getMaterialIngredient(Sulfur, 1)).io(DUST.get(SodiumSulfide, 2)).add("sodium_sulfide",100, 30); + CHEMICAL_REACTOR.RB().ii(DUST.getMaterialIngredient(Sulfur, 1)).fi(Water.getLiquid(2000)).fo(SulfuricAcid.getLiquid(3000)).add("sulfuric_acid",1150, 30); + CHEMICAL_REACTOR.RB().fi(Hydrogen.getGas(2000), Oxygen.getGas(1000)).ii(TierMaps.INT_CIRCUITS.get(1)).fo(Water.getLiquid(3000)).add("water",10, 30); + CHEMICAL_REACTOR.RB().ii(DUST.getMaterialIngredient(Sodium, 2)).fi(NitrogenDioxide.getGas(5000)).io(new ItemStack(Items.GUNPOWDER, 5)).add("gunpowder",34, 30); + CHEMICAL_REACTOR.RB().ii(DUST.getMaterialIngredient(Potassium, 1)).fi(NitricAcid.getLiquid(1000)).io(DUST.get(Saltpeter, 1)).add("saltpeter",20, 30); + CHEMICAL_REACTOR.RB().fi(NitrogenDioxide.getGas(3000), Water.getLiquid(1000)).fo(NitricAcid.getLiquid(2000), NitricOxide.getGas(1000)).add("nitric_acid",20, 30); + CHEMICAL_REACTOR.RB().ii(DUST.getMaterialIngredient(Silicon, 1)).fi(Oxygen.getGas(2000)).io(DUST.get(SiliconDioxide, 3)).add("silicon_dioxide",50,30); + CHEMICAL_REACTOR.RB().fi(NitricOxide.getGas(1000), Oxygen.getGas(1000)).fo(NitrogenDioxide.getGas(1000)).add("nitrogen_dioxide_2",20, 30); + CHEMICAL_REACTOR.RB().fi(Oxygen.getGas(500), Hydrogen.getGas(1000)).fo(DistilledWater.getLiquid(1500)).add("distilled_water",5, 30); + CHEMICAL_REACTOR.RB().fi(FishOil.getLiquid(6000), Ethanol.getLiquid(1000)).ii(DUST_TINY.getMaterialIngredient(SodiumHydroxide, 1)).fo(BioDiesel.getLiquid(6000), Glycerol.getLiquid(1000)).add("biodiesel",600, 30); + CHEMICAL_REACTOR.RB().fi(SeedOil.getLiquid(6000), Ethanol.getLiquid(1000)).ii(DUST_TINY.getMaterialIngredient(SodiumHydroxide, 1)).fo(BioDiesel.getLiquid(6000), Glycerol.getLiquid(1000)).add("biodiesel_1",600, 30); + CHEMICAL_REACTOR.RB().fi(Water.getLiquid(3000)).ii(DUST.getMaterialIngredient(Sodium, 1)).fo(Hydrogen.getGas(1000)).io(DUST.get(SodiumHydroxide, 3)).add("sodium_hydroxide",600, 30); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/CompressorLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/CompressorLoader.java index 37f5009c..1d73d56f 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/CompressorLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/CompressorLoader.java @@ -1,8 +1,6 @@ package trinsdar.gt4r.loader.machines; import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; -import muramasa.antimatter.data.AntimatterMaterialTypes; -import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -18,57 +16,57 @@ import static trinsdar.gt4r.data.CustomTags.CORALS; import static trinsdar.gt4r.data.CustomTags.VINES; import static trinsdar.gt4r.data.Materials.*; -import static trinsdar.gt4r.data.RecipeMaps.COMPRESSING; +import static trinsdar.gt4r.data.RecipeMaps.COMPRESSOR; public class CompressorLoader { public static void init() { INGOT.all().forEach(ingot -> { if (ingot.has(BLOCK)) { - COMPRESSING.RB().ii(RecipeIngredient.of(INGOT.getMaterialTag(ingot),9)).io(BLOCK.get().get(ingot).asStack(1)).add(ingot.getId() + "_block", Math.max(40,ingot.getMass()*2), 16); + COMPRESSOR.RB().ii(RecipeIngredient.of(INGOT.getMaterialTag(ingot),9)).io(BLOCK.get().get(ingot).asStack(1)).add(ingot.getId() + "_block", Math.max(40,ingot.getMass()*2), 16); } }); GEM.all().forEach(gem -> { if (gem.has(BLOCK)) { - COMPRESSING.RB().ii(RecipeIngredient.of(GEM.getMaterialTag(gem), 9)).io(BLOCK.get().get(gem).asStack(1)).add(gem.getId() + "_block", Math.max(40, gem.getMass() * 2), 16); + COMPRESSOR.RB().ii(RecipeIngredient.of(GEM.getMaterialTag(gem), 9)).io(BLOCK.get().get(gem).asStack(1)).add(gem.getId() + "_block", Math.max(40, gem.getMass() * 2), 16); } if (gem.has(PLATE)) { - COMPRESSING.RB().ii(RecipeIngredient.of(DUST.getMaterialTag(gem), 9)).io(PLATE.get(gem, 1)).add(gem.getId() + "_plate", Math.max(40, gem.getMass() * 2), 16); + COMPRESSOR.RB().ii(RecipeIngredient.of(DUST.getMaterialTag(gem), 9)).io(PLATE.get(gem, 1)).add(gem.getId() + "_plate", Math.max(40, gem.getMass() * 2), 16); } }); - COMPRESSING.RB().ii(RecipeIngredient.of(GTCoreItems.CarbonMesh, 1)).io(PLATE.get(Carbon, 1)).add("carbon_plate",400, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(CustomTags.INGOTS_MIXED_METAL, 1).setIgnoreNbt()).io(new ItemStack(GT4RData.AdvancedAlloy)).add("advanced_alloy",400, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.SNOWBALL, 1)).io(new ItemStack(Items.SNOW_BLOCK)).add("snow_block",400, 2); - COMPRESSING.RB().ii(DUST.getMaterialIngredient(Glowstone, 4)).io(new ItemStack(Items.GLOWSTONE)).add("glowstone",400, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.SNOW_BLOCK, 1)).io(new ItemStack(Items.ICE)).add("ice",400, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(GTCoreItems.CoalBall, 1)).io(new ItemStack(GTCoreItems.CompressedCoalBall)).add("compressed_coal_ball",400, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.SAND, 4)).io(new ItemStack(Items.SANDSTONE)).add("sandstone",400, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.RED_SAND, 4)).io(new ItemStack(Items.RED_SANDSTONE)).add("red_sandstone",400, 2); - COMPRESSING.RB().ii(DUST.getMaterialIngredient(Energium, 9)).io(new ItemStack(GTCoreItems.EnergyCrystal)).add("energy_crystal",400, 2); - COMPRESSING.RB().ii(DUST.getMaterialIngredient(Wood, 1)).io(PLATE.get(Wood, 1)).add("wood_plate",400, 2); - COMPRESSING.RB().ii(DUST.getMaterialIngredient(Fireclay, 1)).io(new ItemStack(CompressedFireClay)).add("compressed_fireclay",200, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(ItemTags.SAPLINGS, 4)).io(new ItemStack(Plantball)).add("plantball",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(ItemTags.SMALL_FLOWERS, 8)).io(new ItemStack(Plantball)).add("plantball_1",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(ForgeCTags.CROPS, 8)).io(new ItemStack(Plantball)).add("plantball_2",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(ForgeCTags.SEEDS, 16)).io(new ItemStack(Plantball)).add("plantball_3",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(ItemTags.LEAVES, 8)).io(new ItemStack(Plantball)).add("plantball_4",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.CACTUS, 8)).io(new ItemStack(Plantball)).add("plantball_5",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.DEAD_BUSH, 8)).io(new ItemStack(Plantball)).add("plantball_6",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(CORALS, 8)).io(new ItemStack(Plantball)).add("plantball_7",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(ForgeCTags.MUSHROOMS, 8)).io(new ItemStack(Plantball)).add("plantball_8",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.NETHER_WART_BLOCK, 8)).io(new ItemStack(Plantball)).add("plantball_9",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.WARPED_FUNGUS, 4)).io(new ItemStack(Plantball)).add("plantball_10",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.WARPED_ROOTS, 8)).io(new ItemStack(Plantball)).add("plantball_11",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.CRIMSON_FUNGUS, 4)).io(new ItemStack(Plantball)).add("plantball_12",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.CRIMSON_ROOTS, 8)).io(new ItemStack(Plantball)).add("plantball_13",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.WARPED_WART_BLOCK, 8)).io(new ItemStack(Plantball)).add("plantball_14",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(VINES, 8)).io(new ItemStack(Plantball)).add("plantball_15",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.KELP, 8)).io(new ItemStack(Plantball)).add("plantball_16",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.DRIED_KELP, 8)).io(new ItemStack(Plantball)).add("plantball_17",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.PUMPKIN, 4)).io(new ItemStack(Plantball)).add("plantball_18",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.MELON, 4)).io(new ItemStack(Plantball)).add("plantball_19",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.MELON_SLICE, 8)).io(new ItemStack(Plantball)).add("plantball_20",300, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.SUGAR_CANE, 8)).io(new ItemStack(Plantball)).add("plantball_21",300, 2); - COMPRESSING.RB().ii(DUST.getMaterialIngredient(Quartz, 1)).io(new ItemStack(Items.QUARTZ)).add("quartz",200, 2); - COMPRESSING.RB().ii(RecipeIngredient.of(Items.BLAZE_POWDER, 5)).io(new ItemStack(Items.BLAZE_ROD)).add("blaze_rod",200, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(GTCoreItems.CarbonMesh, 1)).io(PLATE.get(Carbon, 1)).add("carbon_plate",400, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(CustomTags.INGOTS_MIXED_METAL, 1).setIgnoreNbt()).io(new ItemStack(GT4RData.AdvancedAlloy)).add("advanced_alloy",400, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.SNOWBALL, 1)).io(new ItemStack(Items.SNOW_BLOCK)).add("snow_block",400, 2); + COMPRESSOR.RB().ii(DUST.getMaterialIngredient(Glowstone, 4)).io(new ItemStack(Items.GLOWSTONE)).add("glowstone",400, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.SNOW_BLOCK, 1)).io(new ItemStack(Items.ICE)).add("ice",400, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(GTCoreItems.CoalBall, 1)).io(new ItemStack(GTCoreItems.CompressedCoalBall)).add("compressed_coal_ball",400, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.SAND, 4)).io(new ItemStack(Items.SANDSTONE)).add("sandstone",400, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.RED_SAND, 4)).io(new ItemStack(Items.RED_SANDSTONE)).add("red_sandstone",400, 2); + COMPRESSOR.RB().ii(DUST.getMaterialIngredient(Energium, 9)).io(new ItemStack(GTCoreItems.EnergyCrystal)).add("energy_crystal",400, 2); + COMPRESSOR.RB().ii(DUST.getMaterialIngredient(Wood, 1)).io(PLATE.get(Wood, 1)).add("wood_plate",400, 2); + COMPRESSOR.RB().ii(DUST.getMaterialIngredient(Fireclay, 1)).io(new ItemStack(CompressedFireClay)).add("compressed_fireclay",200, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(ItemTags.SAPLINGS, 4)).io(new ItemStack(Plantball)).add("plantball",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(ItemTags.SMALL_FLOWERS, 8)).io(new ItemStack(Plantball)).add("plantball_1",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(ForgeCTags.CROPS, 8)).io(new ItemStack(Plantball)).add("plantball_2",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(ForgeCTags.SEEDS, 16)).io(new ItemStack(Plantball)).add("plantball_3",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(ItemTags.LEAVES, 8)).io(new ItemStack(Plantball)).add("plantball_4",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.CACTUS, 8)).io(new ItemStack(Plantball)).add("plantball_5",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.DEAD_BUSH, 8)).io(new ItemStack(Plantball)).add("plantball_6",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(CORALS, 8)).io(new ItemStack(Plantball)).add("plantball_7",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(ForgeCTags.MUSHROOMS, 8)).io(new ItemStack(Plantball)).add("plantball_8",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.NETHER_WART_BLOCK, 8)).io(new ItemStack(Plantball)).add("plantball_9",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.WARPED_FUNGUS, 4)).io(new ItemStack(Plantball)).add("plantball_10",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.WARPED_ROOTS, 8)).io(new ItemStack(Plantball)).add("plantball_11",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.CRIMSON_FUNGUS, 4)).io(new ItemStack(Plantball)).add("plantball_12",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.CRIMSON_ROOTS, 8)).io(new ItemStack(Plantball)).add("plantball_13",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.WARPED_WART_BLOCK, 8)).io(new ItemStack(Plantball)).add("plantball_14",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(VINES, 8)).io(new ItemStack(Plantball)).add("plantball_15",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.KELP, 8)).io(new ItemStack(Plantball)).add("plantball_16",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.DRIED_KELP, 8)).io(new ItemStack(Plantball)).add("plantball_17",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.PUMPKIN, 4)).io(new ItemStack(Plantball)).add("plantball_18",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.MELON, 4)).io(new ItemStack(Plantball)).add("plantball_19",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.MELON_SLICE, 8)).io(new ItemStack(Plantball)).add("plantball_20",300, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.SUGAR_CANE, 8)).io(new ItemStack(Plantball)).add("plantball_21",300, 2); + COMPRESSOR.RB().ii(DUST.getMaterialIngredient(Quartz, 1)).io(new ItemStack(Items.QUARTZ)).add("quartz",200, 2); + COMPRESSOR.RB().ii(RecipeIngredient.of(Items.BLAZE_POWDER, 5)).io(new ItemStack(Items.BLAZE_ROD)).add("blaze_rod",200, 2); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/CutterLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/CutterLoader.java index 21d2e92d..f66eab44 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/CutterLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/CutterLoader.java @@ -10,8 +10,7 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.BOLT; import static muramasa.antimatter.data.AntimatterMaterialTypes.PLATE; import static muramasa.antimatter.data.AntimatterMaterialTypes.ROD; -import static trinsdar.gt4r.data.Materials.Steam; -import static trinsdar.gt4r.data.RecipeMaps.CUTTING; +import static trinsdar.gt4r.data.RecipeMaps.PLATE_CUTTER; import static trinsdar.gt4r.data.RecipeMaps.STEAM_CUTTER; public class CutterLoader { @@ -23,15 +22,15 @@ public static void init(){ if (t == AntimatterMaterials.Diamond || t == AntimatterMaterials.NetherizedDiamond) multiplier = 5; int count = t.has(MaterialTags.QUARTZ_LIKE_BLOCKS) ? 4 : 9; - CUTTING.RB().ii(RecipeIngredient.of(BLOCK.getMaterialTag(t), 1)).fi(AntimatterMaterials.Water.getLiquid(3)).io(PLATE.get(t,count)).add(t.getId() + "_plate",duration * 8 * multiplier, 30); + PLATE_CUTTER.RB().ii(RecipeIngredient.of(BLOCK.getMaterialTag(t), 1)).fi(AntimatterMaterials.Water.getLiquid(3)).io(PLATE.get(t,count)).add(t.getId() + "_plate",duration * 8 * multiplier, 30); STEAM_CUTTER.RB().ii(BLOCK.getMaterialIngredient(t, 1)).fi(AntimatterMaterials.Water.getLiquid(3)).io(PLATE.get(t, count)).add(t.getId() + "_plate", duration * 8 * multiplier * 4, 30); }); BOLT.all().forEach(t -> { if (!t.has(ROD)) return; long duration = Math.max(t.getMass(), 1) * 4; - CUTTING.RB().ii(RecipeIngredient.of(ROD.getMaterialTag(t), 1)).fi(AntimatterMaterials.Water.getLiquid(3)).io(BOLT.get(t,4)).add(t.getId() + "_bolt",duration, 30); + PLATE_CUTTER.RB().ii(RecipeIngredient.of(ROD.getMaterialTag(t), 1)).fi(AntimatterMaterials.Water.getLiquid(3)).io(BOLT.get(t,4)).add(t.getId() + "_bolt",duration, 30); }); - CUTTING.RB().ii(RecipeIngredient.of(Items.GLASS, 3)).fi(AntimatterMaterials.Water.getLiquid(3)).io(new ItemStack(Items.GLASS_PANE)).add("glass_pane",50, 8); + PLATE_CUTTER.RB().ii(RecipeIngredient.of(Items.GLASS, 3)).fi(AntimatterMaterials.Water.getLiquid(3)).io(new ItemStack(Items.GLASS_PANE)).add("glass_pane",50, 8); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/DistillingLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/DistillingLoader.java index dc0a0f13..4ee1f973 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/DistillingLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/DistillingLoader.java @@ -5,16 +5,16 @@ import static muramasa.antimatter.data.AntimatterMaterials.Water; import static trinsdar.gt4r.data.TierMaps.INT_CIRCUITS; import static trinsdar.gt4r.data.Materials.*; -import static trinsdar.gt4r.data.RecipeMaps.BASIC_DISTILLING; +import static trinsdar.gt4r.data.RecipeMaps.DISTILLERY; public class DistillingLoader { public static void init(){ - BASIC_DISTILLING.RB().fi(Water.getLiquid(5)).ii(INT_CIRCUITS.get(5)).fo(DistilledWater.getLiquid(5)).add("water",16, 10); - BASIC_DISTILLING.RB().fi(Biomass.getLiquid(40)).ii(INT_CIRCUITS.get(0)).fo(Ethanol.getLiquid(12), DistilledWater.getLiquid(20)).add("biomass",24, 16); - BASIC_DISTILLING.RB().fi(Biomass.getLiquid(40)).ii(INT_CIRCUITS.get(1)).fo(Glycerol.getLiquid(20), DistilledWater.getLiquid(20)).add("biomass_1",24, 16); - BASIC_DISTILLING.RB().fi(Oil.getLiquid(80)).ii(INT_CIRCUITS.get(0)).fo(Diesel.getLiquid(20), Lubricant.getLiquid(20)).add("oil",32, 16); - BASIC_DISTILLING.RB().fi(Oil.getLiquid(80)).ii(INT_CIRCUITS.get(1)).fo(Naphtha.getLiquid(20), Lubricant.getLiquid(20)).add("oil_1",32, 16); - BASIC_DISTILLING.RB().fi(Oil.getLiquid(80)).ii(INT_CIRCUITS.get(2)).fo(SulfuricAcid.getLiquid(20), Lubricant.getLiquid(20)).add("oil_2",32, 16); - BASIC_DISTILLING.RB().fi(Honey.getLiquid(100)).ii(INT_CIRCUITS.get(0)).fo(DistilledWater.getLiquid(10)).io(DUST_SMALL.get(Sugar, 2)).add("honey",16, 16); + DISTILLERY.RB().fi(Water.getLiquid(5)).ii(INT_CIRCUITS.get(5)).fo(DistilledWater.getLiquid(5)).add("water",16, 10); + DISTILLERY.RB().fi(Biomass.getLiquid(40)).ii(INT_CIRCUITS.get(0)).fo(Ethanol.getLiquid(12), DistilledWater.getLiquid(20)).add("biomass",24, 16); + DISTILLERY.RB().fi(Biomass.getLiquid(40)).ii(INT_CIRCUITS.get(1)).fo(Glycerol.getLiquid(20), DistilledWater.getLiquid(20)).add("biomass_1",24, 16); + DISTILLERY.RB().fi(Oil.getLiquid(80)).ii(INT_CIRCUITS.get(0)).fo(Diesel.getLiquid(20), Lubricant.getLiquid(20)).add("oil",32, 16); + DISTILLERY.RB().fi(Oil.getLiquid(80)).ii(INT_CIRCUITS.get(1)).fo(Naphtha.getLiquid(20), Lubricant.getLiquid(20)).add("oil_1",32, 16); + DISTILLERY.RB().fi(Oil.getLiquid(80)).ii(INT_CIRCUITS.get(2)).fo(SulfuricAcid.getLiquid(20), Lubricant.getLiquid(20)).add("oil_2",32, 16); + DISTILLERY.RB().fi(Honey.getLiquid(100)).ii(INT_CIRCUITS.get(0)).fo(DistilledWater.getLiquid(10)).io(DUST_SMALL.get(Sugar, 2)).add("honey",16, 16); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/ElectrolyzerLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/ElectrolyzerLoader.java index 5558265a..e3e8f161 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/ElectrolyzerLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/ElectrolyzerLoader.java @@ -1,7 +1,6 @@ package trinsdar.gt4r.loader.machines; import earth.terrarium.botarium.common.fluid.base.FluidHolder; -import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.material.Material; import muramasa.antimatter.material.MaterialStack; @@ -13,13 +12,12 @@ import trinsdar.gt4r.data.GT4RMaterialTags; import java.util.List; -import java.util.stream.Collectors; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static trinsdar.gt4r.data.GT4RMaterialTags.ELEC; import static trinsdar.gt4r.data.Materials.*; -import static trinsdar.gt4r.data.RecipeMaps.ELECTROLYZING; +import static trinsdar.gt4r.data.RecipeMaps.ELECTROLYZER; public class ElectrolyzerLoader { static boolean breakMethod = true; @@ -37,11 +35,11 @@ public static void init() { add(m, power, (int) m.getMass() * count); }); - ELECTROLYZING.RB().fi(Water.getLiquid(3000)).fo(Hydrogen.getGas(2000), Oxygen.getGas(1000)).add("water",2000, 30); - ELECTROLYZING.RB().ii(RecipeIngredient.of(new ItemStack(Items.BONE_MEAL, 3))).io(DUST.get(Calcium, 1)).add("bone_meal",24, 106); - ELECTROLYZING.RB().ii(RecipeIngredient.of(new ItemStack(Blocks.SAND, 8))).io(DUST.get(SiliconDioxide, 1)).add("sand",500, 25); - ELECTROLYZING.RB().ii(RecipeIngredient.of(new ItemStack(Blocks.RED_SAND, 8))).io(DUST.get(SiliconDioxide, 1), DUST_TINY.get(Iron, 1)).add("red_sand",500, 25); - ELECTROLYZING.RB().ii(RecipeIngredient.of(DUST.get(Diamond, 1))).io(DUST.get(Carbon, 64), DUST.get(Carbon, 64)).add("diamond_dust",1536,60); + ELECTROLYZER.RB().fi(Water.getLiquid(3000)).fo(Hydrogen.getGas(2000), Oxygen.getGas(1000)).add("water",2000, 30); + ELECTROLYZER.RB().ii(RecipeIngredient.of(new ItemStack(Items.BONE_MEAL, 3))).io(DUST.get(Calcium, 1)).add("bone_meal",24, 106); + ELECTROLYZER.RB().ii(RecipeIngredient.of(new ItemStack(Blocks.SAND, 8))).io(DUST.get(SiliconDioxide, 1)).add("sand",500, 25); + ELECTROLYZER.RB().ii(RecipeIngredient.of(new ItemStack(Blocks.RED_SAND, 8))).io(DUST.get(SiliconDioxide, 1), DUST_TINY.get(Iron, 1)).add("red_sand",500, 25); + ELECTROLYZER.RB().ii(RecipeIngredient.of(DUST.get(Diamond, 1))).io(DUST.get(Carbon, 64), DUST.get(Carbon, 64)).add("diamond_dust",1536,60); add(Steel,50, 60, 2600); add(DarkAsh, 1, 30, 24); add(AntimatterMaterials.Coal, 1, 30, 24); @@ -71,7 +69,7 @@ private static void add(Material dust, int count, long euT, int duration) { return t.m.has(LIQUID) ? t.m.getLiquid(t.s * 1000) : t.m.getGas(t.s * 1000); }).toList(); List itemStacks = dust.getProcessInto().stream().filter(t -> t.m.has(DUST)).map(t -> new ItemStack(DUST.get(t.m), t.s)).toList(); - RecipeBuilder rb = ELECTROLYZING.RB(); + RecipeBuilder rb = ELECTROLYZER.RB(); String suffix = dust.has(LIQUID) ? "_liquid" : dust.has(GAS) ? "_gas" :"_dust"; if ((dust.has(LIQUID) || dust.has(GAS)) && !dust.has(DUST)){ rb.fi(getFluid(dust,count * 1000)); diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/ExtractorLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/ExtractorLoader.java index 006840f0..7721c89c 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/ExtractorLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/ExtractorLoader.java @@ -9,30 +9,30 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; import static trinsdar.gt4r.data.Materials.Rubber; -import static trinsdar.gt4r.data.RecipeMaps.EXTRACTING; +import static trinsdar.gt4r.data.RecipeMaps.EXTRACTOR; public class ExtractorLoader { public static void init() { - EXTRACTING.RB().ii(of(GTCoreTags.RUBBER_LOGS,1)).io(DUST.get(Rubber, 2)).add("rubber_dust",200,8); - EXTRACTING.RB().ii(of(GTCoreBlocks.RUBBER_LEAVES.asItem(),1)).io(DUST.get(Rubber, 1)).add("rubber_dust_1", 150,8); - EXTRACTING.RB().ii(of(GTCoreBlocks.RUBBER_SAPLING.asItem(),1)).io(DUST.get(Rubber, 1)).add("rubber_dust_2", 150,8); - EXTRACTING.RB().ii(of(GTCoreItems.StickyResin,1)).io(DUST.get(Rubber, 3)).add("rubber_dust_3", 150,8); - EXTRACTING.RB().ii(of(Items.LILY_OF_THE_VALLEY, 1)).io(new ItemStack(Items.WHITE_DYE, 3)).add("white_dye", 400, 2); - EXTRACTING.RB().ii(of(Items.ORANGE_TULIP, 1)).io(new ItemStack(Items.ORANGE_DYE, 3)).add("orange_dye", 400, 2); - EXTRACTING.RB().ii(of(Items.ALLIUM, 1)).io(new ItemStack(Items.MAGENTA_DYE, 3)).add("magenta_dye",400, 2); - EXTRACTING.RB().ii(of(Items.LILAC, 1)).io(new ItemStack(Items.MAGENTA_DYE, 6)).add("magenta_dye_1",400, 2); - EXTRACTING.RB().ii(of(Items.BLUE_ORCHID, 1)).io(new ItemStack(Items.LIGHT_BLUE_DYE, 3)).add("light_blue_dye",400, 2); - EXTRACTING.RB().ii(of(Items.DANDELION, 1)).io(new ItemStack(Items.YELLOW_DYE, 3)).add("yellow_dye",400, 2); - EXTRACTING.RB().ii(of(Items.SUNFLOWER, 1)).io(new ItemStack(Items.YELLOW_DYE, 6)).add("yellow_dye_1",400, 2); - EXTRACTING.RB().ii(of(Items.PINK_TULIP, 1)).io(new ItemStack(Items.PINK_DYE, 3)).add("pink_dye",400, 2); - EXTRACTING.RB().ii(of(Items.PEONY, 1)).io(new ItemStack(Items.PINK_DYE, 6)).add("pink_dye_1",400, 2); - EXTRACTING.RB().ii(of(Items.OXEYE_DAISY, 1)).io(new ItemStack(Items.LIGHT_GRAY_DYE, 3)).add("light_gray_dye",400, 2); - EXTRACTING.RB().ii(of(Items.AZURE_BLUET, 1)).io(new ItemStack(Items.LIGHT_GRAY_DYE, 3)).add("light_gray_dye_1",400, 2); - EXTRACTING.RB().ii(of(Items.WHITE_TULIP, 1)).io(new ItemStack(Items.LIGHT_GRAY_DYE, 3)).add("light_gray_dye_2",400, 2); - EXTRACTING.RB().ii(of(Items.CORNFLOWER, 1)).io(new ItemStack(Items.BLUE_DYE, 3)).add("blue_dye",400, 2); - EXTRACTING.RB().ii(of(Items.RED_TULIP, 1)).io(new ItemStack(Items.RED_DYE, 3)).add("red__dye",400, 2); - EXTRACTING.RB().ii(of(Items.POPPY, 1)).io(new ItemStack(Items.RED_DYE, 3)).add("red__dye_1",400, 2); - EXTRACTING.RB().ii(of(Items.ROSE_BUSH, 1)).io(new ItemStack(Items.RED_DYE, 6)).add("red__dye_2",400, 2); - EXTRACTING.RB().ii(of(Items.WITHER_ROSE, 1)).io(new ItemStack(Items.BLACK_DYE, 3)).add("black_dye",400, 2); + EXTRACTOR.RB().ii(of(GTCoreTags.RUBBER_LOGS,1)).io(DUST.get(Rubber, 2)).add("rubber_dust",200,8); + EXTRACTOR.RB().ii(of(GTCoreBlocks.RUBBER_LEAVES.asItem(),1)).io(DUST.get(Rubber, 1)).add("rubber_dust_1", 150,8); + EXTRACTOR.RB().ii(of(GTCoreBlocks.RUBBER_SAPLING.asItem(),1)).io(DUST.get(Rubber, 1)).add("rubber_dust_2", 150,8); + EXTRACTOR.RB().ii(of(GTCoreItems.StickyResin,1)).io(DUST.get(Rubber, 3)).add("rubber_dust_3", 150,8); + EXTRACTOR.RB().ii(of(Items.LILY_OF_THE_VALLEY, 1)).io(new ItemStack(Items.WHITE_DYE, 3)).add("white_dye", 400, 2); + EXTRACTOR.RB().ii(of(Items.ORANGE_TULIP, 1)).io(new ItemStack(Items.ORANGE_DYE, 3)).add("orange_dye", 400, 2); + EXTRACTOR.RB().ii(of(Items.ALLIUM, 1)).io(new ItemStack(Items.MAGENTA_DYE, 3)).add("magenta_dye",400, 2); + EXTRACTOR.RB().ii(of(Items.LILAC, 1)).io(new ItemStack(Items.MAGENTA_DYE, 6)).add("magenta_dye_1",400, 2); + EXTRACTOR.RB().ii(of(Items.BLUE_ORCHID, 1)).io(new ItemStack(Items.LIGHT_BLUE_DYE, 3)).add("light_blue_dye",400, 2); + EXTRACTOR.RB().ii(of(Items.DANDELION, 1)).io(new ItemStack(Items.YELLOW_DYE, 3)).add("yellow_dye",400, 2); + EXTRACTOR.RB().ii(of(Items.SUNFLOWER, 1)).io(new ItemStack(Items.YELLOW_DYE, 6)).add("yellow_dye_1",400, 2); + EXTRACTOR.RB().ii(of(Items.PINK_TULIP, 1)).io(new ItemStack(Items.PINK_DYE, 3)).add("pink_dye",400, 2); + EXTRACTOR.RB().ii(of(Items.PEONY, 1)).io(new ItemStack(Items.PINK_DYE, 6)).add("pink_dye_1",400, 2); + EXTRACTOR.RB().ii(of(Items.OXEYE_DAISY, 1)).io(new ItemStack(Items.LIGHT_GRAY_DYE, 3)).add("light_gray_dye",400, 2); + EXTRACTOR.RB().ii(of(Items.AZURE_BLUET, 1)).io(new ItemStack(Items.LIGHT_GRAY_DYE, 3)).add("light_gray_dye_1",400, 2); + EXTRACTOR.RB().ii(of(Items.WHITE_TULIP, 1)).io(new ItemStack(Items.LIGHT_GRAY_DYE, 3)).add("light_gray_dye_2",400, 2); + EXTRACTOR.RB().ii(of(Items.CORNFLOWER, 1)).io(new ItemStack(Items.BLUE_DYE, 3)).add("blue_dye",400, 2); + EXTRACTOR.RB().ii(of(Items.RED_TULIP, 1)).io(new ItemStack(Items.RED_DYE, 3)).add("red__dye",400, 2); + EXTRACTOR.RB().ii(of(Items.POPPY, 1)).io(new ItemStack(Items.RED_DYE, 3)).add("red__dye_1",400, 2); + EXTRACTOR.RB().ii(of(Items.ROSE_BUSH, 1)).io(new ItemStack(Items.RED_DYE, 6)).add("red__dye_2",400, 2); + EXTRACTOR.RB().ii(of(Items.WITHER_ROSE, 1)).io(new ItemStack(Items.BLACK_DYE, 3)).add("black_dye",400, 2); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/ExtruderLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/ExtruderLoader.java index f9830be3..f7d629d6 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/ExtruderLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/ExtruderLoader.java @@ -1,6 +1,5 @@ package trinsdar.gt4r.loader.machines; -import io.github.gregtechintergalactical.gtcore.GTCore; import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -19,34 +18,33 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.material.MaterialTags.RUBBERTOOLS; import static trinsdar.gt4r.data.Materials.Rubber; -import static trinsdar.gt4r.data.Materials.SiliconDioxide; import static trinsdar.gt4r.data.Materials.Tin; import static trinsdar.gt4r.data.Materials.WroughtIron; -import static trinsdar.gt4r.data.RecipeMaps.EXTRUDING; +import static trinsdar.gt4r.data.RecipeMaps.EXTRUDER; public class ExtruderLoader { public static void init(){ AntimatterMaterialTypes.ROD.all().forEach(m -> { if (!m.has(AntimatterMaterialTypes.INGOT)) return; int euPerTick = m == Rubber ? 32 : 128; - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapeRod)).io(ROD.get(m, 2)).add(m.getId() + "_rod", (m.getMass() * 2), euPerTick); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapeRod)).io(ROD.get(m, 2)).add(m.getId() + "_rod", (m.getMass() * 2), euPerTick); if (m.has(RUBBERTOOLS) && m.has(DUST)){ - EXTRUDING.RB().ii(DUST.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapeRod)).io(ROD.get(m, 2)).add(m.getId() + "_rod_1", m.getMass() * 2, euPerTick); + EXTRUDER.RB().ii(DUST.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapeRod)).io(ROD.get(m, 2)).add(m.getId() + "_rod_1", m.getMass() * 2, euPerTick); } }); AntimatterMaterialTypes.PLATE.all().forEach(m -> { if (!m.has(AntimatterMaterialTypes.INGOT)) return; int euPerTick = m == Rubber ? 32 : 128; - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapePlate)).io(PLATE.get(m, 1)).add(m.getId() + "_plate", m.getMass(), euPerTick); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapePlate)).io(PLATE.get(m, 1)).add(m.getId() + "_plate", m.getMass(), euPerTick); if (m.has(RUBBERTOOLS) && m.has(DUST)){ - EXTRUDING.RB().ii(DUST.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapePlate)).io(PLATE.get(m, 1)).add(m.getId() + "_plate_1", m.getMass(), euPerTick); + EXTRUDER.RB().ii(DUST.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapePlate)).io(PLATE.get(m, 1)).add(m.getId() + "_plate_1", m.getMass(), euPerTick); } }); AntimatterAPI.all(Wire.class).forEach(t -> { if (!t.getMaterial().has(AntimatterMaterialTypes.INGOT)) return; Item wireItem = t.getBlockItem(PipeSize.VTINY); ItemStack stack = new ItemStack(wireItem,2); - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),1), getReusable(GTCoreItems.ShapeWire)).io(stack).add(t.getId() + "_wire", t.getMaterial().getMass()*2,96); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),1), getReusable(GTCoreItems.ShapeWire)).io(stack).add(t.getId() + "_wire", t.getMaterial().getMass()*2,96); }); AntimatterAPI.all(FluidPipe.class).forEach(t -> { @@ -57,19 +55,19 @@ public static void init(){ Item pipeLarge = t.getBlockItem(PipeSize.LARGE); Item pipeHuge = t.getBlockItem(PipeSize.HUGE); if (t.getSizes().contains(PipeSize.TINY)) { - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),1), getReusable(GTCoreItems.ShapePipeTiny)).io(new ItemStack(pipeTiny, 2)).add(t.getMaterial().getId() + "_fluid_pipe_tiny",t.getMaterial().getMass()*2,128); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),1), getReusable(GTCoreItems.ShapePipeTiny)).io(new ItemStack(pipeTiny, 2)).add(t.getMaterial().getId() + "_fluid_pipe_tiny",t.getMaterial().getMass()*2,128); } if (t.getSizes().contains(PipeSize.SMALL)) { - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),1), getReusable(GTCoreItems.ShapePipeSmall)).io(new ItemStack(pipeSmall, 1)).add(t.getMaterial().getId() + "_fluid_pipe_small",t.getMaterial().getMass(),128); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),1), getReusable(GTCoreItems.ShapePipeSmall)).io(new ItemStack(pipeSmall, 1)).add(t.getMaterial().getId() + "_fluid_pipe_small",t.getMaterial().getMass(),128); } if (t.getSizes().contains(PipeSize.NORMAL)) { - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),3), getReusable(GTCoreItems.ShapePipeNormal)).io(new ItemStack(pipeNormal, 1)).add(t.getMaterial().getId() + "_fluid_pipe_normal",t.getMaterial().getMass()*3,128); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),3), getReusable(GTCoreItems.ShapePipeNormal)).io(new ItemStack(pipeNormal, 1)).add(t.getMaterial().getId() + "_fluid_pipe_normal",t.getMaterial().getMass()*3,128); } if (t.getSizes().contains(PipeSize.LARGE)) { - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),6), getReusable(GTCoreItems.ShapePipeLarge)).io(new ItemStack(pipeLarge, 1)).add(t.getMaterial().getId() + "_fluid_pipe_large",t.getMaterial().getMass()*6,128); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),6), getReusable(GTCoreItems.ShapePipeLarge)).io(new ItemStack(pipeLarge, 1)).add(t.getMaterial().getId() + "_fluid_pipe_large",t.getMaterial().getMass()*6,128); } if (t.getSizes().contains(PipeSize.HUGE)) { - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),12), getReusable(GTCoreItems.ShapePipeHuge)).io(new ItemStack(pipeHuge, 1)).add(t.getMaterial().getId() + "_fluid_pipe_huge",t.getMaterial().getMass()*12,128); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),12), getReusable(GTCoreItems.ShapePipeHuge)).io(new ItemStack(pipeHuge, 1)).add(t.getMaterial().getId() + "_fluid_pipe_huge",t.getMaterial().getMass()*12,128); } }); @@ -81,50 +79,50 @@ public static void init(){ Item pipeLarge = t.getBlockItem(PipeSize.LARGE); Item pipeHuge = t.getBlockItem(PipeSize.HUGE); if (t.getSizes().contains(PipeSize.TINY)) { - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),1), getReusable(GTCoreItems.ShapePipeTiny)).io(new ItemStack(pipeTiny, 2)).add(t.getMaterial().getId() + "_item_pipe_tiny",t.getMaterial().getMass()*2,128); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),1), getReusable(GTCoreItems.ShapePipeTiny)).io(new ItemStack(pipeTiny, 2)).add(t.getMaterial().getId() + "_item_pipe_tiny",t.getMaterial().getMass()*2,128); } if (t.getSizes().contains(PipeSize.SMALL)) { - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),1), getReusable(GTCoreItems.ShapePipeSmall)).io(new ItemStack(pipeSmall, 1)).add(t.getMaterial().getId() + "_item_pipe_small",t.getMaterial().getMass(),128); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),1), getReusable(GTCoreItems.ShapePipeSmall)).io(new ItemStack(pipeSmall, 1)).add(t.getMaterial().getId() + "_item_pipe_small",t.getMaterial().getMass(),128); } if (t.getSizes().contains(PipeSize.NORMAL)) { - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),3), getReusable(GTCoreItems.ShapePipeNormal)).io(new ItemStack(pipeNormal, 1)).add(t.getMaterial().getId() + "_item_pipe_normal",t.getMaterial().getMass()*3,128); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),3), getReusable(GTCoreItems.ShapePipeNormal)).io(new ItemStack(pipeNormal, 1)).add(t.getMaterial().getId() + "_item_pipe_normal",t.getMaterial().getMass()*3,128); } if (t.getSizes().contains(PipeSize.LARGE)) { - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),6), getReusable(GTCoreItems.ShapePipeLarge)).io(new ItemStack(pipeLarge, 1)).add(t.getMaterial().getId() + "_item_pipe_large",t.getMaterial().getMass()*6,128); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),6), getReusable(GTCoreItems.ShapePipeLarge)).io(new ItemStack(pipeLarge, 1)).add(t.getMaterial().getId() + "_item_pipe_large",t.getMaterial().getMass()*6,128); } if (t.getSizes().contains(PipeSize.HUGE)) { - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),12), getReusable(GTCoreItems.ShapePipeHuge)).io(new ItemStack(pipeHuge, 1)).add(t.getMaterial().getId() + "_item_pipe_huge",t.getMaterial().getMass()*12,128); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(t.getMaterial(),12), getReusable(GTCoreItems.ShapePipeHuge)).io(new ItemStack(pipeHuge, 1)).add(t.getMaterial().getId() + "_item_pipe_huge",t.getMaterial().getMass()*12,128); } }); BLOCK.all().forEach(m -> { if (!m.has(INGOT)) return; - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(m, 9), getReusable(GTCoreItems.ShapeBlock)).io(BLOCK.get().get(m).asStack()).add(m.getId() + "_block",10, 128); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(m, 9), getReusable(GTCoreItems.ShapeBlock)).io(BLOCK.get().get(m).asStack()).add(m.getId() + "_block",10, 128); }); GEAR.all().forEach(m -> { if (!m.has(INGOT)) return; - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(m, 4), getReusable(GTCoreItems.ShapeGear)).io(GEAR.get(m, 1)).add(m.getId() + "_gear", (m.getMass() * 5), 128); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(m, 4), getReusable(GTCoreItems.ShapeGear)).io(GEAR.get(m, 1)).add(m.getId() + "_gear", (m.getMass() * 5), 128); }); AntimatterMaterialTypes.RING.all().forEach(m -> { if (!m.has(AntimatterMaterialTypes.INGOT)) return; int euPerTick = m == Rubber ? 32 : 128; - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapeRing)).io(RING.get(m, 4)).add(m.getId() + "_ring", (m.getMass() * 4), euPerTick); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapeRing)).io(RING.get(m, 4)).add(m.getId() + "_ring", (m.getMass() * 4), euPerTick); if (m.has(RUBBERTOOLS) && m.has(DUST)){ - EXTRUDING.RB().ii(DUST.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapeRing)).io(RING.get(m, 4)).add(m.getId() + "_ring_1", m.getMass() * 4, euPerTick); + EXTRUDER.RB().ii(DUST.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapeRing)).io(RING.get(m, 4)).add(m.getId() + "_ring_1", m.getMass() * 4, euPerTick); } }); AntimatterMaterialTypes.BOLT.all().forEach(m -> { if (!m.has(AntimatterMaterialTypes.INGOT)) return; int euPerTick = m == Rubber ? 32 : 128; - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapeBolt)).io(BOLT.get(m, 8)).add(m.getId() + "_bolt", (m.getMass() * 8), euPerTick); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapeBolt)).io(BOLT.get(m, 8)).add(m.getId() + "_bolt", (m.getMass() * 8), euPerTick); if (m.has(RUBBERTOOLS) && m.has(DUST)){ - EXTRUDING.RB().ii(DUST.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapeBolt)).io(BOLT.get(m, 8)).add(m.getId() + "_bolt_1", m.getMass() * 8, euPerTick); + EXTRUDER.RB().ii(DUST.getMaterialIngredient(m, 1), getReusable(GTCoreItems.ShapeBolt)).io(BOLT.get(m, 8)).add(m.getId() + "_bolt_1", m.getMass() * 8, euPerTick); } }); - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(Tin, 2), getReusable(GTCoreItems.ShapeCell)).io(new ItemStack(GT4RData.CellTin)).add("tin_cell",128, 32); - EXTRUDING.RB().ii(DUST.getMaterialIngredient(Rubber, 1), getReusable(GTCoreItems.ShapeIngot)).io(INGOT.get(Rubber, 1)).add("rubber_ingot",10, 16); - EXTRUDING.RB().ii(INGOT.getMaterialIngredient(WroughtIron, 1), getReusable(GTCoreItems.ShapeIngot)).io(new ItemStack(Items.IRON_INGOT)).add("iron_ingot",10, 64); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(Tin, 2), getReusable(GTCoreItems.ShapeCell)).io(new ItemStack(GT4RData.CellTin)).add("tin_cell",128, 32); + EXTRUDER.RB().ii(DUST.getMaterialIngredient(Rubber, 1), getReusable(GTCoreItems.ShapeIngot)).io(INGOT.get(Rubber, 1)).add("rubber_ingot",10, 16); + EXTRUDER.RB().ii(INGOT.getMaterialIngredient(WroughtIron, 1), getReusable(GTCoreItems.ShapeIngot)).io(new ItemStack(Items.IRON_INGOT)).add("iron_ingot",10, 64); //EXTRUDING.RB().ii(DUST.getMaterialIngredient(SiliconDioxide, 1), getReusable(GTCoreItems.ShapeBottle)).io(new ItemStack(Items.GLASS_BOTTLE)).add("glass_bottle",32, 16); } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/FermentingLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/FermentingLoader.java index 8fd07319..420c9934 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/FermentingLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/FermentingLoader.java @@ -2,19 +2,18 @@ import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import trinsdar.gt4r.data.GT4RData; import static muramasa.antimatter.data.AntimatterMaterials.Water; import static trinsdar.gt4r.data.TierMaps.INT_CIRCUITS; import static trinsdar.gt4r.data.Materials.Biomass; import static trinsdar.gt4r.data.Materials.Honey; import static trinsdar.gt4r.data.Materials.Methane; -import static trinsdar.gt4r.data.RecipeMaps.FERMENTING; +import static trinsdar.gt4r.data.RecipeMaps.FERMENTER; public class FermentingLoader { public static void init(){ - FERMENTING.RB().fi(Water.getLiquid(1000)).ii(RecipeIngredient.of(GTCoreItems.Biochaff, 1)).fo(Biomass.getLiquid(1000)).add("biomass",128, 16); - FERMENTING.RB().fi(Honey.getLiquid(1000)).ii(RecipeIngredient.of(GTCoreItems.Biochaff, 1)).fo(Biomass.getLiquid(1500)).add("biomass_1",128, 16); - FERMENTING.RB().fi(Biomass.getLiquid(6)).ii(INT_CIRCUITS.get(0)).fo(Methane.getGas(4)).add("methane",20, 16); + FERMENTER.RB().fi(Water.getLiquid(1000)).ii(RecipeIngredient.of(GTCoreItems.Biochaff, 1)).fo(Biomass.getLiquid(1000)).add("biomass",128, 16); + FERMENTER.RB().fi(Honey.getLiquid(1000)).ii(RecipeIngredient.of(GTCoreItems.Biochaff, 1)).fo(Biomass.getLiquid(1500)).add("biomass_1",128, 16); + FERMENTER.RB().fi(Biomass.getLiquid(6)).ii(INT_CIRCUITS.get(0)).fo(Methane.getGas(4)).add("methane",20, 16); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/FluidCanningLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/FluidCanningLoader.java index 4369153b..1dfb8127 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/FluidCanningLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/FluidCanningLoader.java @@ -1,7 +1,5 @@ package trinsdar.gt4r.loader.machines; -import muramasa.antimatter.AntimatterAPI; -import muramasa.antimatter.item.ItemFluidCell; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.Utils; @@ -20,7 +18,7 @@ import static trinsdar.gt4r.data.Materials.Mercury; import static trinsdar.gt4r.data.Materials.Propane; import static trinsdar.gt4r.data.Materials.SulfuricAcid; -import static trinsdar.gt4r.data.RecipeMaps.FLUID_CANNING; +import static trinsdar.gt4r.data.RecipeMaps.FLUID_CANNER; public class FluidCanningLoader { public static void init() { @@ -30,8 +28,8 @@ public static void init() { //Only the source, so we don't get duplicates. if (!fluid.isSource(fluid.defaultFluidState())) return; ResourceLocation fluidId = AntimatterPlatformUtils.getIdFromFluid(fluid); - RecipeMaps.FLUID_CANNING.RB().ii(RecipeIngredient.of(bucket, 1)).fo(FluidPlatformUtils.createFluidStack(fluid, 1000 * TesseractGraphWrappers.dropletMultiplier)).io(Items.BUCKET.getDefaultInstance()).add(fluidId.getNamespace() + "_" + fluidId.getPath() + "_bucket",20, 8); - RecipeMaps.FLUID_CANNING.RB().ii(RecipeIngredient.of(Items.BUCKET, 1)).fi(FluidPlatformUtils.createFluidStack(fluid, 1000 * TesseractGraphWrappers.dropletMultiplier)).io(new ItemStack(bucket, 1)).add("bucket_from_" + fluidId.getNamespace() + "_" + fluidId.getPath(),20, 8); + RecipeMaps.FLUID_CANNER.RB().ii(RecipeIngredient.of(bucket, 1)).fo(FluidPlatformUtils.createFluidStack(fluid, 1000 * TesseractGraphWrappers.dropletMultiplier)).io(Items.BUCKET.getDefaultInstance()).add(fluidId.getNamespace() + "_" + fluidId.getPath() + "_bucket",20, 8); + RecipeMaps.FLUID_CANNER.RB().ii(RecipeIngredient.of(Items.BUCKET, 1)).fi(FluidPlatformUtils.createFluidStack(fluid, 1000 * TesseractGraphWrappers.dropletMultiplier)).io(new ItemStack(bucket, 1)).add("bucket_from_" + fluidId.getNamespace() + "_" + fluidId.getPath(),20, 8); /*AntimatterAPI.all(ItemFluidCell.class, emptyCell -> { int size = emptyCell.getCapacity(); @@ -40,13 +38,13 @@ public static void init() { FLUID_CANNING.RB().ii(RecipeIngredient.of(emptyCell, 1)).fi(FluidPlatformUtils.createFluidStack(fluid, size * TesseractGraphWrappers.dropletMultiplier)).io(filled).add(AntimatterPlatformUtils.getIdFromFluid(fluid).getPath() + "_" + emptyCell.getId(),20, 8); });*/ }); - FLUID_CANNING.RB().ii(of(BatteryHullSmall, 1)).fi(Mercury.getLiquid(1000)).io(getFullBattery(BatterySmallMercury)).add("bettery_small_mercury",16, 1); - FLUID_CANNING.RB().ii(of(BatteryHullSmall, 1)).fi(SulfuricAcid.getLiquid(1000)).io(getFullBattery(BatterySmallAcid)).add("battery_small_acid",16, 1); - FLUID_CANNING.RB().ii(of(BatteryHullMedium, 1)).fi(Mercury.getLiquid(4000)).io(getFullBattery(BatteryMediumMercury)).add("battery_medium_mercury",64, 1); - FLUID_CANNING.RB().ii(of(BatteryHullMedium, 1)).fi(SulfuricAcid.getLiquid(4000)).io(getFullBattery(BatteryMediumAcid)).add("battery_medium_acid",64, 1); - FLUID_CANNING.RB().ii(of(BatteryHullLarge, 1)).fi(Mercury.getLiquid(16000)).io(getFullBattery(BatteryLargeMercury)).add("battery_large_mercury",258, 1); - FLUID_CANNING.RB().ii(of(BatteryHullLarge, 1)).fi(SulfuricAcid.getLiquid(16000)).io(getFullBattery(BatteryLargeAcid)).add("battery_large_acid",258, 1); - FLUID_CANNING.RB().ii(of(LighterEmpty, 1)).fi(Propane.getGas(100)).io(new ItemStack(Lighter)).add("lighter",1, 1); + FLUID_CANNER.RB().ii(of(BatteryHullSmall, 1)).fi(Mercury.getLiquid(1000)).io(getFullBattery(BatterySmallMercury)).add("bettery_small_mercury",16, 1); + FLUID_CANNER.RB().ii(of(BatteryHullSmall, 1)).fi(SulfuricAcid.getLiquid(1000)).io(getFullBattery(BatterySmallAcid)).add("battery_small_acid",16, 1); + FLUID_CANNER.RB().ii(of(BatteryHullMedium, 1)).fi(Mercury.getLiquid(4000)).io(getFullBattery(BatteryMediumMercury)).add("battery_medium_mercury",64, 1); + FLUID_CANNER.RB().ii(of(BatteryHullMedium, 1)).fi(SulfuricAcid.getLiquid(4000)).io(getFullBattery(BatteryMediumAcid)).add("battery_medium_acid",64, 1); + FLUID_CANNER.RB().ii(of(BatteryHullLarge, 1)).fi(Mercury.getLiquid(16000)).io(getFullBattery(BatteryLargeMercury)).add("battery_large_mercury",258, 1); + FLUID_CANNER.RB().ii(of(BatteryHullLarge, 1)).fi(SulfuricAcid.getLiquid(16000)).io(getFullBattery(BatteryLargeAcid)).add("battery_large_acid",258, 1); + FLUID_CANNER.RB().ii(of(LighterEmpty, 1)).fi(Propane.getGas(100)).io(new ItemStack(Lighter)).add("lighter",1, 1); //FLUID_CANNING.RB().ii(of(Biochaff, 1)).fi(new FluidStack(Fluids.WATER, 1000)).fo(Biomass.getLiquid(1000)).add(400, 8); } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/FluidSolidifierLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/FluidSolidifierLoader.java index c9234584..9adea50e 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/FluidSolidifierLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/FluidSolidifierLoader.java @@ -1,19 +1,17 @@ package trinsdar.gt4r.loader.machines; import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; -import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.material.Material; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.util.AntimatterPlatformUtils; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import trinsdar.gt4r.data.GT4RData; import static muramasa.antimatter.Ref.L; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.Lava; import static trinsdar.gt4r.data.Materials.Obsidian; -import static trinsdar.gt4r.data.RecipeMaps.FLUID_SOLIDIFYING; +import static trinsdar.gt4r.data.RecipeMaps.FLUID_SOLIDIFIER; public class FluidSolidifierLoader { @@ -33,7 +31,7 @@ public static void init() { BLOCK.all().forEach(r -> { add(r, BLOCK.get().get(r).asStack(), "block", GTCoreItems.MoldBlock, 9.0f, 16); }); - FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldPlate, 1).setNoConsume()).fi(Lava.getLiquid(AntimatterPlatformUtils.isFabric() ? L : 111)).io(PLATE.get(Obsidian)).add("obsidian_plate", 16, 8); + FLUID_SOLIDIFIER.RB().ii(RecipeIngredient.of(GTCoreItems.MoldPlate, 1).setNoConsume()).fi(Lava.getLiquid(AntimatterPlatformUtils.isFabric() ? L : 111)).io(PLATE.get(Obsidian)).add("obsidian_plate", 16, 8); } private static void add(Material m, ItemStack output, String suffix, Item mold, float ratio, int power) { @@ -43,7 +41,7 @@ private static void add(Material m, ItemStack output, String suffix, Item mold, private static void add(Material m, ItemStack output, String suffix, Item mold, long amount, int power) { if (!m.has(LIQUID)) return; - FLUID_SOLIDIFYING.RB() + FLUID_SOLIDIFIER.RB() .ii(RecipeIngredient.of(mold,1)) .fi(m.getLiquid(amount)) .io(output) diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/ForgeHammerLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/ForgeHammerLoader.java index 9df79444..52ddb74d 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/ForgeHammerLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/ForgeHammerLoader.java @@ -1,7 +1,6 @@ package trinsdar.gt4r.loader.machines; import muramasa.antimatter.AntimatterAPI; -import muramasa.antimatter.AntimatterConfig; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.material.MaterialTags; @@ -20,7 +19,7 @@ import static muramasa.antimatter.material.MaterialTags.ORE_MULTI; import static muramasa.antimatter.material.MaterialTags.RUBBERTOOLS; import static trinsdar.gt4r.data.Materials.*; -import static trinsdar.gt4r.data.RecipeMaps.HAMMERING; +import static trinsdar.gt4r.data.RecipeMaps.FORGE_HAMMER; public class ForgeHammerLoader { public static void init(){ @@ -30,32 +29,32 @@ public static void init(){ RecipeIngredient ore = RecipeIngredient.of(TagUtils.getForgelikeItemTag("sandless_ores/" + m.getId()),1), crushed = AntimatterMaterialTypes.CRUSHED.getIngredient(m, 1); ItemStack crushedStack = AntimatterMaterialTypes.CRUSHED.get(m,1); - HAMMERING.RB().ii(ore).io(Utils.ca(ORE_MULTI.getInt(m) * multiplier, crushedStack)).add(m.getId() + "_ore",16, 10); - HAMMERING.RB().ii(crushed).io(DUST_IMPURE.get(MACERATE_INTO.getMapping(m), 1)).add(m.getId() + "_crushed_ore",16, 10); - HAMMERING.RB().ii(RecipeIngredient.of(CRUSHED_PURIFIED.get(m,1))).io(DUST_PURE.get(MACERATE_INTO.getMapping(m), 1)).add(m.getId() + "_purified_ore",16, 10); + FORGE_HAMMER.RB().ii(ore).io(Utils.ca(ORE_MULTI.getInt(m) * multiplier, crushedStack)).add(m.getId() + "_ore",16, 10); + FORGE_HAMMER.RB().ii(crushed).io(DUST_IMPURE.get(MACERATE_INTO.getMapping(m), 1)).add(m.getId() + "_crushed_ore",16, 10); + FORGE_HAMMER.RB().ii(RecipeIngredient.of(CRUSHED_PURIFIED.get(m,1))).io(DUST_PURE.get(MACERATE_INTO.getMapping(m), 1)).add(m.getId() + "_purified_ore",16, 10); if (m.has(CRUSHED_REFINED)) { - HAMMERING.RB().ii(RecipeIngredient.of(CRUSHED_REFINED.get(m,1))).io(DUST.get(MACERATE_INTO.getMapping(m), 1)).add(m.getId() + "_centrifuged_ore",16, 10); + FORGE_HAMMER.RB().ii(RecipeIngredient.of(CRUSHED_REFINED.get(m,1))).io(DUST.get(MACERATE_INTO.getMapping(m), 1)).add(m.getId() + "_centrifuged_ore",16, 10); } if (m.has(RAW_ORE)){ - HAMMERING.RB().ii(RecipeIngredient.of(RAW_ORE.getMaterialTag(m), 1)).io(Utils.ca((ORE_MULTI.getInt(m) * multiplier), crushedStack)).add(m.getId() + "_raw_ore",16, 10); + FORGE_HAMMER.RB().ii(RecipeIngredient.of(RAW_ORE.getMaterialTag(m), 1)).io(Utils.ca((ORE_MULTI.getInt(m) * multiplier), crushedStack)).add(m.getId() + "_raw_ore",16, 10); } }); AntimatterMaterialTypes.PLATE.all().stream().filter(m -> m.has(AntimatterMaterialTypes.INGOT) && !m.has(RUBBERTOOLS)).forEach(m -> { int in = 2;//AntimatterConfig.GAMEPLAY.LOSSY_PART_CRAFTING ? 3 : 1; int out = 1;//AntimatterConfig.GAMEPLAY.LOSSY_PART_CRAFTING ? 2 : 1; - HAMMERING.RB().ii(INGOT.getMaterialIngredient(m, in)).io(PLATE.get(m, out)).add(m.getId() + "_plate", m.getMass(), 16); + FORGE_HAMMER.RB().ii(INGOT.getMaterialIngredient(m, in)).io(PLATE.get(m, out)).add(m.getId() + "_plate", m.getMass(), 16); }); ROD_LONG.all().stream().filter(m -> !m.has(MaterialTags.NOSMASH)).forEach(rod -> { - HAMMERING.RB().ii(ROD.getMaterialIngredient(rod, 2)).io(ROD_LONG.get(rod, 1)).add("rod_long_" + rod.getId(), rod.getMass(), 16); + FORGE_HAMMER.RB().ii(ROD.getMaterialIngredient(rod, 2)).io(ROD_LONG.get(rod, 1)).add("rod_long_" + rod.getId(), rod.getMass(), 16); }); AntimatterAPI.all(StoneType.class, GT4RRef.ID, s -> { if (!(s instanceof CobbleStoneType)) return; - HAMMERING.RB().ii(RecipeIngredient.of(((CobbleStoneType)s).getBlock(""), 1)).io(new ItemStack(((CobbleStoneType)s).getBlock("cobble"))).add(s.getId() + "_to_cobble",10, 16); + FORGE_HAMMER.RB().ii(RecipeIngredient.of(((CobbleStoneType)s).getBlock(""), 1)).io(new ItemStack(((CobbleStoneType)s).getBlock("cobble"))).add(s.getId() + "_to_cobble",10, 16); }); - HAMMERING.RB().ii(RecipeIngredient.of(ForgeCTags.COBBLESTONE, 1)).io(new ItemStack(Items.GRAVEL)).add("gravel",10, 16); - HAMMERING.RB().ii(RecipeIngredient.of(Items.STONE, 1)).io(new ItemStack(Items.COBBLESTONE)).add("cobblestone",10, 16); - HAMMERING.RB().ii(RecipeIngredient.of(ForgeCTags.GRAVEL, 1)).io(new ItemStack(Items.SAND)).add("sand",10, 16); - HAMMERING.RB().ii(RecipeIngredient.of(Items.BRICK, 1)).io(DUST_SMALL.get(Brick, 1)).add("brick_dust_small",10, 16); - HAMMERING.RB().ii(RecipeIngredient.of(Items.BRICKS, 1)).io(DUST.get(Brick, 1)).add("brick_dust",40, 16); + FORGE_HAMMER.RB().ii(RecipeIngredient.of(ForgeCTags.COBBLESTONE, 1)).io(new ItemStack(Items.GRAVEL)).add("gravel",10, 16); + FORGE_HAMMER.RB().ii(RecipeIngredient.of(Items.STONE, 1)).io(new ItemStack(Items.COBBLESTONE)).add("cobblestone",10, 16); + FORGE_HAMMER.RB().ii(RecipeIngredient.of(ForgeCTags.GRAVEL, 1)).io(new ItemStack(Items.SAND)).add("sand",10, 16); + FORGE_HAMMER.RB().ii(RecipeIngredient.of(Items.BRICK, 1)).io(DUST_SMALL.get(Brick, 1)).add("brick_dust_small",10, 16); + FORGE_HAMMER.RB().ii(RecipeIngredient.of(Items.BRICKS, 1)).io(DUST.get(Brick, 1)).add("brick_dust",40, 16); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/LatheLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/LatheLoader.java index c6a1cbfe..ea076bf2 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/LatheLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/LatheLoader.java @@ -3,18 +3,18 @@ import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; -import static trinsdar.gt4r.data.RecipeMaps.LATHING; +import static trinsdar.gt4r.data.RecipeMaps.LATHE; public class LatheLoader { public static void init(){ ROD.all().stream().filter(m -> m.has(INGOT) || m.has(GEM)).forEach(m -> { long duration = Math.max(m.getMass(), 1) * 80; RecipeIngredient input = m.has(INGOT) ? INGOT.getMaterialIngredient(m, 1) : GEM.getMaterialIngredient(m , 1); - LATHING.RB().ii(input).io(ROD.get(m,2)).add(m.getId() + "_rod", duration, 16); + LATHE.RB().ii(input).io(ROD.get(m,2)).add(m.getId() + "_rod", duration, 16); }); SCREW.all().forEach(m -> { long duration = Math.max(m.getMass(), 1); - LATHING.RB().ii(BOLT.getMaterialIngredient(m, 1)).io(SCREW.get(m,1)).add(m.getId() + "_screw", duration, 16); + LATHE.RB().ii(BOLT.getMaterialIngredient(m, 1)).io(SCREW.get(m,1)).add(m.getId() + "_screw", duration, 16); }); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/MaceratorLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/MaceratorLoader.java index c969ff02..ac313c27 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/MaceratorLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/MaceratorLoader.java @@ -5,7 +5,6 @@ import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.data.AntimatterStoneTypes; import muramasa.antimatter.material.Material; -import muramasa.antimatter.ore.BlockOre; import muramasa.antimatter.ore.CobbleStoneType; import muramasa.antimatter.ore.StoneType; import muramasa.antimatter.pipe.PipeSize; @@ -14,7 +13,6 @@ import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.recipe.map.RecipeMap; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.antimatter.util.TagUtils; import muramasa.antimatter.util.Utils; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; @@ -35,37 +33,35 @@ import static muramasa.antimatter.material.MaterialTags.ORE_MULTI; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; -import static muramasa.antimatter.util.Utils.getConventionalMaterialType; -import static muramasa.antimatter.util.Utils.getConventionalStoneType; import static trinsdar.gt4r.data.Materials.Brick; import static trinsdar.gt4r.data.Materials.Clay; import static trinsdar.gt4r.data.Materials.Limestone; import static trinsdar.gt4r.data.Materials.Scoria; import static trinsdar.gt4r.data.RecipeMaps.*; -import static trinsdar.gt4r.data.RecipeMaps.UNIVERSAL_MACERATING; +import static trinsdar.gt4r.data.RecipeMaps.UNIVERSAL_MACERATOR; public class MaceratorLoader { public static void initManual(){ - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(Items.STONE, 1)).io(new ItemStack(Items.GRAVEL)).add("gravel",400, 2); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(Items.BRICK, 1)).io(DUST_SMALL.get(Brick, 1)).add("brick_dust_small",25, 2); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(Items.CLAY_BALL, 1)).io(DUST_SMALL.get(Clay, 2)).add("clay_dust_small",16, 4); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(Plantball, 1)).io(new ItemStack(Biochaff, 1)).add("biochaff",300, 2); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(Biochaff, 1)).io(new ItemStack(Items.DIRT, 1)).add("dirt",300, 2); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(Items.CLAY, 1)).io(DUST.get(Clay, 2)).add("clay_dust",30, 4); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(Items.TERRACOTTA, 1)).io(DUST.get(Clay, 1)).add("clay_dust_1",16, 4); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(Items.BRICKS, 1)).io(DUST.get(Brick, 1)).add("brick_dust",100, 2); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 1)).io(DUST.get(Wood, 6)).add("wood_dust",400, 2); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(Items.PRISMARINE, 1)).io(DUST.get(Prismarine, 1)).add("prismarine_dust",400, 2); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(Items.DARK_PRISMARINE, 1)).io(DUST.get(DarkPrismarine, 1)).add("dark_prismarine_dust",400, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(Items.STONE, 1)).io(new ItemStack(Items.GRAVEL)).add("gravel",400, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(Items.BRICK, 1)).io(DUST_SMALL.get(Brick, 1)).add("brick_dust_small",25, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(Items.CLAY_BALL, 1)).io(DUST_SMALL.get(Clay, 2)).add("clay_dust_small",16, 4); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(Plantball, 1)).io(new ItemStack(Biochaff, 1)).add("biochaff",300, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(Biochaff, 1)).io(new ItemStack(Items.DIRT, 1)).add("dirt",300, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(Items.CLAY, 1)).io(DUST.get(Clay, 2)).add("clay_dust",30, 4); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(Items.TERRACOTTA, 1)).io(DUST.get(Clay, 1)).add("clay_dust_1",16, 4); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(Items.BRICKS, 1)).io(DUST.get(Brick, 1)).add("brick_dust",100, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 1)).io(DUST.get(Wood, 6)).add("wood_dust",400, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(Items.PRISMARINE, 1)).io(DUST.get(Prismarine, 1)).add("prismarine_dust",400, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(Items.DARK_PRISMARINE, 1)).io(DUST.get(DarkPrismarine, 1)).add("dark_prismarine_dust",400, 2); if (AntimatterAPI.isModLoaded(GT4RRef.MOD_CREATE)){ - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(AntimatterPlatformUtils.getBlockFromId(new ResourceLocation(GT4RRef.MOD_CREATE, "limestone")), 1)).io(DUST.get(Limestone, 1)).add("limestone_dust",400, 2); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(AntimatterPlatformUtils.getBlockFromId(new ResourceLocation(GT4RRef.MOD_CREATE, "scoria")), 1)).io(DUST.get(Scoria, 1)).add("scoria_dust",400, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(AntimatterPlatformUtils.getBlockFromId(new ResourceLocation(GT4RRef.MOD_CREATE, "limestone")), 1)).io(DUST.get(Limestone, 1)).add("limestone_dust",400, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(AntimatterPlatformUtils.getBlockFromId(new ResourceLocation(GT4RRef.MOD_CREATE, "scoria")), 1)).io(DUST.get(Scoria, 1)).add("scoria_dust",400, 2); } - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(Items.NETHER_QUARTZ_ORE, 1)).io(new ItemStack(Items.QUARTZ, 2)).add("nether_quartz_ore",200, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(Items.NETHER_QUARTZ_ORE, 1)).io(new ItemStack(Items.QUARTZ, 2)).add("nether_quartz_ore",200, 2); if (AntimatterAPI.isModLoaded("cinderscapes")){ - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(AntimatterPlatformUtils.getItemFromID(new ResourceLocation("cinderscapes", "rose_quartz_ore")), 1)).io(new ItemStack(AntimatterPlatformUtils.getItemFromID(new ResourceLocation("cinderscapes", "rose_quartz")), 2)).add("rose_quartz",200, 2); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(AntimatterPlatformUtils.getItemFromID(new ResourceLocation("cinderscapes", "smoky_quartz_ore")), 1)).io(new ItemStack(AntimatterPlatformUtils.getItemFromID(new ResourceLocation("cinderscapes", "smoky_quartz")), 2)).add("smoky_quartz",200, 2); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(AntimatterPlatformUtils.getItemFromID(new ResourceLocation("cinderscapes", "sulfur_quartz_ore")), 1)).io(new ItemStack(AntimatterPlatformUtils.getItemFromID(new ResourceLocation("cinderscapes", "sulfur_quartz")), 2)).add("sulfur_quartz",200, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(AntimatterPlatformUtils.getItemFromID(new ResourceLocation("cinderscapes", "rose_quartz_ore")), 1)).io(new ItemStack(AntimatterPlatformUtils.getItemFromID(new ResourceLocation("cinderscapes", "rose_quartz")), 2)).add("rose_quartz",200, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(AntimatterPlatformUtils.getItemFromID(new ResourceLocation("cinderscapes", "smoky_quartz_ore")), 1)).io(new ItemStack(AntimatterPlatformUtils.getItemFromID(new ResourceLocation("cinderscapes", "smoky_quartz")), 2)).add("smoky_quartz",200, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(AntimatterPlatformUtils.getItemFromID(new ResourceLocation("cinderscapes", "sulfur_quartz_ore")), 1)).io(new ItemStack(AntimatterPlatformUtils.getItemFromID(new ResourceLocation("cinderscapes", "sulfur_quartz")), 2)).add("sulfur_quartz",200, 2); } } @@ -79,10 +75,10 @@ public static void initAuto() { RecipeIngredient ore = RecipeIngredient.of(oreTag,1); ItemStack crushedStack = (m.has(CRUSHED) ? AntimatterMaterialTypes.CRUSHED : DUST).get(m, ORE_MULTI.getInt(m)); Material oreByProduct1 = m.getByProducts().size() > 0 ? m.getByProducts().get(0) : MACERATE_INTO.getMapping(m); - RecipeMap rm = s.isSandLike() ? SIFTING : UNIVERSAL_MACERATING; + RecipeMap rm = s.isSandLike() ? SIFTER : UNIVERSAL_MACERATOR; List stacks = new ArrayList<>(); - stacks.add(Utils.ca((ORE_MULTI.getInt(m)) * (rm == SIFTING ? 1 : 2), crushedStack)); - if (rm == SIFTING){ + stacks.add(Utils.ca((ORE_MULTI.getInt(m)) * (rm == SIFTER ? 1 : 2), crushedStack)); + if (rm == SIFTER){ stacks.add(crushedStack); stacks.add(crushedStack); stacks.add(crushedStack); @@ -91,7 +87,7 @@ public static void initAuto() { if (!stoneDust.isEmpty()) stacks.add(stoneDust); ItemStack[] stackArray = stacks.toArray(new ItemStack[0]); List ints = new ArrayList<>(); - if (rm == SIFTING){ + if (rm == SIFTER){ ints.add(0.7); ints.add(0.5); ints.add(0.3); @@ -119,34 +115,34 @@ public static void initAuto() { Material oreByProduct3 = m.getByProducts().size() > 2 ? m.getByProducts().get(2) : oreByProduct2; if (m == NetheriteScrap){ - UNIVERSAL_MACERATING.RB().ii(ore).io(Utils.ca((ORE_MULTI.getInt(m) * multiplier) * 2, crushedStack), DUST.get(oreByProduct1, 1), DUST.get(Netherrack, 1)).outputChances(1.0, 0.1 * multiplier * BY_PRODUCT_MULTI.getInt(m), 0.5).add("ancient_debris",400, 2); + UNIVERSAL_MACERATOR.RB().ii(ore).io(Utils.ca((ORE_MULTI.getInt(m) * multiplier) * 2, crushedStack), DUST.get(oreByProduct1, 1), DUST.get(Netherrack, 1)).outputChances(1.0, 0.1 * multiplier * BY_PRODUCT_MULTI.getInt(m), 0.5).add("ancient_debris",400, 2); } - UNIVERSAL_MACERATING.RB().ii(crushed).io(DUST_IMPURE.get(MACERATE_INTO.getMapping(m), 1), DUST.get(oreByProduct1, 1)).outputChances(1.0, 0.1).add(m.getId() + "_crushed_ore",400, 2); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(CRUSHED_PURIFIED.getMaterialTag(m), 1)).io(DUST_PURE.get(MACERATE_INTO.getMapping(m), 1), DUST.get(oreByProduct2, 1)).outputChances(1.0, 0.1).add(m.getId() + "_purified_ore",400, 2); - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(CRUSHED_REFINED.getMaterialTag(m), 1)).io(DUST.get(MACERATE_INTO.getMapping(m), 1), DUST.get(oreByProduct3, 1)).outputChances(1.0, 0.1).add(m.getId() + "_centrifuged_ore",400, 2); + UNIVERSAL_MACERATOR.RB().ii(crushed).io(DUST_IMPURE.get(MACERATE_INTO.getMapping(m), 1), DUST.get(oreByProduct1, 1)).outputChances(1.0, 0.1).add(m.getId() + "_crushed_ore",400, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(CRUSHED_PURIFIED.getMaterialTag(m), 1)).io(DUST_PURE.get(MACERATE_INTO.getMapping(m), 1), DUST.get(oreByProduct2, 1)).outputChances(1.0, 0.1).add(m.getId() + "_purified_ore",400, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(CRUSHED_REFINED.getMaterialTag(m), 1)).io(DUST.get(MACERATE_INTO.getMapping(m), 1), DUST.get(oreByProduct3, 1)).outputChances(1.0, 0.1).add(m.getId() + "_centrifuged_ore",400, 2); if (m.has(RAW_ORE)){ - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(RAW_ORE.getMaterialTag(m), 1)).io(Utils.ca((ORE_MULTI.getInt(m) * multiplier) * 2, crushedStack), DUST.get(oreByProduct1, 1)).outputChances(1.0, 0.1 * multiplier * BY_PRODUCT_MULTI.getInt(m)).add(m.getId() + "_raw_ore",400, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(RAW_ORE.getMaterialTag(m), 1)).io(Utils.ca((ORE_MULTI.getInt(m) * multiplier) * 2, crushedStack), DUST.get(oreByProduct1, 1)).outputChances(1.0, 0.1 * multiplier * BY_PRODUCT_MULTI.getInt(m)).add(m.getId() + "_raw_ore",400, 2); } }); AntimatterMaterialTypes.DUST.all().forEach(m -> { if (m.has(AntimatterMaterialTypes.PLATE) && m != AntimatterMaterials.Wood){ long duration = m.getMass(); - UNIVERSAL_MACERATING.RB().ii(PLATE.getMaterialIngredient(m, 1)).io(DUST.get(m, 1)).add(m.getId() + "_plate", duration, 4); + UNIVERSAL_MACERATOR.RB().ii(PLATE.getMaterialIngredient(m, 1)).io(DUST.get(m, 1)).add(m.getId() + "_plate", duration, 4); } if (m.has(AntimatterMaterialTypes.INGOT)){ long duration = m.getMass(); - UNIVERSAL_MACERATING.RB().ii(INGOT.getMaterialIngredient(m, 1)).io(DUST.get(m, 1)).add(m.getId() + "_ingot", duration, 4); + UNIVERSAL_MACERATOR.RB().ii(INGOT.getMaterialIngredient(m, 1)).io(DUST.get(m, 1)).add(m.getId() + "_ingot", duration, 4); } if (m.has(AntimatterMaterialTypes.GEM)){ long duration = m.getMass(); - UNIVERSAL_MACERATING.RB().ii(GEM.getMaterialIngredient(m, 1)).io(DUST.get(m, 1)).add(m.getId() + "_gem", duration, 4); + UNIVERSAL_MACERATOR.RB().ii(GEM.getMaterialIngredient(m, 1)).io(DUST.get(m, 1)).add(m.getId() + "_gem", duration, 4); } }); AntimatterAPI.all(StoneType.class, s -> { if (s.getMaterial() == NULL || !s.getMaterial().has(DUST) || s.isSandLike()) return; - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(s.getState().getBlock().asItem(), 1)).io(DUST.get(s.getMaterial(), 1)).add(s.getId() + "_stone_to_" + s.getMaterial().getId() + "_dust",400, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(s.getState().getBlock().asItem(), 1)).io(DUST.get(s.getMaterial(), 1)).add(s.getId() + "_stone_to_" + s.getMaterial().getId() + "_dust",400, 2); if (s instanceof CobbleStoneType){ - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(((CobbleStoneType)s).getBlock("cobble").asItem(), 1)).io(DUST.get(s.getMaterial(), 1)).add("cobbled_" + s.getId() + "_to_" + s.getMaterial().getId() + "_dust",400, 2); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(((CobbleStoneType)s).getBlock("cobble").asItem(), 1)).io(DUST.get(s.getMaterial(), 1)).add("cobbled_" + s.getId() + "_to_" + s.getMaterial().getId() + "_dust",400, 2); } }); AntimatterAPI.all(FluidPipe.class).forEach(t -> { @@ -157,19 +153,19 @@ public static void initAuto() { Item pipeLarge = t.getBlockItem(PipeSize.LARGE); Item pipeHuge = t.getBlockItem(PipeSize.HUGE); if (t.getSizes().contains(PipeSize.TINY)) { - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(pipeTiny, 1)).io(DUST_SMALL.get(t.getMaterial(), 2)).add(t.getMaterial().getId() + "_fluid_pipe_tiny",t.getMaterial().getMass()/2,128); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(pipeTiny, 1)).io(DUST_SMALL.get(t.getMaterial(), 2)).add(t.getMaterial().getId() + "_fluid_pipe_tiny",t.getMaterial().getMass()/2,128); } if (t.getSizes().contains(PipeSize.SMALL)) { - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(pipeSmall, 1)).io(DUST.get(t.getMaterial(), 1)).add(t.getMaterial().getId() + "_fluid_pipe_small",t.getMaterial().getMass(),128); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(pipeSmall, 1)).io(DUST.get(t.getMaterial(), 1)).add(t.getMaterial().getId() + "_fluid_pipe_small",t.getMaterial().getMass(),128); } if (t.getSizes().contains(PipeSize.NORMAL)) { - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(pipeNormal, 1)).io(DUST.get(t.getMaterial(), 3)).add(t.getMaterial().getId() + "_fluid_pipe_normal",t.getMaterial().getMass()*3,128); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(pipeNormal, 1)).io(DUST.get(t.getMaterial(), 3)).add(t.getMaterial().getId() + "_fluid_pipe_normal",t.getMaterial().getMass()*3,128); } if (t.getSizes().contains(PipeSize.LARGE)) { - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(pipeLarge, 1)).io(DUST.get(t.getMaterial(), 6)).add(t.getMaterial().getId() + "_fluid_pipe_large",t.getMaterial().getMass()*6,128); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(pipeLarge, 1)).io(DUST.get(t.getMaterial(), 6)).add(t.getMaterial().getId() + "_fluid_pipe_large",t.getMaterial().getMass()*6,128); } if (t.getSizes().contains(PipeSize.HUGE)) { - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(pipeHuge, 1)).io(DUST.get(t.getMaterial(), 12)).add(t.getMaterial().getId() + "_fluid_pipe_huge",t.getMaterial().getMass()*12,128); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(pipeHuge, 1)).io(DUST.get(t.getMaterial(), 12)).add(t.getMaterial().getId() + "_fluid_pipe_huge",t.getMaterial().getMass()*12,128); } }); @@ -181,19 +177,19 @@ public static void initAuto() { Item pipeLarge = t.getBlockItem(PipeSize.LARGE); Item pipeHuge = t.getBlockItem(PipeSize.HUGE); if (t.getSizes().contains(PipeSize.TINY)) { - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(pipeTiny, 1)).io(DUST_SMALL.get(t.getMaterial(), 2)).add(t.getMaterial().getId() + "_item_pipe_tiny",t.getMaterial().getMass()/2,128); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(pipeTiny, 1)).io(DUST_SMALL.get(t.getMaterial(), 2)).add(t.getMaterial().getId() + "_item_pipe_tiny",t.getMaterial().getMass()/2,128); } if (t.getSizes().contains(PipeSize.SMALL)) { - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(pipeSmall, 1)).io(DUST.get(t.getMaterial(), 1)).add(t.getMaterial().getId() + "_item_pipe_small",t.getMaterial().getMass(),128); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(pipeSmall, 1)).io(DUST.get(t.getMaterial(), 1)).add(t.getMaterial().getId() + "_item_pipe_small",t.getMaterial().getMass(),128); } if (t.getSizes().contains(PipeSize.NORMAL)) { - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(pipeNormal, 1)).io(DUST.get(t.getMaterial(), 3)).add(t.getMaterial().getId() + "_item_pipe_normal",t.getMaterial().getMass()*3,128); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(pipeNormal, 1)).io(DUST.get(t.getMaterial(), 3)).add(t.getMaterial().getId() + "_item_pipe_normal",t.getMaterial().getMass()*3,128); } if (t.getSizes().contains(PipeSize.LARGE)) { - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(pipeLarge, 1)).io(DUST.get(t.getMaterial(), 6)).add(t.getMaterial().getId() + "_item_pipe_large",t.getMaterial().getMass()*6,128); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(pipeLarge, 1)).io(DUST.get(t.getMaterial(), 6)).add(t.getMaterial().getId() + "_item_pipe_large",t.getMaterial().getMass()*6,128); } if (t.getSizes().contains(PipeSize.HUGE)) { - UNIVERSAL_MACERATING.RB().ii(RecipeIngredient.of(pipeHuge, 1)).io(DUST.get(t.getMaterial(), 12)).add(t.getMaterial().getId() + "_item_pipe_huge",t.getMaterial().getMass()*12,128); + UNIVERSAL_MACERATOR.RB().ii(RecipeIngredient.of(pipeHuge, 1)).io(DUST.get(t.getMaterial(), 12)).add(t.getMaterial().getId() + "_item_pipe_huge",t.getMaterial().getMass()*12,128); } }); diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/MassFabLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/MassFabLoader.java index 7cf3653d..3c8bb936 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/MassFabLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/MassFabLoader.java @@ -6,7 +6,7 @@ public class MassFabLoader { public static void init(){ - RecipeMaps.MASS_FABRICATING.RB().fi(Materials.UUAmplifier.getLiquid(1)).fo(Materials.UUMatter.getLiquid(1)).add("uumatter_1",803, 256); - RecipeMaps.MASS_FABRICATING.RB().ii(TierMaps.INT_CIRCUITS.get(1)).fo(Materials.UUMatter.getLiquid(1)).add("uumatter",3125, 256); + RecipeMaps.MASS_FABRICATOR.RB().fi(Materials.UUAmplifier.getLiquid(1)).fo(Materials.UUMatter.getLiquid(1)).add("uumatter_1",803, 256); + RecipeMaps.MASS_FABRICATOR.RB().ii(TierMaps.INT_CIRCUITS.get(1)).fo(Materials.UUMatter.getLiquid(1)).add("uumatter",3125, 256); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/SiftingLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/SiftingLoader.java index eef861d3..ba4c8eed 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/SiftingLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/SiftingLoader.java @@ -1,7 +1,5 @@ package trinsdar.gt4r.loader.machines; -import muramasa.antimatter.data.AntimatterMaterialTypes; -import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.util.TagUtils; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -10,18 +8,18 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static trinsdar.gt4r.data.Materials.*; -import static trinsdar.gt4r.data.RecipeMaps.SIFTING; +import static trinsdar.gt4r.data.RecipeMaps.SIFTER; public class SiftingLoader { public static void init() { - SIFTING.RB().ii(of(CRUSHED_PURIFIED.getMaterialTag(Ruby), 1)).io(GEM.get(Ruby, 1), DUST.get(Ruby, 1)).outputChances(0.45, 0.35).add("ruby",800, 16); - SIFTING.RB().ii(of(CRUSHED_PURIFIED.getMaterialTag(Sapphire), 1)).io(GEM.get(Sapphire, 1), DUST.get(Sapphire, 1)).outputChances(0.45, 0.35).add("sapphire",800, 16); - SIFTING.RB().ii(of(CRUSHED_PURIFIED.getMaterialTag(Olivine), 1)).io(GEM.get(Olivine, 1), DUST.get(Olivine, 1)).outputChances(0.45, 0.35).add("olivine",800, 16); - SIFTING.RB().ii(of(CRUSHED_PURIFIED.getMaterialTag(Diamond), 1)).io(new ItemStack(Items.DIAMOND, 1), DUST.get(Diamond, 1)).outputChances(0.45, 0.35).add("diamond",800, 16); - SIFTING.RB().ii(of(CRUSHED_PURIFIED.getMaterialTag(Emerald), 1)).io(new ItemStack(Items.EMERALD, 1), DUST.get(Emerald, 1)).outputChances(0.45, 0.35).add("emerald",800, 16); + SIFTER.RB().ii(of(CRUSHED_PURIFIED.getMaterialTag(Ruby), 1)).io(GEM.get(Ruby, 1), DUST.get(Ruby, 1)).outputChances(0.45, 0.35).add("ruby",800, 16); + SIFTER.RB().ii(of(CRUSHED_PURIFIED.getMaterialTag(Sapphire), 1)).io(GEM.get(Sapphire, 1), DUST.get(Sapphire, 1)).outputChances(0.45, 0.35).add("sapphire",800, 16); + SIFTER.RB().ii(of(CRUSHED_PURIFIED.getMaterialTag(Olivine), 1)).io(GEM.get(Olivine, 1), DUST.get(Olivine, 1)).outputChances(0.45, 0.35).add("olivine",800, 16); + SIFTER.RB().ii(of(CRUSHED_PURIFIED.getMaterialTag(Diamond), 1)).io(new ItemStack(Items.DIAMOND, 1), DUST.get(Diamond, 1)).outputChances(0.45, 0.35).add("diamond",800, 16); + SIFTER.RB().ii(of(CRUSHED_PURIFIED.getMaterialTag(Emerald), 1)).io(new ItemStack(Items.EMERALD, 1), DUST.get(Emerald, 1)).outputChances(0.45, 0.35).add("emerald",800, 16); // for when ic2 comes along to 1.16 //SIFTING.RB().ii(of(CRUSHED_PURIFIED.getMaterialTag(Iridium), 1)).io(new ItemStack(Items.Iridium_ore, 1), new ItemStack(Items.Iridium_ore, 1), new ItemStack(Items.Iridium_ore, 1), new ItemStack(Items.Iridium_ore, 1), new ItemStack(Items.Iridium_ore, 1), DUST.get(Iridium, 1)).chances(1, 4, 15, 20, 40, 50).add(800, 16); - SIFTING.RB().ii(of(CRUSHED_PURIFIED.getMaterialTag(Lapis), 1)).io(new ItemStack(Items.LAPIS_LAZULI, 1), new ItemStack(Items.LAPIS_LAZULI, 1), new ItemStack(Items.LAPIS_LAZULI, 1), new ItemStack(Items.LAPIS_LAZULI, 1), new ItemStack(Items.LAPIS_LAZULI, 1), DUST.get(Lapis, 1)).outputChances(0.01, 0.04, 0.15, 0.2, 0.4, 0.5).add("lapis",800, 16); - SIFTING.RB().ii(of(TagUtils.getForgelikeItemTag("gravel"), 1)).io(new ItemStack(Items.FLINT, 1)).add("flint",800, 16); + SIFTER.RB().ii(of(CRUSHED_PURIFIED.getMaterialTag(Lapis), 1)).io(new ItemStack(Items.LAPIS_LAZULI, 1), new ItemStack(Items.LAPIS_LAZULI, 1), new ItemStack(Items.LAPIS_LAZULI, 1), new ItemStack(Items.LAPIS_LAZULI, 1), new ItemStack(Items.LAPIS_LAZULI, 1), DUST.get(Lapis, 1)).outputChances(0.01, 0.04, 0.15, 0.2, 0.4, 0.5).add("lapis",800, 16); + SIFTER.RB().ii(of(TagUtils.getForgelikeItemTag("gravel"), 1)).io(new ItemStack(Items.FLINT, 1)).add("flint",800, 16); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/ThermalCentrifuge.java b/common/src/main/java/trinsdar/gt4r/loader/machines/ThermalCentrifuge.java index b979e68a..f6f1a584 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/ThermalCentrifuge.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/ThermalCentrifuge.java @@ -6,7 +6,7 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.CRUSHED_PURIFIED; import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST_TINY; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static trinsdar.gt4r.data.RecipeMaps.THERMAL_CENTRIFUGING; +import static trinsdar.gt4r.data.RecipeMaps.THERMAL_CENTRIFUGE; public class ThermalCentrifuge { public static void init() { @@ -14,7 +14,7 @@ public static void init() { Material aOreByProduct1 = m.getByProducts().size() >= 1 ? m.getByProducts().get(0) : m; Material aOreByProduct2 = m.getByProducts().size() >= 2 ? m.getByProducts().get(1) : aOreByProduct1; - THERMAL_CENTRIFUGING.RB().ii(of(CRUSHED_PURIFIED.get(m),1)).io(CRUSHED_REFINED.get(m, 1), DUST_TINY.get(aOreByProduct2, 1)).add(m.getId() + "_purified_ore",500, 48,0,2); + THERMAL_CENTRIFUGE.RB().ii(of(CRUSHED_PURIFIED.get(m),1)).io(CRUSHED_REFINED.get(m, 1), DUST_TINY.get(aOreByProduct2, 1)).add(m.getId() + "_purified_ore",500, 48,0,2); }); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/WasherLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/WasherLoader.java index c4af7213..e310f512 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/WasherLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/WasherLoader.java @@ -9,7 +9,7 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static trinsdar.gt4r.data.RecipeMaps.ORE_WASHING; +import static trinsdar.gt4r.data.RecipeMaps.ORE_WASHER; public class WasherLoader { public static void init() { @@ -19,7 +19,7 @@ public static void init() { Material aOreByProduct1 = m.getByProducts().size() >= 1 ? m.getByProducts().get(0) : MaterialTags.MACERATE_INTO.getMapping(m); //Material aOreByProduct2 = m.getByProducts().size() >= 2 ? m.getByProducts().get(1) : aOreByProduct1; - ORE_WASHING.RB().fi(Water.getLiquid(1000)).ii(of(CRUSHED.get(m,1))).io(CRUSHED_PURIFIED.get(m,1), DUST_TINY.get(aOreByProduct1,1), stoneDust).add(m.getId() + "_crushed_ore",200, 24); + ORE_WASHER.RB().fi(Water.getLiquid(1000)).ii(of(CRUSHED.get(m,1))).io(CRUSHED_PURIFIED.get(m,1), DUST_TINY.get(aOreByProduct1,1), stoneDust).add(m.getId() + "_crushed_ore",200, 24); }); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/WiremillLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/WiremillLoader.java index d8c97112..c71da5fd 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/WiremillLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/WiremillLoader.java @@ -14,7 +14,7 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; import static muramasa.antimatter.data.AntimatterMaterialTypes.INGOT; import static trinsdar.gt4r.data.Materials.*; -import static trinsdar.gt4r.data.RecipeMaps.WIRE_MILLING; +import static trinsdar.gt4r.data.RecipeMaps.WIRE_MILL; public class WiremillLoader { public static void init() { @@ -23,7 +23,7 @@ public static void init() { ItemStack stack = new ItemStack(wireItem,2); if (t.getMaterial().has(INGOT)){ RecipeIngredient ing = INGOT.getMaterialIngredient(t.getMaterial(),1); - WIRE_MILLING.RB().ii(ing).io(stack).add(t.getId() + "_wire_vtiny",t.getMaterial().getMass()*2,24); + WIRE_MILL.RB().ii(ing).io(stack).add(t.getId() + "_wire_vtiny",t.getMaterial().getMass()*2,24); } /*if (WIRE_FINE.allowItemGen(t.getMaterial())) { @@ -31,12 +31,12 @@ public static void init() { }*/ }); - WIRE_MILLING.RB().ii(INGOT.getMaterialIngredient(Kanthal, 4)).io(new ItemStack(GT4RData.KanthalHeatingCoil)).add("kanthal_heating_coil",450, 12); - WIRE_MILLING.RB().ii(INGOT.getMaterialIngredient(Nichrome, 5)).io(new ItemStack(GT4RData.NichromeHeatingCoil)).add("nichroome_heating_coil",600, 16); - WIRE_MILLING.RB().ii(INGOT.getMaterialIngredient(Cupronickel, 3)).io(new ItemStack(GT4RData.CupronickelHeatingCoil)).add("cupronickel_heating_coil",300, 8); - WIRE_MILLING.RB().ii(DUST.getMaterialIngredient(Carbon, 8)).io(new ItemStack(GTCoreItems.CarbonFibre)).add("carbon_fibre",400, 2); - WIRE_MILLING.RB().ii(DUST.getMaterialIngredient(Charcoal, 8)).io(new ItemStack(GTCoreItems.CarbonFibre)).add("carbon_fibre_1",400, 2); - WIRE_MILLING.RB().ii(DUST.getMaterialIngredient(Coal, 4)).io(new ItemStack(GTCoreItems.CarbonFibre)).add("carbon_fibre_2",400, 2); + WIRE_MILL.RB().ii(INGOT.getMaterialIngredient(Kanthal, 4)).io(new ItemStack(GT4RData.KanthalHeatingCoil)).add("kanthal_heating_coil",450, 12); + WIRE_MILL.RB().ii(INGOT.getMaterialIngredient(Nichrome, 5)).io(new ItemStack(GT4RData.NichromeHeatingCoil)).add("nichroome_heating_coil",600, 16); + WIRE_MILL.RB().ii(INGOT.getMaterialIngredient(Cupronickel, 3)).io(new ItemStack(GT4RData.CupronickelHeatingCoil)).add("cupronickel_heating_coil",300, 8); + WIRE_MILL.RB().ii(DUST.getMaterialIngredient(Carbon, 8)).io(new ItemStack(GTCoreItems.CarbonFibre)).add("carbon_fibre",400, 2); + WIRE_MILL.RB().ii(DUST.getMaterialIngredient(Charcoal, 8)).io(new ItemStack(GTCoreItems.CarbonFibre)).add("carbon_fibre_1",400, 2); + WIRE_MILL.RB().ii(DUST.getMaterialIngredient(Coal, 4)).io(new ItemStack(GTCoreItems.CarbonFibre)).add("carbon_fibre_2",400, 2); } } diff --git a/common/src/main/java/trinsdar/gt4r/loader/multi/IndustrialSawmill.java b/common/src/main/java/trinsdar/gt4r/loader/multi/IndustrialSawmill.java index 0494eea8..38200c82 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/multi/IndustrialSawmill.java +++ b/common/src/main/java/trinsdar/gt4r/loader/multi/IndustrialSawmill.java @@ -3,11 +3,9 @@ import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import io.github.gregtechintergalactical.gtcore.data.GTCoreTags; -import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.util.AntimatterPlatformUtils; import net.minecraft.tags.TagKey; -import net.minecraft.world.level.material.Fluids; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -42,7 +40,7 @@ private static void addWoodRecipe(TagKey log, ItemLike wood){ INDUSTRIAL_SAWMILLING.RB().ii(RecipeIngredient.of(log, 1)).fi(Water.getLiquid(40)).io(new ItemStack(wood, 6), DUST.get(Wood, 1)).add(woodID + "_log",200, 30); INDUSTRIAL_SAWMILLING.RB().ii(RecipeIngredient.of(log, 1)).fi(Lubricant.getLiquid(10)).io(new ItemStack(wood, 6), DUST.get(Wood, 1)).add(woodID + "_log_1",100, 30); INDUSTRIAL_SAWMILLING.RB().ii(RecipeIngredient.of(log, 1)).fi(DistilledWater.getLiquid(30)).io(new ItemStack(wood, 6), DUST.get(Wood, 1)).add(woodID + "_log_2",200, 30); - CUTTING.RB().ii(RecipeIngredient.of(log, 1)).fi(Water.getLiquid(3)).io(new ItemStack(wood, 4), DUST.get(Wood, 1)).add(woodID + "_log",200, 30); + PLATE_CUTTER.RB().ii(RecipeIngredient.of(log, 1)).fi(Water.getLiquid(3)).io(new ItemStack(wood, 4), DUST.get(Wood, 1)).add(woodID + "_log",200, 30); STEAM_CUTTER.RB().ii(RecipeIngredient.of(log, 1)).fi(Water.getLiquid(3)).io(new ItemStack(wood, 4), DUST.get(Wood, 1)).add(woodID + "_log", 800, 30); } @@ -51,7 +49,7 @@ private static void addWoodRecipe(TagKey log, ItemLike wood, ItemStack out INDUSTRIAL_SAWMILLING.RB().ii(RecipeIngredient.of(log, 1)).fi(Water.getLiquid(40)).io(new ItemStack(wood, 6), DUST.get(Wood, 1), output).add(woodID + "_log",200, 30); INDUSTRIAL_SAWMILLING.RB().ii(RecipeIngredient.of(log, 1)).fi(Lubricant.getLiquid(10)).io(new ItemStack(wood, 6), DUST.get(Wood, 1), output).add(woodID + "_log_1",100, 30); INDUSTRIAL_SAWMILLING.RB().ii(RecipeIngredient.of(log, 1)).fi(DistilledWater.getLiquid(30)).io(new ItemStack(wood, 6), DUST.get(Wood, 1), output).add(woodID + "_log_2",200, 30); - CUTTING.RB().ii(RecipeIngredient.of(log, 1)).fi(Water.getLiquid(3)).io(new ItemStack(wood, 4), DUST.get(Wood, 1)).add(woodID + "_log",200, 30); + PLATE_CUTTER.RB().ii(RecipeIngredient.of(log, 1)).fi(Water.getLiquid(3)).io(new ItemStack(wood, 4), DUST.get(Wood, 1)).add(woodID + "_log",200, 30); STEAM_CUTTER.RB().ii(RecipeIngredient.of(log, 1)).fi(Water.getLiquid(3)).io(new ItemStack(wood, 4), DUST.get(Wood, 1)).add(woodID + "_log", 800, 30); } }