Skip to content
This repository has been archived by the owner on Nov 5, 2024. It is now read-only.

Commit

Permalink
renamed large macerator to large pulverizer
Browse files Browse the repository at this point in the history
  • Loading branch information
Trinsdar committed Sep 17, 2024
1 parent 75ec170 commit d148436
Show file tree
Hide file tree
Showing 22 changed files with 13 additions and 14 deletions.
1 change: 1 addition & 0 deletions common/src/main/java/muramasa/gregtech/GTRemapping.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public static void init(){
AntimatterRemapping.remapBlockEntity(new ResourceLocation(GTIRef.ID, "heat_exchanger"), new ResourceLocation(GTIRef.ID, "large_heat_exchanger"));
AntimatterRemapping.remapMachine("coal_boiler", SOLID_FUEL_BOILER);
AntimatterRemapping.remapMachine("pulverizer", MACERATOR);
AntimatterRemapping.remapMachine("large_macerator", LARGE_PULVERIZER);
AntimatterRemapping.remapMachine("fluid_extractor", FLUID_PRESS);
AntimatterRemapping.remapMachine("hatch_item_input", HATCH_ITEM_I);
AntimatterRemapping.remapMachine("hatch_item_output", HATCH_ITEM_O);
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/muramasa/gregtech/data/Guis.java
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ public static void backgroundTextures(){
LARGE_CENTRIFUGE.getGui().setBackgroundTexture("multiblock");
LARGE_CHEMICAL_REACTOR.getGui().setBackgroundTexture("multiblock");
LARGE_ELECTROLYZER.getGui().setBackgroundTexture("multiblock");
LARGE_MACERATOR.getGui().setBackgroundTexture("multiblock");
LARGE_PULVERIZER.getGui().setBackgroundTexture("multiblock");
LARGE_ORE_WASHER.getGui().setBackgroundTexture("multiblock");
LARGE_TURBINE.getGui().setBackgroundTexture("multiblock");
LARGE_HEAT_EXCHANGER.getGui().setBackgroundTexture("multiblock");
Expand Down
3 changes: 1 addition & 2 deletions common/src/main/java/muramasa/gregtech/data/Machines.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package muramasa.gregtech.data;

import com.google.common.collect.ImmutableMap;
import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks;
import io.github.gregtechintergalactical.gtcore.machine.DrumMachine;
import muramasa.antimatter.Ref;
Expand Down Expand Up @@ -243,7 +242,7 @@ public class Machines {
public static MultiMachine LARGE_CENTRIFUGE = new MultiMachine(GTIRef.ID, "large_centrifuge").setTiers(HV).setMap(RecipeMaps.CENTRIFUGE).addFlags(GUI, ITEM, FLUID, EU).addStructureTooltip(7).setTile(BlockEntityLargeCentrifuge::new).setTextureBlock(GregTechBlocks.CASING_TUNGSTENSTEEL);
public static MultiMachine LARGE_CHEMICAL_REACTOR = new MultiMachine(GTIRef.ID, "large_chemical_reactor").setTiers(HV).setMap(RecipeMaps.CHEMICAL_REACTOR).addFlags(GUI, ITEM, FLUID, EU).addStructureTooltip(10).setTile(BlockEntityLargeChemicalReactor::new).custom().setTextureBlock(GregTechBlocks.CASING_CHEMICALLY_INERT);
public static MultiMachine LARGE_ELECTROLYZER = new MultiMachine(GTIRef.ID, "large_electrolyzer").setTiers(HV).setMap(RecipeMaps.ELECTROLYZER).addFlags(GUI, ITEM, FLUID, EU).addStructureTooltip(9).setTile(BlockEntityLargeElectrolyzer::new).setTextureBlock(GregTechBlocks.CASING_STAINLESS_STEEL);
public static MultiMachine LARGE_MACERATOR = new MultiMachine(GTIRef.ID, "large_macerator").setTiers(HV).setMap(PULVERIZER).addFlags(GUI, ITEM, EU).addStructureTooltip(8).setTile(BlockEntityLargeMacerator::new).setTextureBlock(GregTechBlocks.TUNGSTENSTEEL_WALL).blockColorHandler((state, world, pos, machine, i) -> i == 0 ? TungstenSteel.getRGB() : -1).itemColorHandler((stack, block, i) -> i == 0 ? TungstenSteel.getRGB() : -1);
public static MultiMachine LARGE_PULVERIZER = new MultiMachine(GTIRef.ID, "large_pulverizer").setTiers(HV).setMap(PULVERIZER).addFlags(GUI, ITEM, EU).addStructureTooltip(8).setTile(BlockEntityLargeMacerator::new).setTextureBlock(GregTechBlocks.TUNGSTENSTEEL_WALL).blockColorHandler((state, world, pos, machine, i) -> i == 0 ? TungstenSteel.getRGB() : -1).itemColorHandler((stack, block, i) -> i == 0 ? TungstenSteel.getRGB() : -1);
public static MultiMachine LARGE_ORE_WASHER = new MultiMachine(GTIRef.ID, "large_ore_washer").setTiers(EV).setMap(RecipeMaps.ORE_WASHER).addFlags(GUI, ITEM, FLUID, EU).setTile(BlockEntityLargeOreWasher::new).setTextureBlock(GregTechBlocks.TITANIUM_WALL).blockColorHandler((state, world, pos, machine, i) -> i == 0 ? Titanium.getRGB() : -1).itemColorHandler((stack, block, i) -> i == 0 ? Titanium.getRGB() : -1);
public static MultiMachine LARGE_TURBINE = new MultiMachine(GTIRef.ID, "large_turbine").setTiers(HV, EV, IV).setMap(STEAM_FUELS, HV).setMap(HP_STEAM_FUELS, IV).setMap(GAS_FUELS, EV).addFlags(GUI, ITEM, FLUID, EU, GENERATOR).setTile(BlockEntityLargeTurbine::new).custom(Textures.TURBINE).setTierSpecificLang().addStructureTooltip(8, (machine, stack, world, flag, i) -> {
if (i == 0){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public static void init() {
.offset(2, 1, 0).min(1, HATCH_ENERGY).build()
);

LARGE_MACERATOR.setStructure(BlockEntityLargeMacerator.class, b -> b.part("main")
LARGE_PULVERIZER.setStructure(BlockEntityLargeMacerator.class, b -> b.part("main")
.of("CCCCC", "CGGGC", "CGGGC", "CGGGC", "CCCCC").of(0).of("CC~CC", "CCCCC", "CCCCC", "CCCCC", "CCCCC").build()
.at('C', GregTechBlocks.TUNGSTENSTEEL_WALL, HATCH_ITEM_I, HATCH_ITEM_O, HATCH_ENERGY)
.atElement('G', onElementPass((el, t, w, x, y, z) -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,14 @@ private void structureTranslations(){
add("tooltip.large_electrolyzer.7", "1x Energy Hatch (Any casing except top middle)");
add("tooltip.large_electrolyzer.8", "Stainless Steel Casings for the rest (32 at most!)");

add("tooltip.large_macerator.0", "Controller Block for the Large Macerator");
add("tooltip.large_macerator.1", "Runs up to 16 recipes at a time");
add("tooltip.large_macerator.2", "Size(WxHxD): 5x3x5, Controller (Front middle at bottom)");
add("tooltip.large_macerator.3", "5x3x5 Basin of Tungstensteel Walls (Min 53!)");
add("tooltip.large_macerator.4", "3x2x3 of Grinding Wheels (Inside basin, exactly 18!)");
add("tooltip.large_macerator.5", "1x Item Input Hatch (Any Casing)");
add("tooltip.large_macerator.6", "1x Item Output Hatch (Any Casing)");
add("tooltip.large_macerator.7", "1x Energy Hatch (Any Casing)");
add("tooltip.large_pulverizer.0", "Controller Block for the Large Pulverizer(AKA Macerator)");
add("tooltip.large_pulverizer.1", "Runs up to 16 recipes at a time");
add("tooltip.large_pulverizer.2", "Size(WxHxD): 5x3x5, Controller (Front middle at bottom)");
add("tooltip.large_pulverizer.3", "5x3x5 Basin of Tungstensteel Walls (Min 53!)");
add("tooltip.large_pulverizer.4", "3x2x3 of Grinding Wheels (Inside basin, exactly 18!)");
add("tooltip.large_pulverizer.5", "1x Item Input Hatch (Any Casing)");
add("tooltip.large_pulverizer.6", "1x Item Output Hatch (Any Casing)");
add("tooltip.large_pulverizer.7", "1x Energy Hatch (Any Casing)");

add("tooltip.large_turbine.0", "Controller Block for the %s");
add("tooltip.large_turbine.1", "Size(WxHxD): 3x3x4 (Hollow), Controller (Front centered)");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import io.github.gregtechintergalactical.gtcore.GTCore;
import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks;
import io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials;
import io.github.gregtechintergalactical.gtcore.data.GTCoreTags;
import io.github.gregtechintergalactical.gtcore.machine.*;
import muramasa.antimatter.AntimatterAPI;
import muramasa.antimatter.Ref;
Expand Down Expand Up @@ -890,7 +889,7 @@ private static void addMultiblockRecipes(Consumer<FinishedRecipe> output, Antima
.put('H', HULL.getItem(HV))
.put('C', TIER_CIRCUITS.apply(EV))
.build(), "OPO", "CHC", "OPO"));
add(LARGE_MACERATOR, HV, (m,item) -> provider.addItemRecipe(output, "machines", item,
add(LARGE_PULVERIZER, HV, (m, item) -> provider.addItemRecipe(output, "machines", item,
ImmutableMap.<Character, Object>builder()
.put('P', GregTechItems.PistonIV)
.put('M', MotorIV)
Expand Down

0 comments on commit d148436

Please sign in to comment.