aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-04-22 18:22:42 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-04-22 18:22:42 +1000
commit60710b8812b82ca7d15a3781307410be7ff4392d (patch)
treeda07015242c1a44b82e7d41ea8a491d5361008b7
parentb33cfd02d8a367af0ba9a6689a0507440f44d07c (diff)
downloadGT5-Unofficial-60710b8812b82ca7d15a3781307410be7ff4392d.tar.gz
GT5-Unofficial-60710b8812b82ca7d15a3781307410be7ff4392d.tar.bz2
GT5-Unofficial-60710b8812b82ca7d15a3781307410be7ff4392d.zip
Fixed the texture issue with Iron plated Bricks,
Fixed item registration of the Industrial Centrifuge and related Casings, Added recipes.
-rw-r--r--src/Java/miscutil/gregtech/api/init/InitGregtech.java15
-rw-r--r--src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialCentrifuge.java4
-rw-r--r--src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java4
-rw-r--r--src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaLargeIndustrialCentrifuge.java (renamed from src/Java/miscutil/gregtech/common/machines/multi/GT_MetaTileEntity_LargeIndustrialCentrifuge.java)8
4 files changed, 11 insertions, 20 deletions
diff --git a/src/Java/miscutil/gregtech/api/init/InitGregtech.java b/src/Java/miscutil/gregtech/api/init/InitGregtech.java
index 1507405f0c..45435821c5 100644
--- a/src/Java/miscutil/gregtech/api/init/InitGregtech.java
+++ b/src/Java/miscutil/gregtech/api/init/InitGregtech.java
@@ -1,9 +1,9 @@
package miscutil.gregtech.api.init;
import static miscutil.core.lib.LoadedMods.Gregtech;
-import miscutil.core.util.Utils;
import miscutil.gregtech.api.init.machines.GregtechConduits;
import miscutil.gregtech.api.init.machines.GregtechEnergyBuffer;
+import miscutil.gregtech.api.init.machines.GregtechIndustrialCentrifuge;
import miscutil.gregtech.api.init.machines.GregtechSafeBlock;
import miscutil.gregtech.api.init.machines.GregtechSteamCondenser;
@@ -11,21 +11,12 @@ public class InitGregtech {
public static void run() {
if (Gregtech) {
- Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Meta-TileEntities.");
- }
-
-
-
- /***
- * Load up Blocks classes
- ***/
-
- // Machines
- // GregtechCobbleGenerator.run(); TODO - Weird Textures
GregtechEnergyBuffer.run();
GregtechConduits.run();
GregtechSteamCondenser.run();
GregtechSafeBlock.run();
+ GregtechIndustrialCentrifuge.run();
+ }
}
}
diff --git a/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialCentrifuge.java b/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialCentrifuge.java
index c6abfa8642..a653bbce93 100644
--- a/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialCentrifuge.java
+++ b/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialCentrifuge.java
@@ -2,7 +2,7 @@ package miscutil.gregtech.api.init.machines;
import miscutil.core.util.Utils;
import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaCondensor;
+import miscutil.gregtech.common.machines.multi.GregtechMetaLargeIndustrialCentrifuge;
public class GregtechIndustrialCentrifuge
{
@@ -21,7 +21,7 @@ public class GregtechIndustrialCentrifuge
private static void run1()
{
//Industrial Centrifuge Multiblock
- GregtechItemList.Industrial_Centrifuge.set(new GregtechMetaCondensor(790, "industrialcentrifuge.controller.tier.single", "Steam Condensor").getStackForm(1L));
+ GregtechItemList.Industrial_Centrifuge.set(new GregtechMetaLargeIndustrialCentrifuge(790, "industrialcentrifuge.controller.tier.single", "Industrial Centrifuge").getStackForm(1L));
}
}
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java
index e2587fffef..c02404fff7 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java
+++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java
@@ -60,8 +60,8 @@ extends GT_Block_Casings_Abstract {
return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
case 2:
return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
- case 11:
- return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon();
+ case 10:
+ return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
case 12:
return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
case 13:
diff --git a/src/Java/miscutil/gregtech/common/machines/multi/GT_MetaTileEntity_LargeIndustrialCentrifuge.java b/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaLargeIndustrialCentrifuge.java
index 7df371c8b0..170d68763c 100644
--- a/src/Java/miscutil/gregtech/common/machines/multi/GT_MetaTileEntity_LargeIndustrialCentrifuge.java
+++ b/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaLargeIndustrialCentrifuge.java
@@ -18,21 +18,21 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
-public class GT_MetaTileEntity_LargeIndustrialCentrifuge
+public class GregtechMetaLargeIndustrialCentrifuge
extends GT_MetaTileEntity_MultiBlockBase {
private static boolean controller;
- public GT_MetaTileEntity_LargeIndustrialCentrifuge(int aID, String aName, String aNameRegional) {
+ public GregtechMetaLargeIndustrialCentrifuge(int aID, String aName, String aNameRegional) {
super(aID, aName, aNameRegional);
}
- public GT_MetaTileEntity_LargeIndustrialCentrifuge(String aName) {
+ public GregtechMetaLargeIndustrialCentrifuge(String aName) {
super(aName);
}
@Override
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
- return new GT_MetaTileEntity_LargeIndustrialCentrifuge(this.mName);
+ return new GregtechMetaLargeIndustrialCentrifuge(this.mName);
}
@Override