aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-05-17 08:40:56 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-05-17 08:40:56 +1000
commit23adeefa94f8f6f67bafacd1969bf0b07328b609 (patch)
tree26e7fb7e8fb9f7a3d4d1d348f058d25f53f33ea1
parent92494e56c33fc029f6b06be1c76e50bb5be56cbe (diff)
downloadGT5-Unofficial-23adeefa94f8f6f67bafacd1969bf0b07328b609.tar.gz
GT5-Unofficial-23adeefa94f8f6f67bafacd1969bf0b07328b609.tar.bz2
GT5-Unofficial-23adeefa94f8f6f67bafacd1969bf0b07328b609.zip
+ Added some new Fusion Reactor Casings & Coils.
+ Added recipes for the shelves. % Made the Adv. EBF process 8 parallel recipes, up from 4. % Made the Fusion Reaction MK IV use the new casings.
-rw-r--r--build.gradle2
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java17
-rw-r--r--src/Java/gtPlusPlus/core/slots/SlotLockedInput.java57
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java20
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java311
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java14
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java256
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java18
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java83
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_1.pngbin0 -> 486 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_10.pngbin0 -> 497 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_11.pngbin0 -> 515 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_12.pngbin0 -> 502 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_2.pngbin0 -> 504 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_3.pngbin0 -> 463 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_4.pngbin0 -> 460 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_5.pngbin0 -> 478 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_6.pngbin0 -> 473 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_7.pngbin0 -> 429 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_8.pngbin0 -> 531 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_9.pngbin0 -> 486 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_3.pngbin0 -> 525 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL_II.pngbin0 -> 517 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA.pngbin0 -> 505 bytes
25 files changed, 621 insertions, 159 deletions
diff --git a/build.gradle b/build.gradle
index 764a23d9b5..d76e8d1da2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8
archivesBaseName = "GT-PlusPlus"
-version = "1.7.0-prerelease-14-final"
+version = "1.7.0-prerelease-15-early"
minecraft.version = "1.7.10-10.13.4.1614-1.7.10"
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 5f3969310b..f43f83c79c 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -227,7 +227,7 @@ public class RECIPES_Machines {
EV_MACHINE_Centrifuge= ItemList.Machine_EV_Centrifuge.get(1);
EV_MACHINE_Cutter = ItemList.Machine_EV_Cutter.get(1);
EV_MACHINE_Extruder = ItemList.Machine_EV_Extruder.get(1);
- EV_MACHINE_Sifter = ItemList.Machine_EV_Sifter.get(1);
+ EV_MACHINE_Sifter = ItemList.Machine_HV_Sifter.get(1);
EV_MACHINE_ThermalCentrifuge = ItemList.Machine_EV_ThermalCentrifuge.get(1);
EV_MACHINE_OreWasher = ItemList.Machine_EV_OreWasher.get(1);
EV_MACHINE_AlloySmelter = ItemList.Machine_EV_AlloySmelter.get(1);
@@ -243,7 +243,7 @@ public class RECIPES_Machines {
EV_MACHINE_Centrifuge= ItemList.Machine_IV_Centrifuge.get(1);
EV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1);
EV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1);
- EV_MACHINE_Sifter = ItemList.Machine_IV_Sifter.get(1);
+ EV_MACHINE_Sifter = ItemList.Machine_HV_Sifter.get(1);
EV_MACHINE_ThermalCentrifuge = ItemList.Machine_IV_ThermalCentrifuge.get(1);
EV_MACHINE_OreWasher = ItemList.Machine_IV_OreWasher.get(1);
EV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1);
@@ -1044,6 +1044,19 @@ public class RECIPES_Machines {
}
+
+ //Shelves
+ RecipeUtils.addShapedGregtechRecipe(
+ "screwWood", "plateWood", "screwWood",
+ CI.craftingToolHammer_Hard, "frameGtWood", CI.craftingToolHammer_Soft,
+ "plateWood", "plateWood", "plateWood",
+ GregtechItemList.GT4_Shelf.get(2));
+
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {GregtechItemList.GT4_Shelf.get(1)}, GregtechItemList.GT4_Shelf_Compartment.get(1));
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {GregtechItemList.GT4_Shelf_Compartment.get(1)}, GregtechItemList.GT4_Shelf_Desk.get(1));
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {GregtechItemList.GT4_Shelf_Desk.get(1)}, GregtechItemList.GT4_Shelf_Iron.get(1));
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {GregtechItemList.GT4_Shelf_Iron.get(1)}, GregtechItemList.GT4_Shelf_FileCabinet.get(1));
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {GregtechItemList.GT4_Shelf_FileCabinet.get(1)}, GregtechItemList.GT4_Shelf.get(1));
//Cyclotron
diff --git a/src/Java/gtPlusPlus/core/slots/SlotLockedInput.java b/src/Java/gtPlusPlus/core/slots/SlotLockedInput.java
new file mode 100644
index 0000000000..c67f8acfeb
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/slots/SlotLockedInput.java
@@ -0,0 +1,57 @@
+package gtPlusPlus.core.slots;
+
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest;
+
+public class SlotLockedInput extends Slot {
+
+ private ItemStack mLockStack;
+ private final IGregTechTileEntity mEntity;
+ private boolean mChecked = false;
+
+ public SlotLockedInput(final IGregTechTileEntity inventory, final int index, final int x, final int y, ItemStack lockStack) {
+ super(inventory, index, x, y);
+ mLockStack = lockStack;
+ mEntity = inventory;
+ }
+
+ @Override
+ public boolean isItemValid(final ItemStack itemstack) {
+ if (mEntity == null) {
+ return false;
+ }
+ else {
+ if (!mChecked) {
+ try {
+ mLockStack = (ItemStack) ReflectionUtils.getField(this.mEntity.getMetaTileEntity().getClass(), "mItemStack").get(this.mEntity.getMetaTileEntity());
+ }
+ catch (Throwable t) {
+ t.printStackTrace();
+ mLockStack = null;
+ }
+ mChecked = true;
+ }
+ }
+
+ if (mLockStack == null) {
+ return true;
+ }
+ else {
+ if (ItemStack.areItemStacksEqual(itemstack, mLockStack)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public int getSlotStackLimit() {
+ return mLockStack == null ? 64 : mLockStack.getMaxStackSize();
+ }
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java
index 52c21dc4b0..503b36e157 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java
@@ -8,42 +8,43 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
import gregtech.api.gui.GT_ContainerMetaTile_Machine;
import gregtech.api.gui.GT_Slot_Output;
import gregtech.api.gui.GT_Slot_Render;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.core.slots.SlotLockedInput;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest;
import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf_Large;
public class CONTAINER_SuperChest extends GT_ContainerMetaTile_Machine {
+
public int mContent = 0;
+ private ItemStack mLockedSlotStack = null;
public CONTAINER_SuperChest(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
super(aInventoryPlayer, aTileEntity);
}
public void addSlots(InventoryPlayer aInventoryPlayer) {
- this.addSlotToContainer(new Slot(this.mTileEntity, 0, 80, 17));
+ this.addSlotToContainer(new SlotLockedInput(this.mTileEntity, 0, 80, 17, mLockedSlotStack));
this.addSlotToContainer(new GT_Slot_Output(this.mTileEntity, 1, 80, 53));
this.addSlotToContainer(new GT_Slot_Render(this.mTileEntity, 2, 59, 42));
}
public void detectAndSendChanges() {
super.detectAndSendChanges();
- if (!this.mTileEntity.isClientSide() && this.mTileEntity.getMetaTileEntity() != null) {
-
+ if (!this.mTileEntity.isClientSide() && this.mTileEntity.getMetaTileEntity() != null) {
if (this.mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_TieredChest) {
this.mContent = ((GT_MetaTileEntity_TieredChest) this.mTileEntity.getMetaTileEntity()).mItemCount;
- }
-
- else if (ReflectionUtils.getField(this.mTileEntity, "mItemCount") != null) {
- this.mContent = ReflectionUtils.getField(this.mTileEntity, "mItemCount");
+ mLockedSlotStack = ((GT_MetaTileEntity_TieredChest) this.mTileEntity.getMetaTileEntity()).mItemStack;
}
- else if (this.mTileEntity.getMetaTileEntity() instanceof GT4Entity_Shelf_Large) {
+ if (this.mTileEntity.getMetaTileEntity() instanceof GT4Entity_Shelf_Large) {
this.mContent = ((GT4Entity_Shelf_Large) this.mTileEntity.getMetaTileEntity()).mItemCount;
+ mLockedSlotStack = ((GT4Entity_Shelf_Large) this.mTileEntity.getMetaTileEntity()).mItemStack;
}
else {
this.mContent = 0;
@@ -56,8 +57,7 @@ public class CONTAINER_SuperChest extends GT_ContainerMetaTile_Machine {
var1.sendProgressBarUpdate(this, 100, this.mContent & 65535);
var1.sendProgressBarUpdate(this, 101, this.mContent >>> 16);
}
-
- }
+ }
}
@SideOnly(Side.CLIENT)
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
index aaf4f9f1a6..d192d89af5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
@@ -6,20 +6,27 @@ import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
import gregtech.api.enums.TAE;
+import gregtech.api.enums.Textures;
import gregtech.api.objects.GT_CopiedBlockTexture;
import gregtech.api.util.GT_LanguageManager;
import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler3;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import java.util.List;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class GregtechMetaCasingBlocks3
extends GregtechMetaCasingBlocksAbstract {
+ public static boolean mConnectedMachineTextures = false;
CasingTextureHandler3 TextureHandler = new CasingTextureHandler3();
public static class GregtechMetaCasingItemBlocks3 extends GregtechMetaCasingItems {
@@ -57,8 +64,8 @@ extends GregtechMetaCasingBlocksAbstract {
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Placeholder");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Placeholder");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Fusion 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));
@@ -83,4 +90,304 @@ 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,
+ final int aSide) {
+ final Block thisBlock = aWorld.getBlock(xCoord, yCoord, zCoord);
+ final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
+ if ((tMeta != 12 && tMeta != 13)|| !GregtechMetaCasingBlocks3.mConnectedMachineTextures) {
+ return getIcon(aSide, tMeta);
+ }
+ final int tStartIndex = 0;
+ if (tMeta == 12 || tMeta == 13) {
+ 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.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta,
+ aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock
+ && aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta,
+ aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock
+ && aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta,
+ aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock
+ && aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta,
+ aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock
+ && aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta};
+ switch (aSide) {
+ case 0 : {
+ if (tConnectedSides[0]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 7].getIcon();
+ }
+ if (tConnectedSides[4] && tConnectedSides[5] && tConnectedSides[2] && tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 6].getIcon();
+ }
+ if (!tConnectedSides[4] && tConnectedSides[5] && tConnectedSides[2] && tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 2].getIcon();
+ }
+ if (tConnectedSides[4] && !tConnectedSides[5] && tConnectedSides[2] && tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 3].getIcon();
+ }
+ if (tConnectedSides[4] && tConnectedSides[5] && !tConnectedSides[2] && tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 4].getIcon();
+ }
+ if (tConnectedSides[4] && tConnectedSides[5] && tConnectedSides[2] && !tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 5].getIcon();
+ }
+ if (!tConnectedSides[4] && !tConnectedSides[5] && tConnectedSides[2] && tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 8].getIcon();
+ }
+ if (tConnectedSides[4] && !tConnectedSides[5] && !tConnectedSides[2] && tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 9].getIcon();
+ }
+ if (tConnectedSides[4] && tConnectedSides[5] && !tConnectedSides[2] && !tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 10].getIcon();
+ }
+ if (!tConnectedSides[4] && tConnectedSides[5] && tConnectedSides[2] && !tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 11].getIcon();
+ }
+ if (!tConnectedSides[4] && !tConnectedSides[5] && !tConnectedSides[2] && !tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 7].getIcon();
+ }
+ if (!tConnectedSides[4] && !tConnectedSides[2]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 1].getIcon();
+ }
+ if (!tConnectedSides[5] && !tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 0].getIcon();
+ }
+ }
+ case 1 : {
+ if (tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 7].getIcon();
+ }
+ if (tConnectedSides[4] && tConnectedSides[5] && tConnectedSides[2] && tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 6].getIcon();
+ }
+ if (!tConnectedSides[4] && tConnectedSides[5] && tConnectedSides[2] && tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 2].getIcon();
+ }
+ if (tConnectedSides[4] && !tConnectedSides[5] && tConnectedSides[2] && tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 3].getIcon();
+ }
+ if (tConnectedSides[4] && tConnectedSides[5] && !tConnectedSides[2] && tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 4].getIcon();
+ }
+ if (tConnectedSides[4] && tConnectedSides[5] && tConnectedSides[2] && !tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 5].getIcon();
+ }
+ if (!tConnectedSides[4] && !tConnectedSides[5] && tConnectedSides[2] && tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 8].getIcon();
+ }
+ if (tConnectedSides[4] && !tConnectedSides[5] && !tConnectedSides[2] && tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 9].getIcon();
+ }
+ if (tConnectedSides[4] && tConnectedSides[5] && !tConnectedSides[2] && !tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 10].getIcon();
+ }
+ if (!tConnectedSides[4] && tConnectedSides[5] && tConnectedSides[2] && !tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 11].getIcon();
+ }
+ if (!tConnectedSides[4] && !tConnectedSides[5] && !tConnectedSides[2] && !tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 7].getIcon();
+ }
+ if (!tConnectedSides[2] && !tConnectedSides[4]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 1].getIcon();
+ }
+ if (!tConnectedSides[3] && !tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 0].getIcon();
+ }
+ }
+ case 2 : {
+ if (tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 7].getIcon();
+ }
+ if (tConnectedSides[2] && tConnectedSides[0] && tConnectedSides[4] && tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 6].getIcon();
+ }
+ if (!tConnectedSides[2] && tConnectedSides[0] && tConnectedSides[4] && tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 2].getIcon();
+ }
+ if (tConnectedSides[2] && !tConnectedSides[0] && tConnectedSides[4] && tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 5].getIcon();
+ }
+ if (tConnectedSides[2] && tConnectedSides[0] && !tConnectedSides[4] && tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 4].getIcon();
+ }
+ if (tConnectedSides[2] && tConnectedSides[0] && tConnectedSides[4] && !tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 3].getIcon();
+ }
+ if (!tConnectedSides[2] && !tConnectedSides[0] && tConnectedSides[4] && tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 11].getIcon();
+ }
+ if (tConnectedSides[2] && !tConnectedSides[0] && !tConnectedSides[4] && tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 10].getIcon();
+ }
+ if (tConnectedSides[2] && tConnectedSides[0] && !tConnectedSides[4] && !tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 9].getIcon();
+ }
+ if (!tConnectedSides[2] && tConnectedSides[0] && tConnectedSides[4] && !tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 8].getIcon();
+ }
+ if (!tConnectedSides[2] && !tConnectedSides[0] && !tConnectedSides[4] && !tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 7].getIcon();
+ }
+ if (!tConnectedSides[2] && !tConnectedSides[4]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 1].getIcon();
+ }
+ if (!tConnectedSides[0] && !tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 0].getIcon();
+ }
+ }
+ case 3 : {
+ if (tConnectedSides[3]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 7].getIcon();
+ }
+ if (tConnectedSides[2] && tConnectedSides[0] && tConnectedSides[4] && tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 6].getIcon();
+ }
+ if (!tConnectedSides[2] && tConnectedSides[0] && tConnectedSides[4] && tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 4].getIcon();
+ }
+ if (tConnectedSides[2] && !tConnectedSides[0] && tConnectedSides[4] && tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 5].getIcon();
+ }
+ if (tConnectedSides[2] && tConnectedSides[0] && !tConnectedSides[4] && tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 2].getIcon();
+ }
+ if (tConnectedSides[2] && tConnectedSides[0] && tConnectedSides[4] && !tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 3].getIcon();
+ }
+ if (!tConnectedSides[2] && !tConnectedSides[0] && tConnectedSides[4] && tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 10].getIcon();
+ }
+ if (tConnectedSides[2] && !tConnectedSides[0] && !tConnectedSides[4] && tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 11].getIcon();
+ }
+ if (tConnectedSides[2] && tConnectedSides[0] && !tConnectedSides[4] && !tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 8].getIcon();
+ }
+ if (!tConnectedSides[2] && tConnectedSides[0] && tConnectedSides[4] && !tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 9].getIcon();
+ }
+ if (!tConnectedSides[2] && !tConnectedSides[0] && !tConnectedSides[4] && !tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 7].getIcon();
+ }
+ if (!tConnectedSides[2] && !tConnectedSides[4]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 1].getIcon();
+ }
+ if (!tConnectedSides[0] && !tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 0].getIcon();
+ }
+ }
+ case 4 : {
+ if (tConnectedSides[4]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 7].getIcon();
+ }
+ if (tConnectedSides[0] && tConnectedSides[3] && tConnectedSides[1] && tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 6].getIcon();
+ }
+ if (!tConnectedSides[0] && tConnectedSides[3] && tConnectedSides[1] && tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 5].getIcon();
+ }
+ if (tConnectedSides[0] && !tConnectedSides[3] && tConnectedSides[1] && tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 4].getIcon();
+ }
+ if (tConnectedSides[0] && tConnectedSides[3] && !tConnectedSides[1] && tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 3].getIcon();
+ }
+ if (tConnectedSides[0] && tConnectedSides[3] && tConnectedSides[1] && !tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 2].getIcon();
+ }
+ if (!tConnectedSides[0] && !tConnectedSides[3] && tConnectedSides[1] && tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 10].getIcon();
+ }
+ if (tConnectedSides[0] && !tConnectedSides[3] && !tConnectedSides[1] && tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 9].getIcon();
+ }
+ if (tConnectedSides[0] && tConnectedSides[3] && !tConnectedSides[1] && !tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 8].getIcon();
+ }
+ if (!tConnectedSides[0] && tConnectedSides[3] && tConnectedSides[1] && !tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 11].getIcon();
+ }
+ if (!tConnectedSides[0] && !tConnectedSides[3] && !tConnectedSides[1] && !tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 7].getIcon();
+ }
+ if (!tConnectedSides[0] && !tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 0].getIcon();
+ }
+ if (!tConnectedSides[3] && !tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 1].getIcon();
+ }
+ }
+ case 5 : {
+ if (tConnectedSides[2]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 7].getIcon();
+ }
+ if (tConnectedSides[0] && tConnectedSides[3] && tConnectedSides[1] && tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 6].getIcon();
+ }
+ if (!tConnectedSides[0] && tConnectedSides[3] && tConnectedSides[1] && tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 5].getIcon();
+ }
+ if (tConnectedSides[0] && !tConnectedSides[3] && tConnectedSides[1] && tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 2].getIcon();
+ }
+ if (tConnectedSides[0] && tConnectedSides[3] && !tConnectedSides[1] && tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 3].getIcon();
+ }
+ if (tConnectedSides[0] && tConnectedSides[3] && tConnectedSides[1] && !tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 4].getIcon();
+ }
+ if (!tConnectedSides[0] && !tConnectedSides[3] && tConnectedSides[1] && tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 11].getIcon();
+ }
+ if (tConnectedSides[0] && !tConnectedSides[3] && !tConnectedSides[1] && tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 8].getIcon();
+ }
+ if (tConnectedSides[0] && tConnectedSides[3] && !tConnectedSides[1] && !tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 9].getIcon();
+ }
+ if (!tConnectedSides[0] && tConnectedSides[3] && tConnectedSides[1] && !tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 10].getIcon();
+ }
+ if (!tConnectedSides[0] && !tConnectedSides[3] && !tConnectedSides[1] && !tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 7].getIcon();
+ }
+ if (!tConnectedSides[0] && !tConnectedSides[1]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 0].getIcon();
+ }
+ if (!tConnectedSides[3] && !tConnectedSides[5]) {
+ return TexturesGtBlock.CONNECTED_FUSION_HULLS[tStartIndex + 1].getIcon();
+ }
+ break;
+ }
+ }
+ 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();
+ }
+ case 10 : {
+ return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon();
+ }
+ case 11 : {
+ return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
+ }
+ case 12 : {
+ return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.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 85654523fe..86c3f7138b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
@@ -1,6 +1,7 @@
package gtPlusPlus.xmod.gregtech.common.blocks.textures;
import net.minecraft.util.IIcon;
+import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks3;
public class CasingTextureHandler3 {
@@ -44,14 +45,9 @@ public class CasingTextureHandler3 {
//Adv. EBF
return TexturesGtBlock.TEXTURE_CASING_ADVANCED_VOLCNUS.getIcon();
case 12:
- return TexturesGtBlock._PlaceHolder.getIcon();
+ return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II.getIcon();
case 13:
- if (aSide <2) {
- return TexturesGtBlock._PlaceHolder.getIcon();
- }
- else {
- return TexturesGtBlock._PlaceHolder.getIcon();
- }
+ return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II_INNER.getIcon();
case 14:
return TexturesGtBlock._PlaceHolder.getIcon();
case 15:
@@ -65,4 +61,8 @@ public class CasingTextureHandler3 {
return TexturesGtBlock._PlaceHolder.getIcon();
}
+ static {
+ GregtechMetaCasingBlocks3.mConnectedMachineTextures = true;
+ }
+
} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index 30af8908df..7acefa104c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -149,120 +149,6 @@ public class TexturesGtBlock {
public static final CustomIcon OVERLAY_COMPARTMENT_15 = new CustomIcon("TileEntities/Compartment/30");
public static final CustomIcon OVERLAY_COMPARTMENT_16 = new CustomIcon("TileEntities/Compartment/31");
-
- //Overlay Arrays
- public static ITexture[] OVERLAYS_ENERGY_OUT_BUFFER = new ITexture[]{
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
- new short[]{220, 220, 220, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
- new short[]{220, 220, 220, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
- new short[]{255, 100, 0, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
- new short[]{255, 255, 30, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
- new short[]{128, 128, 128, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
- new short[]{240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
- new short[]{240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
- new short[]{240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
- new short[]{240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
- new short[]{240, 240, 245, 0})};
-
- public static ITexture[] OVERLAYS_ENERGY_OUT_MULTI_BUFFER = new ITexture[]{
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
- new short[]{220, 220, 220, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
- new short[]{220, 220, 220, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
- new short[]{255, 100, 0, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
- new short[]{255, 255, 30, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
- new short[]{128, 128, 128, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
- new short[]{240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
- new short[]{240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
- new short[]{240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
- new short[]{240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
- new short[]{240, 240, 245, 0})};
-
- public static ITexture[] OVERLAYS_CABINET_FRONT = new ITexture[]{
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_1,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_2,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_3,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_4,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_5,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_6,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_7,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_8,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_9,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_10,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_11,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_12,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_13,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_14,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_15,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_16,
- new short[]{255, 255, 255, 0}),};
-
- public static ITexture[] OVERLAYS_COMPARTMENT_FRONT = new ITexture[]{
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_1,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_2,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_3,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_4,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_5,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_6,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_7,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_8,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_9,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_10,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_11,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_12,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_13,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_14,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_15,
- new short[]{255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_16,
- new short[]{255, 255, 255, 0}),};
-
//Controllers
private static final CustomIcon Internal_Casing_Fusion_Simple_Front = new CustomIcon("TileEntities/MACHINE_CASING_FUSION_FRONT");
public static final CustomIcon Casing_Fusion_Simple_Front = Internal_Casing_Fusion_Simple_Front;
@@ -340,8 +226,8 @@ public class TexturesGtBlock {
public static final CustomIcon Casing_Redox_4 = new CustomIcon("redox/redox4");
public static final CustomIcon Casing_Redox_5 = new CustomIcon("redox/redox5");
public static final CustomIcon Casing_Redox_6 = new CustomIcon("redox/redox6");
- public static final CustomIcon Casing_Redox_7 = new CustomIcon("redox/redox7");
- public static final CustomIcon Casing_Redox_8 = new CustomIcon("redox/redox8");
+ //public static final CustomIcon Casing_Redox_7 = new CustomIcon("redox/redox7");
+ //public static final CustomIcon Casing_Redox_8 = new CustomIcon("redox/redox8");
//Centrifuge Casing
private static final CustomIcon Internal_Casing_Centrifuge = new CustomIcon("TileEntities/MACHINE_CASING_CENTRIFUGE");
@@ -381,6 +267,23 @@ public class TexturesGtBlock {
public static final CustomIcon TEXTURE_CASING_ADVANCED_CRYOGENIC = new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC");
public static final CustomIcon TEXTURE_CASING_ADVANCED_VOLCNUS = new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II = new CustomIcon("iconsets/MACHINE_CASING_FUSION_3");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_INNER = new CustomIcon("iconsets/MACHINE_CASING_FUSION_COIL_II");
+ public static final CustomIcon TEXTURE_CASING_FUSION_CASING_ULTRA = new CustomIcon("iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA");
+ //
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_1 = new CustomIcon("iconsets/FUSIONIII_1");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_2 = new CustomIcon("iconsets/FUSIONIII_2");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_3 = new CustomIcon("iconsets/FUSIONIII_3");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_4 = new CustomIcon("iconsets/FUSIONIII_4");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_5 = new CustomIcon("iconsets/FUSIONIII_5");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_6 = new CustomIcon("iconsets/FUSIONIII_6");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_7 = new CustomIcon("iconsets/FUSIONIII_7");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_8 = new CustomIcon("iconsets/FUSIONIII_8");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_9 = new CustomIcon("iconsets/FUSIONIII_9");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_10 = new CustomIcon("iconsets/FUSIONIII_10");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_11 = new CustomIcon("iconsets/FUSIONIII_11");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_12 = new CustomIcon("iconsets/FUSIONIII_12");
+
//Overlays
//Fan Textures
private static final CustomIcon Internal_Overlay_Machine_Vent = new CustomIcon("TileEntities/machine_top_vent_rotating");
@@ -471,4 +374,125 @@ public class TexturesGtBlock {
public static final CustomIcon TEXTURE_TECH_C = new CustomIcon("metro/TEXTURE_TECH_C");
public static final CustomIcon TEXTURE_TECH_PANEL_A = new CustomIcon("metro/TEXTURE_TECH_PANEL_A");
+
+ //Overlay Arrays
+ public static ITexture[] OVERLAYS_ENERGY_OUT_BUFFER = new ITexture[]{
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+ new short[]{220, 220, 220, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+ new short[]{220, 220, 220, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+ new short[]{255, 100, 0, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+ new short[]{255, 255, 30, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+ new short[]{128, 128, 128, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+ new short[]{240, 240, 245, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+ new short[]{240, 240, 245, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+ new short[]{240, 240, 245, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+ new short[]{240, 240, 245, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER,
+ new short[]{240, 240, 245, 0})};
+
+ public static ITexture[] OVERLAYS_ENERGY_OUT_MULTI_BUFFER = new ITexture[]{
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+ new short[]{220, 220, 220, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+ new short[]{220, 220, 220, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+ new short[]{255, 100, 0, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+ new short[]{255, 255, 30, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+ new short[]{128, 128, 128, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+ new short[]{240, 240, 245, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+ new short[]{240, 240, 245, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+ new short[]{240, 240, 245, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+ new short[]{240, 240, 245, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+ new short[]{240, 240, 245, 0})};
+
+ public static ITexture[] OVERLAYS_CABINET_FRONT = new ITexture[]{
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_1,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_2,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_3,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_4,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_5,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_6,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_7,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_8,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_9,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_10,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_11,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_12,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_13,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_14,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_15,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_16,
+ new short[]{255, 255, 255, 0}),};
+
+ public static ITexture[] OVERLAYS_COMPARTMENT_FRONT = new ITexture[]{
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_1,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_2,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_3,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_4,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_5,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_6,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_7,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_8,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_9,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_10,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_11,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_12,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_13,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_14,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_15,
+ new short[]{255, 255, 255, 0}),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_16,
+ new short[]{255, 255, 255, 0}),};
+
+ public static IIconContainer[] CONNECTED_FUSION_HULLS = new IIconContainer[]{
+ TEXTURE_CASING_FUSION_COIL_II_1, TEXTURE_CASING_FUSION_COIL_II_2, TEXTURE_CASING_FUSION_COIL_II_3,
+ TEXTURE_CASING_FUSION_COIL_II_4, TEXTURE_CASING_FUSION_COIL_II_5, TEXTURE_CASING_FUSION_COIL_II_6,
+ TEXTURE_CASING_FUSION_COIL_II_7, TEXTURE_CASING_FUSION_COIL_II_8, TEXTURE_CASING_FUSION_COIL_II_9,
+ TEXTURE_CASING_FUSION_COIL_II_10, TEXTURE_CASING_FUSION_COIL_II_11, TEXTURE_CASING_FUSION_COIL_II_12};
+
+
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
index 5d78c90a9d..15c4d487be 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
@@ -107,7 +107,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase
}
public boolean checkRecipe(ItemStack aStack) {
- return checkRecipeGeneric(4, 100, 100); //Will have to clone the logic from parent class to handle heating coil tiers.
+ return checkRecipeGeneric(8, 90, 120); //Will have to clone the logic from parent class to handle heating coil tiers.
}
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
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 e5b690b7a5..b54e3929d5 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
@@ -7,6 +7,8 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer;
+import gtPlusPlus.core.block.ModBlocks;
+
import net.minecraft.block.Block;
public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_FusionComputer {
@@ -35,18 +37,23 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
}
@Override
+ public Block getCasing() {
+ return getFusionCoil();
+ }
+
+ @Override
public int getCasingMeta() {
- return 8;
+ return 12;
}
@Override
public Block getFusionCoil() {
- return GregTech_API.sBlockCasings4;
+ return ModBlocks.blockCasings3Misc;
}
@Override
public int getFusionCoilMeta() {
- return 7;
+ return 13;
}
public String[] getDescription() {
@@ -66,11 +73,6 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
}
@Override
- public Block getCasing() {
- return GregTech_API.sBlockCasings4;
- }
-
- @Override
public IIconContainer getIconOverlay() {
return Textures.BlockIcons.OVERLAY_FUSION3;
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java
index bdb3584b89..cc17f49d83 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java
@@ -10,7 +10,10 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.util.GT_Utility;
+
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.core.util.sys.KeyboardUtils;
import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SuperChest;
import gtPlusPlus.xmod.gregtech.api.gui.GUI_SuperChest;
@@ -61,19 +64,19 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
}
@Override
- public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
- //Single Block Behaviour
- //return super.onRightclick(aTile, aPlayer);
+ public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
if (aBaseMetaTileEntity.isClientSide()) {
return true;
- }
-
- String itemName = (this.mItemStack != null ? this.mItemStack.getDisplayName() : "Nothing.");
- String itemAmount = (this.mItemCount > 0 ? ""+this.mItemCount : "bad");
- String itemMessage = "This container currently holds "+(itemAmount.equalsIgnoreCase("bad") ? "nothing." : itemName+" x"+itemAmount+".");
- PlayerUtils.messagePlayer(aPlayer, itemMessage);
-
- aBaseMetaTileEntity.openGUI(aPlayer);
+ }
+ if (KeyboardUtils.isCtrlKeyDown()) {
+ String itemName = (this.mItemStack != null ? this.mItemStack.getDisplayName() : "Nothing.");
+ String itemAmount = (this.mItemCount > 0 ? ""+this.mItemCount : "bad");
+ String itemMessage = "This container currently holds "+(itemAmount.equalsIgnoreCase("bad") ? "nothing." : itemName+" x"+itemAmount+".");
+ PlayerUtils.messagePlayer(aPlayer, itemMessage);
+ }
+ else {
+ aBaseMetaTileEntity.openGUI(aPlayer);
+ }
return true;
}
@@ -115,7 +118,7 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTimer) {
if (this.getBaseMetaTileEntity().isServerSide() && this.getBaseMetaTileEntity().isAllowedToWork()) {
-
+ try {
if (this.mInventory[0] != null) {
this.mType = (byte) this.mIndex;
}
@@ -158,6 +161,12 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
} else {
this.mInventory[2] = null;
}
+ }
+ catch (Throwable t) {
+ if (t instanceof ArrayIndexOutOfBoundsException) {
+
+ }
+ }
}
}
@@ -170,8 +179,13 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
}
public int getProgresstime() {
+ try {
return this.mItemCount + ((this.mInventory[0] == null) ? 0 : this.mInventory[0].stackSize)
+ ((this.mInventory[1] == null) ? 0 : this.mInventory[1].stackSize);
+ }
+ catch (Throwable t) {
+ return 0;
+ }
}
public int maxProgresstime() {
@@ -203,5 +217,50 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
"Space Remaining: "+Integer.toString(this.getMaxItemCount()-this.getItemCount())+"/"+Integer.toString(this.getMaxItemCount())};
}
+ @Override
+ public String[] getDescription() {
+ String[] mSuper = super.getDescription();
+ String[] desc = new String[mSuper.length+1];
+ for (int i=0;i>mSuper.length;i++) {
+ desc[i] = mSuper[i];
+ }
+ desc[desc.length-1] = "Control + Rmb block to check contents";
+ return desc;
+ }
+
+ @Override
+ public boolean isItemValidForSlot(int aIndex, ItemStack aStack) {
+ Logger.INFO("1:"+aIndex);
+ if (aIndex == 2) {
+ if (ItemStack.areItemStacksEqual(aStack, mItemStack)) {
+ return true;
+ }
+ else {
+ if (mItemStack == null) {
+ return true;
+ }
+ return false;
+ }
+ }
+ return super.isItemValidForSlot(aIndex, aStack);
+ }
+
+ @Override
+ public boolean canInsertItem(int aIndex, ItemStack aStack, int aSide) {
+ Logger.INFO("2:"+aIndex);
+ if (aIndex == 0) {
+ if (ItemStack.areItemStacksEqual(aStack, mItemStack)) {
+ return true;
+ }
+ else {
+ if (mItemStack == null) {
+ return true;
+ }
+ return false;
+ }
+ }
+ return super.canInsertItem(aIndex, aStack, aSide);
+ }
+
}
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_1.png b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_1.png
new file mode 100644
index 0000000000..9b82677382
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_1.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_10.png b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_10.png
new file mode 100644
index 0000000000..40046deb0c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_10.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_11.png b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_11.png
new file mode 100644
index 0000000000..bcc5c1a725
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_11.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_12.png b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_12.png
new file mode 100644
index 0000000000..250c3131a8
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_12.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_2.png b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_2.png
new file mode 100644
index 0000000000..8d1e3f14e2
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_2.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_3.png b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_3.png
new file mode 100644
index 0000000000..9f997cedf8
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_3.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_4.png b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_4.png
new file mode 100644
index 0000000000..ff2c73964a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_4.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_5.png b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_5.png
new file mode 100644
index 0000000000..107d539765
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_5.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_6.png b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_6.png
new file mode 100644
index 0000000000..5dd516f5e2
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_6.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_7.png b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_7.png
new file mode 100644
index 0000000000..eb8cd5882d
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_7.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_8.png b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_8.png
new file mode 100644
index 0000000000..fa3e6027a7
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_8.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_9.png b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_9.png
new file mode 100644
index 0000000000..ce258e3c13
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_9.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_3.png b/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_3.png
new file mode 100644
index 0000000000..b0aa8bf5e5
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_3.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL_II.png b/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL_II.png
new file mode 100644
index 0000000000..6322205460
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL_II.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA.png b/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA.png
new file mode 100644
index 0000000000..0c9e529514
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA.png
Binary files differ