aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-05-22 20:38:23 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-05-22 20:38:23 +1000
commitb85374315559dde05ac6c826fc05273d250b285a (patch)
tree646ee3333c6ead072ee694f9c4a943c1c6ddeea7 /src
parent4d5643a450af77f19427072e9fd4048fb7fa211e (diff)
downloadGT5-Unofficial-b85374315559dde05ac6c826fc05273d250b285a.tar.gz
GT5-Unofficial-b85374315559dde05ac6c826fc05273d250b285a.tar.bz2
GT5-Unofficial-b85374315559dde05ac6c826fc05273d250b285a.zip
% Made the FusionTek MK IV use improved overlays/textures.
% Made the FusionTek MK IV require UV hatches, down from MAX.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java27
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java28
4 files changed, 40 insertions, 22 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 31bca6d40c..61f33f80bb 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -333,10 +333,9 @@ public enum GregtechItemList implements GregtechItemContainer {
Machine_Adv_ImplosionCompressor,
//Advanced Vacuum Freezer
Industrial_Cryogenic_Freezer, Casing_AdvancedVacuum,
- FusionComputer_UV2,
-
-
+ //FusionTek MK IV
+ FusionComputer_UV2, Casing_Fusion_External, Casing_Fusion_Internal,
;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
index 3e290c4452..6d6284f9b4 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
@@ -66,7 +66,6 @@ extends GregtechMetaCasingBlocksAbstract {
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Fusion Machine Casing MK III");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Advanced Fusion Coil");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Placeholder");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Placeholder");
GregtechItemList.Casing_FishPond.set(new ItemStack(this, 1, 0));
GregtechItemList.Casing_Extruder.set(new ItemStack(this, 1, 1));
@@ -80,9 +79,8 @@ extends GregtechMetaCasingBlocksAbstract {
GregtechItemList.Casing_AmazonWarehouse.set(new ItemStack(this, 1, 9));
GregtechItemList.Casing_AdvancedVacuum.set(new ItemStack(this, 1, 10));
GregtechItemList.Casing_Adv_BlastFurnace.set(new ItemStack(this, 1, 11));
- //GregtechItemList.Casing_Autocrafter.set(new ItemStack(this, 1, 12));
- //GregtechItemList.Casing_CuttingFactoryFrame.set(new ItemStack(this, 1, 13));
- //GregtechItemList.Casing_TeslaTower.set(new ItemStack(this, 1, 14));
+ GregtechItemList.Casing_Fusion_External.set(new ItemStack(this, 1, 12));
+ GregtechItemList.Casing_Fusion_Internal.set(new ItemStack(this, 1, 13));
//GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.set(new ItemStack(this, 1, 15)); //Tree Farmer Textures
}
@@ -90,7 +88,7 @@ extends GregtechMetaCasingBlocksAbstract {
public IIcon getIcon(final int aSide, final int aMeta) {
return CasingTextureHandler3.getIcon(aSide, aMeta);
}
-
+
@SideOnly(Side.CLIENT)
@Override
public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
@@ -105,15 +103,15 @@ extends GregtechMetaCasingBlocksAbstract {
final boolean[] tConnectedSides = {
aWorld.getBlock(xCoord, yCoord - 1, zCoord) == thisBlock
&& aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta,
- aWorld.getBlock(xCoord, yCoord + 1, zCoord) == thisBlock
+ aWorld.getBlock(xCoord, yCoord + 1, zCoord) == thisBlock
&& aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta,
- aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock
+ aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock
&& aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta,
- aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock
+ aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock
&& aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta,
- aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock
+ aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock
&& aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta,
- aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock
+ aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock
&& aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta};
switch (aSide) {
case 0 : {
@@ -366,12 +364,6 @@ extends GregtechMetaCasingBlocksAbstract {
}
return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 7].getIcon();
}
-
- if (aSide == 2 || aSide == 3) {
-
- } else if (aSide == 4 || aSide == 5) {
-
- }
switch (tMeta) {
case 9 : {
return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
@@ -385,6 +377,9 @@ extends GregtechMetaCasingBlocksAbstract {
case 12 : {
return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
}
+ case 14 : {
+ return TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA.getIcon();
+ }
default : {
return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
index 86c3f7138b..b387956a83 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
@@ -49,7 +49,7 @@ public class CasingTextureHandler3 {
case 13:
return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II_INNER.getIcon();
case 14:
- return TexturesGtBlock._PlaceHolder.getIcon();
+ return TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA.getIcon();
case 15:
return TexturesGtBlock._PlaceHolder.getIcon();
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
index 81ae8659c0..4d013cff91 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
@@ -1,11 +1,15 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced;
import gregtech.api.enums.Dyes;
+import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
import gregtech.api.objects.GT_RenderedTexture;
import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer;
@@ -26,7 +30,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
@Override
public int tier() {
- return 9;
+ return 8;
}
@Override
@@ -98,7 +102,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
@Override
public IIconContainer getIconOverlay() {
- return Textures.BlockIcons.OVERLAY_FUSION3;
+ return this.mMaxProgresstime > 0 ? TexturesGtBlock.Casing_Machine_Screen_3 : TexturesGtBlock.Casing_Machine_Screen_1;
}
@Override
@@ -114,4 +118,24 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
}
return (mStartEnergy < 160000000) ? 8 : ((mStartEnergy < 320000000) ? 4 : (mStartEnergy < 640000000) ? 2 : 1);
}
+
+ public boolean turnCasingActive(final boolean status) {
+ if (this.mEnergyHatches != null) {
+ for (final GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) {
+ hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53);
+ }
+ }
+ if (this.mOutputHatches != null) {
+ for (final GT_MetaTileEntity_Hatch_Output hatch2 : this.mOutputHatches) {
+ hatch2.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53);
+ }
+ }
+ if (this.mInputHatches != null) {
+ for (final GT_MetaTileEntity_Hatch_Input hatch3 : this.mInputHatches) {
+ hatch3.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53);
+ }
+ }
+ return true;
+ }
+
}