aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-03-09 03:30:58 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-03-09 03:30:58 +1000
commitf8cf6af92b23fb595c6f9410bf95e7c7d6be981d (patch)
tree2b700720a3ca14eae14114ca83984d0ece32acfb
parentf91432bfbbba3c217bec65407ab3fa601b7241b2 (diff)
downloadGT5-Unofficial-f8cf6af92b23fb595c6f9410bf95e7c7d6be981d.tar.gz
GT5-Unofficial-f8cf6af92b23fb595c6f9410bf95e7c7d6be981d.tar.bz2
GT5-Unofficial-f8cf6af92b23fb595c6f9410bf95e7c7d6be981d.zip
$ Fixed compile issue.
$ Fixed Spelling issue on throwable potion.
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java (renamed from src/Java/gtPlusPlus/core/item/general/chassis/ItemHalfCompleteCasings.java)11
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialMultiMachine.java2
3 files changed, 4 insertions, 13 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 788dfde18d..35b5f9597c 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -325,8 +325,8 @@ public final class ModItems {
itemBlueprintBase = new ItemBlueprint("itemBlueprint");
itemGemShards = new ItemGemShards("itemGemShards", "Gem Shards", AddToCreativeTab.tabMisc, 32, 0, "They glitter in the light", EnumRarity.rare, EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(182, 114, 18)).setTextureName(CORE.MODID + ":itemHeliumBlob");
- itemHalfCompleteCasings = new ItemHalfCompleteCasings("itemHalfCompleteCasings", "Half Complete Casing", AddToCreativeTab.tabMisc, 32, 0, "This isn't quite finished yet.", EnumRarity.common, EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(255, 255, 255)).setTextureName("gregtech" + ":" + "gt.metaitem.01/" + "761");
- itemSulfuricPotion = new ItemSulfuricAcidPotion("itemSulfuricPotion", "Thowable Vial of Sulfuric Acid", "Burn your foes alive!").setTextureName(CORE.MODID + ":itemSulfuricAcidPotion");
+ itemHalfCompleteCasings = new ItemHalfCompleteCasings("itemHalfCompleteCasings", AddToCreativeTab.tabMisc, 32, 0, "This isn't quite finished yet.", EnumRarity.common, EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(255, 255, 255)).setTextureName("gregtech" + ":" + "gt.metaitem.01/" + "761");
+ itemSulfuricPotion = new ItemSulfuricAcidPotion("itemSulfuricPotion", "Throwable Vial of Sulfuric Acid", "Burn your foes alive!").setTextureName(CORE.MODID + ":itemSulfuricAcidPotion");
itemHydrofluoricPotion = new ItemHydrofluoricAcidPotion("itemHydrofluoricPotion", "Thowable Vial of Hydrofluoric Acid", "They won't see this coming, nor anything after!").setTextureName(CORE.MODID + ":itemPotion");
//Start meta Item Generation
ItemsFoods.load();
diff --git a/src/Java/gtPlusPlus/core/item/general/chassis/ItemHalfCompleteCasings.java b/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java
index 0501f616c9..ad9abc8ab2 100644
--- a/src/Java/gtPlusPlus/core/item/general/chassis/ItemHalfCompleteCasings.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.item.general.chassis;
+package gtPlusPlus.core.item.general;
import java.util.List;
@@ -18,11 +18,6 @@ public class ItemHalfCompleteCasings extends BaseItemColourable{
super(unlocalizedName, creativeTab, stackSize, maxDmg, description, regRarity, colour, Effect, rgb);
}
- public ItemHalfCompleteCasings(String unlocalizedName, String displayName, CreativeTabs creativeTab, int stackSize,
- int maxDmg, String description, EnumRarity regRarity, EnumChatFormatting colour, boolean Effect, int rgb) {
- super(unlocalizedName, displayName, creativeTab, stackSize, maxDmg, description, regRarity, colour, Effect, rgb);
- }
-
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
for (int i = 0; i < 4; i ++) {
@@ -64,9 +59,5 @@ public class ItemHalfCompleteCasings extends BaseItemColourable{
return Utils.rgbtoHexValue(77, 175, 182);
}
}
-
-
-
-
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialMultiMachine.java
index e2efdd5b57..c08602b6f4 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialMultiMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialMultiMachine.java
@@ -236,7 +236,7 @@ extends GregtechMeta_MultiBlockBase {
return GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes;
}
else if (aMode == MODE_REPLICATOR) {
- return GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes;
+ return null;
}
else {
return null;