aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-12-08 02:00:35 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-12-08 02:00:35 +0000
commit10d4c7d4b4fd651d64f17936a916785b36a43f92 (patch)
tree88f09ab780bd2271cdf7abb282ba8cc42bfb7e4b /src/Java/gtPlusPlus/core/item
parent7fbe8a8aae1cc923ec4a0a9f5b7075d30568d94c (diff)
downloadGT5-Unofficial-10d4c7d4b4fd651d64f17936a916785b36a43f92.tar.gz
GT5-Unofficial-10d4c7d4b4fd651d64f17936a916785b36a43f92.tar.bz2
GT5-Unofficial-10d4c7d4b4fd651d64f17936a916785b36a43f92.zip
+ Added an assembly recipe for tier 1 Round Robinators.
+ Added localization for Rotor Housing achievement. + Added the Algae Farm (WIP). - Removed Durability bar on Iridium Rotors. - Reverted 2A hatch fix on Multiblocks. % Adjusted all Robinator recipes, removing the fluid requirements. $ Fixed Robinators Crashing on Servers. $ Implemented new backend for all future non-GT tile entities.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java33
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java34
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java6
3 files changed, 26 insertions, 47 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
index 42890ddfa6..251230932c 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
@@ -26,28 +26,43 @@ public class ItemBlockBasicTile extends ItemBlock {
list.add("Can also be placed beside upto 4 other fish traps");
list.add("Requires at least two faces touching water");
list.add("1/1000 chance to produce triple loot.");
- } else if (this.mID == 1) { // Modularity
+ }
+ else if (this.mID == 1) { // Modularity
list.add("Used to construct modular armour & bauble upgrades..");
- } else if (this.mID == 2) { // Trade
+ }
+ else if (this.mID == 2) { // Trade
list.add("Allows for SMP trade-o-mat type trading.");
- } else if (this.mID == 3) { // Project
+ }
+ else if (this.mID == 3) { // Project
list.add("Scan any crafting recipe in this to mass fabricate them in the Autocrafter..");
- } else if (this.mID == 4) { // Circuit Table
+ }
+ else if (this.mID == 4) { // Circuit Table
list.add("Easy Circuit Configuration");
list.add("Change default setting with a Screwdriver");
list.add("Default is used to select slot for auto-insertion");
- } else if (this.mID == 5) { // Decayables Chest
+ }
+ else if (this.mID == 5) { // Decayables Chest
list.add("Chest which holds radioactive materials");
list.add("Items which decay will tick while inside");
list.add("Place with right click");
- } else if (this.mID == 6) { // Butterfly Killer
+ }
+ else if (this.mID == 6) { // Butterfly Killer
list.add("Kills Forestry Butterflies, Bats and other pests");
list.add("Use either Formaldehyde or Hydrogen cyanide");
list.add("Be weary of your neighbours");
- } else if (this.mID == 7) {
- } else {
- list.add("Bad Tooltip ID - " + mID);
+ }
+ else if (this.mID == 7) {
+ }
+ else if (this.mID == 8){
+
+ }
+ else if (this.mID == 9){
+
+ }
+
+ else {
+ list.add("Bad Tooltip ID - " + mID);
}
super.addInformation(stack, aPlayer, list, bool);
}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java
deleted file mode 100644
index 9badd384d8..0000000000
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package gtPlusPlus.core.item.base.itemblock;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-
-import gtPlusPlus.api.interfaces.ITileTooltip;
-
-public class ItemBlockBasicTooltip extends ItemBlock{
-
- protected final int mID;
-
- public ItemBlockBasicTooltip(final Block block) {
- super(block);
- this.mID = ((ITileTooltip) block).getTooltipID();
- }
-
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- @Override
- public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
- if (this.mID == 0){ //blockDarkWorldPortalFrame
- list.add("Assembled in the same shape as the Nether Portal.");
- }
- else if (this.mID == 1){ //Modularity
- list.add("Used to construct modular armour & bauble upgrades..");
- }
- }
-
-
-}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
index f586695eb7..2d0fd00dd9 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
@@ -16,8 +16,6 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
public ItemBlockRoundRobinator(final Block aBlock){
super(aBlock, aBlock);
this.mBlock = aBlock;
- this.setMaxDamage(4);
- this.setHasSubtypes(true);
}
@@ -40,7 +38,7 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
else if (stack.getItemDamage() == 4) {
list.add("1 Item per enabled side every tick");
}
- list.add("Top and bottom do not pull, so you must push item in");
+ list.add("Top and bottom do not pull, so you must push items in");
list.add("Sides can also be disabled with a screwdriver");
list.add("Shift+RMB with empty hand to view inventory contents");
super.addInformation(stack, aPlayer, list, bool);
@@ -62,7 +60,7 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
@Override
public int getMetadata(final int p_77647_1_)
{
- return super.getMetadata(p_77647_1_);
+ return p_77647_1_;
}
@Override