diff options
Diffstat (limited to 'src/main/java/gregtech/api')
5 files changed, 54 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 34df98fc55..8bd9027a23 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1481,6 +1481,8 @@ public enum ItemList implements IItemContainer { Electromagnet_Samarium, Electromagnet_Tengam, + Hatch_Antimatter, + Machine_Multi_Canner, Machine_Multi_Solidifier, diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 5aa02b8094..9ad86df256 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -420,6 +420,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { * Not possible to determine exact Components */ public static Materials Antimatter; + public static Materials Protomatter; public static Materials AdvancedGlue; public static Materials BioFuel; public static Materials Biomass; diff --git a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java index d13fe68a47..1fc32cd413 100644 --- a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java +++ b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java @@ -840,6 +840,54 @@ public class MaterialsUEVplus { .disableAutoGeneratedVacuumFreezerRecipe() .disableAutoGeneratedBlastFurnaceRecipes(); + public static Materials Antimatter = new Materials( + 158, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 255, + 255, + 255, + 0, + "Antimatter", + "Semi-Stable Antimatter", + -1, + -1, + 0, + 1, + false, + true, + 1, + 1, + 1, + Dyes._NULL); + + public static Materials Protomatter = new Materials( + 159, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 255, + 255, + 255, + 0, + "Protomatter", + "Protomatter", + -1, + -1, + 0, + 1, + false, + true, + 1, + 1, + 1, + Dyes._NULL); + /** * called by Materials. Can be safely called multiple times. exists to allow Materials ensure this class is * initialized diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index 12ecb96155..721cb36457 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -1914,6 +1914,7 @@ public enum MetaTileEntityIDs { LargeEssentiaSmeltery(32024), CoolantTower(32025), ComponentAssemblyLine(32026), + AntimatterForge(32027), WireLumiium(32737), WireSignalium(32749),; diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 4eace204e6..39dc57af41 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -278,6 +278,8 @@ public class Textures { MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW, MACHINE_CASING_FUSION_2, + MACHINE_CASING_ANTIMATTER, + MACHINE_CASING_ANTIMATTER_GLOW, MACHINE_CASING_MAGIC, MACHINE_CASING_MAGIC_GLOW, |