aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-07-20 05:55:15 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-07-20 05:55:15 +1000
commit6c90d7217060f747d9f362ab09359f992ff23c9f (patch)
tree0203b54ef3ddd6e9b4fa49c958503133ea27c25f
parent703983c1773e777b52055e5f93d15182f8cbb029 (diff)
downloadGT5-Unofficial-6c90d7217060f747d9f362ab09359f992ff23c9f.tar.gz
GT5-Unofficial-6c90d7217060f747d9f362ab09359f992ff23c9f.tar.bz2
GT5-Unofficial-6c90d7217060f747d9f362ab09359f992ff23c9f.zip
+ Added New Guis for all the Multiblocks.
-rw-r--r--src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java2
-rw-r--r--src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java2
-rw-r--r--src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java2
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java2
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java4
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java2
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java4
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java4
-rw-r--r--src/resources/assets/miscutils/textures/gui/IndustrialElectrolyzer.pngbin0 -> 4647 bytes
-rw-r--r--src/resources/assets/miscutils/textures/gui/MacerationStack.pngbin0 -> 4495 bytes
-rw-r--r--src/resources/assets/miscutils/textures/gui/MaterialPress.pngbin0 -> 4684 bytes
-rw-r--r--src/resources/assets/miscutils/textures/gui/MatterFabricator.pngbin0 -> 4755 bytes
-rw-r--r--src/resources/assets/miscutils/textures/gui/WireFactory.pngbin0 -> 4243 bytes
13 files changed, 11 insertions, 11 deletions
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java
index 22d21bcc40..7cd9628769 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java
@@ -21,7 +21,7 @@ public class GregtechIndustrialElectrolyzer
private static void run1()
{
//Industrial Electrolyzer Multiblock
- GregtechItemList.Industrial_Electrolyzer.set(new GregtechMetaTileEntityIndustrialElectrolyzer(796, "industrialelectrolyzer.controller.tier.single", "Industrial Electrolyzer Controller").getStackForm(1L));
+ GregtechItemList.Industrial_Electrolyzer.set(new GregtechMetaTileEntityIndustrialElectrolyzer(796, "industrialelectrolyzer.controller.tier.single", "Industrial Electrolyzer").getStackForm(1L));
}
} \ No newline at end of file
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java
index 41e9192cd2..b9bd99a7d5 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java
@@ -21,7 +21,7 @@ public class GregtechIndustrialMacerator
private static void run1()
{
//Industrial Electrolyzer Multiblock
- GregtechItemList.Industrial_MacerationStack.set(new GregtechMetaTileEntityIndustrialMacerator(797, "industrialmacerator.controller.tier.single", "Maceration Stack Control Block").getStackForm(1L));
+ GregtechItemList.Industrial_MacerationStack.set(new GregtechMetaTileEntityIndustrialMacerator(797, "industrialmacerator.controller.tier.single", "Maceration Stack Controller").getStackForm(1L));
}
} \ No newline at end of file
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java
index 4d36de7df4..b7e77e5e6c 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java
@@ -21,7 +21,7 @@ public class GregtechIndustrialMassFabricator
private static void run1()
{
//Industrial Electrolyzer Multiblock
- GregtechItemList.Industrial_MassFab.set(new GregtechMetaTileEntityMassFabricator(799, "industrialmassfab.controller.tier.single", "Matter Fabrication Controller").getStackForm(1L));
+ GregtechItemList.Industrial_MassFab.set(new GregtechMetaTileEntityMassFabricator(799, "industrialmassfab.controller.tier.single", "Matter Fabrication CPU").getStackForm(1L));
}
} \ No newline at end of file
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java
index e95a682b92..8150c51deb 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java
@@ -65,7 +65,7 @@ extends GT_MetaTileEntity_MultiBlockBase {
@Override
public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
- return new GUI_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "CokeOven.png");
+ return new GUI_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "IndustrialElectrolyzer.png");
}
@Override
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java
index 83509aed75..3ed271b2e8 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java
@@ -2,7 +2,6 @@ package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Textures;
-import gregtech.api.gui.GT_GUIContainer_MultiMachine;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -17,6 +16,7 @@ import java.util.Random;
import miscutil.core.block.ModBlocks;
import miscutil.core.util.Utils;
+import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import net.minecraft.block.Block;
import net.minecraft.entity.player.InventoryPlayer;
@@ -63,7 +63,7 @@ extends GregtechMeta_MultiBlockBase {
@Override
public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
- return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "DistillationTower.png");
+ return new GUI_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "MacerationStack.png");
}
@Override
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
index b1a9f5ca66..602eebbe3b 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
@@ -60,7 +60,7 @@ extends GT_MetaTileEntity_MultiBlockBase {
@Override
public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
- return new GUI_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "CokeOven.png");
+ return new GUI_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "MaterialPress.png");
}
@Override
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java
index 1dd4d2bd00..4c7d77b490 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java
@@ -1,7 +1,6 @@
package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
import gregtech.api.enums.Textures;
-import gregtech.api.gui.GT_GUIContainer_MultiMachine;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -16,6 +15,7 @@ import java.util.ArrayList;
import miscutil.core.block.ModBlocks;
import miscutil.core.util.Utils;
+import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
import net.minecraft.block.Block;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
@@ -58,7 +58,7 @@ extends GT_MetaTileEntity_MultiBlockBase {
@Override
public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
- return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "LargeTurbine.png");
+ return new GUI_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "WireFactory.png");
}
@Override
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java
index 7fc5e29b0c..346e01f787 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java
@@ -3,7 +3,6 @@ package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Textures;
-import gregtech.api.gui.GT_GUIContainer_MultiMachine;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -19,6 +18,7 @@ import java.util.Arrays;
import miscutil.core.block.ModBlocks;
import miscutil.core.util.Utils;
import miscutil.core.util.item.UtilsItems;
+import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
import miscutil.core.xmod.gregtech.api.util.GregtechRecipe;
import net.minecraft.block.Block;
import net.minecraft.entity.player.InventoryPlayer;
@@ -73,7 +73,7 @@ public class GregtechMetaTileEntityMassFabricator extends GT_MetaTileEntity_Mult
@Override
public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
- return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "VacuumFreezer.png");
+ return new GUI_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "MatterFabricator.png");
}
@Override
diff --git a/src/resources/assets/miscutils/textures/gui/IndustrialElectrolyzer.png b/src/resources/assets/miscutils/textures/gui/IndustrialElectrolyzer.png
new file mode 100644
index 0000000000..acc8ba88fa
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/gui/IndustrialElectrolyzer.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/gui/MacerationStack.png b/src/resources/assets/miscutils/textures/gui/MacerationStack.png
new file mode 100644
index 0000000000..c758bd8f96
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/gui/MacerationStack.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/gui/MaterialPress.png b/src/resources/assets/miscutils/textures/gui/MaterialPress.png
new file mode 100644
index 0000000000..b1f1118eeb
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/gui/MaterialPress.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/gui/MatterFabricator.png b/src/resources/assets/miscutils/textures/gui/MatterFabricator.png
new file mode 100644
index 0000000000..80c994d8b0
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/gui/MatterFabricator.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/gui/WireFactory.png b/src/resources/assets/miscutils/textures/gui/WireFactory.png
new file mode 100644
index 0000000000..c64d6b1de2
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/gui/WireFactory.png
Binary files differ