Skip to content

Commit

Permalink
add recipes to adjustables, simple washer
Browse files Browse the repository at this point in the history
  • Loading branch information
@TechLord22
TechLord22 committed Aug 13, 2021
1 parent d4b0dfa commit 9a7af7d
Show file tree
Hide file tree
Showing 5 changed files with 301 additions and 12 deletions.
12 changes: 6 additions & 6 deletions src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static void register() {
Aluminium = new Material.Builder(2, "aluminium")
.ingot().fluid().ore()
.color(0x80C8F0)
.flags(EXT2_METAL, GENERATE_SMALL_GEAR, GENERATE_RING, GENERATE_FRAME, GENERATE_SPRING)
.flags(EXT2_METAL, GENERATE_SMALL_GEAR, GENERATE_RING, GENERATE_FRAME, GENERATE_SPRING, GENERATE_SPRING_SMALL)
.element(Elements.Al)
.toolStats(10.0f, 2.0f, 128)
.cableProperties(GTValues.V[4], 1, 1)
Expand Down Expand Up @@ -178,7 +178,7 @@ public static void register() {
Copper = new Material.Builder(25, "copper")
.ingot(1).fluid().ore()
.color(0xFF6400).iconSet(SHINY)
.flags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_DENSE, GENERATE_SPRING)
.flags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_DENSE, GENERATE_SPRING, GENERATE_SPRING_SMALL)
.element(Elements.Cu)
.cableProperties(GTValues.V[2], 1, 2)
.fluidPipeProperties(1696, 10, true)
Expand Down Expand Up @@ -234,7 +234,7 @@ public static void register() {
Europium = new Material.Builder(33, "europium")
.ingot().fluid()
.iconSet(METALLIC)
.flags(STD_METAL, GENERATE_ROD, GENERATE_FINE_WIRE)
.flags(STD_METAL, GENERATE_ROD, GENERATE_FINE_WIRE, GENERATE_SPRING_SMALL)
.element(Elements.Eu)
.cableProperties(GTValues.V[GTValues.UHV], 2, 32)
.fluidPipeProperties(7780, 1200, true)
Expand Down Expand Up @@ -385,7 +385,7 @@ public static void register() {
Lead = new Material.Builder(55, "lead")
.ingot(1).fluid().ore()
.color(0x8C648C)
.flags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_DENSE, GENERATE_ROTOR, GENERATE_SPRING)
.flags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_DENSE, GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SPRING_SMALL)
.element(Elements.Pb)
.cableProperties(GTValues.V[1], 2, 2)
.fluidPipeProperties(1200, 15, true)
Expand Down Expand Up @@ -792,7 +792,7 @@ public static void register() {
Tin = new Material.Builder(112, "tin")
.ingot(1).fluid().ore()
.color(0xDCDCDC)
.flags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_ROTOR, GENERATE_SPRING)
.flags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SPRING_SMALL)
.element(Elements.Sn)
.cableProperties(GTValues.V[1], 1, 1)
.itemPipeProperties(4096, 0.5f)
Expand All @@ -818,7 +818,7 @@ public static void register() {
Tungsten = new Material.Builder(115, "tungsten")
.ingot(3).fluid()
.color(0x323232).iconSet(METALLIC)
.flags(EXT2_METAL, GENERATE_SPRING)
.flags(EXT2_METAL, GENERATE_SPRING, GENERATE_SPRING_SMALL)
.element(Elements.W)
.toolStats(7.0f, 3.0f, 2560)
.cableProperties(GTValues.V[5], 2, 2)
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ public static void register() {
NiobiumTitanium = new Material.Builder(296, "niobium_titanium")
.ingot().fluid()
.color(0x1D1D29)
.flags(EXT2_METAL, GENERATE_SPRING)
.flags(EXT2_METAL, GENERATE_SPRING, GENERATE_SPRING_SMALL)
.components(Niobium, 1, Titanium, 1)
.fluidPipeProperties(2900, 150, true)
.cableProperties(GTValues.V[6], 4, 2)
Expand Down Expand Up @@ -641,7 +641,7 @@ public static void register() {
VanadiumGallium = new Material.Builder(334, "vanadium_gallium")
.ingot().fluid()
.color(0x80808C).iconSet(SHINY)
.flags(STD_METAL, GENERATE_FOIL, GENERATE_SPRING, GENERATE_LONG_ROD)
.flags(STD_METAL, GENERATE_FOIL, GENERATE_SPRING, GENERATE_SPRING_SMALL)
.components(Vanadium, 3, Gallium, 1)
.cableProperties(GTValues.V[6], 4, 2)
.blastTemp(4500)
Expand Down Expand Up @@ -673,7 +673,7 @@ public static void register() {
YttriumBariumCuprate = new Material.Builder(338, "yttrium_barium_cuprate")
.ingot().fluid()
.color(0x504046).iconSet(METALLIC)
.flags(EXT_METAL, GENERATE_FINE_WIRE, GENERATE_SPRING)
.flags(EXT_METAL, GENERATE_FINE_WIRE, GENERATE_SPRING, GENERATE_SPRING_SMALL)
.components(Yttrium, 1, Barium, 2, Copper, 3, Oxygen, 7)
.cableProperties(GTValues.V[6], 4, 4)
.build();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregtech/common/metatileentities/MetaTileEntities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,9 +525,9 @@ public static void init() {
}
// MAX Hatches
ENERGY_INPUT_HATCH[ENERGY_INPUT_HATCH.length - 1] = new MetaTileEntityEnergyHatch(gregtechId("energy_hatch.input.max"), ENERGY_INPUT_HATCH.length - 1, false);
ENERGY_INPUT_HATCH_ADJUSTABLE[ENERGY_INPUT_HATCH_ADJUSTABLE.length - 1] = new MetaTileEntityAdjustableEnergyHatch(gregtechId("energy_hatch.hi_amp.input.max"), ENERGY_INPUT_HATCH_ADJUSTABLE.length - 1, false);
ENERGY_INPUT_HATCH_ADJUSTABLE[ENERGY_INPUT_HATCH_ADJUSTABLE.length - 1] = new MetaTileEntityAdjustableEnergyHatch(gregtechId("energy_hatch.adjustable.input.max"), ENERGY_INPUT_HATCH_ADJUSTABLE.length - 1, false);
ENERGY_OUTPUT_HATCH[ENERGY_OUTPUT_HATCH.length - 1] = new MetaTileEntityEnergyHatch(gregtechId("energy_hatch.output.max"), ENERGY_OUTPUT_HATCH.length - 1, true);
ENERGY_OUTPUT_HATCH_ADJUSTABLE[ENERGY_OUTPUT_HATCH_ADJUSTABLE.length - 1] = new MetaTileEntityAdjustableEnergyHatch(gregtechId("energy_hatch.hi_amp.output.max"), ENERGY_OUTPUT_HATCH_ADJUSTABLE.length - 1, true);
ENERGY_OUTPUT_HATCH_ADJUSTABLE[ENERGY_OUTPUT_HATCH_ADJUSTABLE.length - 1] = new MetaTileEntityAdjustableEnergyHatch(gregtechId("energy_hatch.adjustable.output.max"), ENERGY_OUTPUT_HATCH_ADJUSTABLE.length - 1, true);

GregTechAPI.registerMetaTileEntity(1450 + ENERGY_INPUT_HATCH.length - 1, ENERGY_INPUT_HATCH[ENERGY_INPUT_HATCH.length - 1]);
GregTechAPI.registerMetaTileEntity(1465 + ENERGY_INPUT_HATCH_ADJUSTABLE.length - 1, ENERGY_INPUT_HATCH_ADJUSTABLE[ENERGY_INPUT_HATCH_ADJUSTABLE.length - 1]);
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,8 @@ public static void init() {
registerMachineRecipe(MetaTileEntities.ITEM_COLLECTOR, "MRM", "RHR", "CWC", 'M', MOTOR, 'R', ROTOR, 'H', HULL, 'C', CIRCUIT, 'W', CABLE);
registerMachineRecipe(MetaTileEntities.BLOCK_BREAKER, "MGM", "CHC", "WSW", 'M', MOTOR, 'H', HULL, 'C', CIRCUIT, 'W', CABLE, 'S', Blocks.CHEST, 'G', GRINDER);

ModHandler.addShapedRecipe("gregtech.machine.simple_washer.lv", MetaTileEntities.SIMPLE_ORE_WASHER.getStackForm(), "WPW", "WBW", "WHW", 'W', new UnificationEntry(OrePrefix.plate, Materials.WroughtIron), 'P', MetaItems.ELECTRIC_PUMP_LV.getStackForm(), 'B', new UnificationEntry(OrePrefix.pipeNormalFluid, Materials. Bronze), 'H', MetaTileEntities.HULL[GTValues.ULV].getStackForm());

ModHandler.addShapedRecipe("wooden_crate", MetaTileEntities.WOODEN_CRATE.getStackForm(), "RPR", "PsP", "RPR", 'P', "plankWood", 'R', new UnificationEntry(OrePrefix.screw, Materials.Iron));
ModHandler.addShapedRecipe("bronze_crate", MetaTileEntities.BRONZE_CRATE.getStackForm(), "RPR", "PhP", "RPR", 'P', new UnificationEntry(OrePrefix.plate, Materials.Bronze), 'R', new UnificationEntry(OrePrefix.stickLong, Materials.Bronze));
ModHandler.addShapedRecipe("steel_crate", MetaTileEntities.STEEL_CRATE.getStackForm(), "RPR", "PhP", "RPR", 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel), 'R', new UnificationEntry(OrePrefix.stickLong, Materials.Steel));
Expand Down
Loading

0 comments on commit 9a7af7d

Please sign in to comment.