diff options
Diffstat (limited to 'src')
4 files changed, 31 insertions, 32 deletions
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java index 9520b140ff..41e9192cd2 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java @@ -21,7 +21,7 @@ public class GregtechIndustrialMacerator private static void run1() { //Industrial Electrolyzer Multiblock - GregtechItemList.Industrial_MacerationStack.set(new GregtechMetaTileEntityIndustrialMacerator(797, "industrialmacerator.controller.tier.single", "Industrial Maceration Stack Control Block").getStackForm(1L)); + GregtechItemList.Industrial_MacerationStack.set(new GregtechMetaTileEntityIndustrialMacerator(797, "industrialmacerator.controller.tier.single", "Maceration Stack Control Block").getStackForm(1L)); } }
\ No newline at end of file diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java index f56bfa758a..dd40784778 100644 --- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java @@ -15,19 +15,6 @@ import net.minecraftforge.fluids.Fluid; */ public enum GregtechItemList implements GregtechItemContainer { - Credit_Copper, - Credit_Iron, - Credit_Silver, - Credit_Gold, - Credit_Platinum, - Credit_Osmium, - Credit_Greg_Copper, - Credit_Greg_Cupronickel, - Credit_Greg_Silver, - Credit_Greg_Gold, - Credit_Greg_Platinum, - Credit_Greg_Osmium, - Credit_Greg_Naquadah, Energy_Buffer_CREATIVE, //Energy Buffers @@ -58,7 +45,7 @@ public enum GregtechItemList implements GregtechItemContainer { Industrial_CokeOven, Casing_CokeOven, Casing_CokeOven_Coil1, Casing_CokeOven_Coil2, //Bending Maching // Plate Press // Press - Industrial_PlatePress, + Casing_MaterialPress, Industrial_PlatePress, //Gregtech Machine Parts Electric_Motor_LuV, Electric_Motor_ZPM, Electric_Motor_UV, Electric_Motor_MAX, @@ -81,7 +68,7 @@ public enum GregtechItemList implements GregtechItemContainer { Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM, //Unused Machine Casings - Casing_MaterialPress, Casing_Electrolyzer, Casing_U3, Casing_U4, Casing_U5, Casing_U6, Casing_U7, + Casing_U4, Casing_U5, Casing_U6, Casing_U7, //Unused Machine Coils Casing_Coil_U1, Casing_Coil_U2, Casing_Coil_U3, Casing_Coil_U4, @@ -92,10 +79,10 @@ public enum GregtechItemList implements GregtechItemContainer { Battery_RE_EV_Sodium, //Industrial Electrolyzer - Industrial_Electrolyzer, + Casing_Electrolyzer, Industrial_Electrolyzer, //Industrial Maceration Stack - Industrial_MacerationStack; + Casing_Macerator, Industrial_MacerationStack; public static final GregtechItemList[] DYE_ONLY_ITEMS = { diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java index 9711915b2c..be318d9865 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java @@ -31,9 +31,9 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Heat Proof Coke Oven Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Material Press Machine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Electrolyzer Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Maceration Stack Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Unused Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Unused Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "BROKEN BLUE FUSION Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Maceration Stack Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "BROKEN PINK FUSION Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Unused Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Iron Plated Bricks"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Unused Casing"); @@ -47,7 +47,7 @@ extends GregtechMetaCasingBlocksAbstract { GregtechItemList.Casing_CokeOven_Coil2.set(new ItemStack(this, 1, 3)); GregtechItemList.Casing_MaterialPress.set(new ItemStack(this, 1, 4)); GregtechItemList.Casing_Electrolyzer.set(new ItemStack(this, 1, 5)); - GregtechItemList.Casing_U3.set(new ItemStack(this, 1, 6)); + GregtechItemList.Casing_Macerator.set(new ItemStack(this, 1, 6)); GregtechItemList.Casing_U4.set(new ItemStack(this, 1, 7)); GregtechItemList.Casing_U5.set(new ItemStack(this, 1, 8)); GregtechItemList.Casing_U6.set(new ItemStack(this, 1, 9)); @@ -81,9 +81,15 @@ extends GregtechMetaCasingBlocksAbstract { //Electrolyzer Casings case 5: return Textures.BlockIcons.MACHINE_CASING_FUSION_2.getIcon(); + //Broken Blue Fusion Casings + /*case 6: + return Textures.BlockIcons.MACHINE_CASING_FIREBOX_TITANIUM.getIcon();*/ //Maceration Stack Casings - case 6: - return Textures.BlockIcons.MACHINE_CASING_MAGIC.getIcon(); + case 7: + return Textures.BlockIcons.MACHINE_LuV_BOTTOM.getIcon(); + //Broken Pink Fusion Casings + /*case 8: + return Textures.BlockIcons.MACHINE_CASING_FIREBOX_TITANIUM.getIcon();*/ //Iron Blast Fuance Textures case 10: return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java index 63e16ba9c4..2adfbbb722 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.Arrays; import miscutil.core.block.ModBlocks; +import miscutil.core.util.Utils; import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -54,9 +55,9 @@ public class GregtechMetaTileEntityIndustrialMacerator @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[63], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER)}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[64], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER)}; } - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[63]}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[64]}; } @Override @@ -102,7 +103,7 @@ public class GregtechMetaTileEntityIndustrialMacerator this.mEfficiencyIncrease = 10000; this.mEUt = (-tRecipe.mEUt); - this.mMaxProgresstime = Math.max(1, tRecipe.mDuration); + this.mMaxProgresstime = Math.max(1, (tRecipe.mDuration/5)); this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0), tRecipe.getOutput(1)}; sendLoopStart((byte) 20); updateSlots(); @@ -127,11 +128,13 @@ public class GregtechMetaTileEntityIndustrialMacerator if (!(i == 0 && j == 0 && (h > 0 && h < 5)))//((h > 0)&&(h<5)) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0))) { IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); - if ((!addMaintenanceToMachineList(tTileEntity, 63)) && (!addInputToMachineList(tTileEntity, 63)) && (!addOutputToMachineList(tTileEntity, 63)) && (!addEnergyInputToMachineList(tTileEntity, 63)) && (!ignoreController(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j)))) { + if ((!addMaintenanceToMachineList(tTileEntity, 64)) && (!addInputToMachineList(tTileEntity, 64)) && (!addOutputToMachineList(tTileEntity, 64)) && (!addEnergyInputToMachineList(tTileEntity, 64)) && (!ignoreController(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j)))) { if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) { + Utils.LOG_INFO("Returned False 1"); return false; } - if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 1) { + if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 7) { + Utils.LOG_INFO("Returned False 2"); return false; } tAmount++; @@ -140,11 +143,13 @@ public class GregtechMetaTileEntityIndustrialMacerator } } } - if (this.mOutputHatches.size() != 1 || this.mInputHatches.size() != 0 || this.mOutputBusses.size() != 5) { + if (this.mOutputHatches.size() != 0 || this.mInputBusses.size() != 1 || this.mOutputBusses.size() != 5) { + Utils.LOG_INFO("Returned False 3"); return false; } int height = this.getBaseMetaTileEntity().getYCoord(); - if (this.mInputBusses.get(0).getBaseMetaTileEntity().getYCoord() != height || this.mOutputHatches.get(0).getBaseMetaTileEntity().getYCoord() != height) { + if (this.mInputBusses.get(0).getBaseMetaTileEntity().getYCoord() != height) { + Utils.LOG_INFO("height: "+height+" | Returned False 4"); return false; } GT_MetaTileEntity_Hatch_OutputBus[] tmpHatches = new GT_MetaTileEntity_Hatch_OutputBus[5]; @@ -153,6 +158,7 @@ public class GregtechMetaTileEntityIndustrialMacerator if (tmpHatches[hatchNumber] == null) { tmpHatches[hatchNumber] = this.mOutputBusses.get(i); } else { + Utils.LOG_INFO("Returned False 5"); return false; } } @@ -177,7 +183,7 @@ public class GregtechMetaTileEntityIndustrialMacerator if (!(i == 0 && j == 0 && (h > 0 && h < 5)))//((h > 0)&&(h<5)) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0))) { IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); - if ((!addMaintenanceToMachineList(tTileEntity, 63)) && (!addInputToMachineList(tTileEntity, 63)) && (!addOutputToMachineList(tTileEntity, 63)) && (!addEnergyInputToMachineList(tTileEntity, 63)) && (!ignoreController(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j)))) { + if ((!addMaintenanceToMachineList(tTileEntity, 64)) && (!addInputToMachineList(tTileEntity, 64)) && (!addOutputToMachineList(tTileEntity, 64)) && (!addEnergyInputToMachineList(tTileEntity, 64)) && (!ignoreController(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j)))) { if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) { return false; } |