From 21d337d62aa2c5f33503d8d970c017f40c5f89d3 Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Mon, 9 Dec 2024 10:28:53 +0800 Subject: [PATCH] feat: replace pmma can with uhmwpe can --- .../common/metatileentities/SuSyMetaTileEntities.java | 6 +++--- src/main/resources/assets/susy/lang/en_us.lang | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java b/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java index 0a867fb5b..2a1b78a3d 100644 --- a/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java +++ b/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java @@ -72,8 +72,8 @@ public class SuSyMetaTileEntities { public static MetaTileEntityDrum BRASS_DRUM; public static MetaTileEntityPlasticCan PE_CAN; public static MetaTileEntityPlasticCan PP_CAN; - public static MetaTileEntityPlasticCan PMMA_CAN; public static MetaTileEntityPlasticCan PTFE_CAN; + public static MetaTileEntityPlasticCan UHMWPE_CAN; //Machines for chem overhaul public static ContinuousMachineMetaTileEntity[] CONTINUOUS_STIRRED_TANK_REACTOR; @@ -181,12 +181,12 @@ public static void init() { PE_CAN = registerMetaTileEntity(14507, new MetaTileEntityPlasticCan(susyId("drum.pe"), Materials.Polyethylene, 64_000)); PP_CAN = registerMetaTileEntity(14508, new MetaTileEntityPlasticCan(susyId("drum.pp"), new PropertyFluidFilter(444, true, true, false, false), 0xdfe39a, 128_000)); - PMMA_CAN = registerMetaTileEntity(14509, new MetaTileEntityPlasticCan(susyId("drum.pmma"), new PropertyFluidFilter(438, true, true, false, false), 0x72e0c9, 256_000)); + PTFE_CAN = registerMetaTileEntity(14509, new MetaTileEntityPlasticCan(susyId("drum.ptfe"), Materials.Polytetrafluoroethylene, 512_000)); STEAM_LATEX_COLLECTOR[0] = registerMetaTileEntity(14510, new MetaTileEntitySteamLatexCollector(susyId("latex_collector.bronze"), false)); STEAM_LATEX_COLLECTOR[1] = registerMetaTileEntity(14511, new MetaTileEntitySteamLatexCollector(susyId("latex_collector.steel"), true)); - PTFE_CAN = registerMetaTileEntity(14512, new MetaTileEntityPlasticCan(susyId("drum.ptfe"), Materials.Polytetrafluoroethylene, 512_000)); // sadly I have to put it here + UHMWPE_CAN = registerMetaTileEntity(14512, new MetaTileEntityPlasticCan(susyId("drum.uhmwpe"), new PropertyFluidFilter(425, true, true, true, false), 0xc5e3de, 512_000)); // sadly I have to put it here SINTERING_OVEN = registerMetaTileEntity(14521, new MetaTileEntitySinteringOven(susyId("sintering_oven"))); diff --git a/src/main/resources/assets/susy/lang/en_us.lang b/src/main/resources/assets/susy/lang/en_us.lang index 116aa98ad..966b65ad7 100644 --- a/src/main/resources/assets/susy/lang/en_us.lang +++ b/src/main/resources/assets/susy/lang/en_us.lang @@ -211,8 +211,8 @@ gregtech.machine.drum.lead.name=Lead Drum gregtech.machine.drum.brass.name=Brass Drum gregtech.machine.drum.pe.name=Polyethylene (PE) Can gregtech.machine.drum.pp.name=Polypropylene (PP) Can -gregtech.machine.drum.pmma.name=Polymethylmethacrylate (PMMA) Can gregtech.machine.drum.ptfe.name=Polytetrafluoroethylene (PTFE) Can +gregtech.machine.drum.uhmwpe.name=Ultra High Molecular Weight Polyethylene (UHMWPE) Can gregtech.machine.polymerization_tank.name=Polymerization Tank gregtech.machine.fluidized_bed_reactor.name=Fluidized Bed Reactor