Skip to content
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 2.7.6
- Make MetaItem, MetaTileEntity, and Material IDs configurable via cfg
- Each category uses a configurable start ID; individual IDs are calculated as offsets
- Default values match the previous hardcoded values, so no impact on existing worlds

* * *

# 2.7.5
- Re: Fix DEDA logic.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,26 @@
import gregtech.api.unification.material.Material;
import gregtech.api.unification.material.properties.BlastProperty.GasTier;

import com.github.gtexpert.core.common.GTEConfigHolder;

public class GTEFirstDegreeMaterials {

/**
* 24001 - 24100
* Default: 24001 - 24100
*/
Comment thread
tier940 marked this conversation as resolved.
public static void init() {
// Artificial Bone 24001
ArtificialBone = new Material.Builder(24001, gteId("artificial_bone"))
int startId = GTEConfigHolder.startIDs.coreMaterial;

// Artificial Bone
ArtificialBone = new Material.Builder(startId, gteId("artificial_bone"))
.dust(1)
.color(0xFAFAFA)
.flags(FORCE_GENERATE_BLOCK, MORTAR_GRINDABLE, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES)
.components(Calcium, 10, Phosphate, 6, Hydrogen, 2, Oxygen, 2)
.build();

// NM_HEA_NPs
NM_HEA_NPs = new Material.Builder(24002, gteId("nm_hea_nps"))
NM_HEA_NPs = new Material.Builder(startId + 1, gteId("nm_hea_nps"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0xa90000).iconSet(METALLIC)
Expand All @@ -41,7 +45,7 @@ public static void init() {
.build();

// Naquadah Rocket Fuel
NaquadahRocketFuel = new Material.Builder(24003, gteId("naquadah_rocket_fuel"))
NaquadahRocketFuel = new Material.Builder(startId + 2, gteId("naquadah_rocket_fuel"))
.liquid(new FluidBuilder().temperature(1200))
.color(0x2E4C00)
.flags(NO_WORKING)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,21 @@
import gregtech.api.unification.ore.OrePrefix;

import com.github.gtexpert.core.api.GTEValues;
import com.github.gtexpert.core.integration.ae.AEConfigHolder;

public class AEFirstDegreeMaterials {

/**
* 24151 - 24175
* Default: 24151 - 24175
*/
Comment thread
tier940 marked this conversation as resolved.
public static void init() {
int startId = AEConfigHolder.materialStartId;

// Certus Quartz
OrePrefix.block.modifyMaterialAmount(CertusQuartz, 4);

// Charged Certus Quartz
ChargedCertusQuartz = new Material.Builder(24151, gteId("charged_certus_quartz"))
ChargedCertusQuartz = new Material.Builder(startId, gteId("charged_certus_quartz"))
.dust()
.liquid(new FluidBuilder().temperature(1200))
.color(0xCFDAFF).iconSet(MaterialIconSet.CERTUS)
Expand All @@ -35,7 +38,7 @@ public static void init() {
OrePrefix.block.modifyMaterialAmount(ChargedCertusQuartz, 4);

// Fluix
Fluix = new Material.Builder(24152, gteId("fluix"))
Fluix = new Material.Builder(startId + 1, gteId("fluix"))
.dust()
.liquid(new FluidBuilder().temperature(1200))
.color(0x846994).iconSet(MaterialIconSet.CERTUS)
Expand All @@ -45,7 +48,7 @@ public static void init() {
OrePrefix.block.modifyMaterialAmount(Fluix, 4);

// Fluix Alloy
FluixAlloy = new Material.Builder(24153, gteId("fluix_alloy"))
FluixAlloy = new Material.Builder(startId + 2, gteId("fluix_alloy"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0x4A3954).iconSet(MaterialIconSet.SHINY)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,19 @@
import gregtech.api.unification.material.properties.ToolProperty;

import com.github.gtexpert.core.api.unification.material.info.GTEMaterialIconSet;
import com.github.gtexpert.core.common.GTEConfigHolder;

public class AvaritiaFirstDegreeMaterials {

public static void init() {
int startId = GTEConfigHolder.startIDs.avaritiaMaterial;
// Neutronium
// Neutronium.setMaterialRGB(0x000000);
// Neutronium.setMaterialIconSet(GTEMaterialIconSet.NEUTRONIUM);
Neutronium.addFlags(GENERATE_SMALL_GEAR, GENERATE_FOIL, GENERATE_RING, GENERATE_ROTOR, NO_SMELTING);

// Infinity
Infinity = new Material.Builder(24186, gteId("infinity"))
Infinity = new Material.Builder(startId, gteId("infinity"))
.dust(7).ingot(7)
.liquid(new FluidBuilder().temperature(10800))
.iconSet(GTEMaterialIconSet.INFINITY)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,34 @@

import com.github.gtexpert.core.api.GTEValues;
import com.github.gtexpert.core.api.util.Mods;
import com.github.gtexpert.core.integration.deda.DEDAConfigHolder;

public class DEFirstDegreeMaterials {

/**
* 24176 - 24200
* Default: 24176 - 24200
*/
Comment thread
tier940 marked this conversation as resolved.
public static void init() {
int startId = DEDAConfigHolder.materialStartId;

// Cryotheum
Cryotheum = new Material.Builder(24176, gteId("cryotheum"))
Cryotheum = new Material.Builder(startId, gteId("cryotheum"))
.liquid(new FluidBuilder().temperature(2))
.color(0x00B6FF).iconSet(MaterialIconSet.FLUID)
.flags(NO_WORKING, DISABLE_DECOMPOSITION)
.components(Electrotine, 1, EnderPearl, 1, Ice, 4)
.build();

// Pyrotheum
Pyrotheum = new Material.Builder(24177, gteId("pyrotheum"))
Pyrotheum = new Material.Builder(startId + 1, gteId("pyrotheum"))
.fluid(GCYMFluidStorageKeys.MOLTEN, new FluidBuilder().temperature(10273))
.color(0xE42C13).iconSet(MaterialIconSet.BRIGHT)
.flags(NO_WORKING, DISABLE_DECOMPOSITION)
.components(Redstone, 1, Sulfur, 1, Blaze, 16)
.build();

// Dragon Dust
Dragon = new Material.Builder(24178, gteId("dragon"))
Dragon = new Material.Builder(startId + 2, gteId("dragon"))
.dust()
.color(0x000000).iconSet(MaterialIconSet.ROUGH)
.flags(NO_WORKING, DISABLE_DECOMPOSITION)
Expand All @@ -51,7 +54,7 @@ public static void init() {
.build();

// Draconium
Draconium = new Material.Builder(24180, gteId("draconium"))
Draconium = new Material.Builder(startId + 4, gteId("draconium"))
.ore(2, 1, true)
.ingot(5)
.liquid(new FluidBuilder().temperature(1200))
Expand All @@ -72,7 +75,7 @@ public static void init() {
.build();

// Awakened Draconium
AwakenedDraconium = new Material.Builder(24181, gteId("awakened_draconium"))
AwakenedDraconium = new Material.Builder(startId + 5, gteId("awakened_draconium"))
.ingot(6)
.liquid(new FluidBuilder().temperature(1200))
.color(0xFF6C00).iconSet(MaterialIconSet.METALLIC)
Expand All @@ -90,7 +93,7 @@ public static void init() {
.build();

// Chaos Dust
Chaos = new Material.Builder(24179, gteId("chaos"))
Chaos = new Material.Builder(startId + 3, gteId("chaos"))
.dust()
.color(0x000000).iconSet(MaterialIconSet.ROUGH)
.flags(NO_WORKING, DISABLE_DECOMPOSITION)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,32 @@
import gregtech.api.unification.material.properties.BlastProperty.GasTier;

import com.github.gtexpert.core.api.GTEValues;
import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder;

public class EIOFirstDegreeMaterials {

/**
* 24101 - 24150
* Default: 24101 - 24150
*/
Comment thread
tier940 marked this conversation as resolved.
public static void init() {
int startId = EnderIOConfigHolder.materialStartId;

// Soulsand Dust
SoulSand = new Material.Builder(24101, gteId("soul_sand"))
SoulSand = new Material.Builder(startId, gteId("soul_sand"))
.dust()
.color(0x846C4C).iconSet(MaterialIconSet.SAND)
.flags(NO_WORKING)
.build();

// Chorusfruit Dust
ChorusFruit = new Material.Builder(24102, gteId("chorus_fruit"))
ChorusFruit = new Material.Builder(startId + 1, gteId("chorus_fruit"))
.dust()
.color(0x8C648C).iconSet(MaterialIconSet.DULL)
.flags(NO_WORKING)
.build();

// Electrical Steel
ElectricalSteel = new Material.Builder(24103, gteId("electrical_steel"))
ElectricalSteel = new Material.Builder(startId + 2, gteId("electrical_steel"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0x949494).iconSet(MaterialIconSet.METALLIC)
Expand All @@ -47,7 +50,7 @@ public static void init() {
.build();

// Energetic Alloy
EnergeticAlloy = new Material.Builder(24104, gteId("energetic_alloy"))
EnergeticAlloy = new Material.Builder(startId + 3, gteId("energetic_alloy"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0xED8009).iconSet(MaterialIconSet.SHINY)
Expand All @@ -61,7 +64,7 @@ public static void init() {
EnergeticAlloy.setFormula("Au2(Si(FeS2)5(CrAl2O3)Hg3)2", true);

// Vibrant Alloy
VibrantAlloy = new Material.Builder(24105, gteId("vibrant_alloy"))
VibrantAlloy = new Material.Builder(startId + 4, gteId("vibrant_alloy"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0xBAC63F).iconSet(MaterialIconSet.SHINY)
Expand All @@ -75,7 +78,7 @@ public static void init() {
VibrantAlloy.setFormula("BeK4N5(Au2(Si(FeS2)5(CrAl2O3)Hg3)2)", true);

// Redstone Alloy
RedstoneAlloy = new Material.Builder(24106, gteId("redstone_alloy"))
RedstoneAlloy = new Material.Builder(startId + 5, gteId("redstone_alloy"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0x942323).iconSet(MaterialIconSet.DULL)
Expand All @@ -88,7 +91,7 @@ public static void init() {
.build();

// Conductive Iron
ConductiveIron = new Material.Builder(24107, gteId("conductive_iron"))
ConductiveIron = new Material.Builder(startId + 6, gteId("conductive_iron"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0xD1A79B).iconSet(MaterialIconSet.ROUGH)
Expand All @@ -101,7 +104,7 @@ public static void init() {
.build();

// Pulsating Iron
PulsatingIron = new Material.Builder(24108, gteId("pulsating_iron"))
PulsatingIron = new Material.Builder(startId + 7, gteId("pulsating_iron"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0x6EAC7D).iconSet(MaterialIconSet.SHINY)
Expand All @@ -114,7 +117,7 @@ public static void init() {
.build();

// Dark Steel
DarkSteel = new Material.Builder(24109, gteId("dark_steel"))
DarkSteel = new Material.Builder(startId + 8, gteId("dark_steel"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0x5F5F5F).iconSet(MaterialIconSet.METALLIC)
Expand All @@ -127,7 +130,7 @@ public static void init() {
.build();

// Soularium
Soularium = new Material.Builder(24110, gteId("soularium"))
Soularium = new Material.Builder(startId + 9, gteId("soularium"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0x5A4226).iconSet(MaterialIconSet.DULL)
Expand All @@ -140,7 +143,7 @@ public static void init() {
.build();

// End Steel
EndSteel = new Material.Builder(24111, gteId("end_steel"))
EndSteel = new Material.Builder(startId + 10, gteId("end_steel"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0xBCB682).iconSet(MaterialIconSet.METALLIC)
Expand All @@ -158,7 +161,7 @@ public static void init() {
true);

// Iron Alloy
ConstructionAlloy = new Material.Builder(24112, gteId("construction_alloy"))
ConstructionAlloy = new Material.Builder(startId + 11, gteId("construction_alloy"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0x524C53).iconSet(MaterialIconSet.ROUGH)
Expand All @@ -171,7 +174,7 @@ public static void init() {
.build();

// Crystalline Alloy
CrystallineAlloy = new Material.Builder(24113, gteId("crystalline_alloy"))
CrystallineAlloy = new Material.Builder(startId + 12, gteId("crystalline_alloy"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0x9FE4E4).iconSet(MaterialIconSet.SHINY)
Expand All @@ -184,7 +187,7 @@ public static void init() {
.build();

// Melodic Alloy
MelodicAlloy = new Material.Builder(24114, gteId("melodic_alloy"))
MelodicAlloy = new Material.Builder(startId + 13, gteId("melodic_alloy"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0xA877A8).iconSet(MaterialIconSet.SHINY)
Expand All @@ -197,7 +200,7 @@ public static void init() {
.build();

// Stellar Alloy
StellarAlloy = new Material.Builder(24115, gteId("stellar_alloy"))
StellarAlloy = new Material.Builder(startId + 14, gteId("stellar_alloy"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0xDBDECC).iconSet(MaterialIconSet.SHINY)
Expand All @@ -210,7 +213,7 @@ public static void init() {
.build();

// Crystalline Pink Slime
CrystallinePinkSlime = new Material.Builder(24116, gteId("crystalline_pink_slime"))
CrystallinePinkSlime = new Material.Builder(startId + 15, gteId("crystalline_pink_slime"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0xE79EDB).iconSet(MaterialIconSet.SHINY)
Expand All @@ -223,7 +226,7 @@ public static void init() {
.build();

// Energetic Silver
EnergeticSilver = new Material.Builder(24117, gteId("energetic_silver"))
EnergeticSilver = new Material.Builder(startId + 16, gteId("energetic_silver"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0x598DB3).iconSet(MaterialIconSet.SHINY)
Expand All @@ -236,7 +239,7 @@ public static void init() {
.build();

// Vivid Alloy
VividAlloy = new Material.Builder(24118, gteId("vivid_alloy"))
VividAlloy = new Material.Builder(startId + 17, gteId("vivid_alloy"))
.ingot()
.liquid(new FluidBuilder().temperature(1200))
.color(0x469BB1).iconSet(MaterialIconSet.SHINY)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,18 @@
import gregtech.api.unification.material.Material;
import gregtech.api.unification.material.info.MaterialIconSet;

import com.github.gtexpert.core.integration.tc.TCConfigHolder;

public class TCFirstDegreeMaterials {

/**
* 24191 - 24199
* Default: 24191 - 24199
*/
Comment thread
tier940 marked this conversation as resolved.
public static void init() {
int startId = TCConfigHolder.materialStartId;

// Thaumium
Thaumium = new Material.Builder(24191, gteId("thaumium"))
Thaumium = new Material.Builder(startId, gteId("thaumium"))
.dust(3).ingot(3)
.liquid(new FluidBuilder().temperature(1200))
.color(0x9664c8).iconSet(MaterialIconSet.METALLIC)
Expand All @@ -29,7 +33,7 @@ public static void init() {
.build();

// Void Metal
VoidMetal = new Material.Builder(24192, gteId("void_metal"))
VoidMetal = new Material.Builder(startId + 1, gteId("void_metal"))
.dust(4).ingot(4)
.liquid(new FluidBuilder().temperature(1200))
.color(0x1c0639).iconSet(MaterialIconSet.SHINY)
Expand Down
Loading