aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-07-20 11:45:58 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-07-20 11:45:58 +1000
commit63115dc4db7b30b510b8cfb39761ac02f2359c5e (patch)
treec2f3f691a1273f6ea60ca70736486fb2f7849ac0
parent0e6ca93aa3aa0f8b3e582038b1856d74bd34bd5b (diff)
downloadGT5-Unofficial-63115dc4db7b30b510b8cfb39761ac02f2359c5e.tar.gz
GT5-Unofficial-63115dc4db7b30b510b8cfb39761ac02f2359c5e.tar.bz2
GT5-Unofficial-63115dc4db7b30b510b8cfb39761ac02f2359c5e.zip
% Changed Multiblock descriptions
% Changed the GT-TextureHandler for the IndustrialCentrifuge, borked it somehow.
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java4
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java2
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java2
-rw-r--r--src/resources/mcmod.info90
4 files changed, 21 insertions, 77 deletions
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
index dd61d22a4e..3ec28d9d4e 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
@@ -7,6 +7,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
+import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
@@ -18,7 +19,6 @@ 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 miscutil.core.xmod.gregtech.api.objects.GregtechRenderedTexture;
import net.minecraft.block.Block;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
@@ -72,7 +72,7 @@ extends GregtechMeta_MultiBlockBase {
@Override
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
- return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GregtechRenderedTexture(Textures.BlockIcons.LARGETURBINE_ACTIVE5) : new GregtechRenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]};
+ return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]};
}
@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 3ed271b2e8..77694bac8a 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
@@ -44,7 +44,7 @@ extends GregtechMeta_MultiBlockBase {
public String[] getDescription() {
return new String[]{
"Controller Block for the Industrial Maceration Stack",
- "Size(WxHxD): 3x6x3 (Hollow)",
+ "Size[WxHxL]: 3x6x3 (Hollow)",
"Controller (Center Bottom)",
"1x Input Bus (Any bottom layer casing)",
"3x Output Bus (Any casing besides bottom layer)",
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 4c7d77b490..35d128fe65 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
@@ -39,7 +39,7 @@ extends GT_MetaTileEntity_MultiBlockBase {
public String[] getDescription() {
return new String[]{
"Controller Block for the Industrial Wire Factory",
- "Size: 3x5x3 (Hollow)", "Controller (front centered)",
+ "Size: 3x5x3 [WxLxH] (Hollow)", "Controller (front centered)",
"2x Input Bus (side centered)",
"2x Output Bus (side centered)",
"1x Energy Hatch (top or bottom centered)",
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index 9ebae5075b..7ce1b1e464 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -1,74 +1,18 @@
-/**
- * @version 1.4.1
- * @author Alkalus
- * In-game info for project: MiscUtils.
- */
-[ { "modid" : "miscutil"
- , "name" : "GT++"
- , "description" : "
- if (Loader.isModLoaded("gregtech") == true ){
- Gregtech = true;
- }
- if (Loader.isModLoaded("EnderIO") == true){
- EnderIO = true;
- }
- if (Loader.isModLoaded("BigReactors") == true){
- Big_Reactors = true;
- }
- if (Loader.isModLoaded("IC2") == true){
- IndustrialCraft2 = true;
- }
- if (Loader.isModLoaded("simplyjetpacks") == true){
- Simply_Jetpacks = true;
- }
- if (Loader.isModLoaded("rftools") == true){
- RFTools = true;
- }
- if (Loader.isModLoaded("Thaumcraft") == true){
- Thaumcraft = true;
- }
- if (Loader.isModLoaded("ExtraUtilities") == true){
- Extra_Utils = true;
- }
- if (Loader.isModLoaded("PneumaticCraft") == true){
- PneumaticCraft = true;
- }
- if (Loader.isModLoaded("MorePlanet") == true){
- MorePlanets = true;
- }
- if (Loader.isModLoaded("ForbiddenMagic") == true){
- ForbiddenMagic = true;
- }
- if (Loader.isModLoaded("CompactWindmills") == true){
- CompactWindmills = true;
- }
- if (Loader.isModLoaded("Railcraft") == true){
- Railcraft = true;
- }
- if (Loader.isModLoaded("Growthcraft") == true){
- Growthcraft = true;
- }
- if (Loader.isModLoaded("CoFHCore") == true){
- CoFHCore = true;
- }
- if (Loader.isModLoaded("Forestry") == true){
- Forestry = true;
- }
- if (Loader.isModLoaded("MagicBees") == true){
- MagicBees = true;
- }
- if (Loader.isModLoaded("psychedelicraft") == true){
- Psychedelicraft = true;
- }
- "
- , "version" : "1.3.4"
- , "mcversion" : "1.7.10"
- , "url" : ""
- , "updateUrl" : ""
- , "authorList" : ["Alkalus"]
- , "credits" : ""
- , "logoFile" : ""
- , "screenshots" : []
- , "dependencies" : ["Forge10.13.0.1448"]
- }
+[
+{
+ "modid": "miscutils",
+ "name": "GT++",
+ "description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)",
+ "credits": "",
+ "logoFile": "",
+ "version": "1.4.1.3",
+ "mcversion": "1.7.10",
+ "url": "https://github.com/draknyte1/MiscUtilities/wiki",
+ "updateUrl": "https://github.com/draknyte1/MiscUtilities/tree/master/build/libs",
+ "authorList": [ "Alkalus" ],
+ "screenshots": [ "" ],
+ "dependencies": [
+ "mod_MinecraftForge"
+ ]
+}
]