diff options
11 files changed, 137 insertions, 67 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/MachineLoader.java index 800f5cd332..d3aeef6d1b 100644 --- a/src/main/java/com/github/technus/tectech/loader/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MachineLoader.java @@ -200,8 +200,8 @@ public class MachineLoader implements Runnable { // =================================================================================================== // Hatches // =================================================================================================== - Parametrizer_Hatch.set(new GT_MetaTileEntity_Hatch_Param(15420, "hatch.param.tier.08", "Parametrizer", 8).getStackForm(1L)); - Uncertainty_Hatch.set(new GT_MetaTileEntity_Hatch_Uncertainty(15421, "hatch.certain.tier.08", "Uncertainty Resolver", 10).getStackForm(1L)); + Parametrizer_Hatch.set(new GT_MetaTileEntity_Hatch_Param(15420, "hatch.param.tier.08", "Parametrizer", 7).getStackForm(1L)); + Uncertainty_Hatch.set(new GT_MetaTileEntity_Hatch_Uncertainty(15421, "hatch.certain.tier.08", "Uncertainty Resolver", 7).getStackForm(1L)); UncertaintyX_Hatch.set(new GT_MetaTileEntity_Hatch_Uncertainty(15422, "hatch.certain.tier.10", "Uncertainty Resolver X", 10).getStackForm(1L)); dataIn_Hatch.set(new GT_MetaTileEntity_Hatch_InputData(15423, "hatch.datain.tier.08", "Optical Slave Connector", 8).getStackForm(1L)); dataOut_Hatch.set(new GT_MetaTileEntity_Hatch_OutputData(15424, "hatch.dataout.tier.08", "Optical Master Connector", 8).getStackForm(1L)); @@ -210,7 +210,7 @@ public class MachineLoader implements Runnable { // =================================================================================================== // Pipes // =================================================================================================== - EMpipe.set(new GT_MetaTileEntity_Pipe_EM(15460, "pipe.elementalmatter", "Quantum Tunnel").getStackForm(1L)); + EMpipe.set(new GT_MetaTileEntity_Pipe_EM(15460, "pipe.elementalmatter", "Quantum \"Tunnel\"").getStackForm(1L)); DATApipe.set(new GT_MetaTileEntity_Pipe_Data(15461, "pipe.datastream", "Optical Fiber Cable").getStackForm(1L)); // =================================================================================================== diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java index d192a4a0ff..929e277ac0 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -29,7 +29,7 @@ public enum CustomItemList implements IItemContainer { eM_out_UV, eM_out_UHV, eM_out_UEV, eM_out_UIV, eM_out_UMV, eM_out_UXV, eM_muffler_UV, eM_muffler_UHV, eM_muffler_UEV, eM_muffler_UIV, eM_muffler_UMV, eM_muffler_UXV, Parametrizer_Hatch, Uncertainty_Hatch, UncertaintyX_Hatch, dataIn_Hatch, dataOut_Hatch, - eM_Casing, eM_Field, eM_Field_Casing, eM_Coil, eM_Tele, eM_TimeSpaceWarp, eM_computer, eM_computerAdv, eM_computerVent, eM_Hollow, + eM_Containment, eM_Containment_Field, eM_Containment_Advanced, eM_Coil, eM_Teleportation, eM_Dimensional, eM_Ultimate_Containment,eM_Ultimate_Containment_Advanced,eM_Ultimate_Containment_Field,eM_Spacetime, eM_Computer_Casing, eM_Computer_Bus, eM_Computer_Vent, eM_Hollow, eM_Power, debugBlock, Machine_Multi_MatterToEM, Machine_Multi_EMToMatter, Machine_Multi_EMjunction, Machine_Multi_Transformer, Machine_Multi_Computer, Machine_Multi_Infuser, Machine_Multi_Switch, diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java index 02f0a1fa93..76d9c15fa7 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java @@ -23,7 +23,7 @@ import java.util.List; public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract { - private static IIcon eM0s,eM1s,eM2s,eM0,eM1,eM2,eM3, eM4, eM5, eM6s, eM6, eM7, eM8, eM9; + private static IIcon eM0, eM1, eM1s, eM2, eM2s, eM3, eM3s, eM4, eM5, eM6, eM7, eM7s, eM8, eM9, eM10, eM11, eM12, eM13, eM14; private static IIcon debug[] = new IIcon[6]; public GT_Block_CasingsTT() { @@ -32,51 +32,81 @@ public class GT_Block_CasingsTT Textures.BlockIcons.CASING_BLOCKS[(i + 96)] = new GT_CopiedBlockTexture(this, 6, i); /*IMPORTANT for block recoloring**/ } - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Computer Casing");//adding - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Advanced Computer Casing");//adding - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Computer Heat Vent");//adding - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Molecular Containment Casing");//adding - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Containment Field Generator");//adding - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Containment Field Generator Casing");//adding - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Molecular Containment Coil");//adding - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Teleportation Casing");//adding - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Spacetime Altering Casing");//adding - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Collider Hollow Casing");//adding - - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Debug Sides");//adding - - - CustomItemList.eM_computer.set(new ItemStack(this, 1, 0));//adding - CustomItemList.eM_computerAdv.set(new ItemStack(this, 1, 1));//adding - CustomItemList.eM_computerVent.set(new ItemStack(this, 1, 2));//adding - CustomItemList.eM_Casing.set(new ItemStack(this, 1, 3));//adding - CustomItemList.eM_Field.set(new ItemStack(this, 1, 4));//adding - CustomItemList.eM_Field_Casing.set(new ItemStack(this, 1, 5));//adding - CustomItemList.eM_Coil.set(new ItemStack(this, 1, 6));//adding - CustomItemList.eM_Tele.set(new ItemStack(this, 1, 7));//adding - CustomItemList.eM_TimeSpaceWarp.set(new ItemStack(this, 1, 8)); - CustomItemList.eM_Hollow.set(new ItemStack(this, 1, 9)); - - CustomItemList.debugBlock.set(new ItemStack(this, 1, 10)); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "High Power Casing"); + + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Computer Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Computer Heat Vent"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Advanced Computer Casing"); + + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Molecular Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Advanced Molecular Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Containment Field Generator"); + + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Molecular Coil"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Collider Hollow Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Spacetime Altering Casing"); + + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Teleportation Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Dimensional Bridge Generator"); + + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Ultimate Molecular Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Ultimate Advanced Molecular Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Ultimate Containment Field Generator"); + + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Debug Sides"); + + + CustomItemList.eM_Power.set(new ItemStack(this, 1, 0)); + + CustomItemList.eM_Computer_Casing.set(new ItemStack(this, 1, 1)); + CustomItemList.eM_Computer_Vent.set(new ItemStack(this, 1, 2)); + CustomItemList.eM_Computer_Bus.set(new ItemStack(this, 1, 3)); + + CustomItemList.eM_Containment.set(new ItemStack(this, 1, 4)); + CustomItemList.eM_Containment_Advanced.set(new ItemStack(this, 1, 5)); + CustomItemList.eM_Containment_Field.set(new ItemStack(this, 1, 6)); + + CustomItemList.eM_Coil.set(new ItemStack(this, 1, 7)); + CustomItemList.eM_Hollow.set(new ItemStack(this, 1, 8)); + CustomItemList.eM_Spacetime.set(new ItemStack(this, 1, 9)); + + CustomItemList.eM_Teleportation.set(new ItemStack(this, 1, 10)); + CustomItemList.eM_Dimensional.set(new ItemStack(this, 1, 11)); + + CustomItemList.eM_Ultimate_Containment.set(new ItemStack(this, 1, 12)); + CustomItemList.eM_Ultimate_Containment_Advanced.set(new ItemStack(this, 1, 13)); + CustomItemList.eM_Ultimate_Containment_Field.set(new ItemStack(this, 1, 14)); + + CustomItemList.debugBlock.set(new ItemStack(this, 1, 15)); } @Override public void registerBlockIcons(IIconRegister aIconRegister) { //super.registerBlockIcons(aIconRegister); - eM0 = aIconRegister.registerIcon("gregtech:iconsets/EM_PC_NONSIDE"); - eM0s = aIconRegister.registerIcon("gregtech:iconsets/EM_PC"); - eM1 = aIconRegister.registerIcon("gregtech:iconsets/EM_PC_ADV_NONSIDE"); - eM1s = aIconRegister.registerIcon("gregtech:iconsets/EM_PC_ADV"); + eM0 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER"); + + eM1 = aIconRegister.registerIcon("gregtech:iconsets/EM_PC_NONSIDE"); + eM1s = aIconRegister.registerIcon("gregtech:iconsets/EM_PC"); eM2 = aIconRegister.registerIcon("gregtech:iconsets/EM_PC_VENT_NONSIDE"); eM2s = aIconRegister.registerIcon("gregtech:iconsets/EM_PC_VENT"); - eM3 = aIconRegister.registerIcon("gregtech:iconsets/EM_CASING"); - eM4 = aIconRegister.registerIcon("gregtech:iconsets/EM_FIELD"); + eM3 = aIconRegister.registerIcon("gregtech:iconsets/EM_PC_ADV_NONSIDE"); + eM3s = aIconRegister.registerIcon("gregtech:iconsets/EM_PC_ADV"); + + eM4 = aIconRegister.registerIcon("gregtech:iconsets/EM_CASING"); eM5 = aIconRegister.registerIcon("gregtech:iconsets/EM_FIELD_CASING"); - eM6 = aIconRegister.registerIcon("gregtech:iconsets/EM_COIL_NONSIDE"); - eM6s = aIconRegister.registerIcon("gregtech:iconsets/EM_COIL"); - eM7 = aIconRegister.registerIcon("gregtech:iconsets/EM_TELE"); - eM8 = aIconRegister.registerIcon("gregtech:iconsets/EM_TIMESPACE"); - eM9 = aIconRegister.registerIcon("gregtech:iconsets/EM_HOLLOW"); + eM6 = aIconRegister.registerIcon("gregtech:iconsets/EM_FIELD"); + + eM7 = aIconRegister.registerIcon("gregtech:iconsets/EM_COIL_NONSIDE"); + eM7s = aIconRegister.registerIcon("gregtech:iconsets/EM_COIL"); + eM8 = aIconRegister.registerIcon("gregtech:iconsets/EM_HOLLOW"); + eM9 = aIconRegister.registerIcon("gregtech:iconsets/EM_TIMESPACE"); + + eM10 = aIconRegister.registerIcon("gregtech:iconsets/EM_TELE"); + eM11 = aIconRegister.registerIcon("gregtech:iconsets/EM_DIM"); + + eM12 = aIconRegister.registerIcon("gregtech:iconsets/EM_ULTIMATE_CASING"); + eM13 = aIconRegister.registerIcon("gregtech:iconsets/EM_ULTIMATE_FIELD_CASING"); + eM14 = aIconRegister.registerIcon("gregtech:iconsets/EM_ULTIMATE_FIELD"); debug[0] = aIconRegister.registerIcon("gregtech:iconsets/DEBUG_0"); debug[1] = aIconRegister.registerIcon("gregtech:iconsets/DEBUG_1"); @@ -89,8 +119,7 @@ public class GT_Block_CasingsTT public IIcon getIcon(int aSide, int aMeta) { switch (aMeta) { case 0: - if (aSide < 2) return eM0; - return eM0s; + return eM0; case 1: if (aSide < 2) return eM1; return eM1s; @@ -98,21 +127,32 @@ public class GT_Block_CasingsTT if (aSide < 2) return eM2; return eM2s; case 3: - return eM3; + if (aSide < 2) return eM3; + return eM3s; case 4: return eM4; case 5: return eM5; case 6: - if (aSide < 2) return eM6; - return eM6s; + return eM6; case 7: - return eM7; + if (aSide < 2) return eM7; + return eM7s; case 8: return eM8; case 9: return eM9; case 10: + return eM10; + case 11: + return eM11; + case 12: + return eM12; + case 13: + return eM13; + case 14: + return eM14; + case 15: return debug[aSide]; default: return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); @@ -131,7 +171,7 @@ public class GT_Block_CasingsTT @Override public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { - for (int i = 0; i <= 10; i++) { + for (int i = 0; i <= 15; i++) { aList.add(new ItemStack(aItem, 1, i)); } } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java index bdc7b6e340..8590fbffbf 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java @@ -24,52 +24,72 @@ public class GT_Item_CasingsTT aList.add(tecMark); switch(aStack.getItemDamage()){ case 0: - aList.add("Nice and clean casing."); - aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Dust can break it!?"); + aList.add("Well suited for high power applications."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "The power levels are rising!"); break; case 1: - aList.add("Contains high bandwidth bus"); - aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "couple thousand qubits wide."); + aList.add("Nice and clean casing."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Dust can break it!?"); break; case 2: aList.add("Air vent with a filter."); aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Perfectly muffled sound!"); break; case 3: - aList.add("Stops elemental things."); - aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Radiation and emotions too..."); + aList.add("Contains high bandwidth bus"); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "couple thousand qubits wide."); break; case 4: - aList.add("Creates a field that..."); - aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "can stop even force carriers."); + aList.add("Stops elemental things."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Radiation and emotions too..."); break; case 5: aList.add("Cooling and stabilization."); aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Like a comfortable bed."); break; case 6: - aList.add("Well it does things too..."); - aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "[use this coil]"); + aList.add("Creates a field that..."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "can stop even force carriers."); break; case 7: - aList.add("Remote connection."); - aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Better use a stick."); + aList.add("Well it does things too..."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "[Use this coil!]"); break; case 8: - aList.add("C is no longer the limit."); - aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Wibbly wobbly timey wimey stuff."); - break; - case 9: aList.add("Reinforced accelerator tunnel."); aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Most advanced pipe ever."); break; + case 9: + aList.add("C is no longer the limit."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Wibbly wobbly timey wimey stuff."); + break; case 10: + aList.add("Remote connection."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Better use a stick."); + break; + case 11: + aList.add("Interdimensional Operations."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Around the universe and other places too."); + break; + case 12: + aList.add("Ultimate in every way."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "I don't know what it can't do."); + break; + case 13: + aList.add("More Ultimate in every way."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "I don't know what I am doing!"); + break; + case 14: + aList.add("Black Hole..."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Meh..."); + break; + case 15: aList.add("Lazy man way of determining sides."); aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!"); break; default: - aList.add("Damn son where did you get that."); - aList.add(EnumChatFormatting.BLUE.toString() + "From outer space..."); + aList.add("Damn son where did you get that!?"); + aList.add(EnumChatFormatting.BLUE.toString() + "From outer space... I guess..."); } } } diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DIM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DIM.png Binary files differnew file mode 100644 index 0000000000..2686522d15 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DIM.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DIM.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DIM.png.mcmeta new file mode 100644 index 0000000000..60af678259 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_DIM.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":4 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_POWER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_POWER.png Binary files differnew file mode 100644 index 0000000000..6e7e0fc3d2 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_POWER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ULTIMATE_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ULTIMATE_CASING.png Binary files differnew file mode 100644 index 0000000000..798f7b6dbd --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ULTIMATE_CASING.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ULTIMATE_FIELD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ULTIMATE_FIELD.png Binary files differnew file mode 100644 index 0000000000..fd0b41482d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ULTIMATE_FIELD.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ULTIMATE_FIELD.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ULTIMATE_FIELD.png.mcmeta new file mode 100644 index 0000000000..dfae8cae16 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ULTIMATE_FIELD.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ULTIMATE_FIELD_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ULTIMATE_FIELD_CASING.png Binary files differnew file mode 100644 index 0000000000..d956c9d8cc --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_ULTIMATE_FIELD_CASING.png |
