diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-07-02 00:36:10 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-07-02 00:36:10 +1000 |
| commit | 81360a320daf83530cc9260068e13111759d2212 (patch) | |
| tree | 0db5bdb7fa09fd91a8dfc8b43801daf5a2faf53f /src/Java/gtPlusPlus/core/creative | |
| parent | afa03ba1b0475ad6b2caeeb1af6f7ed2f8a76e0a (diff) | |
| download | GT5-Unofficial-81360a320daf83530cc9260068e13111759d2212.tar.gz GT5-Unofficial-81360a320daf83530cc9260068e13111759d2212.tar.bz2 GT5-Unofficial-81360a320daf83530cc9260068e13111759d2212.zip | |
% Hopefully improved recipe loading by several factors.
% Re-arranged spawner code during loading.
$ Hopefully recipe Creative Tabs issues.
$ Fixed profession of one of the new villagers.
Diffstat (limited to 'src/Java/gtPlusPlus/core/creative')
5 files changed, 5 insertions, 13 deletions
diff --git a/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java index 0f3be72c69..8e6d38f301 100644 --- a/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java +++ b/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java @@ -3,8 +3,6 @@ package gtPlusPlus.core.creative; import net.minecraft.creativetab.CreativeTabs; import gtPlusPlus.core.creative.tabs.*; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.xmod.bop.creative.MiscUtilsBOPTab; public class AddToCreativeTab { @@ -23,12 +21,6 @@ public class AddToCreativeTab { tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab"); - if (LoadedMods.BiomesOPlenty) { - tabBOP = new MiscUtilsBOPTab("MiscUtilBOP"); - } - - if (CORE.DEBUG) { - // tabCombat = new MiscUtilCreativeTabCombat("MiscUtilCombatTab"); - } + tabBOP = new MiscUtilsBOPTab("MiscUtilBOP"); } } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java index 39d5108dea..3af79c7305 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java @@ -13,7 +13,7 @@ public class MiscUtilCreativeTabBlock extends CreativeTabs { @Override public Item getTabIconItem() { - return Item.getItemFromBlock(ModBlocks.MatterFabricatorEffectBlock); + return Item.getItemFromBlock(ModBlocks.blockCompressedObsidian); } } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java index 285ef8af0a..9f145cf581 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java @@ -14,7 +14,7 @@ public class MiscUtilCreativeTabMachines extends CreativeTabs { @Override public Item getTabIconItem() { - return ModItems.itemPLACEHOLDER_Circuit; + return ModItems.itemAlkalusDisk; } } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java index da60afe511..17c56f68af 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java @@ -13,7 +13,7 @@ public class MiscUtilCreativeTabMisc extends CreativeTabs { @Override public Item getTabIconItem() { - return ModItems.itemFoodCurriedSausages; + return ModItems.AAA_Broken; } } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java index 649316a220..b68eccd0e4 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java @@ -13,7 +13,7 @@ public class MiscUtilCreativeTabTools extends CreativeTabs { @Override public Item getTabIconItem() { - return ModItems.itemStaballoyAxe; + return ModItems.itemStaballoyPickaxe; } } |