Skip to content

Commit

Permalink
Add flag for double plates (GregTechCEu#1765)
Browse files Browse the repository at this point in the history
  • Loading branch information
@TechLord22
TechLord22 authored May 27, 2023
1 parent d14d5bd commit b7c4908
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 53 deletions.
5 changes: 5 additions & 0 deletions src/main/java/gregtech/api/unification/material/info/MaterialFlags.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ public String toString() {
.requireProps(PropertyKey.DUST)
.build();

public static final MaterialFlag GENERATE_DOUBLE_PLATE = new MaterialFlag.Builder("generate_double_plate")
.requireFlags(GENERATE_PLATE)
.requireProps(PropertyKey.INGOT)
.build();

public static final MaterialFlag GENERATE_ROD = new MaterialFlag.Builder("generate_rod")
.requireProps(PropertyKey.DUST)
.build();
Expand Down
52 changes: 29 additions & 23 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 @@ -23,7 +23,8 @@ public static void register() {
Aluminium = new Material.Builder(2, "aluminium")
.ingot().fluid().ore()
.color(0x80C8F0)
.flags(EXT2_METAL, GENERATE_GEAR, GENERATE_SMALL_GEAR, GENERATE_RING, GENERATE_FRAME, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE)
.flags(EXT2_METAL, GENERATE_GEAR, GENERATE_SMALL_GEAR, GENERATE_RING, GENERATE_FRAME, GENERATE_SPRING,
GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE, GENERATE_DOUBLE_PLATE)
.element(Elements.Al)
.toolStats(ToolProperty.Builder.of(6.0F, 7.5F, 768, 2)
.enchantability(14).build())
Expand All @@ -37,7 +38,7 @@ public static void register() {
Americium = new Material.Builder(3, "americium")
.ingot(3).fluid()
.color(0x287869).iconSet(METALLIC)
.flags(EXT_METAL, GENERATE_FOIL, GENERATE_FINE_WIRE)
.flags(EXT_METAL, GENERATE_FOIL, GENERATE_FINE_WIRE, GENERATE_DOUBLE_PLATE)
.element(Elements.Am)
.itemPipeProperties(64, 64)
.fluidTemp(1449)
Expand Down Expand Up @@ -83,7 +84,7 @@ public static void register() {
Beryllium = new Material.Builder(10, "beryllium")
.ingot().fluid().ore()
.color(0x64B464).iconSet(METALLIC)
.flags(STD_METAL)
.flags(STD_METAL, GENERATE_DOUBLE_PLATE)
.element(Elements.Be)
.fluidTemp(1560)
.build();
Expand Down Expand Up @@ -156,7 +157,7 @@ public static void register() {
Chrome = new Material.Builder(22, "chrome")
.ingot(3).fluid()
.color(0xEAC4D8).iconSet(SHINY)
.flags(EXT_METAL, GENERATE_ROTOR)
.flags(EXT_METAL, GENERATE_ROTOR, GENERATE_DOUBLE_PLATE)
.element(Elements.Cr)
.rotorStats(12.0f, 3.0f, 512)
.fluidPipeProperties(2180, 35, true, true, false, false)
Expand All @@ -167,7 +168,7 @@ public static void register() {
Cobalt = new Material.Builder(23, "cobalt")
.ingot().fluid().ore() // leave for TiCon ore processing
.color(0x5050FA).iconSet(METALLIC)
.flags(EXT_METAL)
.flags(EXT_METAL, GENERATE_DOUBLE_PLATE)
.element(Elements.Co)
.cableProperties(GTValues.V[1], 2, 2)
.itemPipeProperties(2560, 2.0f)
Expand All @@ -182,7 +183,8 @@ public static void register() {
Copper = new Material.Builder(25, "copper")
.ingot(1).fluid().ore()
.color(0xFF6400).iconSet(SHINY)
.flags(EXT_METAL, MORTAR_GRINDABLE, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE)
.flags(EXT_METAL, MORTAR_GRINDABLE, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE,
GENERATE_DOUBLE_PLATE)
.element(Elements.Cu)
.cableProperties(GTValues.V[2], 1, 2)
.fluidPipeProperties(1696, 6, true)
Expand All @@ -197,7 +199,7 @@ public static void register() {
Darmstadtium = new Material.Builder(27, "darmstadtium")
.ingot().fluid()
.color(0x578062)
.flags(EXT2_METAL, GENERATE_ROTOR, GENERATE_DENSE, GENERATE_SMALL_GEAR)
.flags(EXT2_METAL, GENERATE_DOUBLE_PLATE, GENERATE_ROTOR, GENERATE_DENSE, GENERATE_SMALL_GEAR)
.element(Elements.Ds)
.build();

Expand Down Expand Up @@ -229,7 +231,8 @@ public static void register() {
Europium = new Material.Builder(33, "europium")
.ingot().fluid()
.color(0x20FFFF).iconSet(METALLIC)
.flags(STD_METAL, GENERATE_LONG_ROD, GENERATE_FINE_WIRE, GENERATE_SPRING, GENERATE_FOIL, GENERATE_FRAME)
.flags(STD_METAL, GENERATE_LONG_ROD, GENERATE_FINE_WIRE, GENERATE_SPRING, GENERATE_FOIL, GENERATE_FRAME,
GENERATE_DOUBLE_PLATE)
.element(Elements.Eu)
.cableProperties(GTValues.V[GTValues.UHV], 2, 32)
.fluidPipeProperties(7750, 300, true)
Expand Down Expand Up @@ -278,7 +281,8 @@ public static void register() {
Gold = new Material.Builder(41, "gold")
.ingot().fluid().ore()
.color(0xFFE650).iconSet(SHINY)
.flags(EXT2_METAL, GENERATE_RING, MORTAR_GRINDABLE, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE, GENERATE_FOIL)
.flags(EXT2_METAL, GENERATE_RING, MORTAR_GRINDABLE, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES,
GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE, GENERATE_FOIL, GENERATE_DOUBLE_PLATE)
.element(Elements.Au)
.cableProperties(GTValues.V[3], 3, 2)
.fluidPipeProperties(1671, 25, true, true, false, false)
Expand Down Expand Up @@ -331,7 +335,7 @@ public static void register() {
Iridium = new Material.Builder(50, "iridium")
.ingot(3).fluid()
.color(0xA1E4E4).iconSet(METALLIC)
.flags(EXT2_METAL, GENERATE_FINE_WIRE, GENERATE_GEAR)
.flags(EXT2_METAL, GENERATE_DOUBLE_PLATE, GENERATE_FINE_WIRE, GENERATE_GEAR)
.element(Elements.Ir)
.rotorStats(7.0f, 3.0f, 2560)
.fluidPipeProperties(3398, 250, true, false, true, false)
Expand Down Expand Up @@ -372,7 +376,8 @@ public static void register() {
Lead = new Material.Builder(55, "lead")
.ingot(1).fluid().ore()
.color(0x8C648C)
.flags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE)
.flags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SPRING_SMALL,
GENERATE_FINE_WIRE, GENERATE_DOUBLE_PLATE)
.element(Elements.Pb)
.cableProperties(GTValues.V[0], 2, 2)
.fluidPipeProperties(1200, 8, true)
Expand Down Expand Up @@ -467,7 +472,7 @@ public static void register() {
Nickel = new Material.Builder(69, "nickel")
.ingot().fluid().plasma().ore()
.color(0xC8C8FA).iconSet(METALLIC)
.flags(STD_METAL, MORTAR_GRINDABLE)
.flags(STD_METAL, MORTAR_GRINDABLE, GENERATE_DOUBLE_PLATE)
.element(Elements.Ni)
.cableProperties(GTValues.V[GTValues.LV], 3, 3)
.itemPipeProperties(2048, 1.0f)
Expand Down Expand Up @@ -505,7 +510,7 @@ public static void register() {
Osmium = new Material.Builder(75, "osmium")
.ingot(4).fluid()
.color(0x3232FF).iconSet(METALLIC)
.flags(EXT2_METAL, GENERATE_FOIL)
.flags(EXT2_METAL, GENERATE_FOIL, GENERATE_DOUBLE_PLATE)
.element(Elements.Os)
.rotorStats(16.0f, 4.0f, 1280)
.cableProperties(GTValues.V[6], 4, 2)
Expand Down Expand Up @@ -542,7 +547,7 @@ public static void register() {
Platinum = new Material.Builder(80, "platinum")
.ingot().fluid().ore()
.color(0xFFFFC8).iconSet(SHINY)
.flags(EXT2_METAL, GENERATE_FOIL, GENERATE_FINE_WIRE, GENERATE_RING)
.flags(EXT2_METAL, GENERATE_FOIL, GENERATE_FINE_WIRE, GENERATE_RING, GENERATE_DOUBLE_PLATE)
.element(Elements.Pt)
.cableProperties(GTValues.V[5], 2, 1)
.itemPipeProperties(512, 4.0f)
Expand All @@ -559,7 +564,7 @@ public static void register() {
Plutonium241 = new Material.Builder(82, "plutonium_241")
.ingot(3).fluid()
.color(0xFA4646).iconSet(SHINY)
.flags(EXT_METAL)
.flags(EXT_METAL, GENERATE_DOUBLE_PLATE)
.element(Elements.Pu241)
.fluidTemp(913)
.build();
Expand Down Expand Up @@ -668,7 +673,7 @@ public static void register() {
Silver = new Material.Builder(100, "silver")
.ingot().fluid().ore()
.color(0xDCDCFF).iconSet(SHINY)
.flags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_FINE_WIRE, GENERATE_RING)
.flags(EXT2_METAL, GENERATE_DOUBLE_PLATE, MORTAR_GRINDABLE, GENERATE_FINE_WIRE, GENERATE_RING)
.element(Elements.Ag)
.cableProperties(GTValues.V[3], 1, 1)
.fluidTemp(1235)
Expand Down Expand Up @@ -741,7 +746,8 @@ public static void register() {
Tin = new Material.Builder(112, "tin")
.ingot(1).fluid(FluidTypes.LIQUID, true).ore()
.color(0xDCDCDC)
.flags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE)
.flags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SPRING_SMALL,
GENERATE_FINE_WIRE, GENERATE_DOUBLE_PLATE)
.element(Elements.Sn)
.cableProperties(GTValues.V[1], 1, 1)
.itemPipeProperties(4096, 0.5f)
Expand All @@ -751,7 +757,7 @@ public static void register() {
Titanium = new Material.Builder(113, "titanium") // todo Ore? Look at EBF recipe here if we do Ti ores
.ingot(3).fluid()
.color(0xDCA0F0).iconSet(METALLIC)
.flags(EXT2_METAL, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_GEAR, GENERATE_FRAME)
.flags(EXT2_METAL, GENERATE_DOUBLE_PLATE, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_GEAR, GENERATE_FRAME)
.element(Elements.Ti)
.toolStats(ToolProperty.Builder.of(8.0F, 6.0F, 1536, 3)
.enchantability(14).build())
Expand All @@ -769,7 +775,7 @@ public static void register() {
Tungsten = new Material.Builder(115, "tungsten")
.ingot(3).fluid()
.color(0x323232).iconSet(METALLIC)
.flags(EXT2_METAL, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FOIL, GENERATE_GEAR)
.flags(EXT2_METAL, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FOIL, GENERATE_GEAR, GENERATE_DOUBLE_PLATE)
.element(Elements.W)
.rotorStats(7.0f, 3.0f, 2560)
.cableProperties(GTValues.V[5], 2, 2)
Expand Down Expand Up @@ -835,7 +841,7 @@ public static void register() {
Naquadah = new Material.Builder(124, "naquadah")
.ingot(4).fluid().ore()
.color(0x323232, false).iconSet(METALLIC)
.flags(EXT_METAL, GENERATE_FOIL, GENERATE_SPRING, GENERATE_FINE_WIRE, GENERATE_BOLT_SCREW)
.flags(EXT_METAL, GENERATE_FOIL, GENERATE_SPRING, GENERATE_FINE_WIRE, GENERATE_BOLT_SCREW, GENERATE_DOUBLE_PLATE)
.element(Elements.Nq)
.rotorStats(6.0f, 4.0f, 1280)
.cableProperties(GTValues.V[7], 2, 2)
Expand All @@ -854,15 +860,15 @@ public static void register() {
Naquadria = new Material.Builder(126, "naquadria")
.ingot(3).fluid()
.color(0x1E1E1E, false).iconSet(SHINY)
.flags(EXT_METAL, GENERATE_FOIL, GENERATE_GEAR, GENERATE_FINE_WIRE, GENERATE_BOLT_SCREW)
.flags(EXT_METAL, GENERATE_DOUBLE_PLATE, GENERATE_FOIL, GENERATE_GEAR, GENERATE_FINE_WIRE, GENERATE_BOLT_SCREW)
.element(Elements.Nq2)
.blastTemp(9000, GasTier.HIGH, VA[ZPM], 1200)
.build();

Neutronium = new Material.Builder(127, "neutronium")
.ingot(6).fluid()
.color(0xFAFAFA)
.flags(EXT_METAL, GENERATE_BOLT_SCREW, GENERATE_FRAME, GENERATE_GEAR, GENERATE_LONG_ROD)
.flags(EXT_METAL, GENERATE_BOLT_SCREW, GENERATE_FRAME, GENERATE_GEAR, GENERATE_LONG_ROD, GENERATE_DOUBLE_PLATE)
.element(Elements.Nt)
.toolStats(ToolProperty.Builder.of(180.0F, 100.0F, 65535, 6)
.attackSpeed(0.5F).enchantability(33).magnetic().unbreakable().build())
Expand All @@ -884,7 +890,7 @@ public static void register() {
Duranium = new Material.Builder(129, "duranium")
.ingot(5).fluid()
.color(0x4BAFAF).iconSet(BRIGHT)
.flags(EXT_METAL, GENERATE_FOIL, GENERATE_GEAR)
.flags(EXT_METAL, GENERATE_FOIL, GENERATE_GEAR, GENERATE_DOUBLE_PLATE)
.element(Elements.Dr)
.toolStats(ToolProperty.Builder.of(14.0F, 12.0F, 8192, 5)
.attackSpeed(0.3F).enchantability(33).magnetic().build())
Expand Down
Loading

0 comments on commit b7c4908

Please sign in to comment.