Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Hermetically Sealed Crate & Industrial Concrete for Dungeons #362

Merged
merged 3 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ public enum StoneType implements IStringSerializable {
SHALE("shale", MapColor.RED_STAINED_HARDENED_CLAY),
SLATE("slate", MapColor.RED_STAINED_HARDENED_CLAY),
SOAPSTONE("soapstone", MapColor.GRAY_STAINED_HARDENED_CLAY),
KIMBERLITE("kimberlite", MapColor.GRAY);
KIMBERLITE("kimberlite", MapColor.GRAY),
INDUSTRIAL_CONCRETE("industrial_concrete", MapColor.YELLOW_STAINED_HARDENED_CLAY);

private final String name;
public final MapColor mapColor;
Expand All @@ -137,6 +138,7 @@ public OrePrefix getOrePrefix() {
return switch (this) {
case GABBRO, GNEISS, LIMESTONE, PHYLLITE, QUARTZITE, SHALE, SLATE, SOAPSTONE, KIMBERLITE ->
OrePrefix.stone;
case INDUSTRIAL_CONCRETE -> OrePrefix.block;
};
}

Expand All @@ -151,6 +153,7 @@ public gregtech.api.unification.material.Material getMaterial() {
case SLATE -> SusyMaterials.Slate;
case SOAPSTONE -> Materials.Soapstone;
case KIMBERLITE -> SusyMaterials.Kimberlite;
case INDUSTRIAL_CONCRETE -> Materials.Concrete;
};
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import gregtech.common.blocks.MetaBlocks;
import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityEnergyHatch;
import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiFluidHatch;
import gregtech.common.metatileentities.storage.MetaTileEntityCrate;
import gregtech.common.metatileentities.storage.MetaTileEntityDrum;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
Expand Down Expand Up @@ -80,6 +81,8 @@ public class SuSyMetaTileEntities {
public static MetaTileEntityPlasticCan PTFE_CAN;
public static MetaTileEntityPlasticCan UHMWPE_CAN;

public static MetaTileEntityCrate HERMETICALLY_SEALED_CRATE;

//Machines for chem overhaul
public static ContinuousMachineMetaTileEntity[] CONTINUOUS_STIRRED_TANK_REACTOR;
public static ContinuousMachineMetaTileEntity[] FIXED_BED_REACTOR;
Expand Down Expand Up @@ -205,6 +208,8 @@ public static void init() {

SINTERING_OVEN = registerMetaTileEntity(14521, new MetaTileEntitySinteringOven(susyId("sintering_oven")));

HERMETICALLY_SEALED_CRATE = registerMetaTileEntity(14522, new MetaTileEntityCrate(susyId("crate.pe"), Materials.Polyethylene, 54));

registerSimpleSteamMTE(STEAM_VULCANIZING_PRESS, 14515, "vulcanizing_press", SuSyRecipeMaps.VULCANIZATION_RECIPES, SuSySteamProgressIndicators.COMPRESS, SusyTextures.VULCANIZING_PRESS_OVERLAY, true);
registerCatalystMTE(VULCANIZING_PRESS, 3, 14517, "vulcanizing_press", SuSyRecipeMaps.VULCANIZATION_RECIPES, SusyTextures.VULCANIZING_PRESS_OVERLAY, true);

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
"textures" : {
"all" : "gregtech:blocks/susy_stones/kimberlite_bricks"
}
},
"industrial_concrete" : {
"textures" : {
"all" : "gregtech:blocks/susy_stones/industrial_concrete_bricks"
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
"textures" : {
"all" : "gregtech:blocks/susy_stones/kimberlite_cobble"
}
},
"industrial_concrete" : {
"textures" : {
"all" : "gregtech:blocks/susy_stones/industrial_concrete_cobble"
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
"textures" : {
"all" : "gregtech:blocks/susy_stones/kimberlite"
}
},
"industrial_concrete" : {
"textures" : {
"all" : "gregtech:blocks/susy_stones/industrial_concrete"
}
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/assets/susy/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ tile.susy_stone_smooth.shale.name=Shale
tile.susy_stone_smooth.slate.name=Slate
tile.susy_stone_smooth.soapstone.name=Soapstone
tile.susy_stone_smooth.kimberlite.name=Kimberlite
tile.susy_stone_smooth.industrial_concrete.name=Industrial Concrete
tile.susy_stone_cobble.gabbro.name=Gabbro Cobblestone
tile.susy_stone_cobble.gneiss.name=Gneiss Cobblestone
tile.susy_stone_cobble.graphite.name=Graphite Cobblestone
Expand All @@ -123,6 +124,7 @@ tile.susy_stone_cobble.shale.name=Shale Cobblestone
tile.susy_stone_cobble.slate.name=Slate Cobblestone
tile.susy_stone_cobble.soapstone.name=Soapstone Cobblestone
tile.susy_stone_cobble.kimberlite.name=Kimberlite Cobblestone
tile.susy_stone_cobble.industrial_concrete.name=Industrial Concrete Cobblestone
tile.susy_stone_bricks.gabbro.name=Gabbro Bricks
tile.susy_stone_bricks.gneiss.name=Gneiss Bricks
tile.susy_stone_bricks.graphite.name=Graphite Bricks
Expand All @@ -134,6 +136,7 @@ tile.susy_stone_bricks.shale.name=Shale Bricks
tile.susy_stone_bricks.slate.name=Slate Bricks
tile.susy_stone_bricks.soapstone.name=Soapstone Bricks
tile.susy_stone_bricks.kimberlite.name=Kimberlite Bricks
tile.susy_stone_bricks.industrial_concrete.name=Industrial Concrete Bricks

# Materials
susy.material.manganese_iron_arsenic_phosphide=Manganese Iron Arsenic Phosphide
Expand Down Expand Up @@ -214,6 +217,8 @@ gregtech.machine.drum.pp.name=Polypropylene (PP) Can
gregtech.machine.drum.ptfe.name=Polytetrafluoroethylene (PTFE) Can
gregtech.machine.drum.uhmwpe.name=Ultra High Molecular Weight Polyethylene (UHMWPE) Can

gregtech.machine.crate.pe.name=Hermetically Sealed Crate

gregtech.machine.polymerization_tank.name=Polymerization Tank
gregtech.machine.fluidized_bed_reactor.name=Fluidized Bed Reactor

Expand Down
Loading