diff --git a/CHANGELOG-GTCEU.md b/CHANGELOG-GTCEU.md index 0ffe44b64bd..02aa5313867 100644 --- a/CHANGELOG-GTCEU.md +++ b/CHANGELOG-GTCEU.md @@ -147,6 +147,8 @@ - Alloys can no longer be handcrafted past Stainless Steel, and require an on-tier Mixer to make - Harder recipes for Energy Hatches (configurable, default false) - Config to disable in-world Concrete Powder -> Concrete conversion +- Indium now outputs 1 Small Dust each recipe instead of 1 Tiny Dust +- High Octane Gasoline (HOG) and Nitrobenzene were added as more power options (as well as normal Gasoline) ### Bug Fixes - Electric Tools now properly use power over durability diff --git a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java index 3a1f219ba22..d621b915c12 100644 --- a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java @@ -66,6 +66,7 @@ public static void register() { .ingot().fluid() .color(0x83824C).iconSet(METALLIC) .element(Elements.Ba) + .flags(GENERATE_FOIL) .build(); Berkelium = new Material.Builder(9, "berkelium") @@ -98,6 +99,7 @@ public static void register() { .dust() .color(0xD2FAD2) .element(Elements.B) + .flags(GENERATE_ROD) .build(); Bromine = new Material.Builder(14, "bromine") @@ -116,6 +118,7 @@ public static void register() { .ingot().fluid() .color(0xFFF5F5).iconSet(METALLIC) .element(Elements.Ca) + .flags(GENERATE_FOIL) .build(); Californium = new Material.Builder(17, "californium") @@ -141,6 +144,7 @@ public static void register() { .ingot().fluid() .iconSet(METALLIC) .element(Elements.Ce) + .flags(GENERATE_FINE_WIRE) .blastTemp(1068) .build(); @@ -162,7 +166,7 @@ public static void register() { Cobalt = new Material.Builder(23, "cobalt") .ingot().fluid().ore() .color(0x5050FA).iconSet(METALLIC) - .flags(STD_METAL, GENERATE_GEAR) + .flags(STD_METAL, GENERATE_GEAR, GENERATE_BOLT_SCREW) .element(Elements.Co) .toolStats(10.0f, 3.0f, 256, 21) .cableProperties(GTValues.V[1], 2, 2) @@ -234,7 +238,7 @@ public static void register() { Europium = new Material.Builder(33, "europium") .ingot().fluid() .iconSet(METALLIC) - .flags(STD_METAL, GENERATE_ROD, GENERATE_FINE_WIRE, GENERATE_SPRING_SMALL) + .flags(STD_METAL, GENERATE_LONG_ROD, GENERATE_FINE_WIRE, GENERATE_SPRING_SMALL) .element(Elements.Eu) .cableProperties(GTValues.V[GTValues.UHV], 2, 32) .fluidPipeProperties(7780, 1200, true) @@ -427,7 +431,7 @@ public static void register() { Manganese = new Material.Builder(61, "manganese") .ingot().fluid() .color(0xFAFAFA) - .flags(STD_METAL, GENERATE_FOIL) + .flags(STD_METAL, GENERATE_FOIL, GENERATE_DENSE, GENERATE_BOLT_SCREW) .element(Elements.Mn) .toolStats(7.0f, 2.0f, 512, 21) .build(); @@ -448,6 +452,7 @@ public static void register() { .ingot().fluid().ore() .color(0xB4B4DC).iconSet(SHINY) .element(Elements.Mo) + .flags(GENERATE_FOIL, GENERATE_BOLT_SCREW) .toolStats(7.0f, 2.0f, 512, 33) .build(); @@ -460,7 +465,7 @@ public static void register() { Neodymium = new Material.Builder(66, "neodymium") .ingot().fluid().ore() .color(0x646464).iconSet(METALLIC) - .flags(STD_METAL, GENERATE_ROD) + .flags(STD_METAL, GENERATE_ROD, GENERATE_BOLT_SCREW) .element(Elements.Nd) .toolStats(7.0f, 2.0f, 512, 21) .blastTemp(1297) @@ -727,7 +732,7 @@ public static void register() { .build(); Sulfur = new Material.Builder(103, "sulfur") - .dust().ore() + .dust().ore().fluid() .color(0xC8C800) .flags(FLAMMABLE) .element(Elements.S) @@ -770,7 +775,7 @@ public static void register() { Thorium = new Material.Builder(109, "thorium") .ingot().fluid().ore() .color(0x001E00).iconSet(SHINY) - .flags(STD_METAL) + .flags(STD_METAL, GENERATE_ROD) .element(Elements.Th) .toolStats(6.0f, 2.0f, 512, 33) .build(); @@ -875,7 +880,7 @@ public static void register() { Zinc = new Material.Builder(122, "zinc") .ingot(1).fluid().ore() .color(0xFAF0F0).iconSet(METALLIC) - .flags(STD_METAL, MORTAR_GRINDABLE, GENERATE_FOIL, GENERATE_RING) + .flags(STD_METAL, MORTAR_GRINDABLE, GENERATE_FOIL, GENERATE_RING, GENERATE_FINE_WIRE) .element(Elements.Zn) .cableProperties(GTValues.V[1], 1, 1) .build(); @@ -910,7 +915,7 @@ public static void register() { Naquadria = new Material.Builder(126, "naquadria") .ingot(3).fluid() .color(0x1E1E1E).iconSet(SHINY) - .flags(EXT_METAL, GENERATE_FOIL) + .flags(EXT_METAL, GENERATE_FOIL, GENERATE_GEAR, GENERATE_DENSE) .element(Elements.Nq2) .blastTemp(9000) .build(); @@ -927,7 +932,7 @@ public static void register() { Tritanium = new Material.Builder(128, "tritanium") .ingot(6).fluid() .color(0x600000).iconSet(METALLIC) - .flags(EXT_METAL, GENERATE_FRAME) + .flags(EXT_METAL, GENERATE_FRAME, GENERATE_ROUND) .element(Elements.Tr) .toolStats(20.0f, 6.0f, 10240, 21) .build(); @@ -935,7 +940,7 @@ public static void register() { Duranium = new Material.Builder(129, "duranium") .ingot(5).fluid() .color(0x4BAFAF).iconSet(METALLIC) - .flags(EXT_METAL, GENERATE_FOIL) + .flags(EXT_METAL, GENERATE_FOIL, GENERATE_FINE_WIRE) .element(Elements.Dr) .toolStats(16.0f, 5.0f, 5120, 21) .cableProperties(GTValues.V[8], 1, 8) diff --git a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java index 16e6b8b55c8..d86e3b45936 100644 --- a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java @@ -182,7 +182,7 @@ public static void register() { Cupronickel = new Material.Builder(274, "cupronickel") .ingot(1).fluid() .color(0xE39680).iconSet(METALLIC) - .flags(EXT_METAL, GENERATE_SPRING) + .flags(EXT_METAL, GENERATE_SPRING, GENERATE_FINE_WIRE) .components(Copper, 1, Nickel, 1) .itemPipeProperties(2048, 1) .cableProperties(GTValues.V[1], 1, 1) @@ -551,7 +551,7 @@ public static void register() { StainlessSteel = new Material.Builder(323, "stainless_steel") .ingot().fluid() .color(0xC8C8DC).iconSet(SHINY) - .flags(EXT2_METAL, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_FRAME, GENERATE_LONG_ROD) + .flags(EXT2_METAL, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_FRAME, GENERATE_LONG_ROD, GENERATE_DENSE) .components(Iron, 7, Chrome, 1, Manganese, 1, Nickel, 1) .toolStats(7.0f, 4.0f, 480, 33) .fluidPipeProperties(2428, 60, true) diff --git a/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java index 15dc017a148..31e757bba4a 100644 --- a/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java @@ -35,7 +35,7 @@ public static void register() { RedSteel = new Material.Builder(2510, "red_steel") .ingot().fluid() .color(0x8C6464).iconSet(METALLIC) - .flags(EXT_METAL) + .flags(EXT_METAL, GENERATE_GEAR) .components(SterlingSilver, 1, BismuthBronze, 1, Steel, 2, BlackSteel, 4) .toolStats(7.0f, 4.5f, 896, 21) .blastTemp(1300) diff --git a/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java b/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java index 3ef35493ccf..d53c2417f1f 100644 --- a/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java @@ -56,7 +56,7 @@ public static void register() { ReinforcedEpoxyResin = new Material.Builder(1006, "reinforced_epoxy_resin") .ingot().fluid() .color(0xA07A10) - .flags(STD_METAL, DISABLE_DECOMPOSITION, NO_SMASHING) + .flags(STD_METAL, DISABLE_DECOMPOSITION, NO_SMASHING, GENERATE_FINE_WIRE, GENERATE_ROD) .components(Carbon, 6, Hydrogen, 4, Oxygen, 1) .build(); @@ -99,7 +99,7 @@ public static void register() { Polyethylene = new Material.Builder(1012, "plastic") //todo add polyethylene oredicts .ingot(1).fluid() .color(0xC8C8C8) - .flags(GENERATE_FOIL, FLAMMABLE, NO_SMASHING, DISABLE_DECOMPOSITION) + .flags(GENERATE_FOIL, GENERATE_ROTOR, FLAMMABLE, NO_SMASHING, DISABLE_DECOMPOSITION) .components(Carbon, 1, Hydrogen, 2) .fluidPipeProperties(350, 60, true) .build(); @@ -121,14 +121,14 @@ public static void register() { Polycaprolactam = new Material.Builder(1015, "polycaprolactam") .ingot(1).fluid() .color(0x323232) - .flags(STD_METAL, DISABLE_DECOMPOSITION, NO_SMASHING) + .flags(STD_METAL, DISABLE_DECOMPOSITION, NO_SMASHING, GENERATE_FOIL) .components(Carbon, 6, Hydrogen, 11, Nitrogen, 1, Oxygen, 1) .build(); Polytetrafluoroethylene = new Material.Builder(1016, "polytetrafluoroethylene") .ingot(1).fluid() .color(0x646464) - .flags(STD_METAL, GENERATE_FRAME, DISABLE_DECOMPOSITION, NO_SMASHING) + .flags(STD_METAL, GENERATE_FRAME, DISABLE_DECOMPOSITION, NO_SMASHING, GENERATE_FOIL) .components(Carbon, 2, Fluorine, 4) .fluidPipeProperties(600, 80, true) .build(); @@ -470,7 +470,7 @@ public static void register() { Rubber = new Material.Builder(1068, "rubber") .ingot(0).fluid() .color(0x000000).iconSet(SHINY) - .flags(GENERATE_GEAR, GENERATE_RING, FLAMMABLE, NO_SMASHING, DISABLE_DECOMPOSITION) + .flags(GENERATE_GEAR, GENERATE_RING, FLAMMABLE, NO_SMASHING, DISABLE_DECOMPOSITION, GENERATE_FOIL, GENERATE_BOLT_SCREW) .components(Carbon, 5, Hydrogen, 8) .build(); } diff --git a/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java index 903cd1d3aca..95d2f8e297e 100644 --- a/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java @@ -87,14 +87,14 @@ public static void register() { Apatite = new Material.Builder(2010, "apatite") .gem(1).ore(4, 2) .color(0xC8C8FF).iconSet(DIAMOND) - .flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE) + .flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, GENERATE_BOLT_SCREW) .components(Calcium, 5, Phosphate, 3, Chlorine, 1) .build(); BlackSteel = new Material.Builder(2011, "black_steel") .ingot().fluid() .color(0x646464).iconSet(METALLIC) - .flags(EXT_METAL, GENERATE_FINE_WIRE) + .flags(EXT_METAL, GENERATE_FINE_WIRE, GENERATE_GEAR) .components(Nickel, 1, BlackBronze, 1, Steel, 3) .toolStats(6.5f, 6.5f, 768, 21) .cableProperties(GTValues.V[4], 3, 2) @@ -296,7 +296,7 @@ public static void register() { BorosilicateGlass = new Material.Builder(2038, "borosilicate_glass") .ingot(1).fluid() .color(0xE6F3E6).iconSet(SHINY) - .flags(GENERATE_FINE_WIRE) + .flags(GENERATE_FINE_WIRE, GENERATE_PLATE) .components(Boron, 1, SiliconDioxide, 7) .build();