diff options
Diffstat (limited to 'src/Java/miscutil/xmod')
5 files changed, 18 insertions, 9 deletions
diff --git a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechItemList.java index 32e7cb157e..1a1fd804fe 100644 --- a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechItemList.java @@ -99,7 +99,9 @@ public enum GregtechItemList implements GregtechItemContainer { Food_Baked_Raisin_Bread, Industrial_SinterFurnace, - SuperConductorInputNode; + SuperConductorInputNode, + + Casing_Reactor_I, Casing_Reactor_II; public static final GregtechItemList[] DYE_ONLY_ITEMS = { diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java index b6a79955a8..6371764894 100644 --- a/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java +++ b/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java @@ -36,8 +36,8 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Matter Fabricator Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Iron Plated Bricks"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Unused Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Unused Coil Block"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Unused Coil Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Reactor Casing Tier I"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Reactor Casing Tier II"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Unused Coil Block"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Unused Coil Block"); GregtechItemList.Casing_Centrifuge1.set(new ItemStack(this, 1, 0)); @@ -52,8 +52,8 @@ extends GregtechMetaCasingBlocksAbstract { GregtechItemList.Casing_MatterFab.set(new ItemStack(this, 1, 9)); GregtechItemList.Casing_IronPlatedBricks.set(new ItemStack(this, 1, 10)); GregtechItemList.Casing_U7.set(new ItemStack(this, 1, 11)); - GregtechItemList.Casing_Coil_U1.set(new ItemStack(this, 1, 12)); - GregtechItemList.Casing_Coil_U2.set(new ItemStack(this, 1, 13)); + GregtechItemList.Casing_Reactor_I.set(new ItemStack(this, 1, 12)); + GregtechItemList.Casing_Reactor_II.set(new ItemStack(this, 1, 13)); GregtechItemList.Casing_Coil_U3.set(new ItemStack(this, 1, 14)); GregtechItemList.Casing_Coil_U4.set(new ItemStack(this, 1, 15)); } diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java index 6c3cdcad87..fd1fa305a8 100644 --- a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java +++ b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java @@ -32,8 +32,8 @@ public class GregtechFluidHandler { */ if (!LoadedMods.ThermalFoundation){ - Utils.LOG_INFO("Adding Gregtech versions of Gelic Cryotheum and Blazing Pyrotheum."); - + + Utils.LOG_INFO("Adding in our own GT versions of Thermal Foundation Fluids"); Meta_GT_Proxy.addFluid("cryotheum", "Gelid Cryotheum", GT_Materials.Cryotheum, 4, -1200, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); Meta_GT_Proxy.addFluid("pyrotheum", "Blazing Pyrotheum", GT_Materials.Pyrotheum, 4, 4000, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); } diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/Java/miscutil/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java index 0b2ef3f620..c304c3edf6 100644 --- a/src/Java/miscutil/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java +++ b/src/Java/miscutil/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java @@ -46,7 +46,14 @@ public class CasingTextureHandler { return Textures.BlockIcons.MACHINE_CASING_DRAGONEGG.getIcon(); //Iron Blast Fuance Textures case 10: - return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + + //Reactor Casing I + case 12: + return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); + //Reactor Casing II + case 13: + return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); default: return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon(); diff --git a/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java index 92396f558b..671eba0dea 100644 --- a/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java +++ b/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java @@ -19,7 +19,7 @@ public class TF_Fluids public static void preInit() { if (!LoadedMods.ThermalFoundation){ - Utils.LOG_INFO("Adding in our own versions of Thermal Foundation Fluids"); + Utils.LOG_INFO("Adding in our own versions of Thermal Foundation Fluids - Non-GT"); Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum"); Fluid cryotheum = FluidRegistry.getFluid("cryotheum"); |