diff options
Diffstat (limited to 'src')
7 files changed, 205 insertions, 79 deletions
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 a5885f2a3d..538f296b95 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -400,6 +400,8 @@ public enum CustomItemList implements IItemContainer { SpacetimeCompressionFieldGeneratorTier4, SpacetimeCompressionFieldGeneratorTier5, SpacetimeCompressionFieldGeneratorTier6, + SpacetimeCompressionFieldGeneratorTier7, + SpacetimeCompressionFieldGeneratorTier8, TimeAccelerationFieldGeneratorTier0, TimeAccelerationFieldGeneratorTier1, @@ -408,6 +410,8 @@ public enum CustomItemList implements IItemContainer { TimeAccelerationFieldGeneratorTier4, TimeAccelerationFieldGeneratorTier5, TimeAccelerationFieldGeneratorTier6, + TimeAccelerationFieldGeneratorTier7, + TimeAccelerationFieldGeneratorTier8, StabilisationFieldGeneratorTier0, StabilisationFieldGeneratorTier1, @@ -415,7 +419,10 @@ public enum CustomItemList implements IItemContainer { StabilisationFieldGeneratorTier3, StabilisationFieldGeneratorTier4, StabilisationFieldGeneratorTier5, - StabilisationFieldGeneratorTier6; + StabilisationFieldGeneratorTier6, + StabilisationFieldGeneratorTier7, + StabilisationFieldGeneratorTier8; + private ItemStack mStack; private boolean mHasNotBeenSet = true; diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java new file mode 100644 index 0000000000..e1f16db3f9 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java @@ -0,0 +1,40 @@ +package com.github.technus.tectech.thing.casing; + +import static com.google.common.math.LongMath.pow; +import static gregtech.api.enums.GT_Values.AuthorColen; +import static gregtech.api.util.GT_Utility.formatNumbers; + +import gregtech.common.blocks.GT_Item_Casings_Abstract; +import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +public class GT_Item_Casings_Spacetime extends GT_Item_Casings_Abstract { + public GT_Item_Casings_Spacetime(Block par1) { + super(par1); + } + + @Override + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + switch (aStack.getItemDamage()) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + aList.add("Supports an internal spacetime volume of up to " + formatNumbers(pow(10, 5+aStack.getItemDamage())) + "km³."); + aList.add(EnumChatFormatting.AQUA.toString() + + EnumChatFormatting.BOLD + "Capable of running recipes up to tier " + aStack.getItemDamage()); + break; + default: + aList.add(EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD + "Error, report to GTNH team"); + } + aList.add(AuthorColen); + } +} diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java new file mode 100644 index 0000000000..6bee8ef2e9 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java @@ -0,0 +1,40 @@ +package com.github.technus.tectech.thing.casing; + +import gregtech.common.blocks.GT_Item_Casings_Abstract; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +import java.util.List; + +import static com.google.common.math.LongMath.pow; +import static gregtech.api.enums.GT_Values.AuthorColen; +import static gregtech.api.util.GT_Utility.formatNumbers; + +public class GT_Item_Casings_Stabilisation extends GT_Item_Casings_Abstract { + public GT_Item_Casings_Stabilisation(Block par1) { + super(par1); + } + + @Override + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + switch (aStack.getItemDamage()) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + aList.add(EnumChatFormatting.AQUA.toString() + + EnumChatFormatting.BOLD + "Increases stability of spacetime field."); + break; + default: + aList.add(EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD + "Error, report to GTNH team"); + } + aList.add(AuthorColen); + } +} diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java new file mode 100644 index 0000000000..696e5470de --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java @@ -0,0 +1,39 @@ +package com.github.technus.tectech.thing.casing; + +import gregtech.common.blocks.GT_Item_Casings_Abstract; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +import java.util.List; + +import static gregtech.api.enums.GT_Values.AuthorColen; + +public class GT_Item_Casings_TimeAcceleration extends GT_Item_Casings_Abstract { + public GT_Item_Casings_TimeAcceleration(Block par1) { + super(par1); + } + + @Override + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + switch (aStack.getItemDamage()) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + aList.add(EnumChatFormatting.AQUA.toString() + + EnumChatFormatting.BOLD + + "Time dilation in a box."); + break; + default: + aList.add(EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD + "Error, report to GTNH team"); + } + aList.add(AuthorColen); + } +} diff --git a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java index 59d8ff7ef3..4b5afb6298 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java @@ -1,6 +1,7 @@ package com.github.technus.tectech.thing.casing; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; +import static com.github.technus.tectech.util.CommonValues.EOH_TIER_FANCY_NAMES; import com.github.technus.tectech.thing.CustomItemList; import cpw.mods.fml.relauncher.Side; @@ -18,35 +19,25 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -/** - * Created by danie_000 on 03.10.2016. - */ + +@SuppressWarnings("SpellCheckingInspection") public class SpacetimeCompressionFieldCasing extends GT_Block_Casings_Abstract { - private static IIcon texture_tier_0; + private static IIcon textureTier0; + private static final int maxBlockTier = 9; private static final byte START_INDEX = 16; public SpacetimeCompressionFieldCasing() { - super(GT_Item_CasingsBA0.class, "gt.spacetime_compression_field_generator", GT_Material_Casings.INSTANCE); + super(GT_Item_Casings_Spacetime.class, "gt.spacetime_compression_field_generator", GT_Material_Casings.INSTANCE); for (byte b = 0; b < 16; b = (byte) (b + 1)) { Textures.BlockIcons.casingTexturePages[texturePage][b + START_INDEX] = new GT_CopiedBlockTexture(this, 6, b); } - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".0.name", "Crude Spacetime Compression Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".1.name", "Primitive Spacetime Compression Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".2.name", "Stable Spacetime Compression Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".3.name", "Superb Spacetime Compression Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".4.name", "Resplendent Spacetime Compression Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".5.name", "Perfect Spacetime Compression Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".6.name", "Tipler Grade Spacetime Compression Field Generator"); + for(int i = 0; i < maxBlockTier; i++) { + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + "." + i + ".name", EOH_TIER_FANCY_NAMES[i] + " Spacetime Compression Field Generator"); + } CustomItemList.SpacetimeCompressionFieldGeneratorTier0.set(new ItemStack(this, 1, 0)); CustomItemList.SpacetimeCompressionFieldGeneratorTier1.set(new ItemStack(this, 1, 1)); @@ -55,30 +46,36 @@ public class SpacetimeCompressionFieldCasing extends GT_Block_Casings_Abstract { CustomItemList.SpacetimeCompressionFieldGeneratorTier4.set(new ItemStack(this, 1, 4)); CustomItemList.SpacetimeCompressionFieldGeneratorTier5.set(new ItemStack(this, 1, 5)); CustomItemList.SpacetimeCompressionFieldGeneratorTier6.set(new ItemStack(this, 1, 6)); + CustomItemList.SpacetimeCompressionFieldGeneratorTier7.set(new ItemStack(this, 1, 7)); + CustomItemList.SpacetimeCompressionFieldGeneratorTier8.set(new ItemStack(this, 1, 8)); } @Override public void registerBlockIcons(IIconRegister aIconRegister) { - texture_tier_0 = aIconRegister.registerIcon("gregtech:iconsets/EM_DIM"); + textureTier0 = aIconRegister.registerIcon("gregtech:iconsets/EM_DIM"); } @Override public IIcon getIcon(int aSide, int aMeta) { switch (aMeta) { case 0: - return texture_tier_0; + return textureTier0; case 1: - return texture_tier_0; + return textureTier0; case 2: - return texture_tier_0; + return textureTier0; case 3: - return texture_tier_0; + return textureTier0; case 4: - return texture_tier_0; + return textureTier0; case 5: - return texture_tier_0; + return textureTier0; case 6: - return texture_tier_0; + return textureTier0; + case 7: + return textureTier0; + case 8: + return textureTier0; default: return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); } @@ -91,9 +88,10 @@ public class SpacetimeCompressionFieldCasing extends GT_Block_Casings_Abstract { return getIcon(aSide, tMeta); } + @SuppressWarnings("unchecked") @Override public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { - for (int i = 0; i <= 6; i++) { + for (int i = 0; i < maxBlockTier; i++) { aList.add(new ItemStack(aItem, 1, i)); } } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java index 05d97b0eb3..43628df242 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java @@ -1,6 +1,7 @@ package com.github.technus.tectech.thing.casing; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; +import static com.github.technus.tectech.util.CommonValues.EOH_TIER_FANCY_NAMES; import com.github.technus.tectech.thing.CustomItemList; import cpw.mods.fml.relauncher.Side; @@ -18,32 +19,25 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + +@SuppressWarnings("SpellCheckingInspection") public class StabilisationFieldCasing extends GT_Block_Casings_Abstract { - private static IIcon texture_tier_0; + private static IIcon textureTier0; + private static final int maxBlockTier = 9; private static final byte START_INDEX = 16; public StabilisationFieldCasing() { - super(GT_Item_CasingsBA0.class, "gt.stabilisation_field_generator", GT_Material_Casings.INSTANCE); + super(GT_Item_Casings_Stabilisation.class, "gt.stabilisation_field_generator", GT_Material_Casings.INSTANCE); for (byte b = 0; b < 16; b = (byte) (b + 1)) { Textures.BlockIcons.casingTexturePages[texturePage][b + START_INDEX] = new GT_CopiedBlockTexture(this, 6, b); } - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".0.name", "Crude Stabilisation Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".1.name", "Primitive Stabilisation Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".2.name", "Stable Stabilisation Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".3.name", "Superb Stabilisation Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".4.name", "Resplendent Stabilisation Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".5.name", "Perfect Stabilisation Dilation Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".6.name", "Tipler Grade Stabilisation Field Generator"); + for(int i = 0; i < maxBlockTier; i++) { + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + "." + i + ".name", EOH_TIER_FANCY_NAMES[i] + " Stabilisation Field Generator"); + } CustomItemList.StabilisationFieldGeneratorTier0.set(new ItemStack(this, 1, 0)); CustomItemList.StabilisationFieldGeneratorTier1.set(new ItemStack(this, 1, 1)); @@ -52,30 +46,36 @@ public class StabilisationFieldCasing extends GT_Block_Casings_Abstract { CustomItemList.StabilisationFieldGeneratorTier4.set(new ItemStack(this, 1, 4)); CustomItemList.StabilisationFieldGeneratorTier5.set(new ItemStack(this, 1, 5)); CustomItemList.StabilisationFieldGeneratorTier6.set(new ItemStack(this, 1, 6)); + CustomItemList.StabilisationFieldGeneratorTier7.set(new ItemStack(this, 1, 7)); + CustomItemList.StabilisationFieldGeneratorTier8.set(new ItemStack(this, 1, 8)); } @Override public void registerBlockIcons(IIconRegister aIconRegister) { - texture_tier_0 = aIconRegister.registerIcon("gregtech:iconsets/EM_TIMESPACE"); + textureTier0 = aIconRegister.registerIcon("gregtech:iconsets/EM_TIMESPACE"); } @Override public IIcon getIcon(int aSide, int aMeta) { switch (aMeta) { case 0: - return texture_tier_0; + return textureTier0; case 1: - return texture_tier_0; + return textureTier0; case 2: - return texture_tier_0; + return textureTier0; case 3: - return texture_tier_0; + return textureTier0; case 4: - return texture_tier_0; + return textureTier0; case 5: - return texture_tier_0; + return textureTier0; case 6: - return texture_tier_0; + return textureTier0; + case 7: + return textureTier0; + case 8: + return textureTier0; default: return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); } @@ -88,9 +88,10 @@ public class StabilisationFieldCasing extends GT_Block_Casings_Abstract { return getIcon(aSide, tMeta); } + @SuppressWarnings("unchecked") @Override public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { - for (int i = 0; i <= 6; i++) { + for (int i = 0; i < maxBlockTier; i++) { aList.add(new ItemStack(aItem, 1, i)); } } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java index fc6ec97dd5..cd2f0d5c44 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java @@ -1,6 +1,7 @@ package com.github.technus.tectech.thing.casing; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; +import static com.github.technus.tectech.util.CommonValues.EOH_TIER_FANCY_NAMES; import com.github.technus.tectech.thing.CustomItemList; import cpw.mods.fml.relauncher.Side; @@ -18,32 +19,25 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + +@SuppressWarnings("SpellCheckingInspection") public class TimeAccelerationFieldCasing extends GT_Block_Casings_Abstract { - private static IIcon texture_tier_0; + private static IIcon textureTier0; + private static final int maxBlockTier = 9; private static final byte START_INDEX = 16; public TimeAccelerationFieldCasing() { - super(GT_Item_CasingsBA0.class, "gt.time_acceleration_field_generator", GT_Material_Casings.INSTANCE); + super(GT_Item_Casings_TimeAcceleration.class, "gt.time_acceleration_field_generator", GT_Material_Casings.INSTANCE); for (byte b = 0; b < 16; b = (byte) (b + 1)) { Textures.BlockIcons.casingTexturePages[texturePage][b + START_INDEX] = new GT_CopiedBlockTexture(this, 6, b); } - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".0.name", "Crude Time Dilation Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".1.name", "Primitive Time Dilation Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".2.name", "Stable Time Dilation Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".3.name", "Superb Time Dilation Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".4.name", "Resplendent Time Dilation Field Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".5.name", "Perfect Time Temporal Dilation Generator"); - GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + ".6.name", "Tipler Grade Time Dilation Field Generator"); + for(int i = 0; i < maxBlockTier; i++) { + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + "." + i + ".name", EOH_TIER_FANCY_NAMES[i] + " Time Dilation Field Generator"); + } CustomItemList.TimeAccelerationFieldGeneratorTier0.set(new ItemStack(this, 1, 0)); CustomItemList.TimeAccelerationFieldGeneratorTier1.set(new ItemStack(this, 1, 1)); @@ -52,30 +46,36 @@ public class TimeAccelerationFieldCasing extends GT_Block_Casings_Abstract { CustomItemList.TimeAccelerationFieldGeneratorTier4.set(new ItemStack(this, 1, 4)); CustomItemList.TimeAccelerationFieldGeneratorTier5.set(new ItemStack(this, 1, 5)); CustomItemList.TimeAccelerationFieldGeneratorTier6.set(new ItemStack(this, 1, 6)); + CustomItemList.TimeAccelerationFieldGeneratorTier7.set(new ItemStack(this, 1, 7)); + CustomItemList.TimeAccelerationFieldGeneratorTier7.set(new ItemStack(this, 1, 8)); } @Override public void registerBlockIcons(IIconRegister aIconRegister) { - texture_tier_0 = aIconRegister.registerIcon("gregtech:iconsets/EM_FIELD"); + textureTier0 = aIconRegister.registerIcon("gregtech:iconsets/EM_FIELD"); } @Override public IIcon getIcon(int aSide, int aMeta) { switch (aMeta) { case 0: - return texture_tier_0; + return textureTier0; case 1: - return texture_tier_0; + return textureTier0; case 2: - return texture_tier_0; + return textureTier0; case 3: - return texture_tier_0; + return textureTier0; case 4: - return texture_tier_0; + return textureTier0; case 5: - return texture_tier_0; + return textureTier0; case 6: - return texture_tier_0; + return textureTier0; + case 7: + return textureTier0; + case 8: + return textureTier0; default: return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); } @@ -88,9 +88,10 @@ public class TimeAccelerationFieldCasing extends GT_Block_Casings_Abstract { return getIcon(aSide, tMeta); } + @SuppressWarnings("unchecked") @Override public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { - for (int i = 0; i <= 6; i++) { + for (int i = 0; i < maxBlockTier; i++) { aList.add(new ItemStack(aItem, 1, i)); } } |