aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2021-12-14 14:40:37 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2021-12-14 14:40:37 +0000
commitb404dd06675bb5031c4c3095f950a83fb7d40e43 (patch)
tree97fed73f7de8943573ec4e44fe80881b359fa084 /src/Java/gtPlusPlus/core/item
parent5d8163cffad0e1e65bcd93779aec38572c90ae78 (diff)
downloadGT5-Unofficial-b404dd06675bb5031c4c3095f950a83fb7d40e43.tar.gz
GT5-Unofficial-b404dd06675bb5031c4c3095f950a83fb7d40e43.tar.bz2
GT5-Unofficial-b404dd06675bb5031c4c3095f950a83fb7d40e43.zip
Fix PSS not forming correctly. Thanks to @Glease.
Fix ItemBasicScrubberTurbine not working in Scrubbers. Improved scrubber handling slightly.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java b/src/Java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java
index bd8159eb01..2b7b98640e 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java
@@ -42,7 +42,7 @@ public class ItemBasicScrubberTurbine extends Item {
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
- for (int i = 0; i < 2; i ++) {
+ for (int i = 0; i < 3; i ++) {
list.add(new ItemStack(item, 1, i));
}
}
@@ -69,6 +69,9 @@ public class ItemBasicScrubberTurbine extends Item {
if (meta == 1){
HEX_OxFFFFFF = Utils.rgbtoHexValue(255,128,0);
}
+ if (meta == 2){
+ HEX_OxFFFFFF = Utils.rgbtoHexValue(128,128,128);
+ }
return HEX_OxFFFFFF;
}
@@ -111,10 +114,13 @@ public class ItemBasicScrubberTurbine extends Item {
if (aStack != null) {
int aMeta = aStack.getItemDamage();
if (aMeta == 0) {
- return 2500;
+ return 2000;
}
if (aMeta == 1) {
- return 5000;
+ return 4000;
+ }
+ if (aMeta == 2) {
+ return 6000;
}
}
return 0;