diff options
Diffstat (limited to 'src/Java')
5 files changed, 40 insertions, 18 deletions
diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java index efc5a3b08a..bb92613fe2 100644 --- a/src/Java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java @@ -23,6 +23,7 @@ public final class ModBlocks { // WIP TODO public static Block blockToolBuilder; public static Block blockGriefSaver; public static Block blockCasingsMisc; + public static Block blockCasings2Misc; public static Block blockMetaTileEntity; public static Block blockHeliumGenerator; public static Block blockNHG; @@ -32,7 +33,6 @@ public final class ModBlocks { public static Fluid fluidSludge = new Fluid("fluid.sludge"); public static Block blockFluidSludge; - public static Block blockCasings2Misc; public static Block blockFirePit; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index fc081c6f51..69cbedad83 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -144,12 +144,34 @@ public enum GregtechItemList implements GregtechItemContainer { GT4_Tesseract_Generator, GT4_Tesseract_Terminal, //Casings Tier 2 [17-32] + //Structural Glass Casing_StructuralGlass, - Casing_Refinery_External, Casing_Refinery_Structural, Casing_Refinery_Internal, - Casing_PlaceHolder4, Casing_Sifter, Casing_SifterGrate, - Casing_PlaceHolder7, Casing_PlaceHolder8, Casing_PlaceHolder9, - Casing_PlaceHolder10, Casing_PlaceHolder11, Casing_PlaceHolder12, - Casing_PlaceHolder13, Casing_PlaceHolder14, Casing_PlaceHolder15, + + //Fission Fuel Refinery + Casing_Refinery_External, + Casing_Refinery_Structural, + Casing_Refinery_Internal, + + //Unknown + Casing_PlaceHolder4, + + //Industrial Sifter + Casing_Sifter, + Casing_SifterGrate, + + //Unknown + Casing_PlaceHolder7, + Casing_PlaceHolder8, + + //Cyclotron + Casing_Cyclotron_Coil, + Casing_Cyclotron_External, + + Casing_PlaceHolder11, + Casing_PlaceHolder12, + Casing_PlaceHolder13, + Casing_PlaceHolder14, + Casing_PlaceHolder15, //LFTR ThoriumReactor, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java index e7ab9acc9a..a7d7b922ee 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java @@ -29,8 +29,8 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Large Sieve Grate"); //79 GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Placeholder Casing"); //80 GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Incoloy Casing"); //81 - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Placeholder Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Placeholder Casing"); + GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Cyclotron Coil"); + GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Cyclotron Outer Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Placeholder Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Placeholder Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Placeholder Casing"); @@ -45,8 +45,8 @@ extends GregtechMetaCasingBlocksAbstract { GregtechItemList.Casing_SifterGrate.set(new ItemStack(this, 1, 6)); GregtechItemList.Casing_PlaceHolder7.set(new ItemStack(this, 1, 7)); GregtechItemList.Casing_PlaceHolder8.set(new ItemStack(this, 1, 8)); - GregtechItemList.Casing_PlaceHolder9.set(new ItemStack(this, 1, 9)); - GregtechItemList.Casing_PlaceHolder10.set(new ItemStack(this, 1, 10)); + GregtechItemList.Casing_Cyclotron_Coil.set(new ItemStack(this, 1, 9)); + GregtechItemList.Casing_Cyclotron_External.set(new ItemStack(this, 1, 10)); GregtechItemList.Casing_PlaceHolder11.set(new ItemStack(this, 1, 11)); GregtechItemList.Casing_PlaceHolder12.set(new ItemStack(this, 1, 12)); GregtechItemList.Casing_PlaceHolder13.set(new ItemStack(this, 1, 13)); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java index 1eda274bd7..97b81b65d9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java @@ -36,12 +36,12 @@ public class CasingTextureHandler2 { //Broken Pink Fusion Casings case 8: return TexturesGtBlock._PlaceHolder.getIcon(); - //Matter Fabricator Casings + //Cyclotron Coil case 9: - return TexturesGtBlock._PlaceHolder.getIcon(); - //Iron Blast Fuance Textures + return TexturesGtBlock.Casing_Machine_Metal_Panel_B.getIcon(); + //Cyclotron External Casing case 10: - return TexturesGtBlock._PlaceHolder.getIcon(); + return TexturesGtBlock.Casing_Material_HastelloyX.getIcon(); //Multitank Exterior Casing case 11: return TexturesGtBlock._PlaceHolder.getIcon(); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java index 329177a4a4..91f07f79d6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java @@ -202,19 +202,19 @@ public abstract class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity } public Block getCasing() { - return GregTech_API.sBlockCasings4; + return ModBlocks.blockCasings2Misc; } public int getCasingMeta() { - return 0; + return 10; } public Block getCyclotronCoil() { - return GregTech_API.sBlockCasings4; + return ModBlocks.blockCasings2Misc; } public int getCyclotronCoilMeta() { - return 0; + return 9; } @Override |