xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

material def using DictFrames

Browse Source
This commit is contained in:
Boblet 2022-09-13 16:59:48 +02:00
parent 5a87f9be64
commit c0cb5b3ebc
4 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/hbm/inventory/OreDictManager.java
View File

@ -526,7 +526,7 @@ public class OreDictManager {
} }
public static class DictFrame { public static class DictFrame {
String[] mats; public String[] mats;
float hazMult = 1.0F; float hazMult = 1.0F;
List<HazardEntry> hazards = new ArrayList(); List<HazardEntry> hazards = new ArrayList();

6
src/main/java/com/hbm/inventory/material/MaterialShapes.java
View File

@ -4,7 +4,9 @@ public enum MaterialShapes {
QUANTUM(1), // 1/72 of an ingot, allows the ingot to be divisible through 2, 4, 6, 8, 9, 12, 24 and 36 QUANTUM(1), // 1/72 of an ingot, allows the ingot to be divisible through 2, 4, 6, 8, 9, 12, 24 and 36
NUGGET(8, "nugget"), NUGGET(8, "nugget"),
DUSTTINY(NUGGET.quantity, "dustTiny"),
WIRE(9), WIRE(9),
BILLET(NUGGET.quantity * 6, "billet"),
INGOT(NUGGET.quantity * 9, "ingot"), INGOT(NUGGET.quantity * 9, "ingot"),
DUST(INGOT.quantity, "dust"), DUST(INGOT.quantity, "dust"),
PLATE(INGOT.quantity, "plate"), PLATE(INGOT.quantity, "plate"),
@ -16,5 +18,9 @@ public enum MaterialShapes {
private MaterialShapes(int quantity, String... prefixes) { private MaterialShapes(int quantity, String... prefixes) {
this.quantity = quantity; this.quantity = quantity;
this.prefixes = prefixes; this.prefixes = prefixes;
for(String prefix : prefixes) {
Mats.prefixByName.put(prefix, this);
}
} }
} }

36
src/main/java/com/hbm/inventory/material/Mats.java
View File

@ -1,17 +1,39 @@
package com.hbm.inventory.material; package com.hbm.inventory.material;
import static com.hbm.inventory.material.MaterialShapes.*;
import java.util.HashMap;
import com.hbm.inventory.OreDictManager;
import com.hbm.inventory.OreDictManager.DictFrame;
import com.hbm.inventory.material.NTMMaterial.SmeltingBehavior;
/* with every new rewrite, optimization and improvement, the code becomes more gregian */ /* with every new rewrite, optimization and improvement, the code becomes more gregian */
/**
* Defines materials that wrap around DictFrames to more accurately describe that material.
* Direct uses are the crucible and possibly item auto-gen, depending on what traits are set.
* @author hbm
*/
public class Mats { public class Mats {
public static HashMap<String, MaterialShapes> prefixByName = new HashMap();
public static HashMap<String, NTMMaterial> matByName = new HashMap();
public static NTMMaterial public static NTMMaterial
IRON = makeSmeltable(OreDictManager.IRON, 0).omitAutoGen(),
GOLD = makeSmeltable(OreDictManager.GOLD, 0).omitAutoGen(),
STEEL = makeSmeltable(OreDictManager.STEEL, 0).setShapes(DUSTTINY, INGOT, DUST, PLATE, BLOCK),
TUNGSTEN = makeSmeltable(OreDictManager.W, 0).setShapes(WIRE, INGOT, DUST, BLOCK),
COPPER = makeSmeltable(OreDictManager.CU, 0).setShapes(WIRE, INGOT, DUST, PLATE, BLOCK),
ALUMINIUM = makeSmeltable(OreDictManager.AL, 0).setShapes(WIRE, INGOT, DUST, PLATE, BLOCK),
MINGRADE = makeSmeltable(OreDictManager.MINGRADE, 0).setShapes(WIRE, INGOT, DUST, BLOCK),
ALLOY = makeSmeltable(OreDictManager.ALLOY, 0).setShapes(WIRE, INGOT, DUST, PLATE, BLOCK);
IRON = make("Iron"), public static NTMMaterial make(DictFrame dict) {
GOLD = make("Gold"), return new NTMMaterial(dict);
STEEL = make("Steel"), }
TUNGSTEN = make("Tungsten"),
COPPER = make("Copper");
public static NTMMaterial make(String... names) { public static NTMMaterial makeSmeltable(DictFrame dict, int color) {
return new NTMMaterial(names); return new NTMMaterial(dict).smeltable(SmeltingBehavior.SMELTABLE).setMoltenColor(color);
} }
} }

10
src/main/java/com/hbm/inventory/material/NTMMaterial.java
View File

@ -1,5 +1,7 @@
package com.hbm.inventory.material; package com.hbm.inventory.material;
import com.hbm.inventory.OreDictManager.DictFrame;
/** /**
* Encapsulates most materials that are currently listed as DictFrames, even vanilla ones. * Encapsulates most materials that are currently listed as DictFrames, even vanilla ones.
* @author hbm * @author hbm
@ -7,14 +9,16 @@ package com.hbm.inventory.material;
*/ */
public class NTMMaterial { public class NTMMaterial {
public String[] names;
public MaterialShapes[] shapes = new MaterialShapes[0]; public MaterialShapes[] shapes = new MaterialShapes[0];
public boolean omitItemGen = false; public boolean omitItemGen = false;
public SmeltingBehavior smeltable = SmeltingBehavior.NOT_SMELTABLE; public SmeltingBehavior smeltable = SmeltingBehavior.NOT_SMELTABLE;
public int moltenColor = 0xFF4A00; public int moltenColor = 0xFF4A00;
public NTMMaterial(String... names) { public NTMMaterial(DictFrame dict) {
this.names = names;
for(String name : dict.mats) {
Mats.matByName.put(name, this);
}
} }
/** Shapes for autogen */ /** Shapes for autogen */