From 56735323895acb0bdbaafe1065583ef207519d2d Mon Sep 17 00:00:00 2001 From: Technus Date: Mon, 26 Dec 2016 10:23:43 +0100 Subject: becon base --- src/main/java/gregtech/common/blocks/GT_Block_Metal.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main/java/gregtech/common/blocks') diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java index f3347772ce..2621864acd 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java @@ -9,6 +9,7 @@ import gregtech.api.util.GT_OreDictUnificator; import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; public class GT_Block_Metal extends GT_Block_Storage { public Materials[] mMats; @@ -36,4 +37,8 @@ public class GT_Block_Metal extends GT_Block_Storage { return null; } + @Override + public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { + return true; + } } -- cgit From f9593e403eda8885af7027814cef52b8bb599274 Mon Sep 17 00:00:00 2001 From: Technus Date: Mon, 26 Dec 2016 10:31:12 +0100 Subject: Revert "becon base" This reverts commit 56735323895acb0bdbaafe1065583ef207519d2d. --- src/main/java/gregtech/common/blocks/GT_Block_Metal.java | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/main/java/gregtech/common/blocks') diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java index 2621864acd..f3347772ce 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java @@ -9,7 +9,6 @@ import gregtech.api.util.GT_OreDictUnificator; import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; public class GT_Block_Metal extends GT_Block_Storage { public Materials[] mMats; @@ -37,8 +36,4 @@ public class GT_Block_Metal extends GT_Block_Storage { return null; } - @Override - public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { - return true; - } } -- cgit From 8e17ef93349e7eb6da809ea7e4124d77b3713940 Mon Sep 17 00:00:00 2001 From: Technus Date: Thu, 12 Jan 2017 22:52:02 +0100 Subject: Move texture to core --- src/main/java/gregtech/common/blocks/GT_Item_Machines.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/gregtech/common/blocks') diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java index bfe24782ca..28ca4f86f5 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java @@ -64,7 +64,7 @@ public class GT_Item_Machines if (tTileEntity.getOutputAmperage() > 1L) { aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.YELLOW + tTileEntity.getOutputAmperage() + EnumChatFormatting.GRAY); } - aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.BLUE + tTileEntity.getEUCapacity() + EnumChatFormatting.GRAY); + aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "EU Capacity: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.BLUE + tTileEntity.getEUCapacity() + EnumChatFormatting.GRAY); } } } -- cgit From 63607b523a6b893c69c2cad5e5ba2d8fcfb0039e Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 21 Jan 2017 13:14:41 +0100 Subject: Much better. --- .../gregtech/common/blocks/GT_Block_Casings6.java | 24 +++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/common/blocks') diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java index 76e70a8cde..a8af3be431 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java @@ -24,6 +24,12 @@ public class GT_Block_Casings6 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Hermetic Casing VIII"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Hermetic Casing IX"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Hermetic Casing X"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Hermetic Casing XI"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Hermetic Casing XII"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hermetic Casing XIII"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Hermetic Casing XIV"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Hermetic Casing XV"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Hermetic Casing"); ItemList.Casing_Tank_1.set(new ItemStack(this, 1, 0)); ItemList.Casing_Tank_2.set(new ItemStack(this, 1, 1)); @@ -35,6 +41,12 @@ public class GT_Block_Casings6 ItemList.Casing_Tank_8.set(new ItemStack(this, 1, 7)); ItemList.Casing_Tank_9.set(new ItemStack(this, 1, 8)); ItemList.Casing_Tank_10.set(new ItemStack(this, 1, 9)); + ItemList.Casing_Tank_11.set(new ItemStack(this, 1, 10)); + ItemList.Casing_Tank_12.set(new ItemStack(this, 1, 11)); + ItemList.Casing_Tank_13.set(new ItemStack(this, 1, 12)); + ItemList.Casing_Tank_14.set(new ItemStack(this, 1, 13)); + ItemList.Casing_Tank_15.set(new ItemStack(this, 1, 14)); + ItemList.Casing_Tank_0.set(new ItemStack(this, 1, 15)); } @Override @SideOnly(Side.CLIENT) @@ -60,7 +72,17 @@ public class GT_Block_Casings6 return Textures.BlockIcons.MACHINE_CASING_TANK_9.getIcon(); case 9: return Textures.BlockIcons.MACHINE_CASING_TANK_10.getIcon(); + case 10: + return Textures.BlockIcons.MACHINE_CASING_TANK_11.getIcon(); + case 11: + return Textures.BlockIcons.MACHINE_CASING_TANK_12.getIcon(); + case 12: + return Textures.BlockIcons.MACHINE_CASING_TANK_13.getIcon(); + case 13: + return Textures.BlockIcons.MACHINE_CASING_TANK_14.getIcon(); + case 14: + return Textures.BlockIcons.MACHINE_CASING_TANK_15.getIcon(); } - return Textures.BlockIcons.MACHINE_CASING_TANK_1.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_0.getIcon(); } } -- cgit From 5b61cdec3946179a54a2c4c0397e63d2156f04d6 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 21 Jan 2017 13:32:38 +0100 Subject: Fix casing --- .../gregtech/common/blocks/GT_Block_Casings6.java | 97 +++++++++++----------- 1 file changed, 49 insertions(+), 48 deletions(-) (limited to 'src/main/java/gregtech/common/blocks') diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java index a8af3be431..509fba26a4 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java @@ -14,75 +14,76 @@ public class GT_Block_Casings6 public GT_Block_Casings6() { super(GT_Item_Casings6.class, "gt.blockcasings6", GT_Material_Casings.INSTANCE); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Hermetic Casing I"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Hermetic Casing II"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Hermetic Casing III"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Hermetic Casing IV"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Hermetic Casing V"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Hermetic Casing VI"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Hermetic Casing VII"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Hermetic Casing VIII"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Hermetic Casing IX"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Hermetic Casing X"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Hermetic Casing XI"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Hermetic Casing XII"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hermetic Casing XIII"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Hermetic Casing XIV"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Hermetic Casing XV"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Hermetic Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Hermetic Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Hermetic Casing I"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Hermetic Casing II"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Hermetic Casing III"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Hermetic Casing IV"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Hermetic Casing V"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Hermetic Casing VI"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Hermetic Casing VII"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Hermetic Casing VII"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Hermetic Casing IX"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Hermetic Casing X"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Hermetic Casing XI"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hermetic Casing XII"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Hermetic Casing XIII"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Hermetic Casing XIV"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Hermetic Casing XV"); - ItemList.Casing_Tank_1.set(new ItemStack(this, 1, 0)); - ItemList.Casing_Tank_2.set(new ItemStack(this, 1, 1)); - ItemList.Casing_Tank_3.set(new ItemStack(this, 1, 2)); - ItemList.Casing_Tank_4.set(new ItemStack(this, 1, 3)); - ItemList.Casing_Tank_5.set(new ItemStack(this, 1, 4)); - ItemList.Casing_Tank_6.set(new ItemStack(this, 1, 5)); - ItemList.Casing_Tank_7.set(new ItemStack(this, 1, 6)); - ItemList.Casing_Tank_8.set(new ItemStack(this, 1, 7)); - ItemList.Casing_Tank_9.set(new ItemStack(this, 1, 8)); - ItemList.Casing_Tank_10.set(new ItemStack(this, 1, 9)); - ItemList.Casing_Tank_11.set(new ItemStack(this, 1, 10)); - ItemList.Casing_Tank_12.set(new ItemStack(this, 1, 11)); - ItemList.Casing_Tank_13.set(new ItemStack(this, 1, 12)); - ItemList.Casing_Tank_14.set(new ItemStack(this, 1, 13)); - ItemList.Casing_Tank_15.set(new ItemStack(this, 1, 14)); - ItemList.Casing_Tank_0.set(new ItemStack(this, 1, 15)); + ItemList.Casing_Tank_0.set(new ItemStack(this, 1, 0)); + ItemList.Casing_Tank_1.set(new ItemStack(this, 1, 1)); + ItemList.Casing_Tank_2.set(new ItemStack(this, 1, 2)); + ItemList.Casing_Tank_3.set(new ItemStack(this, 1, 3)); + ItemList.Casing_Tank_4.set(new ItemStack(this, 1, 4)); + ItemList.Casing_Tank_5.set(new ItemStack(this, 1, 5)); + ItemList.Casing_Tank_6.set(new ItemStack(this, 1, 6)); + ItemList.Casing_Tank_7.set(new ItemStack(this, 1, 7)); + ItemList.Casing_Tank_8.set(new ItemStack(this, 1, 8)); + ItemList.Casing_Tank_9.set(new ItemStack(this, 1, 9)); + ItemList.Casing_Tank_10.set(new ItemStack(this, 1, 10)); + ItemList.Casing_Tank_11.set(new ItemStack(this, 1, 11)); + ItemList.Casing_Tank_12.set(new ItemStack(this, 1, 12)); + ItemList.Casing_Tank_13.set(new ItemStack(this, 1, 13)); + ItemList.Casing_Tank_14.set(new ItemStack(this, 1, 14)); + ItemList.Casing_Tank_15.set(new ItemStack(this, 1, 15)); } @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int aSide, int aMeta) { switch (aMeta) { - case 0: - return Textures.BlockIcons.MACHINE_CASING_TANK_1.getIcon(); case 1: - return Textures.BlockIcons.MACHINE_CASING_TANK_2.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_1.getIcon(); case 2: - return Textures.BlockIcons.MACHINE_CASING_TANK_3.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_2.getIcon(); case 3: - return Textures.BlockIcons.MACHINE_CASING_TANK_4.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_3.getIcon(); case 4: - return Textures.BlockIcons.MACHINE_CASING_TANK_5.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_4.getIcon(); case 5: - return Textures.BlockIcons.MACHINE_CASING_TANK_6.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_5.getIcon(); case 6: - return Textures.BlockIcons.MACHINE_CASING_TANK_7.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_6.getIcon(); case 7: - return Textures.BlockIcons.MACHINE_CASING_TANK_8.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_7.getIcon(); case 8: - return Textures.BlockIcons.MACHINE_CASING_TANK_9.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_8.getIcon(); case 9: - return Textures.BlockIcons.MACHINE_CASING_TANK_10.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_9.getIcon(); case 10: - return Textures.BlockIcons.MACHINE_CASING_TANK_11.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_10.getIcon(); case 11: - return Textures.BlockIcons.MACHINE_CASING_TANK_12.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_11.getIcon(); case 12: - return Textures.BlockIcons.MACHINE_CASING_TANK_13.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_12.getIcon(); case 13: - return Textures.BlockIcons.MACHINE_CASING_TANK_14.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TANK_13.getIcon(); case 14: + return Textures.BlockIcons.MACHINE_CASING_TANK_14.getIcon(); + case 15: return Textures.BlockIcons.MACHINE_CASING_TANK_15.getIcon(); + default: + return Textures.BlockIcons.MACHINE_CASING_TANK_0.getIcon(); } - return Textures.BlockIcons.MACHINE_CASING_TANK_0.getIcon(); } } -- cgit From 433f352d82989f74ccaef233871dbab8a09931bc Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 21 Jan 2017 13:59:18 +0100 Subject: fix top and bottom --- src/main/java/gregtech/common/blocks/GT_Block_Casings6.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/main/java/gregtech/common/blocks') diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java index 509fba26a4..68c1936b53 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java @@ -51,6 +51,12 @@ public class GT_Block_Casings6 @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int aSide, int aMeta) { + if (aSide == 0) { + return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon(); + } + if (aSide == 1) { + return Textures.BlockIcons.MACHINECASINGS_TOP[aMeta].getIcon(); + } switch (aMeta) { case 1: return Textures.BlockIcons.MACHINE_CASING_TANK_1.getIcon(); -- cgit From 2f30d6cdfab56cd5051bac6ddd64997baba53507 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 21 Jan 2017 14:22:10 +0100 Subject: add color modulation --- src/main/java/gregtech/common/blocks/GT_Block_Casings6.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main/java/gregtech/common/blocks') diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java index 68c1936b53..03c77d2563 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java @@ -8,6 +8,7 @@ import gregtech.api.objects.GT_CopiedBlockTexture; import gregtech.api.util.GT_LanguageManager; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; public class GT_Block_Casings6 extends GT_Block_Casings_Abstract { @@ -92,4 +93,8 @@ public class GT_Block_Casings6 return Textures.BlockIcons.MACHINE_CASING_TANK_0.getIcon(); } } + + public int colorMultiplier(IBlockAccess aWorld, int aX, int aY, int aZ) { + return gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[0] << 16 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[1] << 8 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[2]; + } } -- cgit