diff options
Diffstat (limited to 'src')
16 files changed, 165 insertions, 93 deletions
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index 9d5f940529..656951fe31 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -15,6 +15,9 @@ import gtPlusPlus.api.objects.minecraft.ChunkManager; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.entity.InternalEntityRegistry; +import gtPlusPlus.core.entity.monster.EntityGiantChickenBase; +import gtPlusPlus.core.entity.monster.EntitySickBlaze; +import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; import gtPlusPlus.core.handler.*; import gtPlusPlus.core.handler.events.*; import gtPlusPlus.core.item.ModItems; @@ -28,6 +31,7 @@ import gtPlusPlus.core.tileentities.ModTileEntities; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.debug.DEBUG_INIT; import gtPlusPlus.core.util.player.PlayerCache; +import gtPlusPlus.plugin.villagers.block.BlockGenericSpawner; import gtPlusPlus.xmod.eio.handler.HandlerTooltip_EIO; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import net.minecraftforge.common.ForgeChunkManager; @@ -98,13 +102,20 @@ public class CommonProxy { Material.generateQueuedFluids(); mFluidsGenerated = true; } + + //Must be done in pre-init. + generateMobSpawners(); + } public void init(final FMLInitializationEvent e) { //Debug Loading if (CORE.DEBUG){ DEBUG_INIT.registerHandlers(); - } + } + + ModBlocks.blockCustomMobSpawner = new BlockGenericSpawner(); + if (!mFluidsGenerated && ItemList.valueOf("Cell_Empty").hasBeenSet()) { Material.generateQueuedFluids(); mFluidsGenerated = true; @@ -159,8 +170,9 @@ public class CommonProxy { } //Compat Handling - COMPAT_HANDLER.InitialiseHandlerThenAddRecipes(); COMPAT_HANDLER.RemoveRecipesFromOtherMods(); + COMPAT_HANDLER.InitialiseHandlerThenAddRecipes(); + COMPAT_HANDLER.runQueuedRecipes(); COMPAT_HANDLER.startLoadingGregAPIBasedRecipes(); COMPAT_IntermodStaging.postInit(); } @@ -192,6 +204,14 @@ public class CommonProxy { } public void generateMysteriousParticles(final Entity entity) { + + } + + public void generateMobSpawners() { + //Try register some test spawners + Utils.createNewMobSpawner(0, EntityGiantChickenBase.class); + Utils.createNewMobSpawner(1, EntitySickBlaze.class); + Utils.createNewMobSpawner(2, EntityStaballoyConstruct.class); } } 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; } } diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 2ec0c9abdd..810abdbc32 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -8,6 +8,7 @@ import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.common.compat.*; import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; @@ -55,7 +56,7 @@ public class COMPAT_HANDLER { 911 to 940 - */ + */ new RECIPES_LaserEngraver(); new RECIPES_Extruder(); @@ -115,7 +116,7 @@ public class COMPAT_HANDLER { GregtechThreadedBuffers.run(); GregtechIndustrialMixer.run(); GregtechCustomHatches.run(); - + //New Horizons Content NewHorizonsAccelerator.run(); } @@ -181,7 +182,7 @@ public class COMPAT_HANDLER { for (Set<RunnableWithInfo<Material>> m : MaterialGenerator.mRecipeMapsToGenerate) { for (RunnableWithInfo<Material> r : m) { try { - r.run(); + r.run(); } catch (Throwable t) { t.printStackTrace(); @@ -191,4 +192,31 @@ public class COMPAT_HANDLER { } RecipeGen_Recycling.executeGenerators(); } + + public static final AutoMap<RunnableWithInfo<String>> mRecipesToGenerate = new AutoMap<RunnableWithInfo<String>>(); + public static final AutoMap<RunnableWithInfo<String>> mGtRecipesToGenerate = new AutoMap<RunnableWithInfo<String>>(); + + public static void runQueuedRecipes() { + //Add autogenerated Recipes from Item Components + for (RunnableWithInfo<String> m : mRecipesToGenerate) { + try { + m.run(); + } + catch (Throwable t) { + t.printStackTrace(); + Logger.INFO("[ERROR] "+m.getInfoData()+" recipe failed to generated."); + } + + } + for (RunnableWithInfo<String> m : mGtRecipesToGenerate) { + try { + m.run(); + } + catch (Throwable t) { + t.printStackTrace(); + Logger.INFO("[ERROR] "+m.getInfoData()+" recipe failed to generated."); + } + + } + } } diff --git a/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java b/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java index cbc8518fd7..4192e71091 100644 --- a/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java +++ b/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java @@ -15,15 +15,13 @@ public class RegistrationHandler { private final static void init(){ RECIPES_Tools.loadRecipes(); + RECIPES_General.loadRecipes(); RECIPES_Machines.loadRecipes(); RECIPES_Shapeless.loadRecipes(); RECIPES_MachineComponents.loadRecipes(); RECIPE_Batteries.loadRecipes(); - RECIPES_General.loadRecipes(); - //RECIPES_MTWRAPPER.run(); Logger.INFO("Loaded: "+recipesSuccess+" Failed: "+recipesFailed); COMPAT_HANDLER.areInitItemsLoaded = true; - //Utils.LOG_INFO("MT Loaded: "+RECIPES_MTWRAPPER.MT_RECIPES_LOADED+" MT Failed: "+RECIPES_MTWRAPPER.MT_RECIPES_FAILED); } } diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java index c5f50c8b0f..6eb52b40d2 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java @@ -15,13 +15,14 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; - +import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.handler.COMPAT_HANDLER; import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.material.Material; import gtPlusPlus.core.recipe.common.CI; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -119,7 +120,9 @@ public class RecipeUtils { } try { - GameRegistry.addRecipe(new ShapedOreRecipe(resultItem.copy(), validSlots.toArray())); + + COMPAT_HANDLER.mRecipesToGenerate.put(new InternalRecipeObject(validSlots.toArray(), resultItem, false)); + //Utils.LOG_WARNING("Success! Added a recipe for "+resultItem.getDisplayName()); if (!COMPAT_HANDLER.areInitItemsLoaded){ RegistrationHandler.recipesSuccess++; @@ -391,24 +394,11 @@ public class RecipeUtils { InputItem4, InputItem5, InputItem6, InputItem7, InputItem8, InputItem9 }; - - if (addShapedGregtechRecipe(o, OutputItem)){ - return true; - } - else if (recipeBuilder( - InputItem1, InputItem2, InputItem3, - InputItem4, InputItem5, InputItem6, - InputItem7, InputItem8, InputItem9, - OutputItem)){ - return true; - } - else { - if (OutputItem != null){ - Logger.WARNING("Adding recipe for "+OutputItem.getDisplayName()+" failed. Error 62."); - } - RegistrationHandler.recipesFailed++; - return false; - } + + int size = COMPAT_HANDLER.mGtRecipesToGenerate.size(); + COMPAT_HANDLER.mGtRecipesToGenerate.put(new InternalRecipeObject(o, OutputItem, true)); + return COMPAT_HANDLER.mGtRecipesToGenerate.size() > size; + } public static boolean addShapedGregtechRecipe(final Object[] inputs, ItemStack output){ @@ -439,29 +429,10 @@ public class RecipeUtils { } } - if (GT_ModHandler.addCraftingRecipe(output, - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | - GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[]{"ABC", "DEF", "GHI", - 'A', inputs[0], - 'B', inputs[1], - 'C', inputs[2], - 'D', inputs[3], - 'E', inputs[4], - 'F', inputs[5], - 'G', inputs[6], - 'H', inputs[7], - 'I', inputs[8]})){ - Logger.WARNING("Success! Added a recipe for "+output.getDisplayName()); - RegistrationHandler.recipesSuccess++; - return true; - } - else { - if (output != null){ - Logger.WARNING("Adding recipe for "+output.getDisplayName()+" failed. Error 61."); - } - return false; - } + + int size = COMPAT_HANDLER.mGtRecipesToGenerate.size(); + COMPAT_HANDLER.mGtRecipesToGenerate.put(new InternalRecipeObject(inputs, output, true)); + return COMPAT_HANDLER.mGtRecipesToGenerate.size() > size; } public static boolean addShapelessGregtechRecipe(final Object[] inputItems, final ItemStack OutputItem){ @@ -543,5 +514,67 @@ public class RecipeUtils { } return s; } + + + public static class InternalRecipeObject implements RunnableWithInfo<String> { + final Object[] mInputs; + final ItemStack mOutput; + final boolean gtType; + + public InternalRecipeObject(Object[] aInputs, ItemStack aOutput, boolean gtRecipe) { + mInputs = aInputs; + mOutput = aOutput; + gtType = gtRecipe; + } + + @Override + public void run() { + if (!gtType) { + GameRegistry.addRecipe(new ShapedOreRecipe(((ItemStack) mOutput).copy(), mInputs)); + } + else { + if (GT_ModHandler.addCraftingRecipe(mOutput, + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | + GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[]{"ABC", "DEF", "GHI", + 'A', mInputs[0], + 'B', mInputs[1], + 'C', mInputs[2], + 'D', mInputs[3], + 'E', mInputs[4], + 'F', mInputs[5], + 'G', mInputs[6], + 'H', mInputs[7], + 'I', mInputs[8]})){ + Logger.WARNING("Success! Added a recipe for "+mOutput.getDisplayName()); + RegistrationHandler.recipesSuccess++; + } + else if (recipeBuilder( + mInputs[0], mInputs[0], mInputs[0], + mInputs[0], mInputs[0], mInputs[0], + mInputs[0], mInputs[0], mInputs[0], + mOutput)){ + + } + else { + if (mOutput != null){ + Logger.WARNING("Adding recipe for "+mOutput.getDisplayName()+" failed. Error 62."); + } + RegistrationHandler.recipesFailed++; + } + } + } + + @Override + public String getInfoData() { + if (mOutput != null && mOutput instanceof ItemStack) { + return ((ItemStack) mOutput).getDisplayName(); + } + return ""; + } + + } + + } diff --git a/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java b/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java index a74578cef4..169e0d648c 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java +++ b/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java @@ -46,14 +46,8 @@ public class Core_VillagerAdditions implements IPlugin { } if (shouldLoad) { //Register Custom Villager Entity - EntityRegistry.registerGlobalEntityID(EntityBaseVillager.class, "VillagerV5", EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(180, 120, 120), Utils.rgbtoHexValue(0, 0, 0)); - - //Try register some test spawners - Utils.createNewMobSpawner(0, EntityGiantChickenBase.class); - Utils.createNewMobSpawner(1, EntitySickBlaze.class); - Utils.createNewMobSpawner(2, EntityStaballoyConstruct.class); - - VillagerUtils.registerNewVillager(0, "Banker", "Banker", "Banker", "banker", new TradeHandlerBanker()); + EntityRegistry.registerGlobalEntityID(EntityBaseVillager.class, "WiseVillager", EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(180, 120, 120), Utils.rgbtoHexValue(0, 0, 0)); + VillagerUtils.registerNewVillager(0, "Banker", "Banker", "Banker", "banker", new TradeHandlerBanker()); VillagerUtils.registerNewVillager(1, "Technician", "Technician", "Technician", "technician", new TradeHandlerTechnician()); VillagerUtils.registerNewVillager(2, "Trader", "Trader", "Trader", "trader", new TradeHandlerTrader()); @@ -81,7 +75,8 @@ public class Core_VillagerAdditions implements IPlugin { } } } - } + } + return true; } return false; } @@ -89,7 +84,6 @@ public class Core_VillagerAdditions implements IPlugin { @Override public boolean init() { if (shouldLoad) { - ModBlocks.blockCustomMobSpawner = new BlockGenericSpawner(); return true; } return false; diff --git a/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java b/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java index 8f47cb0243..9507371fb1 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java +++ b/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java @@ -3,20 +3,20 @@ package gtPlusPlus.plugin.villagers; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.plugin.villagers.entity.EntityBaseVillager; import net.minecraft.util.ResourceLocation; public class VillagerObject { public final int mID; public final String mName; + public final IVillageTradeHandler mCustomTrade; public VillagerObject(int aID, String aName, Object aProfession, Object aCareer, Object aSkin, IVillageTradeHandler aCustomTrade) { mID = aID; mName = aName; + mCustomTrade = aCustomTrade; //Register Custom Trade to Registry. if (aCustomTrade != null) { diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java index 1b08d90978..d85f86ad57 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java +++ b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java @@ -14,12 +14,14 @@ public class TradeHandlerBanker extends TradeHandlerBase { @SuppressWarnings("unchecked") @Override public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) { - recipeList.add(new MerchantRecipe(CI.electricMotor_LV, CI.electricPiston_LV, CI.robotArm_LV)); - recipeList.add(new MerchantRecipe(CI.electricMotor_MV, CI.electricPiston_MV, CI.robotArm_MV)); - recipeList.add(new MerchantRecipe(CI.electricMotor_HV, CI.electricPiston_HV, CI.robotArm_HV)); - recipeList.add(new MerchantRecipe(CI.electricMotor_EV, CI.electricPiston_EV, CI.robotArm_EV)); - recipeList.add(new MerchantRecipe(CI.electricMotor_IV, CI.electricPiston_IV, CI.robotArm_IV)); - Collections.shuffle(recipeList); + if (villager.getProfession() == 7735) { + recipeList.add(new MerchantRecipe(CI.electricMotor_LV, CI.electricPiston_LV, CI.robotArm_LV)); + recipeList.add(new MerchantRecipe(CI.electricMotor_MV, CI.electricPiston_MV, CI.robotArm_MV)); + recipeList.add(new MerchantRecipe(CI.electricMotor_HV, CI.electricPiston_HV, CI.robotArm_HV)); + recipeList.add(new MerchantRecipe(CI.electricMotor_EV, CI.electricPiston_EV, CI.robotArm_EV)); + recipeList.add(new MerchantRecipe(CI.electricMotor_IV, CI.electricPiston_IV, CI.robotArm_IV)); + Collections.shuffle(recipeList); + } } } diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java index 9d27962f22..cc77aa69cf 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java +++ b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java @@ -14,12 +14,14 @@ public class TradeHandlerTechnician extends TradeHandlerBase { @SuppressWarnings("unchecked") @Override public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) { - recipeList.add(new MerchantRecipe(CI.machineHull_LV, CI.electricMotor_LV, CI.machineHull_LV)); - recipeList.add(new MerchantRecipe(CI.machineHull_MV, CI.electricMotor_MV, CI.machineHull_MV)); - recipeList.add(new MerchantRecipe(CI.machineHull_HV, CI.electricMotor_HV, CI.machineHull_HV)); - recipeList.add(new MerchantRecipe(CI.machineHull_EV, CI.electricMotor_EV, CI.machineHull_EV)); - recipeList.add(new MerchantRecipe(CI.machineHull_IV, CI.electricMotor_IV, CI.machineHull_IV)); - Collections.shuffle(recipeList); + if (villager.getProfession() == 7737) { + recipeList.add(new MerchantRecipe(CI.machineHull_LV, CI.electricMotor_LV, CI.machineHull_LV)); + recipeList.add(new MerchantRecipe(CI.machineHull_MV, CI.electricMotor_MV, CI.machineHull_MV)); + recipeList.add(new MerchantRecipe(CI.machineHull_HV, CI.electricMotor_HV, CI.machineHull_HV)); + recipeList.add(new MerchantRecipe(CI.machineHull_EV, CI.electricMotor_EV, CI.machineHull_EV)); + recipeList.add(new MerchantRecipe(CI.machineHull_IV, CI.electricMotor_IV, CI.machineHull_IV)); + Collections.shuffle(recipeList); + } } - + } diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java index 885c0400d8..508ecd9e83 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java +++ b/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java @@ -15,12 +15,14 @@ public class TradeHandlerTrader extends TradeHandlerBase { @SuppressWarnings("unchecked") @Override public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) { + if (villager.getProfession() == 7736) { recipeList.add(new MerchantRecipe(ItemUtils.getItemStackOfAmountFromOreDict("logWood", 32), ELEMENT.getInstance().IRON.getOre(1))); recipeList.add(new MerchantRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRawMeat", 32), ELEMENT.getInstance().COPPER.getOre(1))); recipeList.add(new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.obsidian, 6), ELEMENT.getInstance().TIN.getOre(1))); recipeList.add(new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.glowstone, 32), ELEMENT.getInstance().SILICON.getOre(1))); recipeList.add(new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.piston, 32), ELEMENT.getInstance().ALUMINIUM.getOre(1))); - Collections.shuffle(recipeList); + Collections.shuffle(recipeList); + } } } diff --git a/src/Java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java b/src/Java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java index f7a9ea3d41..d33b19aaf9 100644 --- a/src/Java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java +++ b/src/Java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java @@ -3,7 +3,8 @@ package gtPlusPlus.xmod.bop.creative; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; public class MiscUtilsBOPTab extends CreativeTabs { @@ -13,7 +14,7 @@ public class MiscUtilsBOPTab extends CreativeTabs { @Override public Item getTabIconItem() { - return ModItems.itemAlkalusDisk; + return ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest).getItem(); } } diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index d20089234d..bb224f5c9b 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -2012,5 +2012,5 @@ tile.blockMobSpawnerEx.13.name=Monster Spawner tile.blockMobSpawnerEx.14.name=Monster Spawner tile.blockMobSpawnerEx.15.name=Monster Spawner description.villager.profession.miscutils.banker=Banker -description.villager.profession.miscutils.technician=GT Technitian +description.villager.profession.miscutils.technician=GT Technician description.villager.profession.miscutils.trader=Ore Trader |