aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-08-25 07:54:08 +1000
committerAlkalus <draknyte1@hotmail.com>2017-08-25 07:54:08 +1000
commit51bf8ba4b428226bd4e0336ab73875920d29cfb1 (patch)
treee66f3d855e071d854b65d1b878e119d0d00ae941
parent0da5ef8eef325a8320971637eb992ef17b70c00d (diff)
downloadGT5-Unofficial-51bf8ba4b428226bd4e0336ab73875920d29cfb1.tar.gz
GT5-Unofficial-51bf8ba4b428226bd4e0336ab73875920d29cfb1.tar.bz2
GT5-Unofficial-51bf8ba4b428226bd4e0336ab73875920d29cfb1.zip
% Changed Autocrafter name.
% Changed Autocrafter Tooltip.
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_AutoCrafter.java59
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java2
2 files changed, 59 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_AutoCrafter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_AutoCrafter.java
index a34304a0af..bc03a50b65 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_AutoCrafter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_AutoCrafter.java
@@ -13,6 +13,7 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.player.PlayerUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -98,7 +99,21 @@ extends GT_MetaTileEntity_MultiBlockBase
return new String[]{
"Highly Advanced Autocrafter",
"Right Click with a Screwdriver to change mode",
- "This Machine Can Assemble or Disassemble",
+ "This Machine Can Craft, Assemble or Disassemble",
+ "--------------------------------------",
+ "Insert a Memory stick into the GUI",
+ "to automate a crafting table recipe",
+ "Requires recipe to be scanned in a project table",
+ "--------------------------------------",
+ "Hatches & Busses can be placed anywhere",
+ "1x Input Bus",
+ "1x Input Hatch",
+ "1x Output Bus",
+ "1x Output Hatch",
+ "1x Muffler Hatch",
+ "1x Maintenance Hatch",
+ "1x Energy Hatch",
+ "--------------------------------------",
CORE.GT_Tooltip
};
}
@@ -141,6 +156,15 @@ extends GT_MetaTileEntity_MultiBlockBase
}
}
}
+
+ if ((this.mInputHatches.size() >= 1) || (this.mOutputHatches.size() >= 1) ||
+ (this.mInputBusses.size() >= 1) || (this.mOutputBusses.size() >= 1) ||
+ (this.mMufflerHatches.size() != 1) || (this.mMaintenanceHatches.size() != 1) ||
+ (this.mEnergyHatches.size() >= 1)){
+ Utils.LOG_INFO("Wrong Hatch count.");
+ return false;
+ }
+
return tAmount >= 16;
}
@@ -153,6 +177,12 @@ extends GT_MetaTileEntity_MultiBlockBase
@Override
public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
isDisassembling = Utils.invertBoolean(isDisassembling);
+ if (this.isDisassembling){
+ PlayerUtils.messagePlayer(aPlayer, "You are now running the Auto-Crafter in mode: §cDisassembly");
+ }
+ else {
+ PlayerUtils.messagePlayer(aPlayer, "You are now running the Auto-Crafter in mode: §aAssembly");
+ }
super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);
}
@@ -296,4 +326,31 @@ extends GT_MetaTileEntity_MultiBlockBase
Utils.LOG_INFO("test - bad");
return false;
}
+
+
+ @Override
+ public String[] getInfoData() {
+
+ final String tRunning = (this.mMaxProgresstime>0 ? "Auto-Crafter running":"Auto-Crafter stopped");
+ final String tMaintainance = (this.getIdealStatus() == this.getRepairStatus() ? "No Maintainance issues" : "Needs Maintainance");
+ String tMode;
+ if (this.isDisassembling){
+ tMode = "§cDisassembly";
+ }
+ else {
+ tMode = "§aAssembly";
+ }
+
+ return new String[]{
+ "Large Scale Auto-Asesembler v1.01c",
+ tRunning,
+ tMaintainance,
+ "Mode: "+tMode};
+ }
+
+ @Override
+ public boolean isGivingInformation() {
+ return true;
+ }
+
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
index d5cb8401c6..4e06d1d3b3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -107,6 +107,6 @@ public class Gregtech4Content {
// Gregtech 4 Multiblock Auto-Crafter
Utils.LOG_INFO("Gregtech 4 Content | Registering Multiblock Crafter.");
GregtechItemList.GT4_Multi_Crafter.set(
- new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Autocrafter").getStackForm(1L));
+ new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Scale Auto-Asesembler v1.01").getStackForm(1L));
}
}