Skip to content

Commit

Permalink
renamed a bunch of recipe maps
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trinsdar
Trinsdar committed Sep 2, 2024
1 parent 61b2ee1 commit f16ad70
Show file tree
Hide file tree
Showing 28 changed files with 416 additions and 449 deletions.
5 changes: 1 addition & 4 deletions common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityMacerator.java
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
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;
import trinsdar.gt4r.data.RecipeMaps;
import trinsdar.gt4r.machine.UpgradeableMachine;

import static muramasa.antimatter.machine.Tier.LV;
import static muramasa.antimatter.machine.Tier.MV;

public class BlockEntityMacerator extends BlockEntityUpgradeableMachine<BlockEntityMacerator> {
public BlockEntityMacerator(UpgradeableMachine type, BlockPos pos, BlockState state) {
super(type, pos, state);
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();
}
});
Expand Down
61 changes: 29 additions & 32 deletions common/src/main/java/trinsdar/gt4r/data/Machines.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand All @@ -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();
Expand Down
Loading

0 comments on commit f16ad70

Please sign in to comment.