From e2a49158f35010aab98757ab8ee00bae77942467 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 6 Aug 2017 19:41:48 -0700 Subject: [PATCH] Update to 1.12 --- build.gradle | 6 +- gradle.properties | 18 ++-- .../binnie/botany/ceramic/BlockCeramic.java | 5 +- .../botany/ceramic/BlockStainedGlass.java | 2 +- .../botany/ceramic/CeramicTileRecipe.java | 14 ++- .../binnie/botany/ceramic/PigmentRecipe.java | 26 +++--- .../ceramic/brick/BlockCeramicBrick.java | 3 +- .../botany/flower/EnumTubeInsulate.java | 14 ++- .../botany/flower/EnumTubeMaterial.java | 14 ++- .../java/binnie/botany/flower/ItemBotany.java | 9 +- .../botany/flower/ItemInsulatedTube.java | 19 ++-- .../binnie/botany/gardening/BlockPlant.java | 3 +- .../binnie/botany/gardening/BlockSoil.java | 3 +- .../binnie/botany/gardening/ItemSoil.java | 6 +- .../botany/gardening/ModuleGardening.java | 92 ++++++++++--------- .../botany/genetics/EnumFlowerColor.java | 12 ++- .../botany/genetics/FlowerAlyzerPlugin.java | 10 +- .../botany/genetics/ItemDictionary.java | 8 +- .../botany/genetics/ModuleGenetics.java | 7 +- .../gui/database/ControlColorDisplay.java | 5 +- .../gui/database/ControlColorMixSymbol.java | 3 +- .../java/binnie/botany/items/ItemClay.java | 9 +- .../java/binnie/botany/items/ItemPigment.java | 9 +- .../binnie/core/block/BaseBakedModel.java | 3 +- .../binnie/core/genetics/ManagerGenetics.java | 2 +- src/main/java/binnie/core/gui/ITooltip.java | 4 +- .../core/gui/controls/ControlTextEdit.java | 4 +- .../core/gui/controls/core/Control.java | 3 +- .../core/gui/controls/tab/ControlTab.java | 5 +- .../ControlDatabaseIndividualDisplay.java | 3 +- .../gui/database/ControlMutationSymbol.java | 3 +- .../gui/fieldkit/ControlChromoPicker.java | 3 +- .../core/gui/minecraft/ContainerCraftGUI.java | 2 +- .../core/gui/minecraft/GuiCraftGUI.java | 6 +- .../binnie/core/gui/minecraft/Window.java | 5 +- .../minecraft/control/ControlEnergyBar.java | 3 +- .../minecraft/control/ControlErrorState.java | 3 +- .../gui/minecraft/control/ControlHelp.java | 17 ++-- .../gui/minecraft/control/ControlInfo.java | 3 +- .../minecraft/control/ControlItemDisplay.java | 8 +- .../minecraft/control/ControlLiquidTank.java | 3 +- .../minecraft/control/ControlPowerSystem.java | 3 +- .../minecraft/control/ControlSlotBase.java | 5 +- .../gui/minecraft/control/ControlUser.java | 3 +- .../binnie/core/gui/renderer/RenderUtil.java | 30 +++--- .../core/gui/renderer/TextureRenderer.java | 2 +- .../java/binnie/core/item/ItemFieldKit.java | 12 ++- src/main/java/binnie/core/item/ItemMisc.java | 18 ++-- .../java/binnie/core/item/ModuleItems.java | 5 +- .../core/liquid/ItemFluidContainer.java | 21 +++-- .../binnie/core/liquid/ManagerLiquid.java | 11 ++- .../binnie/core/machines/BlockMachine.java | 21 ++--- .../binnie/core/machines/MachineUtil.java | 7 +- .../machines/TileEntityMachineRenderer.java | 2 +- .../storage/ControlColourSelector.java | 3 +- .../core/machines/storage/ModuleStorage.java | 15 +-- .../java/binnie/core/models/ModelManager.java | 6 +- .../core/network/BinnieCorePacketID.java | 2 +- .../core/network/BinniePacketHandler.java | 2 +- .../binnie/core/proxy/BinnieModProxy.java | 3 +- .../java/binnie/core/util/FakeMapStorage.java | 2 +- .../java/binnie/core/util/RecipeUtil.java | 36 ++++++++ .../extrabees/alveary/BlockAlveary.java | 4 +- .../extrabees/blocks/BlockExtraBeeHive.java | 2 +- .../client/gui/ContainerStimulator.java | 2 +- .../client/gui/GuiContainerAlvearyPart.java | 2 +- .../binnie/extrabees/init/BlockRegister.java | 5 +- .../binnie/extrabees/init/RecipeRegister.java | 32 +++---- .../binnie/extrabees/items/ItemBeehive.java | 8 +- .../binnie/extrabees/items/ItemHiveFrame.java | 8 +- .../extrabees/items/ItemHoneyCrystal.java | 13 +-- .../extrabees/items/ItemIndustrialFrame.java | 23 +++-- .../extrabees/items/ItemMiscProduct.java | 7 +- .../binnie/extrabees/items/ItemProduct.java | 10 +- .../extrabees/items/types/EnumHiveFrame.java | 31 ++++--- .../extrabees/items/types/EnumHoneyComb.java | 14 +-- .../extrabees/proxy/ExtraBeesCommonProxy.java | 10 +- .../extrabees/utils/BeeModifierLogic.java | 4 +- .../worldgen/ExtraBeesWorldGenerator.java | 4 +- .../extratrees/alcohol/drink/ItemDrink.java | 11 ++- .../block/BlockETDecorativeLeaves.java | 5 +- .../block/BlockETDefaultLeaves.java | 20 ++-- .../binnie/extratrees/block/EnumETLog.java | 14 ++- .../block/ItemBlockETDecorativeLeaves.java | 2 +- .../binnie/extratrees/block/ModuleBlocks.java | 32 ++++--- .../extratrees/block/decor/BlockHedge.java | 5 +- .../block/decor/BlockMultiFence.java | 23 +---- .../block/decor/MultiFenceRecipeEmbedded.java | 13 ++- .../block/decor/MultiFenceRecipeSize.java | 10 +- .../block/decor/MultiFenceRecipeSolid.java | 13 ++- .../carpentry/BlockCarpentryPanel.java | 2 +- .../extratrees/carpentry/BlockDesign.java | 5 +- .../crafttweaker/CraftTweakerModule.java | 10 +- .../crafttweaker/CraftTweakerUtil.java | 10 +- .../handlers/BreweryRecipeHandler.java | 8 +- .../handlers/DistilleryRecipeHandler.java | 4 +- .../handlers/FruitPressRecipeHandler.java | 6 +- .../handlers/GenericRecipeHandler.java | 91 +++--------------- .../handlers/LumbermillRecipeHandler.java | 4 +- .../extratrees/item/ItemArboristDatabase.java | 13 ++- .../binnie/extratrees/item/ItemETFood.java | 17 ++-- .../extratrees/item/ItemMothDatabase.java | 14 +-- .../binnie/extratrees/item/ModuleItems.java | 27 +++--- .../kitchen/craftgui/ControlFluidDisplay.java | 3 +- .../kitchen/craftgui/ControlSlotFluid.java | 3 +- .../extratrees/machines/ModuleMachine.java | 19 ++-- .../brewery/recipes/BrewedGrainRecipe.java | 3 +- .../brewery/recipes/BreweryRecipe.java | 3 +- .../designer/window/ControlTileSelect.java | 3 +- .../distillery/recipes/DistilleryRecipe.java | 3 +- .../fruitpress/recipes/FruitPressRecipe.java | 3 +- .../lumbermill/recipes/LumbermillRecipe.java | 3 +- .../recipes/LumbermillRecipeManager.java | 24 +++-- .../genetics/genetics/GeneProjectTracker.java | 2 +- .../binnie/genetics/genetics/GeneTracker.java | 2 +- .../gui/analyst/AnalystPageProduce.java | 56 ++++------- .../gui/analyst/ControlAnalystButton.java | 3 +- .../gui/analyst/ControlAnalystChromosome.java | 3 +- .../genetics/gui/analyst/ControlBiome.java | 3 +- .../gui/analyst/ControlIndividualDisplay.java | 3 +- .../gui/analyst/ControlSystemButton.java | 3 +- .../gui/analyst/ControlToleranceBar.java | 3 +- .../genetics/gui/analyst/ControlTooltip.java | 3 +- .../gui/analyst/bee/AnalystPageProducts.java | 5 +- .../gui/analyst/tree/AnalystPageClimate.java | 3 +- .../gui/database/bee/ControlBiomes.java | 3 +- .../gui/database/bee/ControlClimateBar.java | 3 +- .../gui/punnett/ControlChromosome.java | 3 +- .../jei/database/DatabaseRecipeWrapper.java | 2 +- .../jei/genepool/GenepoolRecipeWrapper.java | 2 +- .../jei/incubator/IncubatorRecipeWrapper.java | 4 +- .../inoculator/InoculatorRecipeWrapper.java | 8 +- .../jei/isolator/IsolatorRecipeCategory.java | 4 +- .../jei/isolator/IsolatorRecipeWrapper.java | 2 +- .../genetics/item/ItemBeeDictionary.java | 15 +-- .../binnie/genetics/item/ItemDatabase.java | 9 +- .../java/binnie/genetics/item/ItemGene.java | 7 +- .../binnie/genetics/item/ItemSequence.java | 29 +++--- .../java/binnie/genetics/item/ItemSerum.java | 27 +++--- .../binnie/genetics/item/ItemSerumArray.java | 33 +++---- .../binnie/genetics/item/ModuleItems.java | 56 +++++------ .../genetics/machine/MachineRendererLab.java | 8 +- .../genetics/machine/ModuleMachine.java | 24 +++-- .../genetics/machine/analyser/AnalyserFX.java | 4 +- .../machine/craftgui/ControlGene.java | 3 +- .../machine/craftgui/WindowGeneBank.java | 3 +- .../machine/inoculator/InoculatorFX.java | 4 +- .../genetics/machine/splicer/SplicerFX.java | 4 +- 148 files changed, 817 insertions(+), 720 deletions(-) create mode 100644 src/main/java/binnie/core/util/RecipeUtil.java diff --git a/build.gradle b/build.gradle index 0d22cf35..7d831614 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' classpath "gradle.plugin.se.bjurr.gitchangelog:git-changelog-gradle-plugin:1.47" } } @@ -29,7 +29,7 @@ if (System.getenv("BUILD_NUMBER") != null) { version = version + "." + System.getenv("BUILD_NUMBER") } group = "binnie" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "binnie-mods-1.11.2" +archivesBaseName = "binnie-mods-" + mcversion minecraft { version = mcversion + "-" + forgeversion @@ -67,7 +67,7 @@ dependencies { runtime "jei-bees:jeibees:${jeibees_version}:mc${mcversion}" deobfProvided "net.industrial-craft:industrialcraft-2:${ic2_version}:api" runtime "net.industrial-craft:industrialcraft-2:${ic2_version}" - deobfProvided "MineTweaker3:MineTweaker3-API:${minetweaker_version}" + deobfProvided "CraftTweaker2:CraftTweaker2-API:${minetweaker_version}" } processResources { diff --git a/gradle.properties b/gradle.properties index 248c228a..fb6199cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,18 +2,18 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G -mcversion=1.11.2 -forgeversion=13.20.1.2393 -mcp_mappings=snapshot_20161220 +mcversion=1.12 +forgeversion=14.21.1.2443 +mcp_mappings=snapshot_20170806 curse_project_id=223525 -forestry_version=5.3.4.132 -ic2_version=2.7.71-ex111 +forestry_version=5.5.0.154 +ic2_version=2.8.14-ex112 version_major=2 -version_minor=1 +version_minor=2 version_patch=0 -jei_version=4.5.0.292 -jeibees_version=0.9.0.5 -minetweaker_version=3.0.26.113 +jei_version=4.7.4.82 +jeibees_version=0.9.0.2 +minetweaker_version=4.0.3.239 diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index 8ad9ccd3..2e734c86 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -89,10 +89,9 @@ public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegi } @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, NonNullList itemList) { + public void getSubBlocks(CreativeTabs tab, NonNullList itemList) { for (EnumFlowerColor c : EnumFlowerColor.values()) { - itemList.add(new ItemStack(item, 1, c.getFlowerColorAllele().getID())); + itemList.add(new ItemStack(this, 1, c.getFlowerColorAllele().getID())); } } diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index 9cec2f06..20e0a5ac 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -143,7 +143,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList itemList) { + public void getSubBlocks(CreativeTabs tab, NonNullList itemList) { for (EnumFlowerColor color : EnumFlowerColor.values()) { itemList.add(TileEntityMetadata.getItemStack(this, color.ordinal())); } diff --git a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java index 62f246bf..8c03a836 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java +++ b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java @@ -3,11 +3,13 @@ package binnie.botany.ceramic; import java.util.ArrayList; import java.util.List; +import binnie.Constants; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; @@ -15,9 +17,13 @@ import net.minecraftforge.common.ForgeHooks; import binnie.botany.Botany; import binnie.botany.ceramic.brick.CeramicBrickType; import binnie.botany.gardening.ModuleGardening; +import net.minecraftforge.registries.IForgeRegistryEntry; -public class CeramicTileRecipe implements IRecipe { - private ItemStack cached = ItemStack.EMPTY; +public class CeramicTileRecipe extends IForgeRegistryEntry.Impl implements IRecipe { private ItemStack cached = ItemStack.EMPTY; + + public CeramicTileRecipe() { + setRegistryName(new ResourceLocation(Constants.BOTANY_MOD_ID, "ceramic_tile")); + } @Override public boolean matches(InventoryCrafting inv, World world) { @@ -63,8 +69,8 @@ public class CeramicTileRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 2; + public boolean canFit(int width, int height) { + return width >= 2 && height >= 2; } @Override diff --git a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java index 7c64bede..d1b2b8be 100644 --- a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java +++ b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java @@ -1,18 +1,21 @@ package binnie.botany.ceramic; +import binnie.Binnie; +import binnie.Constants; +import binnie.botany.Botany; +import binnie.botany.api.IFlower; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.registries.IForgeRegistryEntry; -import net.minecraftforge.common.ForgeHooks; +public class PigmentRecipe extends IForgeRegistryEntry.Impl implements IRecipe { + public PigmentRecipe() { + setRegistryName(new ResourceLocation(Constants.BOTANY_MOD_ID, "pigment")); + } -import binnie.Binnie; -import binnie.botany.Botany; -import binnie.botany.api.IFlower; - -public class PigmentRecipe implements IRecipe { @Override public boolean matches(InventoryCrafting crafting, World world) { return !getCraftingResult(crafting).isEmpty(); @@ -45,12 +48,7 @@ public class PigmentRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 1; - } - - @Override - public NonNullList getRemainingItems(InventoryCrafting inv) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); + public boolean canFit(int width, int height) { + return width >= 1 && height >= 1; } } diff --git a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java index 3a55f9e8..d4a0c964 100644 --- a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java @@ -103,9 +103,8 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock itemList) { + public void getSubBlocks(CreativeTabs tab, NonNullList itemList) { for (EnumFlowerColor color : EnumFlowerColor.values()) { itemList.add(new CeramicBrickPair(color, color, CeramicBrickType.TILE).getStack(1)); } diff --git a/src/main/java/binnie/botany/flower/EnumTubeInsulate.java b/src/main/java/binnie/botany/flower/EnumTubeInsulate.java index acdcecdd..ef6830e4 100644 --- a/src/main/java/binnie/botany/flower/EnumTubeInsulate.java +++ b/src/main/java/binnie/botany/flower/EnumTubeInsulate.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import binnie.core.util.I18N; -enum EnumTubeInsulate { +public enum EnumTubeInsulate { CLAY(0xa1aacc, "clay"), COBBLE(0x7b7b7b, "cobblestone"), SAND(0xefeab5, "sandstone"), @@ -16,11 +16,11 @@ enum EnumTubeInsulate { public static final EnumTubeInsulate[] VALUES = values(); int color; - String name; + String uid; - EnumTubeInsulate(int color, String name) { + EnumTubeInsulate(int color, String uid) { this.color = color; - this.name = name; + this.uid = uid; } public static EnumTubeInsulate get(int meta) { @@ -32,7 +32,11 @@ enum EnumTubeInsulate { } public String getDisplayName() { - return I18N.localise("botany.tube.insulate." + name + ".name"); + return I18N.localise("botany.tube.insulate." + uid + ".name"); + } + + public String getUid() { + return uid; } public ItemStack getStack() { diff --git a/src/main/java/binnie/botany/flower/EnumTubeMaterial.java b/src/main/java/binnie/botany/flower/EnumTubeMaterial.java index cf6e31d6..368e5254 100644 --- a/src/main/java/binnie/botany/flower/EnumTubeMaterial.java +++ b/src/main/java/binnie/botany/flower/EnumTubeMaterial.java @@ -2,7 +2,7 @@ package binnie.botany.flower; import binnie.core.util.I18N; -enum EnumTubeMaterial { +public enum EnumTubeMaterial { COPPER(0xe3b78e, "copper"), TIN(0xe1eef4, "tin"), BRONZE(0xddc276, "bronze"), @@ -11,22 +11,26 @@ enum EnumTubeMaterial { public static final EnumTubeMaterial[] VALUES = values(); int color; - String name; + String uid; - EnumTubeMaterial(int color, String name) { + EnumTubeMaterial(int color, String uid) { this.color = color; - this.name = name; + this.uid = uid; } public static EnumTubeMaterial get(int meta) { return VALUES[meta % VALUES.length]; } + public String getUid() { + return uid; + } + public int getColor() { return color; } public String getDisplayName() { - return I18N.localise("botany.tube.material." + name + ".name"); + return I18N.localise("botany.tube.material." + uid + ".name"); } } diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 55f32090..9f54f0e8 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -11,6 +11,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -89,7 +90,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemStack, @Nullable World worldIn, List list, ITooltipFlag flagIn) { IFlower individual = (IFlower) getIndividual(itemStack); if (individual == null) { list.add(TextFormatting.DARK_RED + I18N.localise("item.botany.flower.destroy")); @@ -150,8 +151,10 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList itemList) { - addCreativeItems(itemList, true); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + addCreativeItems(items, true); + } } public void addCreativeItems(NonNullList itemList, boolean hideSecrets) { diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index db3a4cb9..789fabea 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -1,5 +1,7 @@ package binnie.botany.flower; +import javax.annotation.Nullable; + import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; @@ -7,6 +9,7 @@ import java.util.Collection; import java.util.List; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -14,6 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -58,11 +62,12 @@ public class ItemInsulatedTube extends ItemCore implements IColoredItem { } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { - for (EnumTubeMaterial mat : EnumTubeMaterial.values()) { - for (EnumTubeInsulate ins : EnumTubeInsulate.values()) { - subItems.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + for (EnumTubeMaterial mat : EnumTubeMaterial.values()) { + for (EnumTubeInsulate ins : EnumTubeInsulate.values()) { + items.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128)); + } } } } @@ -89,8 +94,8 @@ public class ItemInsulatedTube extends ItemCore implements IColoredItem { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { - super.addInformation(itemstack, player, list, flag); + public void addInformation(ItemStack itemstack, @Nullable World worldIn, List list, ITooltipFlag flagIn) { + super.addInformation(itemstack, worldIn, list, flagIn); Multimap circuits = getCircuits(itemstack); if (!circuits.isEmpty()) { if (GuiScreen.isShiftKeyDown()) { diff --git a/src/main/java/binnie/botany/gardening/BlockPlant.java b/src/main/java/binnie/botany/gardening/BlockPlant.java index 091fc745..bc165615 100644 --- a/src/main/java/binnie/botany/gardening/BlockPlant.java +++ b/src/main/java/binnie/botany/gardening/BlockPlant.java @@ -90,8 +90,7 @@ public class BlockPlant extends BlockBush implements IItemModelRegister { } @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, NonNullList subBlocks) { + public void getSubBlocks(CreativeTabs p_149666_2_, NonNullList subBlocks) { for (PlantType type : PlantType.values()) { subBlocks.add(type.get()); } diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index 0970fada..28453569 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -135,8 +135,7 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { } @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (int i = 0; i < 9; ++i) { list.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/binnie/botany/gardening/ItemSoil.java b/src/main/java/binnie/botany/gardening/ItemSoil.java index 4f3a2646..e9dc6e7e 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoil.java +++ b/src/main/java/binnie/botany/gardening/ItemSoil.java @@ -1,12 +1,15 @@ package binnie.botany.gardening; +import javax.annotation.Nullable; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -25,8 +28,7 @@ public class ItemSoil extends ItemBlock { } @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { String info = ""; info += BlockSoil.getMoisture(stack, true, true); if (info.length() > 0) { diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index b847cf7e..cbff35b1 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -3,11 +3,16 @@ package binnie.botany.gardening; import java.util.HashMap; import java.util.Map; +import binnie.Constants; +import binnie.botany.flower.EnumTubeInsulate; +import binnie.botany.flower.EnumTubeMaterial; +import binnie.core.util.RecipeUtil; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -167,66 +172,68 @@ public class ModuleGardening implements IInitializable { @Override public void postInit() { + RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID); IGardeningManager gardening = BotanyCore.getGardening(); - GameRegistry.addRecipe(new CeramicTileRecipe()); - for (int mat = 0; mat < 4; ++mat) { - for (int insulate = 0; insulate < 6; ++insulate) { - ItemStack tubes = new ItemStack(insulatedTube, 2, mat + 128 * insulate); + ForgeRegistries.RECIPES.register(new CeramicTileRecipe()); + for (EnumTubeMaterial mat: EnumTubeMaterial.VALUES) { + for (EnumTubeInsulate insulate : EnumTubeInsulate.VALUES) { + ItemStack tubes = new ItemStack(insulatedTube, 2, mat.ordinal() + 128 * insulate.ordinal()); ItemStack insulateStack = ItemInsulatedTube.getInsulateStack(tubes); - ItemStack forestryTube = new ItemStack(Mods.Forestry.item("thermionic_tubes"), 1, mat); - GameRegistry.addShapelessRecipe(tubes, forestryTube, forestryTube, insulateStack); + ItemStack forestryTube = new ItemStack(Mods.Forestry.item("thermionic_tubes"), 1, mat.ordinal()); + String recipeName = "thermionic_tubes_" + insulate.getUid() + "_" + mat.getUid(); + recipeUtil.addShapelessRecipe(recipeName, tubes, forestryTube, forestryTube, insulateStack); } } - GameRegistry.addRecipe(new ShapedOreRecipe( + recipeUtil.addRecipe("trowel_wood", trowelWood, "d ", " x ", " s", 'd', Blocks.DIRT, 's', "stickWood", - 'x', "plankWood") + 'x', "plankWood" ); - GameRegistry.addRecipe(new ShapedOreRecipe( + recipeUtil.addRecipe("trowel_stone", trowelStone, "d ", " x ", " s", 'd', Blocks.DIRT, 's', "stickWood", 'x', "cobblestone" - )); + ); - GameRegistry.addRecipe(new ShapedOreRecipe( + recipeUtil.addRecipe("trowel_iron", trowelIron, "d ", " x ", " s", 'd', Blocks.DIRT, 's', "stickWood", 'x', "ingotIron" - )); + ); - GameRegistry.addRecipe(new ShapedOreRecipe( + recipeUtil.addRecipe("trowel_gold", trowelGold, "d ", " x ", " s", 'd', Blocks.DIRT, 's', "stickWood", 'x', "ingotGold" - )); + ); - GameRegistry.addRecipe(new ShapedOreRecipe( + recipeUtil.addRecipe("trowel_diamond", trowelDiamond, "d ", " x ", " s", 'd', Blocks.DIRT, 's', "stickWood", 'x', "gemDiamond" - )); + ); - GameRegistry.addRecipe(new ShapedOreRecipe( + recipeUtil.addRecipe("soil_meter", soilMeter, " gg", " rg", "i ", 'g', "ingotGold", 'r', "dustRedstone", 'i', "ingotIron" - )); + ); - GameRegistry.addShapelessRecipe( + recipeUtil.addShapelessRecipe("weed_killer", BotanyItems.WEEDKILLER.get(4), new ItemStack(Items.SPIDER_EYE), new ItemStack(Items.WHEAT_SEEDS), @@ -234,40 +241,40 @@ public class ModuleGardening implements IInitializable { new ItemStack(Items.WHEAT_SEEDS) ); - GameRegistry.addShapelessRecipe( + recipeUtil.addShapelessRecipe("powder_ash", BotanyItems.POWDER_ASH.get(4), Mods.Forestry.stack("ash") ); - GameRegistry.addShapelessRecipe( + recipeUtil.addShapelessRecipe("powder_mulch", BotanyItems.POWDER_MULCH.get(4), Mods.Forestry.stack("mulch") ); - GameRegistry.addShapelessRecipe( + recipeUtil.addShapelessRecipe("powder_compost", BotanyItems.POWDER_COMPOST.get(4), Mods.Forestry.stack("fertilizer_bio") ); - GameRegistry.addShapelessRecipe( + recipeUtil.addShapelessRecipe("powder_fertilizer", BotanyItems.POWDER_FERTILISER.get(4), Mods.Forestry.stack("fertilizer_compound") ); - GameRegistry.addShapelessRecipe( + recipeUtil.addShapelessRecipe("powder_pulp", BotanyItems.POWDER_PULP.get(4), Mods.Forestry.stack("wood_pulp") ); - GameRegistry.addRecipe(new ShapelessOreRecipe( + recipeUtil.addShapelessRecipe("powder_sulphur", BotanyItems.POWDER_SULPHUR.get(4), "dustSulphur" - )); + ); - GameRegistry.addRecipe(new ShapelessOreRecipe( + recipeUtil.addShapelessRecipe("pigment_black", new ItemStack(pigment, 2, EnumFlowerColor.Black.ordinal()), "pigment", "pigment", "dyeBlack" - )); + ); gardening.registerAcidFertiliser(BotanyItems.POWDER_SULPHUR.get(1), 1); gardening.registerAcidFertiliser(BotanyItems.POWDER_MULCH.get(1), 1); @@ -286,32 +293,32 @@ public class ModuleGardening implements IInitializable { gardening.registerNutrientFertiliser(Mods.Forestry.stack("fertilizer_compound"), 2); for (Map.Entry entry : ModuleGardening.queuedAcidFertilisers.entrySet()) { - addAcidFertiliserRecipe(entry.getKey(), entry.getValue()); + addAcidFertiliserRecipe(recipeUtil, entry.getKey(), entry.getValue()); } for (Map.Entry entry : ModuleGardening.queuedAlkalineFertilisers.entrySet()) { - addAlkalineFertiliserRecipe(entry.getKey(), entry.getValue()); + addAlkalineFertiliserRecipe(recipeUtil, entry.getKey(), entry.getValue()); } for (Map.Entry entry : ModuleGardening.queuedNutrientFertilisers.entrySet()) { - addNutrientFertiliserRecipe(entry.getKey(), entry.getValue()); + addNutrientFertiliserRecipe(recipeUtil, entry.getKey(), entry.getValue()); } - GameRegistry.addRecipe(BotanyItems.MORTAR.get(6), " c ", "cgc", " c ", 'c', Items.CLAY_BALL, 'g', Blocks.GRAVEL); + recipeUtil.addRecipe("mortar", BotanyItems.MORTAR.get(6), " c ", "cgc", " c ", 'c', Items.CLAY_BALL, 'g', Blocks.GRAVEL); for (EnumFlowerColor c : EnumFlowerColor.values()) { ItemStack clay = new ItemStack(this.clay, 1, c.ordinal()); ItemStack pigment = new ItemStack(this.pigment, 1, c.ordinal()); - GameRegistry.addShapelessRecipe(clay, Items.CLAY_BALL, Items.CLAY_BALL, Items.CLAY_BALL, pigment); + recipeUtil.addShapelessRecipe("clay_" + c.getIdent(), clay, Items.CLAY_BALL, Items.CLAY_BALL, Items.CLAY_BALL, pigment); GameRegistry.addSmelting(clay, TileEntityMetadata.getItemStack(ceramic, c.ordinal()), 0.0f); ItemStack glass = TileEntityMetadata.getItemStack(stained, c.ordinal()); glass.setCount(4); - GameRegistry.addShapedRecipe( + recipeUtil.addRecipe("mortar_" + c.getIdent(), glass, " g ", "gpg", " g ", 'g', Blocks.GLASS, 'p', pigment ); } - GameRegistry.addRecipe(new PigmentRecipe()); + ForgeRegistries.RECIPES.register(new PigmentRecipe()); } private ItemStack getStack(int type, int pH, int moisture) { @@ -321,7 +328,7 @@ public class ModuleGardening implements IInitializable { return ItemStack.EMPTY; } - private void addAcidFertiliserRecipe(ItemStack stack, int strengthMax) { + private void addAcidFertiliserRecipe(RecipeUtil recipeUtil, ItemStack stack, int strengthMax) { for (int moisture = 0; moisture < 3; ++moisture) { for (int pH = 0; pH < 3; ++pH) { for (int type = 0; type < 3; ++type) { @@ -336,7 +343,8 @@ public class ModuleGardening implements IInitializable { stacks[i] = start; } stacks[numOfBlocks] = stack.copy(); - GameRegistry.addShapelessRecipe(end, stacks); + String recipeName = "acid_fertiliser_moisture" + moisture + "_ph" + pH + "_type" + type + "_strength" + strength; + recipeUtil.addShapelessRecipe(recipeName, end, stacks); } numOfBlocks /= 2; } @@ -345,7 +353,7 @@ public class ModuleGardening implements IInitializable { } } - private void addAlkalineFertiliserRecipe(ItemStack stack, int strengthMax) { + private void addAlkalineFertiliserRecipe(RecipeUtil recipeUtil, ItemStack stack, int strengthMax) { for (int moisture = 0; moisture < 3; ++moisture) { for (int pH = 0; pH < 3; ++pH) { for (int type = 0; type < 3; ++type) { @@ -360,7 +368,8 @@ public class ModuleGardening implements IInitializable { stacks[i] = start; } stacks[numOfBlocks] = stack.copy(); - GameRegistry.addShapelessRecipe(end, stacks); + String recipeName = "alkaline_fertiliser_moisture" + moisture + "_ph" + pH + "_type" + type + "_strength" + strength; + recipeUtil.addShapelessRecipe(recipeName, end, stacks); } numOfBlocks /= 2; } @@ -369,7 +378,7 @@ public class ModuleGardening implements IInitializable { } } - private void addNutrientFertiliserRecipe(ItemStack stack, int strengthMax) { + private void addNutrientFertiliserRecipe(RecipeUtil recipeUtil, ItemStack stack, int strengthMax) { for (int moisture = 0; moisture < 3; ++moisture) { for (int pH = 0; pH < 3; ++pH) { for (int type = 0; type < 3; ++type) { @@ -384,7 +393,8 @@ public class ModuleGardening implements IInitializable { stacks[i] = start; } stacks[numOfBlocks] = stack.copy(); - GameRegistry.addShapelessRecipe(end, stacks); + String recipeName = "nutrient_fertiliser_moisture" + moisture + "_ph" + pH + "_type" + type + "_strength" + strength; + recipeUtil.addShapelessRecipe(recipeName, end, stacks); } numOfBlocks /= 2; } diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java index d35dbbc6..bfffb8b7 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java @@ -92,13 +92,11 @@ public enum EnumFlowerColor implements IStringSerializable { public static final EnumFlowerColor[] VALUES = values(); + private final String ident; private FlowerColorAllele allele; - EnumFlowerColor(String ident, int c) { - this(c); - } - - EnumFlowerColor(int color) { + EnumFlowerColor(String ident, int color) { + this.ident = ident; int r = color >> 16 & 0xFF; int g = color >> 8 & 0xFF; int b = color & 0xFF; @@ -110,6 +108,10 @@ public enum EnumFlowerColor implements IStringSerializable { allele = new FlowerColorAllele(uid, ordinal(), color, colorDis, name().toLowerCase(), uid, true); } + public String getIdent() { + return ident; + } + public static void addMix(EnumFlowerColor start1, EnumFlowerColor start2, EnumFlowerColor result, int chance) { BotanyCore.getFlowerRoot().registerColourMix(new ColorMix(start1.allele, start2.allele, result.allele, chance)); } diff --git a/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java b/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java index c3a907b8..833b937f 100644 --- a/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java +++ b/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java @@ -66,7 +66,7 @@ public class FlowerAlyzerPlugin implements IAlyzerPlugin { } public void drawLine(GuiScreen gui, int xOffset, String msg, int color) { - gui.mc.fontRendererObj.drawString(msg, guiLeft + xOffset, guiTop + lastTopOffset + margin, color); + gui.mc.fontRenderer.drawString(msg, guiLeft + xOffset, guiTop + lastTopOffset + margin, color); } public void drawChromosom(GuiScreen gui, EnumFlowerChromosome chromosome, IFlower flower) { @@ -95,16 +95,16 @@ public class FlowerAlyzerPlugin implements IAlyzerPlugin { ItemStack renderS = getIconStacks().get(flower.getGenome().getSecondary().getUID()); - gui.mc.fontRendererObj.drawString("Active", guiLeft + 10 + COLUMN_1, guiTop + 10, 0xffffff); - gui.mc.fontRendererObj.drawString("Inactive", guiLeft + 10 + COLUMN_2, guiTop + 10, 0xffffff); + gui.mc.fontRenderer.drawString("Active", guiLeft + 10 + COLUMN_1, guiTop + 10, 0xffffff); + gui.mc.fontRenderer.drawString("Inactive", guiLeft + 10 + COLUMN_2, guiTop + 10, 0xffffff); if (renderP != null && renderS != null) { RenderItem itemRender = Minecraft.getMinecraft().getRenderItem(); itemRender.renderItemAndEffectIntoGUI(renderP, guiLeft + 10 + COLUMN_1, guiTop + 10 + 12); - itemRender.renderItemOverlayIntoGUI(gui.mc.fontRendererObj, renderP, guiLeft + 10 + COLUMN_1, guiTop + 10 + 12, null); + itemRender.renderItemOverlayIntoGUI(gui.mc.fontRenderer, renderP, guiLeft + 10 + COLUMN_1, guiTop + 10 + 12, null); itemRender.renderItemAndEffectIntoGUI(renderS, guiLeft + 10 + COLUMN_2, guiTop + 10 + 12); - itemRender.renderItemOverlayIntoGUI(gui.mc.fontRendererObj, renderS, guiLeft + 10 + COLUMN_1, guiTop + 10 + 12, null); + itemRender.renderItemOverlayIntoGUI(gui.mc.fontRenderer, renderS, guiLeft + 10 + COLUMN_1, guiTop + 10 + 12, null); } guiTop += rowSize * 3; diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index 36e79978..68192ea3 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -29,10 +29,10 @@ public class ItemDictionary extends Item implements IItemModelRegister { } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList subItems) { - super.getSubItems(itemIn, tab, subItems); - subItems.add(new ItemStack(itemIn, 1, 1)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + items.add(new ItemStack(this, 1, 1)); + } } @Override diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index 567f495c..06a8f05d 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -3,6 +3,8 @@ package binnie.botany.genetics; import java.awt.Color; import java.util.function.Predicate; +import binnie.Constants; +import binnie.core.util.RecipeUtil; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -13,7 +15,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; import forestry.api.storage.IBackpackInterface; -import forestry.core.recipes.RecipeUtil; import forestry.storage.BackpackDefinition; import binnie.Binnie; @@ -79,6 +80,7 @@ public class ModuleGenetics implements IInitializable { @Override public void postInit() { + RecipeUtil recipeUtil = new RecipeUtil(Constants.GENETICS_MOD_ID); forestry.api.apiculture.FlowerManager.flowerRegistry.registerAcceptableFlower(Botany.flower, "flowersVanilla"); RecipeManagers.carpenterManager.addRecipe( 100, @@ -95,8 +97,7 @@ public class ModuleGenetics implements IInitializable { 'D', Items.DIAMOND, 'E', Items.EMERALD ); - RecipeUtil.addRecipe - (Botany.botanistBackpack, + recipeUtil.addRecipe("botanist_backpack", Botany.botanistBackpack, "X#X", "VYZ", "X#X", diff --git a/src/main/java/binnie/botany/gui/database/ControlColorDisplay.java b/src/main/java/binnie/botany/gui/database/ControlColorDisplay.java index 54df55b7..f137fc80 100644 --- a/src/main/java/binnie/botany/gui/database/ControlColorDisplay.java +++ b/src/main/java/binnie/botany/gui/database/ControlColorDisplay.java @@ -1,5 +1,6 @@ package binnie.botany.gui.database; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -39,8 +40,8 @@ public class ControlColorDisplay extends Control implements IControlValue list) { - for (EnumFlowerColor color : EnumFlowerColor.values()) { - list.add(new ItemStack(this, 1, color.ordinal())); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + for (EnumFlowerColor color : EnumFlowerColor.values()) { + items.add(new ItemStack(this, 1, color.ordinal())); + } } } } diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/src/main/java/binnie/botany/items/ItemPigment.java index 51cc048a..7fe875a8 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/src/main/java/binnie/botany/items/ItemPigment.java @@ -46,10 +46,11 @@ public class ItemPigment extends Item implements IItemModelRegister, IColoredIte } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList list) { - for (EnumFlowerColor color : EnumFlowerColor.values()) { - list.add(new ItemStack(this, 1, color.ordinal())); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + for (EnumFlowerColor color : EnumFlowerColor.values()) { + items.add(new ItemStack(this, 1, color.ordinal())); + } } } } diff --git a/src/main/java/binnie/core/block/BaseBakedModel.java b/src/main/java/binnie/core/block/BaseBakedModel.java index fc97c8ce..65180d3e 100644 --- a/src/main/java/binnie/core/block/BaseBakedModel.java +++ b/src/main/java/binnie/core/block/BaseBakedModel.java @@ -32,14 +32,13 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public abstract class BaseBakedModel implements IPerspectiveAwareModel { +public abstract class BaseBakedModel implements IBakedModel { private static final TRSRTransformation flipX = new TRSRTransformation(null, null, new Vector3f(-1, 1, 1), null); private final EnumMap transformMap = new EnumMap<>(ItemCameraTransforms.TransformType.class); private final ResourceLocation particle; diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index 77458c9c..13e504d9 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -57,7 +57,7 @@ public class ManagerGenetics extends ManagerBase { } @Override - public void init() { + public void preInit() { if (BinnieCore.isApicultureActive()) { this.beeBreedingSystem = new BeeBreedingSystem(); } diff --git a/src/main/java/binnie/core/gui/ITooltip.java b/src/main/java/binnie/core/gui/ITooltip.java index 71ec3ba2..86263087 100644 --- a/src/main/java/binnie/core/gui/ITooltip.java +++ b/src/main/java/binnie/core/gui/ITooltip.java @@ -1,5 +1,7 @@ package binnie.core.gui; +import net.minecraft.client.util.ITooltipFlag; + public interface ITooltip { - void getTooltip(Tooltip tooltip); + void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag); } diff --git a/src/main/java/binnie/core/gui/controls/ControlTextEdit.java b/src/main/java/binnie/core/gui/controls/ControlTextEdit.java index 69845949..10bf8c2f 100644 --- a/src/main/java/binnie/core/gui/controls/ControlTextEdit.java +++ b/src/main/java/binnie/core/gui/controls/ControlTextEdit.java @@ -90,8 +90,8 @@ public class ControlTextEdit extends Control implements IControlValue { protected void renderTextField() { this.field.width = this.getWidth(); this.field.height = this.getHeight(); - this.field.xPosition = (int) ((this.getHeight() - 8.0f) / 2.0f); - this.field.yPosition = (int) ((this.getHeight() - 8.0f) / 2.0f); + this.field.x = (int) ((this.getHeight() - 8.0f) / 2.0f); + this.field.y = (int) ((this.getHeight() - 8.0f) / 2.0f); this.field.drawTextBox(); } } diff --git a/src/main/java/binnie/core/gui/controls/core/Control.java b/src/main/java/binnie/core/gui/controls/core/Control.java index 6b8b1122..f33d53ff 100644 --- a/src/main/java/binnie/core/gui/controls/core/Control.java +++ b/src/main/java/binnie/core/gui/controls/core/Control.java @@ -4,6 +4,7 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -83,7 +84,7 @@ public class Control extends Widget implements ITooltipHelp, ITooltip { } @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.add(this.tooltipStrings); } diff --git a/src/main/java/binnie/core/gui/controls/tab/ControlTab.java b/src/main/java/binnie/core/gui/controls/tab/ControlTab.java index 258c1f27..43072989 100644 --- a/src/main/java/binnie/core/gui/controls/tab/ControlTab.java +++ b/src/main/java/binnie/core/gui/controls/tab/ControlTab.java @@ -1,5 +1,6 @@ package binnie.core.gui.controls.tab; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -38,13 +39,13 @@ public class ControlTab extends Control implements ITooltip, IControlValue } @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { final String name = this.getName(); if (name != null && !name.isEmpty()) { tooltip.add(this.getName()); } if (this.value instanceof ITooltip) { - ((ITooltip) this.value).getTooltip(tooltip); + ((ITooltip) this.value).getTooltip(tooltip, tooltipFlag); } } diff --git a/src/main/java/binnie/core/gui/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/core/gui/database/ControlDatabaseIndividualDisplay.java index 8a57bca5..c518289e 100644 --- a/src/main/java/binnie/core/gui/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/core/gui/database/ControlDatabaseIndividualDisplay.java @@ -6,6 +6,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import com.mojang.authlib.GameProfile; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -101,7 +102,7 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme } @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { if (this.species != null) { switch (this.discovered) { case Show: { diff --git a/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java b/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java index 745681bd..8932daa0 100644 --- a/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java @@ -1,5 +1,6 @@ package binnie.core.gui.database; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -58,7 +59,7 @@ class ControlMutationSymbol extends Control implements ITooltip { } @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { if (this.type == 1 && this.discovered) { final IAlleleSpecies species1 = this.value.getAllele0(); final IAlleleSpecies species2 = this.value.getAllele1(); diff --git a/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java b/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java index 5265c293..ad597acb 100644 --- a/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java +++ b/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java @@ -1,5 +1,6 @@ package binnie.core.gui.fieldkit; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -55,7 +56,7 @@ public class ControlChromoPicker extends Control implements ITooltip { } @Override - public void getTooltip(Tooltip tooltip) { + public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.add(Binnie.GENETICS.getSystem(parent.getRoot()).getChromosomeName(type)); } } diff --git a/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java index 4e9731fa..dacd3fbf 100644 --- a/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java @@ -200,7 +200,7 @@ public class ContainerCraftGUI extends Container { final int slotNumber = action.getShort("n"); this.createServerSlot(InventoryType.values()[type % 4], index, slotNumber); for (IContainerListener listener : listeners) { - listener.updateCraftingInventory(this, this.getInventory()); + listener.sendAllContents(this, this.getInventory()); } } return false; diff --git a/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java index 3b8e203a..215d0207 100644 --- a/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java @@ -10,6 +10,7 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.JsonToNBT; @@ -106,7 +107,8 @@ public class GuiCraftGUI extends GuiContainer { this.window.getHelpTooltip(tooltip); } else { tooltip.setType(Tooltip.Type.STANDARD); - this.window.getTooltip(tooltip); + ITooltipFlag tooltipFlag = this.mc.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL; + this.window.getTooltip(tooltip, tooltipFlag); } if (tooltip.exists()) { this.renderTooltip(new Point(mouseX, mouseY), tooltip); @@ -286,7 +288,7 @@ public class GuiCraftGUI extends GuiContainer { } public FontRenderer getFontRenderer() { - return this.fontRendererObj; + return this.fontRenderer; } public void resize(final Point size) { diff --git a/src/main/java/binnie/core/gui/minecraft/Window.java b/src/main/java/binnie/core/gui/minecraft/Window.java index 5fe5621c..0460d2a9 100644 --- a/src/main/java/binnie/core/gui/minecraft/Window.java +++ b/src/main/java/binnie/core/gui/minecraft/Window.java @@ -6,6 +6,7 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Deque; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -115,13 +116,13 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG return (T) widget.getTopParent(); } - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { final Deque queue = this.calculateMousedOverWidgets(); while (!queue.isEmpty()) { final IWidget widget = queue.removeFirst(); if (widget.isEnabled() && widget.isVisible() && widget.calculateIsMouseOver()) { if (widget instanceof ITooltip) { - ((ITooltip) widget).getTooltip(tooltip); + ((ITooltip) widget).getTooltip(tooltip, tooltipFlag); if (tooltip.exists()) { return; } diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java index 2a96eb4f..5812bec1 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java @@ -3,6 +3,7 @@ package binnie.core.gui.minecraft.control; import javax.annotation.Nullable; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; @@ -63,7 +64,7 @@ public class ControlEnergyBar extends Control implements ITooltip { } @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.add((int) this.getPercentage() + "% charged"); tooltip.add(this.getStoredEnergy() + "/" + this.getMaxEnergy() + " RF"); } diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java index 0e8096e5..10c21abb 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java @@ -2,6 +2,7 @@ package binnie.core.gui.minecraft.control; import javax.annotation.Nullable; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; @@ -86,7 +87,7 @@ public class ControlErrorState extends Control implements ITooltip { } @Override - public void getTooltip(final Tooltip tooltipOrig) { + public void getTooltip(final Tooltip tooltipOrig, ITooltipFlag tooltipFlag) { final MinecraftTooltip tooltip = (MinecraftTooltip) tooltipOrig; if (this.errorState != null) { if (this.type == 0) { diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java b/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java index 1211c20f..315af18a 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java @@ -1,5 +1,6 @@ package binnie.core.gui.minecraft.control; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -24,16 +25,20 @@ public class ControlHelp extends Control implements ITooltip { } @Override - public void getTooltip(final Tooltip tooltip) { - tooltip.setType(Tooltip.Type.HELP); - tooltip.add("Help"); - tooltip.add("To activate help tooltips,"); - tooltip.add("hold down the tab key and"); - tooltip.add("mouse over controls."); + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { + this.getTooltip(tooltip); } @Override public void getHelpTooltip(final Tooltip tooltip) { this.getTooltip(tooltip); } + + private void getTooltip(final Tooltip tooltip) { + tooltip.setType(Tooltip.Type.HELP); + tooltip.add("Help"); + tooltip.add("To activate help tooltips,"); + tooltip.add("hold down the tab key and"); + tooltip.add("mouse over controls."); + } } diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java b/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java index bcf96429..da8942f4 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java @@ -1,5 +1,6 @@ package binnie.core.gui.minecraft.control; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -27,7 +28,7 @@ public class ControlInfo extends Control implements ITooltip { } @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.setType(Tooltip.Type.INFORMATION); tooltip.add("Info"); tooltip.add(this.info); diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java b/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java index 5acb4b75..f9dbaf73 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java @@ -4,6 +4,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; @@ -82,14 +83,13 @@ public class ControlItemDisplay extends Control implements ITooltip { @Override @SideOnly(Side.CLIENT) - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { if (this.hastooltip && !this.itemStack.isEmpty()) { - final boolean advancedItemTooltips = Minecraft.getMinecraft().gameSettings.advancedItemTooltips; - List itemStackTooltip = this.itemStack.getTooltip(((Window) this.getTopParent()).getPlayer(), advancedItemTooltips); + List itemStackTooltip = this.itemStack.getTooltip(((Window) this.getTopParent()).getPlayer(), tooltipFlag); tooltip.add(itemStackTooltip); tooltip.setItemStack(this.itemStack); } - super.getTooltip(tooltip); + super.getTooltip(tooltip, tooltipFlag); } public void setRotating() { diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java index 4caa97d3..a60d6818 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java @@ -7,6 +7,7 @@ import java.util.List; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; @@ -169,7 +170,7 @@ public class ControlLiquidTank extends Control implements ITooltip { } @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { if (this.isTankValid()) { final int percentage = (int) (100.0 * this.getTank().getAmount() / this.getTankCapacity()); tooltip.add(this.getTank().getName()); diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java b/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java index 8775e8e5..a730222d 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java @@ -1,5 +1,6 @@ package binnie.core.gui.minecraft.control; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -28,7 +29,7 @@ public class ControlPowerSystem extends Control implements ITooltip { } @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.setType(Tooltip.Type.POWER); tooltip.add("Power Supply"); tooltip.add("Powered by " + this.system.getUnitName()); diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java index f59645db..ed152cf3 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java @@ -2,6 +2,7 @@ package binnie.core.gui.minecraft.control; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; @@ -63,12 +64,12 @@ public abstract class ControlSlotBase extends Control implements ITooltip { @Override @SideOnly(Side.CLIENT) - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { final ItemStack stack = this.getItemStack(); if (stack.isEmpty()) { return; } - List list = stack.getTooltip(((Window) this.getTopParent()).getPlayer(), false); + List list = stack.getTooltip(((Window) this.getTopParent()).getPlayer(), tooltipFlag); for (int i = 0; i < list.size(); ++i) { if (i == 0) { diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java b/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java index c6018b9e..3fed3a92 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java @@ -2,6 +2,7 @@ package binnie.core.gui.minecraft.control; import java.util.Objects; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -32,7 +33,7 @@ public class ControlUser extends Control implements ITooltip { } @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.setType(Tooltip.Type.USER); tooltip.add("Owner"); if (!Objects.equals(this.username, "")) { diff --git a/src/main/java/binnie/core/gui/renderer/RenderUtil.java b/src/main/java/binnie/core/gui/renderer/RenderUtil.java index 66508449..60e619b1 100644 --- a/src/main/java/binnie/core/gui/renderer/RenderUtil.java +++ b/src/main/java/binnie/core/gui/renderer/RenderUtil.java @@ -7,11 +7,11 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -80,7 +80,7 @@ public class RenderUtil { private static FontRenderer getFontRenderer(Minecraft minecraft, ItemStack ingredient) { FontRenderer fontRenderer = ingredient.getItem().getFontRenderer(ingredient); if (fontRenderer == null) { - fontRenderer = minecraft.fontRendererObj; + fontRenderer = minecraft.fontRenderer; } return fontRenderer; } @@ -94,12 +94,12 @@ public class RenderUtil { vMax = vMax - maskTop / 16.0 * (vMax - vMin); Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer vertexBuffer = tessellator.getBuffer(); - vertexBuffer.begin(7, DefaultVertexFormats.POSITION_TEX); - vertexBuffer.pos(xCoord, yCoord + 16, zLevel).tex(uMin, vMax).endVertex(); - vertexBuffer.pos(xCoord + 16 - maskRight, yCoord + 16, zLevel).tex(uMax, vMax).endVertex(); - vertexBuffer.pos(xCoord + 16 - maskRight, yCoord + maskTop, zLevel).tex(uMax, vMin).endVertex(); - vertexBuffer.pos(xCoord, yCoord + maskTop, zLevel).tex(uMin, vMin).endVertex(); + BufferBuilder bufferBuilder = tessellator.getBuffer(); + bufferBuilder.begin(7, DefaultVertexFormats.POSITION_TEX); + bufferBuilder.pos(xCoord, yCoord + 16, zLevel).tex(uMin, vMax).endVertex(); + bufferBuilder.pos(xCoord + 16 - maskRight, yCoord + 16, zLevel).tex(uMax, vMax).endVertex(); + bufferBuilder.pos(xCoord + 16 - maskRight, yCoord + maskTop, zLevel).tex(uMax, vMin).endVertex(); + bufferBuilder.pos(xCoord, yCoord + maskTop, zLevel).tex(uMin, vMin).endVertex(); tessellator.draw(); } @@ -119,13 +119,13 @@ public class RenderUtil { } public static int getTextWidth(final String text) { - FontRenderer fontRendererObj = Minecraft.getMinecraft().fontRendererObj; - return fontRendererObj.getStringWidth(text); + FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + return fontRenderer.getStringWidth(text); } public static int getTextHeight() { - FontRenderer fontRendererObj = Minecraft.getMinecraft().fontRendererObj; - return (fontRendererObj == null) ? 0 : fontRendererObj.FONT_HEIGHT; + FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + return (fontRenderer == null) ? 0 : fontRenderer.FONT_HEIGHT; } public static void drawText(final Point pos, final String text, final int colour) { @@ -137,8 +137,8 @@ public class RenderUtil { if (area.size().xPos() <= 0.0f) { return; } - FontRenderer fontRendererObj = Minecraft.getMinecraft().fontRendererObj; - final List wrappedStrings = fontRendererObj.listFormattedStringToWidth(text, area.size().xPos()); + FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + final List wrappedStrings = fontRenderer.listFormattedStringToWidth(text, area.size().xPos()); final float totalHeight = wrappedStrings.size() * getTextHeight(); float posY = pos.yPos(); if (area.size().yPos() > totalHeight) { @@ -149,7 +149,7 @@ public class RenderUtil { float posX = area.size().xPos() - stringWidth; posX *= justification.getXOffset(); GlStateManager.disableDepth(); - fontRendererObj.drawString(string, (int) (pos.xPos() + posX), (int) posY, colour); + fontRenderer.drawString(string, (int) (pos.xPos() + posX), (int) posY, colour); posY += getTextHeight(); } GlStateManager.color(1.0f, 1.0f, 1.0f); diff --git a/src/main/java/binnie/core/gui/renderer/TextureRenderer.java b/src/main/java/binnie/core/gui/renderer/TextureRenderer.java index e0f2d2db..0dbb8c81 100644 --- a/src/main/java/binnie/core/gui/renderer/TextureRenderer.java +++ b/src/main/java/binnie/core/gui/renderer/TextureRenderer.java @@ -181,7 +181,7 @@ public class TextureRenderer { public int textHeight(final String text, final int width) { Minecraft minecraft = Minecraft.getMinecraft(); - FontRenderer fontRenderer = minecraft.fontRendererObj; + FontRenderer fontRenderer = minecraft.fontRenderer; return fontRenderer.listFormattedStringToWidth(text, width).size() * RenderUtil.getTextHeight(); } diff --git a/src/main/java/binnie/core/item/ItemFieldKit.java b/src/main/java/binnie/core/item/ItemFieldKit.java index 6c95d5c7..544e083a 100644 --- a/src/main/java/binnie/core/item/ItemFieldKit.java +++ b/src/main/java/binnie/core/item/ItemFieldKit.java @@ -1,10 +1,12 @@ package binnie.core.item; +import javax.annotation.Nullable; import java.util.List; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -57,14 +59,14 @@ public class ItemFieldKit extends ItemCore { @Override @SideOnly(Side.CLIENT) - public void addInformation(final ItemStack p_77624_1_, final EntityPlayer p_77624_2_, final List p_77624_3_, final boolean p_77624_4_) { - final int i = p_77624_1_.getMaxDamage() - p_77624_1_.getItemDamage(); + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + final int i = stack.getMaxDamage() - stack.getItemDamage(); if (i == 0) { - p_77624_3_.add("No paper"); + tooltip.add("No paper"); } else { - p_77624_3_.add("" + i + " sheet" + ((i > 1) ? "s" : "") + " of paper"); + tooltip.add("" + i + " sheet" + ((i > 1) ? "s" : "") + " of paper"); } - super.addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_); + super.addInformation(stack, worldIn, tooltip, flagIn); } @Override diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index 87d62ce2..5229cfb3 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -1,13 +1,16 @@ package binnie.core.item; +import javax.annotation.Nullable; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -25,11 +28,12 @@ public class ItemMisc extends ItemCore { } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(final Item itemIn, final CreativeTabs creativeTabs, NonNullList subItems) { - for (IItemMiscProvider item : this.items) { - if (item.isActive()) { - subItems.add(this.getStack(item, 1)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + for (IItemMiscProvider item : this.items) { + if (item.isActive()) { + items.add(this.getStack(item, 1)); + } } } } @@ -44,8 +48,8 @@ public class ItemMisc extends ItemCore { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - super.addInformation(stack, playerIn, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + super.addInformation(stack, worldIn, tooltip, flagIn); IItemMiscProvider item = this.getItem(stack.getItemDamage()); item.addInformation(tooltip); } diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index 477940d3..62a0609e 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -1,5 +1,7 @@ package binnie.core.item; +import binnie.Constants; +import binnie.core.util.RecipeUtil; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -24,6 +26,7 @@ public class ModuleItems implements IInitializable { @Override public void postInit() { - GameRegistry.addRecipe(new ItemStack(BinnieCore.getFieldKit(), 1, 63), "g ", " is", " pi", 'g', Blocks.GLASS_PANE, 'i', Items.IRON_INGOT, 'p', Items.PAPER, 's', new ItemStack(Items.DYE, 1)); + RecipeUtil recipeUtil = new RecipeUtil(Constants.CORE_MOD_ID); + recipeUtil.addRecipe("field_kit", new ItemStack(BinnieCore.getFieldKit(), 1, 63), "g ", " is", " pi", 'g', Blocks.GLASS_PANE, 'i', Items.IRON_INGOT, 'p', Items.PAPER, 's', new ItemStack(Items.DYE, 1)); } } diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index e8525a78..594f17cc 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -63,17 +63,18 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(final Item item, final CreativeTabs tab, final NonNullList subItems) { - super.getSubItems(item, tab, subItems); - for (final IFluidType liquid : Binnie.LIQUID.fluids.values()) { - if (!liquid.canPlaceIn(this.container)) { - continue; + public void getSubItems(CreativeTabs tab, NonNullList items) { + super.getSubItems(tab, items); + if (this.isInCreativeTab(tab)) { + for (final IFluidType liquid : Binnie.LIQUID.fluids.values()) { + if (!liquid.canPlaceIn(this.container)) { + continue; + } + if (!liquid.showInCreative(this.container)) { + continue; + } + items.add(getContainer(liquid)); } - if (!liquid.showInCreative(this.container)) { - continue; - } - subItems.add(getContainer(liquid)); } } diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index 0e1fcb57..ba95fd36 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -5,6 +5,8 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; +import binnie.Constants; +import binnie.core.util.RecipeUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Items; @@ -67,12 +69,13 @@ public class ManagerLiquid extends ManagerBase { @Override public void postInit() { - GameRegistry.addShapelessRecipe(FluidContainerType.GLASS.get(1), Items.GLASS_BOTTLE); - GameRegistry.addShapelessRecipe(new ItemStack(Items.GLASS_BOTTLE), FluidContainerType.GLASS.get(1)); - GameRegistry.addRecipe(new ShapedOreRecipe(FluidContainerType.GLASS.get(3), + RecipeUtil recipeUtil = new RecipeUtil(Constants.CORE_MOD_ID); + recipeUtil.addShapelessRecipe("glass_container_conversion", FluidContainerType.GLASS.get(1), Items.GLASS_BOTTLE); + recipeUtil.addShapelessRecipe("glass_bottle_conversion", new ItemStack(Items.GLASS_BOTTLE), FluidContainerType.GLASS.get(1)); + recipeUtil.addRecipe("glass_container", FluidContainerType.GLASS.get(3), " b ", "g g", " g ", 'g', OreDictUtil.BLOCK_GLASS, 'b', OreDictUtil.SLAB_WOOD - )); + ); } public IFluidType getFluidType(final String liquid) { diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/src/main/java/binnie/core/machines/BlockMachine.java index 7536219d..560d12a8 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/src/main/java/binnie/core/machines/BlockMachine.java @@ -13,6 +13,7 @@ import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -54,7 +55,7 @@ class BlockMachine extends Block implements IBlockMachine, ITileEntityProvider { } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList itemList) { + public void getSubBlocks(CreativeTabs tab, NonNullList itemList) { for (final MachinePackage pack : this.group.getPackages()) { if (pack.isActive()) { itemList.add(new ItemStack(this, 1, pack.getMetadata())); @@ -108,9 +109,10 @@ class BlockMachine extends Block implements IBlockMachine, ITileEntityProvider { MachinePackage machinePackage = this.getPackage(meta); return (machinePackage == null) ? "Unnamed Machine" : machinePackage.getDisplayName(); } - + @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, @Nullable World player, List tooltip, ITooltipFlag advanced) { super.addInformation(stack, player, tooltip, advanced); if (GuiScreen.isShiftKeyDown()) { MachinePackage machinePackage = this.getPackage(stack.getMetadata()); @@ -121,7 +123,7 @@ class BlockMachine extends Block implements IBlockMachine, ITileEntityProvider { tooltip.add(TextFormatting.ITALIC + "<" + Translator.translateToLocal("for.gui.tooltip.tmi") + ">"); } } - + @Override public int damageDropped(IBlockState state) { return state.getValue(MACHINE_TYPE); @@ -147,14 +149,9 @@ class BlockMachine extends Block implements IBlockMachine, ITileEntityProvider { } TileEntity tileEntity = worldIn.getTileEntity(pos); if (tileEntity != null) { - if (tileEntity.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing)) { - IFluidHandler tileFluidHandler = tileEntity.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing); - ItemStack heldItem = playerIn.getHeldItem(hand); - FluidActionResult actionResult = FluidUtil.interactWithFluidHandler(heldItem, tileFluidHandler, playerIn); - if (actionResult.isSuccess()) { - playerIn.setHeldItem(hand, actionResult.getResult()); - return true; - } + IFluidHandler tileFluidHandler = tileEntity.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing); + if (tileFluidHandler != null && FluidUtil.interactWithFluidHandler(playerIn, hand, tileFluidHandler)) { + return true; } if (tileEntity instanceof TileEntityMachine) { ((TileEntityMachine) tileEntity).getMachine().onRightClick(worldIn, playerIn, pos); diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/src/main/java/binnie/core/machines/MachineUtil.java index 05337e72..405974e6 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/src/main/java/binnie/core/machines/MachineUtil.java @@ -24,6 +24,7 @@ import binnie.core.machines.power.PowerSystem; import binnie.core.util.ItemStackSet; public class MachineUtil { + private static final Random DAMAGE_RANDOM = new Random(); private IMachine machine; public MachineUtil(final IMachine machine) { @@ -103,8 +104,10 @@ public class MachineUtil { public void damageItem(final ItemStack item, final int slot, final int damage) { if (damage < 0) { item.setItemDamage(Math.max(0, item.getItemDamage() + damage)); - } else if (item.attemptDamageItem(damage, new Random())) { - this.setStack(slot, ItemStack.EMPTY); + } else { + if (item.attemptDamageItem(damage, DAMAGE_RANDOM, null)) { + this.setStack(slot, ItemStack.EMPTY); + } } this.setStack(slot, item); } diff --git a/src/main/java/binnie/core/machines/TileEntityMachineRenderer.java b/src/main/java/binnie/core/machines/TileEntityMachineRenderer.java index 7f785b2d..56e409d8 100644 --- a/src/main/java/binnie/core/machines/TileEntityMachineRenderer.java +++ b/src/main/java/binnie/core/machines/TileEntityMachineRenderer.java @@ -5,7 +5,7 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; public class TileEntityMachineRenderer extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntityMachine te, double x, double y, double z, float partialTicks, int destroyStage) { + public void render(TileEntityMachine te, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { if (te != null && te.getMachine() != null) { te.getMachine().getPackage().renderMachine(te.getMachine(), x, y, z, partialTicks, destroyStage); } diff --git a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java index 3b897d2e..412f2021 100644 --- a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java +++ b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java @@ -1,5 +1,6 @@ package binnie.core.machines.storage; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -22,7 +23,7 @@ class ControlColourSelector extends Control implements ITooltip, IControlValue tMap = Maps.newHashMap(); TRSRTransformation guiTransformation = secondaryState.apply(Optional.of(TransformType.GUI)).get(); - tMap.putAll(IPerspectiveAwareModel.MapWrapper.getTransforms(state)); + tMap.putAll(PerspectiveMapWrapper.getTransforms(state)); tMap.put(TransformType.GUI, guiTransformation); return new SimpleModelState(ImmutableMap.copyOf(tMap)); } diff --git a/src/main/java/binnie/core/network/BinnieCorePacketID.java b/src/main/java/binnie/core/network/BinnieCorePacketID.java index 3a6d9266..093dfd2b 100644 --- a/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -48,7 +48,7 @@ public enum BinnieCorePacketID implements IPacketID { } } else if (this == BinnieCorePacketID.CRAFT_GUI_ACTION && context.side == Side.SERVER && context.netHandler instanceof NetHandlerPlayServer) { final MessageCraftGUI packet3 = new MessageCraftGUI(message); - final EntityPlayer player = ((NetHandlerPlayServer) context.netHandler).playerEntity; + final EntityPlayer player = ((NetHandlerPlayServer) context.netHandler).player; if (player.openContainer instanceof ContainerCraftGUI && packet3.getTagCompound() != null) { ((ContainerCraftGUI) player.openContainer).receiveNBTServer(player, packet3.getTagCompound()); } diff --git a/src/main/java/binnie/core/network/BinniePacketHandler.java b/src/main/java/binnie/core/network/BinniePacketHandler.java index 7767a405..14df0b6a 100644 --- a/src/main/java/binnie/core/network/BinniePacketHandler.java +++ b/src/main/java/binnie/core/network/BinniePacketHandler.java @@ -76,7 +76,7 @@ public abstract class BinniePacketHandler implements IMessageHandler list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (int i = 0; i < EnumAlvearyLogicType.VALUES.length; i++) { - list.add(new ItemStack(itemIn, 1, i)); + list.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java b/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java index afb8eba3..3af1e932 100644 --- a/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java +++ b/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java @@ -51,7 +51,7 @@ public class BlockExtraBeeHive extends Block implements ITileEntityProvider { } @Override - public void getSubBlocks(@Nonnull final Item itemIn, final CreativeTabs tab, final NonNullList itemList) { + public void getSubBlocks(CreativeTabs tab, NonNullList itemList) { for (int i = 0; i < EnumHiveType.values().length; ++i) { itemList.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java b/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java index 622f401f..cb5b6cfd 100644 --- a/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java +++ b/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java @@ -36,7 +36,7 @@ public class ContainerStimulator extends AbstractAlvearyContainer { public void checkPower() { if (power != storage.getEnergyStored()) { for (IContainerListener listener : listeners) { - listener.sendProgressBarUpdate(this, 9, power = storage.getEnergyStored()); + listener.sendWindowProperty(this, 9, power = storage.getEnergyStored()); } } } diff --git a/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java b/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java index 295fe93a..d6688132 100644 --- a/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java +++ b/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java @@ -23,7 +23,7 @@ public class GuiContainerAlvearyPart extends GuiContainer { public GuiContainerAlvearyPart(AbstractAlvearyContainer container) { super(container); this.container = container; - font = Minecraft.getMinecraft().fontRendererObj; + font = Minecraft.getMinecraft().fontRenderer; } @Override diff --git a/src/main/java/binnie/extrabees/init/BlockRegister.java b/src/main/java/binnie/extrabees/init/BlockRegister.java index 942c0df7..11361adf 100644 --- a/src/main/java/binnie/extrabees/init/BlockRegister.java +++ b/src/main/java/binnie/extrabees/init/BlockRegister.java @@ -1,5 +1,6 @@ package binnie.extrabees.init; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -30,12 +31,12 @@ public final class BlockRegister { } private static void registerMisc() { - GameRegistry.register(ExtraBees.ectoplasm = new BlockEctoplasm()); + ForgeRegistries.BLOCKS.register(ExtraBees.ectoplasm = new BlockEctoplasm()); } @SuppressWarnings("all") private static void registerHives() { - GameRegistry.register(ExtraBees.hive = new BlockExtraBeeHive()); + ForgeRegistries.BLOCKS.register(ExtraBees.hive = new BlockExtraBeeHive()); } private static void registerHiveDrops() { diff --git a/src/main/java/binnie/extrabees/init/RecipeRegister.java b/src/main/java/binnie/extrabees/init/RecipeRegister.java index d855db52..b2c8cfcf 100644 --- a/src/main/java/binnie/extrabees/init/RecipeRegister.java +++ b/src/main/java/binnie/extrabees/init/RecipeRegister.java @@ -1,14 +1,13 @@ package binnie.extrabees.init; +import binnie.core.util.RecipeUtil; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; import forestry.api.circuits.ICircuitLayout; import forestry.api.recipes.RecipeManagers; @@ -30,10 +29,11 @@ import binnie.extrabees.items.types.ExtraBeeItems; import binnie.extrabees.utils.Utils; public final class RecipeRegister { + private static final RecipeUtil RECIPE_UTIL = new RecipeUtil(ExtraBees.MODID); public static void postInitRecipes() { if (Loader.isModLoaded("ic2")) { - GameRegistry.addRecipe(ExtraBees.honeyCrystal.getCharged(0), "#@#", "@#@", "#@#", '@', PluginApiculture.getItems().honeyDrop, '#', EnumHoneyDrop.ENERGY.get(1)); + RECIPE_UTIL.addRecipe("honey_crystal", ExtraBees.honeyCrystal.getCharged(0), "#@#", "@#@", "#@#", '@', PluginApiculture.getItems().honeyDrop, '#', EnumHoneyDrop.ENERGY.get(1)); } for (final EnumHoneyComb info : EnumHoneyComb.values()) { info.addRecipe(); @@ -44,7 +44,7 @@ public final class RecipeRegister { for (final EnumPropolis info3 : EnumPropolis.values()) { info3.addRecipe(); } - EnumHiveFrame.init(); + EnumHiveFrame.init(RECIPE_UTIL); addForestryRecipes(); addForestryRecipes(); addMiscItemRecipes(); @@ -56,13 +56,13 @@ public final class RecipeRegister { Item thermionicTubes = PluginCore.getItems().tubes; Item chipsets = PluginCore.getItems().circuitboards; - GameRegistry.addRecipe(getAlvearyPart(EnumAlvearyLogicType.MUTATOR), "g g", " a ", "t t", 'g', Items.GOLD_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5)); - GameRegistry.addRecipe(getAlvearyPart(EnumAlvearyLogicType.FRAME), "iii", "tat", " t ", 'i', Items.IRON_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); - GameRegistry.addRecipe(getAlvearyPart(EnumAlvearyLogicType.RAINSHIELD), " b ", "bab", "t t", 'b', Items.BRICK, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); - GameRegistry.addRecipe(getAlvearyPart(EnumAlvearyLogicType.LIGHTING), "iii", "iai", " t ", 'i', Items.GLOWSTONE_DUST, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); - GameRegistry.addRecipe(getAlvearyPart(EnumAlvearyLogicType.STIMULATOR), "kik", "iai", " t ", 'i', Items.GOLD_NUGGET, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4), 'k', new ItemStack(chipsets, 1, 2)); - GameRegistry.addRecipe(getAlvearyPart(EnumAlvearyLogicType.HATCHERY), "i i", " a ", "iti", 'i', Blocks.GLASS_PANE, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5)); - GameRegistry.addRecipe(new ShapedOreRecipe(getAlvearyPart(EnumAlvearyLogicType.TRANSMISSION), " t ", "tat", " t ", 'a', alveary, 't', "gearTin")); + RECIPE_UTIL.addRecipe("alveary_mutator", getAlvearyPart(EnumAlvearyLogicType.MUTATOR), "g g", " a ", "t t", 'g', Items.GOLD_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5)); + RECIPE_UTIL.addRecipe("alveary_frame", getAlvearyPart(EnumAlvearyLogicType.FRAME), "iii", "tat", " t ", 'i', Items.IRON_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); + RECIPE_UTIL.addRecipe("alveary_rain_shield", getAlvearyPart(EnumAlvearyLogicType.RAINSHIELD), " b ", "bab", "t t", 'b', Items.BRICK, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); + RECIPE_UTIL.addRecipe("alveary_lighting", getAlvearyPart(EnumAlvearyLogicType.LIGHTING), "iii", "iai", " t ", 'i', Items.GLOWSTONE_DUST, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); + RECIPE_UTIL.addRecipe("alveary_stimulator", getAlvearyPart(EnumAlvearyLogicType.STIMULATOR), "kik", "iai", " t ", 'i', Items.GOLD_NUGGET, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4), 'k', new ItemStack(chipsets, 1, 2)); + RECIPE_UTIL.addRecipe("alveary_hatchery", getAlvearyPart(EnumAlvearyLogicType.HATCHERY), "i i", " a ", "iti", 'i', Blocks.GLASS_PANE, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5)); + RECIPE_UTIL.addRecipe("alveary_transmission", getAlvearyPart(EnumAlvearyLogicType.TRANSMISSION), " t ", "tat", " t ", 'a', alveary, 't', "gearTin"); ICircuitLayout stimulatorLayout = new BinnieCircuitLayout("Stimulator", BinnieCircuitSocketType.STIMULATOR); for (final AlvearySimulatorCircuitType type : AlvearySimulatorCircuitType.values()) { type.createCircuit(stimulatorLayout); @@ -79,7 +79,7 @@ public final class RecipeRegister { private static void addMiscItemRecipes() { final ItemStack lapisShard = ExtraBeeItems.LapisShard.get(1); - GameRegistry.addShapelessRecipe(new ItemStack(Items.DYE, 1, 4), lapisShard, lapisShard, lapisShard, lapisShard); + RECIPE_UTIL.addShapelessRecipe("lapis_from_shards", new ItemStack(Items.DYE, 1, 4), lapisShard, lapisShard, lapisShard, lapisShard); for (final ExtraBeeItems item : ExtraBeeItems.values()) { if (item.metalString != null) { ItemStack dust = null; @@ -92,11 +92,11 @@ public final class RecipeRegister { } final ItemStack input = item.get(1); if (dust != null) { - GameRegistry.addShapelessRecipe(dust, input, input, input, input); + RECIPE_UTIL.addShapelessRecipe(item.getModelPath() + "_dust", dust, input, input, input, input); } else if (ingot != null) { - GameRegistry.addShapelessRecipe(ingot, input, input, input, input, input, input, input, input, input); + RECIPE_UTIL.addShapelessRecipe(item.getModelPath() + "_ingot", ingot, input, input, input, input, input, input, input, input, input); } else if (item == ExtraBeeItems.CoalDust) { - GameRegistry.addShapelessRecipe(new ItemStack(Items.COAL), input, input, input, input); + RECIPE_UTIL.addShapelessRecipe("coal_dust_to_coal", new ItemStack(Items.COAL), input, input, input, input); } } else if (item.gemString != null) { ItemStack gem = null; @@ -105,7 +105,7 @@ public final class RecipeRegister { } final ItemStack input2 = item.get(1); if (gem != null) { - GameRegistry.addShapelessRecipe(gem.copy(), input2, input2, input2, input2, input2, input2, input2, input2, input2); + RECIPE_UTIL.addShapelessRecipe(item.getModelPath() + "_gem", gem.copy(), input2, input2, input2, input2, input2, input2, input2, input2, input2); } } } diff --git a/src/main/java/binnie/extrabees/items/ItemBeehive.java b/src/main/java/binnie/extrabees/items/ItemBeehive.java index 9044f2f8..0cfaf0ae 100644 --- a/src/main/java/binnie/extrabees/items/ItemBeehive.java +++ b/src/main/java/binnie/extrabees/items/ItemBeehive.java @@ -34,9 +34,11 @@ public class ItemBeehive extends ItemBlock implements IItemModelProvider { } @Override - public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList subItems) { - for (int i = 0; i < EnumHiveType.values().length; ++i) { - subItems.add(new ItemStack(this, 1, i)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + for (int i = 0; i < EnumHiveType.values().length; ++i) { + items.add(new ItemStack(this, 1, i)); + } } } diff --git a/src/main/java/binnie/extrabees/items/ItemHiveFrame.java b/src/main/java/binnie/extrabees/items/ItemHiveFrame.java index 713d1cbd..db98ad99 100644 --- a/src/main/java/binnie/extrabees/items/ItemHiveFrame.java +++ b/src/main/java/binnie/extrabees/items/ItemHiveFrame.java @@ -4,10 +4,12 @@ import javax.annotation.Nullable; import java.util.List; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; @@ -106,9 +108,9 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - super.addInformation(stack, playerIn, tooltip, advanced); - this.frame.addInformation(stack, playerIn, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + super.addInformation(stack, worldIn, tooltip, flagIn); + this.frame.addInformation(stack, tooltip, flagIn); if (!stack.isItemDamaged()) { tooltip.add(Translator.translateToLocalFormatted("item.for.durability", stack.getMaxDamage())); } diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java b/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java index 8026a488..43953516 100644 --- a/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java @@ -148,19 +148,20 @@ public class ItemHoneyCrystal extends Item implements IElectricItem, IItemHudInf info.add(ElectricItem.manager.getToolTip(stack)); return info; } - + @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { - if(Mods.IC2.active()) { - subItems.add(getCharged(0.0D)); - subItems.add(getCharged(1.0D / 0.0)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (Mods.IC2.active() && this.isInCreativeTab(tab)) { + items.add(getCharged(0.0D)); + // TODO: @Nedelosk please fix +// items.add(getCharged(1.0D / 0.0)); } } @Optional.Method(modid = "ic2") public ItemStack getCharged(double charge) { ItemStack ret = new ItemStack(this); + // TODO: tier 2147483647 ?! ElectricItem.manager.charge(ret, charge, 2147483647, true, false); return ret; } diff --git a/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java b/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java index e032b97e..ec016d9c 100644 --- a/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java +++ b/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java @@ -3,6 +3,7 @@ package binnie.extrabees.items; import javax.annotation.Nullable; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -10,6 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -34,21 +36,22 @@ public class ItemIndustrialFrame extends Item { } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList subItems) { - for (final IndustrialFrame frame : IndustrialFrame.values()) { - final ItemStack stack = new ItemStack(this); - final NBTTagCompound nbt = new NBTTagCompound(); - nbt.setInteger("frame", frame.ordinal()); - stack.setTagCompound(nbt); - subItems.add(stack); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + for (final IndustrialFrame frame : IndustrialFrame.values()) { + final ItemStack stack = new ItemStack(this); + final NBTTagCompound nbt = new NBTTagCompound(); + nbt.setInteger("frame", frame.ordinal()); + stack.setTagCompound(nbt); + items.add(stack); + } } } @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - super.addInformation(stack, playerIn, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + super.addInformation(stack, worldIn, tooltip, flagIn); final IndustrialFrame frame = getFrame(stack); if (frame == null) { tooltip.add("Invalid Contents"); diff --git a/src/main/java/binnie/extrabees/items/ItemMiscProduct.java b/src/main/java/binnie/extrabees/items/ItemMiscProduct.java index e8e51fac..4defa032 100644 --- a/src/main/java/binnie/extrabees/items/ItemMiscProduct.java +++ b/src/main/java/binnie/extrabees/items/ItemMiscProduct.java @@ -1,13 +1,16 @@ package binnie.extrabees.items; +import javax.annotation.Nullable; import java.util.List; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; @@ -29,8 +32,8 @@ public class ItemMiscProduct extends ItemProduct { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - super.addInformation(stack, playerIn, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + super.addInformation(stack, worldIn, tooltip, flagIn); ((IEBItemMiscProvider) get(stack)).addInformation(tooltip); } diff --git a/src/main/java/binnie/extrabees/items/ItemProduct.java b/src/main/java/binnie/extrabees/items/ItemProduct.java index fcd9d747..7f36357f 100644 --- a/src/main/java/binnie/extrabees/items/ItemProduct.java +++ b/src/main/java/binnie/extrabees/items/ItemProduct.java @@ -41,10 +41,12 @@ public class ItemProduct extends Item implements IItemModelRegister { } @Override - public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList subItems) { - for (final IEBEnumItem type : this.types) { - if (type.isActive()) { - subItems.add(new ItemStack(this, 1, type.ordinal())); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + for (final IEBEnumItem type : this.types) { + if (type.isActive()) { + items.add(new ItemStack(this, 1, type.ordinal())); + } } } } diff --git a/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java b/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java index 80978c1d..9413c64a 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java @@ -3,7 +3,8 @@ package binnie.extrabees.items.types; import javax.annotation.Nullable; import java.util.List; -import net.minecraft.entity.player.EntityPlayer; +import binnie.core.util.RecipeUtil; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -30,10 +31,10 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { COCOA{ @Override - protected void init(ItemStack impregnatedFrame) { + protected void init(RecipeUtil recipeUtil, ItemStack impregnatedFrame) { logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.25f); logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 5.0f); - GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.COCOA.item), + recipeUtil.addRecipe("cocoa_frame", new ItemStack(EnumHiveFrame.COCOA.item), " c ", "cFc", " c ", @@ -43,29 +44,29 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { }, CAGE{ @Override - protected void init(ItemStack impregnatedFrame) { + protected void init(RecipeUtil recipeUtil, ItemStack impregnatedFrame) { logic.setModifier(EnumBeeModifier.TERRITORY, 0.5f, 0.1f); logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f); logic.setModifier(EnumBeeModifier.PRODUCTION, 0.75f, 0.5f); - GameRegistry.addShapelessRecipe(new ItemStack(EnumHiveFrame.CAGE.item), impregnatedFrame, Blocks.IRON_BARS); + recipeUtil.addShapelessRecipe("cage_frame", new ItemStack(EnumHiveFrame.CAGE.item), impregnatedFrame, Blocks.IRON_BARS); } }, SOUL(80){ @Override - protected void init(ItemStack impregnatedFrame) { + protected void init(RecipeUtil recipeUtil, ItemStack impregnatedFrame) { logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f); logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f); logic.setModifier(EnumBeeModifier.PRODUCTION, 0.25f, 0.1f); - GameRegistry.addShapelessRecipe(new ItemStack(EnumHiveFrame.SOUL.item), impregnatedFrame, Blocks.SOUL_SAND); + recipeUtil.addShapelessRecipe("soul_frame", new ItemStack(EnumHiveFrame.SOUL.item), impregnatedFrame, Blocks.SOUL_SAND); } }, CLAY{ @Override - protected void init(ItemStack impregnatedFrame) { + protected void init(RecipeUtil recipeUtil, ItemStack impregnatedFrame) { logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f); logic.setModifier(EnumBeeModifier.MUTATION, 0.5f, 0.2f); logic.setModifier(EnumBeeModifier.PRODUCTION, 0.75f, 0.2f); - GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.CLAY.item), + recipeUtil.addRecipe("clay_frame", new ItemStack(EnumHiveFrame.CLAY.item), " c ", "cFc", " c ", @@ -75,7 +76,7 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { }, DEBUG{ @Override - protected void init(ItemStack impregnatedFrame) { + protected void init(RecipeUtil recipeUtil, ItemStack impregnatedFrame) { logic.setModifier(EnumBeeModifier.LIFESPAN, 1.0E-4f, 1.0E-4f); } }; @@ -94,14 +95,14 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { this.item = new ItemHiveFrame(this).setRegistryName("hive_frame." + name().toLowerCase()); } - protected void init(ItemStack impregnatedFrame){ + protected void init(RecipeUtil recipeUtil, ItemStack impregnatedFrame){ } - public static void init() { + public static void init(RecipeUtil recipeUtil) { ItemStack impregnatedFrame = PluginApiculture.getItems().frameImpregnated.getItemStack(); for(EnumHiveFrame frame : values()){ - frame.init(impregnatedFrame); + frame.init(recipeUtil, impregnatedFrame); } } @@ -186,8 +187,8 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { } @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - this.logic.addInformation(stack, playerIn, tooltip, advanced); + public void addInformation(ItemStack stack, List tooltip, ITooltipFlag flagIn) { + this.logic.addInformation(stack, tooltip, flagIn); } } diff --git a/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java b/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java index e7f39acb..d15ca513 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java @@ -1,6 +1,7 @@ package binnie.extrabees.items.types; -import com.google.common.base.Objects; +import binnie.core.Mods; +import com.google.common.base.MoreObjects; import javax.annotation.Nullable; import java.util.LinkedHashMap; @@ -14,8 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import forestry.api.recipes.RecipeManagers; -import forestry.apiculture.PluginApiculture; -import forestry.core.PluginCore; import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; @@ -512,7 +511,8 @@ public enum EnumHoneyComb implements IEBEnumItem { @Override protected void addSubtypes(ItemStack beeswax, ItemStack honeyDrop) { addProduct(honeyDrop, 0.25f); - tryAddProduct(PluginCore.getItems().fertilizerBio.getItemStack(), 1.00f); + ItemStack compost = Mods.Forestry.stack("fertilizer_bio"); + tryAddProduct(compost, 1.00f); } }, SAWDUST(12561009, 15913854){ @@ -636,8 +636,8 @@ public enum EnumHoneyComb implements IEBEnumItem { public static void addSubtypes() { OreDictionary.registerOre("beeComb", new ItemStack(ExtraBees.comb, 1, 32767)); - ItemStack beeswax = PluginCore.getItems().beeswax.getItemStack(); - ItemStack honeyDrop = PluginApiculture.getItems().honeyDrop.getItemStack(); + ItemStack beeswax = Mods.Forestry.stack("beeswax"); + ItemStack honeyDrop = Mods.Forestry.stack("honey_drop"); for(EnumHoneyComb comb : values()){ comb.addSubtypes(beeswax, honeyDrop); } @@ -665,7 +665,7 @@ public enum EnumHoneyComb implements IEBEnumItem { } public boolean addProduct(@Nullable Item item, final Float chance) { - return addProduct(new ItemStack(Objects.firstNonNull(item, Item.getItemFromBlock(Blocks.AIR))), chance); + return addProduct(new ItemStack(MoreObjects.firstNonNull(item, Item.getItemFromBlock(Blocks.AIR))), chance); } public boolean addProduct(final ItemStack item, final Float chance) { diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java b/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java index ff45916b..582fef1d 100644 --- a/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java +++ b/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java @@ -4,7 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.util.text.translation.I18n; -import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import binnie.extrabees.genetics.ExtraBeeDefinition; @@ -14,18 +14,20 @@ public class ExtraBeesCommonProxy { } public Block registerBlock(Block block) { - return GameRegistry.register(block); + ForgeRegistries.BLOCKS.register(block); + return block; } public Item registerItem(Item item) { - return GameRegistry.register(item); + ForgeRegistries.ITEMS.register(item); + return item; } @SuppressWarnings("deprecation") public String localise(String s) { return I18n.translateToLocal("extrabees." + s); } - + public String localiseWithOutPrefix(String s) { return I18n.translateToLocal(s); } diff --git a/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java b/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java index ac0a8f76..0418e36c 100644 --- a/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java +++ b/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; @@ -55,7 +55,7 @@ public class BeeModifierLogic { } @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, List tooltip, ITooltipFlag flagIn) { for (Map.Entry modifier : modifiers.entrySet()) { final EnumBeeModifier key = modifier.getKey(); final Float[] value = modifier.getValue(); diff --git a/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java b/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java index 65f83bdd..7fcdc286 100644 --- a/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java +++ b/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java @@ -3,8 +3,8 @@ package binnie.extrabees.worldgen; import binnie.extrabees.utils.config.ConfigurationMain; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkGenerator; import net.minecraft.world.chunk.IChunkProvider; +import net.minecraft.world.gen.IChunkGenerator; import net.minecraftforge.fml.common.IWorldGenerator; import java.util.LinkedList; @@ -26,7 +26,7 @@ public class ExtraBeesWorldGenerator implements IWorldGenerator { @Override public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, IChunkProvider chunkProvider) { - worldGenHives.stream().forEach(hive -> generateHive(hive, rand, chunkX, chunkZ, world)); + worldGenHives.forEach(hive -> generateHive(hive, rand, chunkX, chunkZ, world)); } private void generateHive(WorldGenHive hive, Random rand, int chunkX, int chunkZ, World world) { diff --git a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java b/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java index 48c0e500..26cec271 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java @@ -101,12 +101,13 @@ public class ItemDrink extends ItemFood implements IItemModelRegister { } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(final Item item, final CreativeTabs creativeTabs, final NonNullList itemList) { - for (final Glassware glassware : Glassware.values()) { - itemList.add(this.getStack(glassware, null)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + for (final Glassware glassware : Glassware.values()) { + items.add(this.getStack(glassware, null)); + } + items.add(this.getStack(Glassware.Wine, Alcohol.RedWine.get(Glassware.Wine.getCapacity()))); } - itemList.add(this.getStack(Glassware.Wine, Alcohol.RedWine.get(Glassware.Wine.getCapacity()))); } @Override diff --git a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java index bceff420..787a0e13 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java @@ -89,12 +89,11 @@ public abstract class BlockETDecorativeLeaves extends Block implements IItemMode /** * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks) */ - @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(Item item, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (IBlockState state : getBlockState().getValidStates()) { int meta = getMetaFromState(state); - ItemStack itemStack = new ItemStack(item, 1, meta); + ItemStack itemStack = new ItemStack(this, 1, meta); list.add(itemStack); } } diff --git a/src/main/java/binnie/extratrees/block/BlockETDefaultLeaves.java b/src/main/java/binnie/extratrees/block/BlockETDefaultLeaves.java index 0c021d00..2af03860 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDefaultLeaves.java +++ b/src/main/java/binnie/extratrees/block/BlockETDefaultLeaves.java @@ -130,35 +130,31 @@ public abstract class BlockETDefaultLeaves extends BlockAbstractLeaves { int variantMeta = (meta % variantCount) + blockNumber * VARIANTS_PER_BLOCK; return ETTreeDefinition.byMetadata(variantMeta); } - + @Override - protected NonNullList getLeafDrop(World world, @Nullable GameProfile playerProfile, BlockPos pos, float saplingModifier, int fortune) { - NonNullList prod = NonNullList.create(); - + protected void getLeafDrop(NonNullList drops, World world, @Nullable GameProfile playerProfile, BlockPos pos, float saplingModifier, int fortune) { ITree tree = getTree(world, pos); if (tree == null) { - return prod; + return; } - + // Add saplings List saplings = tree.getSaplings(world, playerProfile, pos, saplingModifier); for (ITree sapling : saplings) { if (sapling != null) { - prod.add(TreeManager.treeRoot.getMemberStack(sapling, EnumGermlingType.SAPLING)); + drops.add(TreeManager.treeRoot.getMemberStack(sapling, EnumGermlingType.SAPLING)); } } - + // Add fruits ITreeGenome genome = tree.getGenome(); IFruitProvider fruitProvider = genome.getFruitProvider(); if (fruitProvider.isFruitLeaf(genome, world, pos)) { NonNullList produceStacks = tree.produceStacks(world, pos, Integer.MAX_VALUE); - prod.addAll(produceStacks); + drops.addAll(produceStacks); } - - return prod; } - + @Override public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { ETTreeDefinition type = getTreeType(meta); diff --git a/src/main/java/binnie/extratrees/block/EnumETLog.java b/src/main/java/binnie/extratrees/block/EnumETLog.java index c7d6c735..65eb130f 100644 --- a/src/main/java/binnie/extratrees/block/EnumETLog.java +++ b/src/main/java/binnie/extratrees/block/EnumETLog.java @@ -42,7 +42,7 @@ public enum EnumETLog implements IWoodType { Eucalyptus("Eucalyptus", PlankType.ExtraTreePlanks.Eucalyptus), Box("Box", PlankType.ExtraTreePlanks.Box), Syzgium("Syzgium", PlankType.ExtraTreePlanks.Syzgium), - PinkIvory("Pink Ivory", PlankType.ExtraTreePlanks.PinkIvory), + PinkIvory("PinkIvory", PlankType.ExtraTreePlanks.PinkIvory), Eucalyptus2("Eucalyptus", PlankType.ExtraTreePlanks.Eucalyptus, false), Eucalyptus3("Eucalyptus", PlankType.ExtraTreePlanks.Eucalyptus, false), Cherry("Cherry", PlankType.ForestryPlanks.CHERRY, false), @@ -51,6 +51,7 @@ public enum EnumETLog implements IWoodType { public static final EnumETLog[] VALUES = values(); private final String name; + private final String uid; private final IPlankType plank; private final boolean hasProducts; @@ -60,6 +61,7 @@ public enum EnumETLog implements IWoodType { EnumETLog(final String name, final IPlankType plank, boolean hasProducts) { this.name = name; + this.uid = name.toLowerCase(Locale.ENGLISH).replace(" ", "_"); this.plank = plank; this.hasProducts = hasProducts; } @@ -113,8 +115,7 @@ public enum EnumETLog implements IWoodType { @Override public String getHeartTexture() { - String name = name().toLowerCase(Locale.ENGLISH).replace(" ", "_"); - return Constants.EXTRA_TREES_MOD_ID + ":blocks/logs/" + name + "_trunk"; + return Constants.EXTRA_TREES_MOD_ID + ":blocks/logs/" + uid + "_trunk"; } @Override @@ -129,8 +130,7 @@ public enum EnumETLog implements IWoodType { @Override public String getBarkTexture() { - String name = name().toLowerCase(Locale.ENGLISH).replace(" ", "_"); - return Constants.EXTRA_TREES_MOD_ID + ":blocks/logs/" + name + "_bark"; + return Constants.EXTRA_TREES_MOD_ID + ":blocks/logs/" + uid + "_bark"; } @Override @@ -146,5 +146,9 @@ public enum EnumETLog implements IWoodType { public int getMetadata() { return ordinal(); } + + public String getUid() { + return uid; + } } diff --git a/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java b/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java index 083687ae..382dcda8 100644 --- a/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java @@ -26,7 +26,7 @@ public class ItemBlockETDecorativeLeaves extends ItemBlockForestry list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (int i = 0; i < 6; ++i) { for (int f = 0; f < 2; ++f) { - list.add(new ItemStack(item, 1, i + f * 8)); + list.add(new ItemStack(this, 1, i + f * 8)); } } } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index f0ff3fd2..1930fa8e 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -112,26 +112,6 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStat return true; } - @Override - public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { - IBlockState state = worldIn.getBlockState(pos); - Block block = state.getBlock(); - if (PluginArboriculture.validFences.contains(block)) { - return true; - } - - if (block != Blocks.BARRIER) { - Material blockMaterial = block.getMaterial(state); - if (block instanceof BlockFence || block instanceof BlockFenceGate || block instanceof IBlockFence) { - return blockMaterial == this.blockMaterial; - } - if (blockMaterial.isOpaque() && state.isFullCube() && blockMaterial != Material.GOURD) { - return true; - } - } - return false; - } - @Override public void breakBlock(World world, BlockPos pos, IBlockState state) { super.breakBlock(world, pos, state); @@ -173,9 +153,8 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStat return ((IExtendedBlockState) state).withProperty(UnlistedBlockPos.POS, pos).withProperty(UnlistedBlockAccess.BLOCKACCESS, world); } - @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList itemList) { + public void getSubBlocks(CreativeTabs tab, NonNullList itemList) { for (FenceType type : FenceType.values()) { itemList.add(WoodManager.getFence(PlankType.VanillaPlanks.SPRUCE, PlankType.VanillaPlanks.BIRCH, type, 1)); } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java index e58f4d4d..196200de 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java @@ -1,20 +1,27 @@ package binnie.extratrees.block.decor; +import binnie.Constants; import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; +import net.minecraftforge.registries.IForgeRegistryEntry; -public class MultiFenceRecipeEmbedded implements IRecipe { +public class MultiFenceRecipeEmbedded extends IForgeRegistryEntry.Impl implements IRecipe { private ItemStack cached = ItemStack.EMPTY; + public MultiFenceRecipeEmbedded() { + setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "multi_fence_embedded")); + } + @Override public boolean matches(final InventoryCrafting inv, final World world) { for (int row = 0; row < 3; ++row) { @@ -46,8 +53,8 @@ public class MultiFenceRecipeEmbedded implements IRecipe { } @Override - public int getRecipeSize() { - return 3; + public boolean canFit(int width, int height) { + return width >= 3 && height >= 3; } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index 66ce5841..d8bc6aa2 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -3,22 +3,26 @@ package binnie.extratrees.block.decor; import java.util.ArrayList; import java.util.List; +import binnie.Constants; import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; +import net.minecraftforge.registries.IForgeRegistryEntry; -public class MultiFenceRecipeSize implements IRecipe { +public class MultiFenceRecipeSize extends IForgeRegistryEntry.Impl implements IRecipe { private ItemStack cached = ItemStack.EMPTY; public MultiFenceRecipeSize() { + setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "multi_fence_size")); } @Override @@ -69,8 +73,8 @@ public class MultiFenceRecipeSize implements IRecipe { } @Override - public int getRecipeSize() { - return 3; + public boolean canFit(int width, int height) { + return width >= 3 && height >= 3; } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java index 8f9bb7b4..65cd4c41 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java @@ -1,19 +1,26 @@ package binnie.extratrees.block.decor; +import binnie.Constants; import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import binnie.extratrees.block.WoodManager; +import net.minecraftforge.registries.IForgeRegistryEntry; -public class MultiFenceRecipeSolid implements IRecipe { +public class MultiFenceRecipeSolid extends IForgeRegistryEntry.Impl implements IRecipe { private ItemStack cached = ItemStack.EMPTY; + public MultiFenceRecipeSolid() { + setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "multi_fence_solid")); + } + @Override public boolean matches(final InventoryCrafting inv, final World world) { for (int row = 0; row < 3; ++row) { @@ -43,8 +50,8 @@ public class MultiFenceRecipeSolid implements IRecipe { } @Override - public int getRecipeSize() { - return 3; + public boolean canFit(int width, int height) { + return width >= 3 && height >= 3; } @Override diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index 5f914182..35580505 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -34,7 +34,7 @@ public class BlockCarpentryPanel extends BlockCarpentry { } @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList itemList) { + public void getSubBlocks(CreativeTabs tab, NonNullList itemList) { } @Override diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index 52e6a471..be4aa2b4 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -10,6 +10,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -101,7 +102,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo public abstract ItemStack getCreativeStack(final IDesign p0); @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList itemList) { + public void getSubBlocks(CreativeTabs tab, NonNullList itemList) { for (final IDesign design : CarpentryManager.carpentryInterface.getSortedDesigns()) { itemList.add(this.getCreativeStack(design)); } @@ -142,7 +143,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World player, List tooltip, ITooltipFlag advanced) { DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) { tooltip.add(block.getPrimaryMaterial().getDesignMaterialName() + " and " + block.getSecondaryMaterial().getDesignMaterialName()); diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerModule.java b/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerModule.java index 9eabf7b9..2c2af248 100644 --- a/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerModule.java +++ b/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerModule.java @@ -1,5 +1,6 @@ package binnie.extratrees.integration.crafttweaker; +import crafttweaker.CraftTweakerAPI; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Optional; @@ -8,7 +9,6 @@ import binnie.extratrees.integration.crafttweaker.handlers.BreweryRecipeHandler; import binnie.extratrees.integration.crafttweaker.handlers.DistilleryRecipeHandler; import binnie.extratrees.integration.crafttweaker.handlers.FruitPressRecipeHandler; import binnie.extratrees.integration.crafttweaker.handlers.LumbermillRecipeHandler; -import minetweaker.MineTweakerAPI; public class CraftTweakerModule implements IInitializable { public static final String MOD_ID = "crafttweaker"; @@ -27,10 +27,10 @@ public class CraftTweakerModule implements IInitializable { @Optional.Method(modid = "crafttweaker") private void initCT(){ - MineTweakerAPI.registerClass(BreweryRecipeHandler.class); - MineTweakerAPI.registerClass(DistilleryRecipeHandler.class); - MineTweakerAPI.registerClass(FruitPressRecipeHandler.class); - MineTweakerAPI.registerClass(LumbermillRecipeHandler.class); + CraftTweakerAPI.registerClass(BreweryRecipeHandler.class); + CraftTweakerAPI.registerClass(DistilleryRecipeHandler.class); + CraftTweakerAPI.registerClass(FruitPressRecipeHandler.class); + CraftTweakerAPI.registerClass(LumbermillRecipeHandler.class); } @Override diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerUtil.java b/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerUtil.java index 67423f24..cca6bdb1 100644 --- a/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerUtil.java +++ b/src/main/java/binnie/extratrees/integration/crafttweaker/CraftTweakerUtil.java @@ -1,12 +1,11 @@ package binnie.extratrees.integration.crafttweaker; +import crafttweaker.CraftTweakerAPI; +import crafttweaker.api.item.IIngredient; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IIngredient; - public class CraftTweakerUtil { public static ItemStack getItemStack(IIngredient item) { @@ -14,8 +13,9 @@ public class CraftTweakerUtil { return ItemStack.EMPTY; Object internal = item.getInternal(); - if(internal == null || !(internal instanceof ItemStack)) { - MineTweakerAPI.logError("Not a valid item stack: " + item); + if (!(internal instanceof ItemStack)) { + CraftTweakerAPI.logError("Not a valid item stack: " + item); + return ItemStack.EMPTY; } return (ItemStack) internal; } diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/BreweryRecipeHandler.java b/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/BreweryRecipeHandler.java index e0338f95..2ea0aec4 100644 --- a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/BreweryRecipeHandler.java +++ b/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/BreweryRecipeHandler.java @@ -1,5 +1,9 @@ package binnie.extratrees.integration.crafttweaker.handlers; +import crafttweaker.api.item.IIngredient; +import crafttweaker.api.item.IItemStack; +import crafttweaker.api.liquid.ILiquidStack; +import crafttweaker.api.oredict.IOreDictEntry; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -9,10 +13,6 @@ import binnie.extratrees.integration.crafttweaker.CraftTweakerUtil; import binnie.extratrees.item.ExtraTreeItems; import binnie.extratrees.machines.brewery.recipes.BrewedGrainRecipe; import binnie.extratrees.machines.brewery.recipes.BreweryRecipe; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.liquid.ILiquidStack; -import minetweaker.api.oredict.IOreDictEntry; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/DistilleryRecipeHandler.java b/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/DistilleryRecipeHandler.java index f741de30..d7f83694 100644 --- a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/DistilleryRecipeHandler.java +++ b/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/DistilleryRecipeHandler.java @@ -1,12 +1,12 @@ package binnie.extratrees.integration.crafttweaker.handlers; +import crafttweaker.api.item.IIngredient; +import crafttweaker.api.liquid.ILiquidStack; import net.minecraftforge.fluids.FluidStack; import binnie.extratrees.api.recipes.ExtraTreesRecipeManager; import binnie.extratrees.integration.crafttweaker.CraftTweakerUtil; import binnie.extratrees.machines.distillery.recipes.DistilleryRecipe; -import minetweaker.api.item.IIngredient; -import minetweaker.api.liquid.ILiquidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/FruitPressRecipeHandler.java b/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/FruitPressRecipeHandler.java index d8d38f20..e0dba648 100644 --- a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/FruitPressRecipeHandler.java +++ b/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/FruitPressRecipeHandler.java @@ -1,5 +1,8 @@ package binnie.extratrees.integration.crafttweaker.handlers; +import crafttweaker.api.item.IIngredient; +import crafttweaker.api.item.IItemStack; +import crafttweaker.api.liquid.ILiquidStack; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -7,9 +10,6 @@ import net.minecraftforge.fluids.FluidStack; import binnie.extratrees.api.recipes.ExtraTreesRecipeManager; import binnie.extratrees.integration.crafttweaker.CraftTweakerUtil; import binnie.extratrees.machines.fruitpress.recipes.FruitPressRecipe; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.liquid.ILiquidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/GenericRecipeHandler.java b/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/GenericRecipeHandler.java index 95a87f35..7651992e 100644 --- a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/GenericRecipeHandler.java +++ b/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/GenericRecipeHandler.java @@ -1,10 +1,11 @@ package binnie.extratrees.integration.crafttweaker.handlers; import java.util.Collection; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import crafttweaker.CraftTweakerAPI; +import crafttweaker.IAction; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -12,8 +13,6 @@ import net.minecraftforge.fluids.FluidStack; import binnie.core.api.IBinnieRecipe; import binnie.core.api.ICraftingManager; import binnie.core.util.ItemStackUtil; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; public class GenericRecipeHandler { @@ -31,7 +30,7 @@ public class GenericRecipeHandler { } } } - MineTweakerAPI.apply(new Remove(recipeToRemove, manager)); + CraftTweakerAPI.apply(new Remove<>(recipeToRemove, manager)); } public static > void removeRecipeInput(ItemStack input, M manager) { @@ -48,7 +47,7 @@ public class GenericRecipeHandler { } } } - MineTweakerAPI.apply(new Remove(recipeToRemove, manager)); + CraftTweakerAPI.apply(new Remove<>(recipeToRemove, manager)); } public static > void removeRecipe(FluidStack output, M manager) { @@ -65,7 +64,7 @@ public class GenericRecipeHandler { } } } - MineTweakerAPI.apply(new Remove(recipeToRemove, manager)); + CraftTweakerAPI.apply(new Remove<>(recipeToRemove, manager)); } public static > void removeRecipeInput(FluidStack input, M manager) { @@ -82,14 +81,14 @@ public class GenericRecipeHandler { } } } - MineTweakerAPI.apply(new Remove(recipeToRemove, manager)); + CraftTweakerAPI.apply(new Remove<>(recipeToRemove, manager)); } public static > void addRecipe(R recipe, M manager) { - MineTweakerAPI.apply(new Add(recipe, manager)); + CraftTweakerAPI.apply(new Add<>(recipe, manager)); } - private static class Add> implements IUndoableAction { + private static class Add> implements IAction { private final R recipe; private final M manager; @@ -100,37 +99,7 @@ public class GenericRecipeHandler { @Override public void apply() { - if(manager.addRecipe(recipe)) { - Object recipeWrapper = manager.getJeiWrapper(recipe); - if(recipeWrapper != null) { - MineTweakerAPI.getIjeiRecipeRegistry().addRecipe(recipeWrapper, manager.getJEICategory()); - } - } - } - - @Override - public void undo() { - if(manager.removeRecipe(recipe)) { - Object recipeWrapper = manager.getJeiWrapper(recipe); - if(recipeWrapper != null) { - MineTweakerAPI.getIjeiRecipeRegistry().removeRecipe(recipeWrapper, manager.getJEICategory()); - } - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public String describeUndo() { - return "Removing " + manager.toString() + " recipe for " + recipe.toString(); - } - - @Override - public Object getOverrideKey() { - return null; + manager.addRecipe(recipe); } @Override @@ -139,7 +108,7 @@ public class GenericRecipeHandler { } } - private static class Remove> implements IUndoableAction { + private static class Remove> implements IAction { private final List recipes; private final M manager; @@ -150,50 +119,12 @@ public class GenericRecipeHandler { @Override public void apply() { - Iterator rIterator = recipes.iterator(); - while(rIterator.hasNext()) { - R recipe = rIterator.next(); - if (manager.removeRecipe(recipe)) { - Object recipeWrapper = manager.getJeiWrapper(recipe); - if (recipeWrapper != null) { - MineTweakerAPI.getIjeiRecipeRegistry().removeRecipe(recipeWrapper, manager.getJEICategory()); - } - }else{ - rIterator.remove(); - } - } - } - - @Override - public void undo() { - for(R recipe : recipes) { - if (manager.addRecipe(recipe)) { - Object recipeWrapper = manager.getJeiWrapper(recipe); - if (recipeWrapper != null) { - MineTweakerAPI.getIjeiRecipeRegistry().addRecipe(recipeWrapper, manager.getJEICategory()); - } - } - } - } - - @Override - public boolean canUndo() { - return true; + recipes.removeIf(recipe -> !manager.removeRecipe(recipe)); } @Override public String describe() { return "Removing " + manager.toString() + " recipe for " + recipes.toString(); } - - @Override - public Object getOverrideKey() { - return null; - } - - @Override - public String describeUndo() { - return "Adding " + manager.toString() + " recipe for " + recipes.toString(); - } } } diff --git a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/LumbermillRecipeHandler.java b/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/LumbermillRecipeHandler.java index c5a9f8e9..5b40d2b6 100644 --- a/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/LumbermillRecipeHandler.java +++ b/src/main/java/binnie/extratrees/integration/crafttweaker/handlers/LumbermillRecipeHandler.java @@ -1,12 +1,12 @@ package binnie.extratrees.integration.crafttweaker.handlers; +import crafttweaker.api.item.IIngredient; +import crafttweaker.api.item.IItemStack; import net.minecraft.item.ItemStack; import binnie.extratrees.api.recipes.ExtraTreesRecipeManager; import binnie.extratrees.integration.crafttweaker.CraftTweakerUtil; import binnie.extratrees.machines.lumbermill.recipes.LumbermillRecipe; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java index 45b384d3..459e21f0 100644 --- a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java @@ -1,7 +1,9 @@ package binnie.extratrees.item; +import javax.annotation.Nullable; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -42,17 +44,18 @@ public class ItemArboristDatabase extends Item implements IItemModelRegister { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { if (isMaster(stack)) { tooltip.add(TextFormatting.DARK_PURPLE + I18N.localise("extratrees.item.database.arborist.master.tooltip")); } } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { - super.getSubItems(item, tab, subItems); - subItems.add(new ItemStack(item, 1, 1)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + super.getSubItems(tab, items); + if (this.isInCreativeTab(tab)) { + items.add(new ItemStack(this, 1, 1)); + } } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemETFood.java b/src/main/java/binnie/extratrees/item/ItemETFood.java index 1188a386..6e2436d7 100644 --- a/src/main/java/binnie/extratrees/item/ItemETFood.java +++ b/src/main/java/binnie/extratrees/item/ItemETFood.java @@ -1,7 +1,9 @@ package binnie.extratrees.item; +import javax.annotation.Nullable; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -9,6 +11,7 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -29,12 +32,13 @@ public class ItemETFood extends ItemFood implements IItemModelRegister { setRegistryName("food"); } - @SideOnly(Side.CLIENT) @Override - public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList subItems) { - for (IItemMiscProvider item : ItemETFood.items) { - if (item.isActive()) { - subItems.add(this.getStack(item, 1)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + for (IItemMiscProvider item : ItemETFood.items) { + if (item.isActive()) { + items.add(this.getStack(item, 1)); + } } } } @@ -48,8 +52,7 @@ public class ItemETFood extends ItemFood implements IItemModelRegister { } @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { IItemMiscProvider item = this.getItem(stack.getItemDamage()); item.addInformation(tooltip); } diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 816972e0..7d8f3d2a 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -1,7 +1,9 @@ package binnie.extratrees.item; +import javax.annotation.Nullable; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -41,18 +43,18 @@ public class ItemMothDatabase extends Item implements IItemModelRegister { } @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { if (isMaster(stack)) { tooltip.add(TextFormatting.DARK_PURPLE + I18N.localise("extratrees.item.database.lepi.master.tooltip")); } } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { - super.getSubItems(item, tab, subItems); - subItems.add(new ItemStack(item, 1, 1)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + super.getSubItems(tab, items); + if (this.isInCreativeTab(tab)) { + items.add(new ItemStack(this, 1, 1)); + } } @Override diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index 353b4b4c..7cd2169c 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -1,5 +1,7 @@ package binnie.extratrees.item; +import binnie.Constants; +import binnie.core.util.RecipeUtil; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -8,8 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -132,27 +132,28 @@ public class ModuleItems implements IInitializable { @Override public void postInit() { + RecipeUtil recipeUtil = new RecipeUtil(Constants.EXTRA_TREES_MOD_ID); ModuleItems items = ExtraTrees.items(); MinecraftForge.addGrassSeed(new ItemStack(itemHops), 5); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(items.itemDurableHammer, 1, 0), "wiw", " s ", " s ", 'w', Blocks.OBSIDIAN, 'i', Items.GOLD_INGOT, 's', Items.STICK)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(items.itemHammer, 1, 0), "wiw", " s ", " s ", 'w', "plankWood", 'i', Items.IRON_INGOT, 's', Items.STICK)); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeItems.Yeast.get(8), " m ", "mbm", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM)); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeItems.LagerYeast.get(8), "mbm", " m ", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM)); - GameRegistry.addRecipe(ExtraTreeItems.GrainWheat.get(5), " s ", "sss", " s ", 's', Items.WHEAT_SEEDS); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeItems.GrainBarley.get(3), false, " s ", "s ", " s ", 's', ExtraTreeItems.GrainWheat.get(1))); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeItems.GrainCorn.get(3), false, " s ", " s", " s ", 's', ExtraTreeItems.GrainWheat.get(1))); - GameRegistry.addRecipe(ExtraTreeItems.GrainRye.get(3), " ", "s s", " s ", 's', ExtraTreeItems.GrainWheat.get(1)); - GameRegistry.addRecipe(ExtraTreeItems.ProvenGear.get(1), " s ", "s s", " s ", 's', Mods.Forestry.stack("oak_stick")); - GameRegistry.addRecipe(ExtraTreeItems.GlassFitting.get(6), "s s", " i ", "s s", 'i', Items.IRON_INGOT, 's', Items.STICK); + recipeUtil.addRecipe("durable_hammer", new ItemStack(items.itemDurableHammer, 1, 0), "wiw", " s ", " s ", 'w', Blocks.OBSIDIAN, 'i', Items.GOLD_INGOT, 's', Items.STICK); + recipeUtil.addRecipe("hammer", new ItemStack(items.itemHammer, 1, 0), "wiw", " s ", " s ", 'w', "plankWood", 'i', Items.IRON_INGOT, 's', Items.STICK); + recipeUtil.addRecipe("yeast", ExtraTreeItems.Yeast.get(8), " m ", "mbm", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM); + recipeUtil.addRecipe("lager_yeast", ExtraTreeItems.LagerYeast.get(8), "mbm", " m ", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM); + recipeUtil.addRecipe("grain_wheat", ExtraTreeItems.GrainWheat.get(5), " s ", "sss", " s ", 's', Items.WHEAT_SEEDS); + recipeUtil.addRecipe("grain_barley", ExtraTreeItems.GrainBarley.get(3), false, " s ", "s ", " s ", 's', ExtraTreeItems.GrainWheat.get(1)); + recipeUtil.addRecipe("grain_corn", ExtraTreeItems.GrainCorn.get(3), false, " s ", " s", " s ", 's', ExtraTreeItems.GrainWheat.get(1)); + recipeUtil.addRecipe("grain_rye", ExtraTreeItems.GrainRye.get(3), " ", "s s", " s ", 's', ExtraTreeItems.GrainWheat.get(1)); + recipeUtil.addRecipe("proven_gear", ExtraTreeItems.ProvenGear.get(1), " s ", "s s", " s ", 's', Mods.Forestry.stack("oak_stick")); + recipeUtil.addRecipe("glass_fitting", ExtraTreeItems.GlassFitting.get(6), "s s", " i ", "s s", 'i', Items.IRON_INGOT, 's', Items.STICK); GameRegistry.addSmelting(ExtraTreeItems.GrainWheat.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); GameRegistry.addSmelting(ExtraTreeItems.GrainRye.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); GameRegistry.addSmelting(ExtraTreeItems.GrainCorn.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); GameRegistry.addSmelting(ExtraTreeItems.GrainBarley.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); try { final Item minium = (Item) Class.forName("com.pahimar.ee3.lib.ItemIds").getField("minium_shard").get(null); - GameRegistry.addRecipe(new ShapelessOreRecipe(Food.PAPAYIMAR.get(1), minium, "cropPapaya")); + recipeUtil.addShapelessRecipe("papayimar", Food.PAPAYIMAR.get(1), minium, "cropPapaya"); } catch (Exception ignored) { } ICarpenterManager carpenterManager = RecipeManagers.carpenterManager; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java index 5db9a567..00e18e97 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java @@ -4,6 +4,7 @@ import javax.annotation.Nullable; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; @@ -89,7 +90,7 @@ public class ControlFluidDisplay extends Control implements ITooltip { } @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { if (this.hastooltip && this.fluidStack != null) { tooltip.add(this.fluidStack.getLocalizedName()); } diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java index 321c5370..7478bb58 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java @@ -2,6 +2,7 @@ package binnie.extratrees.kitchen.craftgui; import javax.annotation.Nullable; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; @@ -59,7 +60,7 @@ public class ControlSlotFluid extends Control implements ITooltip { } @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { final FluidStack item = this.getFluidStack(); if (item == null) { return; diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index 970e2673..c4be56a1 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -1,5 +1,7 @@ package binnie.extratrees.machines; +import binnie.Constants; +import binnie.core.util.RecipeUtil; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -42,14 +44,15 @@ public class ModuleMachine implements IInitializable { @Override public void postInit() { - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Lumbermill.get(1), "gAg", "GsG", "gPg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'A', Items.IRON_AXE, 's', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze")); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Press.get(1), "iGi", "tSt", "tPt", 'i', "ingotIron", 'G', Blocks.GLASS, 't', "ingotTin", 'S', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze")); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.BREWERY.get(1), "bGb", "iSi", "bPb", 'i', "ingotIron", 'G', Blocks.GLASS, 'b', "gearBronze", 'S', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze")); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Distillery.get(1), "rGr", "iSi", "rPr", 'i', "ingotIron", 'G', Blocks.GLASS, 'r', "dustRedstone", 'S', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze")); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Woodworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.PLANKS, 's', Mods.Forestry.stack("impregnated_casing"))); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Panelworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.WOODEN_SLAB, 's', Mods.Forestry.stack("impregnated_casing"))); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Glassworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.GLASS, 's', Mods.Forestry.stack("impregnated_casing"))); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Tileworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Items.CLAY_BALL, 's', Mods.Forestry.stack("impregnated_casing"))); + RecipeUtil recipeUtil = new RecipeUtil(Constants.EXTRA_TREES_MOD_ID); + recipeUtil.addRecipe("lumbermill", ExtraTreeMachine.Lumbermill.get(1), "gAg", "GsG", "gPg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'A', Items.IRON_AXE, 's', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze"); + recipeUtil.addRecipe("press", ExtraTreeMachine.Press.get(1), "iGi", "tSt", "tPt", 'i', "ingotIron", 'G', Blocks.GLASS, 't', "ingotTin", 'S', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze"); + recipeUtil.addRecipe("brewery", ExtraTreeMachine.BREWERY.get(1), "bGb", "iSi", "bPb", 'i', "ingotIron", 'G', Blocks.GLASS, 'b', "gearBronze", 'S', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze"); + recipeUtil.addRecipe("distillery", ExtraTreeMachine.Distillery.get(1), "rGr", "iSi", "rPr", 'i', "ingotIron", 'G', Blocks.GLASS, 'r', "dustRedstone", 'S', Mods.Forestry.stack("sturdy_machine"), 'P', "gearBronze"); + recipeUtil.addRecipe("woodworker", ExtraTreeMachine.Woodworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.PLANKS, 's', Mods.Forestry.stack("impregnated_casing")); + recipeUtil.addRecipe("panelworker", ExtraTreeMachine.Panelworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.WOODEN_SLAB, 's', Mods.Forestry.stack("impregnated_casing")); + recipeUtil.addRecipe("glassworker", ExtraTreeMachine.Glassworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.GLASS, 's', Mods.Forestry.stack("impregnated_casing")); + recipeUtil.addRecipe("tileworker", ExtraTreeMachine.Tileworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Items.CLAY_BALL, 's', Mods.Forestry.stack("impregnated_casing")); LumbermillRecipeManager.calculateProducts(); } } diff --git a/src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java index d2351699..e634edaa 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/recipes/BrewedGrainRecipe.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.brewery.recipes; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; @@ -117,7 +118,7 @@ public class BrewedGrainRecipe implements IBreweryRecipe { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("grainOreName", grainOreName) .add("output", FluidStackUtil.toString(output)) .add("ingredientOreName", ingredientOreName) diff --git a/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipe.java index 72ea1747..65726d9b 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipe.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.brewery.recipes; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; @@ -92,7 +93,7 @@ public class BreweryRecipe implements IBreweryRecipe { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("input", FluidStackUtil.toString(input)) .add("output", FluidStackUtil.toString(output)) .add("yeast", yeast) diff --git a/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java b/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java index 0c3bf5a9..3d82bb4a 100644 --- a/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.Objects; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -148,7 +149,7 @@ public class ControlTileSelect extends Control implements IControlValue } @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.add(I18N.localise("binniecore.gui.designer.pattern", this.getValue().getName())); } diff --git a/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipe.java b/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipe.java index 7f60a5eb..658582c9 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipe.java +++ b/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipe.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.distillery.recipes; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.util.Collection; @@ -49,7 +50,7 @@ public class DistilleryRecipe implements IDistilleryRecipe { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("input", FluidStackUtil.toString(input)) .add("output", FluidStackUtil.toString(output)) .add("level", level) diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipe.java b/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipe.java index 159563dc..23a9c0e8 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipe.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipe.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.fruitpress.recipes; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.util.Collection; @@ -43,7 +44,7 @@ public class FruitPressRecipe implements IFruitPressRecipe{ @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("input", input) .add("output", FluidStackUtil.toString(output)) .toString(); diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipe.java b/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipe.java index fb0e0c2a..c3266522 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipe.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipe.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.lumbermill.recipes; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.util.Collection; @@ -41,7 +42,7 @@ public class LumbermillRecipe implements ILumbermillRecipe { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("input", input) .add("output", output) .toString(); diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java b/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java index 0f77124d..ce52373d 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java @@ -13,6 +13,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraftforge.oredict.OreDictionary; @@ -46,7 +47,6 @@ public class LumbermillRecipeManager implements ILumbermillManager { } public static void calculateProducts() { - CraftingManager craftingManager = CraftingManager.getInstance(); InventoryCrafting fakeCraftingInventory = new InventoryCrafting(new FakeCraftingHandler(), 3, 3){}; NonNullList logs = OreDictionary.getOres("logWood"); @@ -59,10 +59,13 @@ public class LumbermillRecipeManager implements ILumbermillManager { fakeCraftingInventory.clear(); fakeCraftingInventory.setInventorySlotContents(0, logCopy); - ItemStack recipeOutput = craftingManager.findMatchingRecipe(fakeCraftingInventory, FakeCraftingWorld.getInstance()); - if (!recipeOutput.isEmpty()) { - if (OreDictionaryUtil.hasOreName(recipeOutput, "plankWood")) { - addLogToPlankRecipe(logCopy.copy(), recipeOutput.copy()); + IRecipe recipe = CraftingManager.findMatchingRecipe(fakeCraftingInventory, FakeCraftingWorld.getInstance()); + if (recipe != null) { + ItemStack recipeOutput = recipe.getCraftingResult(fakeCraftingInventory); + if (!recipeOutput.isEmpty()) { + if (OreDictionaryUtil.hasOreName(recipeOutput, "plankWood")) { + addLogToPlankRecipe(logCopy.copy(), recipeOutput.copy()); + } } } } @@ -70,10 +73,13 @@ public class LumbermillRecipeManager implements ILumbermillManager { fakeCraftingInventory.clear(); fakeCraftingInventory.setInventorySlotContents(0, logStack.copy()); - ItemStack recipeOutput = craftingManager.findMatchingRecipe(fakeCraftingInventory, FakeCraftingWorld.getInstance()); - if (!recipeOutput.isEmpty()) { - if (OreDictionaryUtil.hasOreName(recipeOutput, "plankWood")) { - addLogToPlankRecipe(logStack.copy(), recipeOutput.copy()); + IRecipe recipe = CraftingManager.findMatchingRecipe(fakeCraftingInventory, FakeCraftingWorld.getInstance()); + if (recipe != null) { + ItemStack recipeOutput = recipe.getCraftingResult(fakeCraftingInventory); + if (!recipeOutput.isEmpty()) { + if (OreDictionaryUtil.hasOreName(recipeOutput, "plankWood")) { + addLogToPlankRecipe(logStack.copy(), recipeOutput.copy()); + } } } } diff --git a/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java b/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java index 8739715e..77dfd923 100644 --- a/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java +++ b/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java @@ -7,9 +7,9 @@ import java.util.Set; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraft.world.WorldSavedData; import com.mojang.authlib.GameProfile; +import net.minecraft.world.storage.WorldSavedData; public class GeneProjectTracker extends WorldSavedData { private Map projects; diff --git a/src/main/java/binnie/genetics/genetics/GeneTracker.java b/src/main/java/binnie/genetics/genetics/GeneTracker.java index d935178e..feaa0c90 100644 --- a/src/main/java/binnie/genetics/genetics/GeneTracker.java +++ b/src/main/java/binnie/genetics/genetics/GeneTracker.java @@ -8,7 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.world.World; -import net.minecraft.world.WorldSavedData; +import net.minecraft.world.storage.WorldSavedData; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java index b3123508..91b3e876 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java @@ -5,15 +5,14 @@ import java.util.Collection; import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.NonNullList; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.oredict.ShapelessOreRecipe; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import forestry.api.recipes.ICentrifugeRecipe; import forestry.api.recipes.ISqueezerRecipe; @@ -82,43 +81,22 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { public Collection getCrafting(ItemStack stack) { List products = new ArrayList<>(); - for (Object recipeO : CraftingManager.getInstance().getRecipeList()) { - if (recipeO instanceof ShapelessRecipes) { - ShapelessRecipes recipe = (ShapelessRecipes) recipeO; - boolean match = true; - for (Object rec : recipe.recipeItems) { - if (rec != null && (!(rec instanceof ItemStack) || !stack.isItemEqual((ItemStack) rec))) { - match = false; + for (IRecipe recipe : ForgeRegistries.RECIPES.getValues()) { + ItemStack recipeOutput = recipe.getRecipeOutput(); + if (!recipeOutput.isEmpty()) { + NonNullList ingredients = recipe.getIngredients(); + if (!ingredients.isEmpty()) { + boolean match = true; + for (Ingredient ingredient : ingredients) { + if (!ingredient.apply(stack)) { + match = false; + break; + } + } + if (match) { + products.add(recipeOutput); } } - if (match) { - products.add(recipe.getRecipeOutput()); - } - } - if (recipeO instanceof ShapedRecipes) { - ShapedRecipes recipe2 = (ShapedRecipes) recipeO; - boolean match = true; - for (Object rec2 : recipe2.recipeItems) { - if (rec2 != null && (!(rec2 instanceof ItemStack) || !stack.isItemEqual((ItemStack) rec2))) { - match = false; - } - } - if (match) { - products.add(recipe2.getRecipeOutput()); - } - } - if (recipeO instanceof ShapelessOreRecipe) { - ShapelessOreRecipe recipe3 = (ShapelessOreRecipe) recipeO; - boolean match = true; - for (Object rec : recipe3.getInput()) { - if (rec != null && (!(rec instanceof ItemStack) || !stack.isItemEqual((ItemStack) rec))) { - match = false; - } - } - if (!match) { - continue; - } - products.add(recipe3.getRecipeOutput()); } } return products; diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java b/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java index fa08896c..9a5ab9b3 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java @@ -4,6 +4,7 @@ import java.util.List; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -52,7 +53,7 @@ public class ControlAnalystButton extends Control { } @Override - public void getTooltip(Tooltip tooltip) { + public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.add(value.getTitle()); } diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java b/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java index 9f66466e..176c0031 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java @@ -1,5 +1,6 @@ package binnie.genetics.gui.analyst; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -51,7 +52,7 @@ public class ControlAnalystChromosome extends Control implements ITooltip { } @Override - public void getTooltip(Tooltip tooltip) { + public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { BreedingSystem system = Binnie.GENETICS.getSystem(root); tooltip.add(system.getChromosomeName(chromosomeType)); if (isHomozygous()) { diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java b/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java index 4e35fdfb..b03a234d 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java @@ -1,6 +1,7 @@ package binnie.genetics.gui.analyst; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.world.biome.Biome; import net.minecraftforge.common.BiomeDictionary; @@ -68,7 +69,7 @@ public class ControlBiome extends Control implements ITooltip { } @Override - public void getTooltip(Tooltip tooltip) { + public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.add(biome.getBiomeName().replaceAll("(\\p{Ll})(\\p{Lu})", "$1 $2")); } } diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java b/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java index 834233fb..9cbe5c87 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java @@ -1,5 +1,6 @@ package binnie.genetics.gui.analyst; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import forestry.api.genetics.AlleleManager; @@ -25,7 +26,7 @@ public class ControlIndividualDisplay extends ControlItemDisplay implements IToo } @Override - public void getTooltip(Tooltip tooltip) { + public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { ItemStack stack = getItemStack(); if (stack.isEmpty()) { return; diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java b/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java index d714509c..5b0c8bf0 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlSystemButton.java @@ -1,5 +1,6 @@ package binnie.genetics.gui.analyst; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -36,7 +37,7 @@ public class ControlSystemButton extends Control { } @Override - public void getTooltip(Tooltip tooltip) { + public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.add(system.getName()); } diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java b/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java index 0481ffa7..42c2119b 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java @@ -2,6 +2,7 @@ package binnie.genetics.gui.analyst; import java.util.EnumSet; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; @@ -36,7 +37,7 @@ public abstract class ControlToleranceBar> extends Control imp } @Override - public void getTooltip(Tooltip tooltip) { + public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { int types = fullSet.size(); int type = getRelativeMousePosition().xPos() / (getSize().xPos() / types); for (T tol : fullSet) { diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java b/src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java index 90b52179..b6dd75c5 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java @@ -4,6 +4,7 @@ import binnie.core.gui.ITooltip; import binnie.core.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; +import net.minecraft.client.util.ITooltipFlag; public class ControlTooltip extends Control implements ITooltip { public ControlTooltip(IWidget parent, int x, int y, int w, int h) { @@ -11,6 +12,6 @@ public class ControlTooltip extends Control implements ITooltip { } @Override - public void getTooltip(Tooltip tooltip) { + public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { } } diff --git a/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java index 5492bbda..f583629a 100644 --- a/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -172,8 +173,8 @@ public class AnalystPageProducts extends AnalystPageProduce { ControlItemDisplay item = new ControlItemDisplay(this, 16, y) { @Override @SideOnly(Side.CLIENT) - public void getTooltip(Tooltip tooltip) { - super.getTooltip(tooltip); + public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { + super.getTooltip(tooltip, tooltipFlag); Collection products = getCentrifuge(key); if (!products.isEmpty()) { tooltip.add(I18N.localise(AnalystConstants.PRODUCTS_KEY + ".centrifuges") + ": "); diff --git a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java index 936c0c5e..eead3913 100644 --- a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java +++ b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java @@ -30,6 +30,7 @@ import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.ControlAnalystPage; import binnie.genetics.gui.analyst.ControlBiome; import binnie.genetics.gui.analyst.ControlToleranceBar; +import net.minecraftforge.fml.common.registry.ForgeRegistries; public class AnalystPageClimate extends ControlAnalystPage { public AnalystPageClimate(IWidget parent, Area area, IIndividual ind) { @@ -67,7 +68,7 @@ public class AnalystPageClimate extends ControlAnalystPage { new ControlText(this, new Area(4, y, getWidth() - 8, 14), I18N.localise(AnalystConstants.CLIMATE_KEY + ".biomes"), TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; List biomes = new ArrayList<>(); - for (Biome biome : Biome.EXPLORATION_BIOMES_LIST) { //TODO check + for (Biome biome : ForgeRegistries.BIOMES.getValues()) { //TODO check if (biome != null && biome != Biomes.FROZEN_OCEAN && Tolerance.canTolerate(temp, EnumTemperature.getFromBiome(biome), tempTol) && diff --git a/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java b/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java index 9452889d..bf1b4285 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java +++ b/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java @@ -3,6 +3,7 @@ package binnie.genetics.gui.database.bee; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.world.biome.Biome; import net.minecraftforge.fml.relauncher.Side; @@ -32,7 +33,7 @@ public class ControlBiomes extends Control implements ITooltip { } @Override - public void getTooltip(Tooltip tooltip) { + public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { if (tolerated.isEmpty()) { return; } diff --git a/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java b/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java index 34aa6d1b..c382fbcb 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java +++ b/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java @@ -3,6 +3,7 @@ package binnie.genetics.gui.database.bee; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -55,7 +56,7 @@ public class ControlClimateBar extends Control implements ITooltip { } @Override - public void getTooltip(Tooltip tooltip) { + public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { if (tolerated.isEmpty()) { return; } diff --git a/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java b/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java index 425bf5c0..cc5e7bd6 100644 --- a/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java +++ b/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java @@ -1,5 +1,6 @@ package binnie.genetics.gui.punnett; +import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -42,7 +43,7 @@ public class ControlChromosome extends Control implements IControlValue 0) { - minecraft.fontRendererObj.drawString("Item", 24, 0, Color.gray.getRGB()); + minecraft.fontRenderer.drawString("Item", 24, 0, Color.gray.getRGB()); String lossString = String.format("Loss: %.0f%%", loss * 100); - minecraft.fontRendererObj.drawString(lossString, 24, 10, Color.gray.getRGB()); + minecraft.fontRenderer.drawString(lossString, 24, 10, Color.gray.getRGB()); } } } diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java index d0ce0647..fa765e58 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java @@ -94,13 +94,13 @@ public class InoculatorRecipeWrapper extends BlankRecipeWrapper { NumberFormat decimalFormat = NumberFormat.getIntegerInstance(MinecraftForgeClient.getLocale()); String powerString = decimalFormat.format(power) + " RF"; - int xPower = 15 + (recipeWidth - minecraft.fontRendererObj.getStringWidth(powerString)) / 2; - minecraft.fontRendererObj.drawString(powerString, xPower, 5, Color.gray.getRGB()); + int xPower = 15 + (recipeWidth - minecraft.fontRenderer.getStringWidth(powerString)) / 2; + minecraft.fontRenderer.drawString(powerString, xPower, 5, Color.gray.getRGB()); // todo: find a localized duration formatter String processTime = DurationFormatUtils.formatDurationWords(processTicks * 1000 / 20, true, true); - int xTime = 15 + (recipeWidth - minecraft.fontRendererObj.getStringWidth(processTime)) / 2; - minecraft.fontRendererObj.drawString(processTime, xTime, 45, Color.gray.getRGB()); + int xTime = 15 + (recipeWidth - minecraft.fontRenderer.getStringWidth(processTime)) / 2; + minecraft.fontRenderer.drawString(processTime, xTime, 45, Color.gray.getRGB()); } } diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java index 4ff36ea0..3b597e3b 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java @@ -54,8 +54,8 @@ public class IsolatorRecipeCategory extends BlankRecipeCategory tooltip, boolean advanced) { - super.addInformation(stack, playerIn, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + super.addInformation(stack, worldIn, tooltip, flagIn); if (stack.getItemDamage() > 0) { tooltip.add("Flora-in-a-box"); } } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList subItems) { - super.getSubItems(itemIn, tab, subItems); - subItems.add(new ItemStack(itemIn, 1, 1)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + super.getSubItems(tab, items); + if (this.isInCreativeTab(tab)) { + items.add(new ItemStack(this, 1, 1)); + } } @Override diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index fbded859..ccc68b64 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -38,10 +38,11 @@ public class ItemDatabase extends ItemCore { } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList subItems) { - super.getSubItems(itemIn, tab, subItems); - subItems.add(new ItemStack(itemIn, 1, 1)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + super.getSubItems(tab, items); + if (this.isInCreativeTab(tab)) { + items.add(new ItemStack(this, 1, 1)); + } } @Override diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index 6d10c2f3..ec251086 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -3,12 +3,14 @@ package binnie.genetics.item; import javax.annotation.Nullable; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -31,7 +33,7 @@ public abstract class ItemGene extends ItemCore implements IColoredItem { @Override @SideOnly(Side.CLIENT) - public void addInformation(final ItemStack itemstack, final EntityPlayer entityPlayer, final List list, final boolean advanced) { + public void addInformation(ItemStack itemstack, @Nullable World worldIn, List list, ITooltipFlag flagIn) { int damage = itemstack.getMaxDamage() - itemstack.getItemDamage(); if (damage == 0) { list.add(I18N.localise("genetics.item.gene.empty")); @@ -53,9 +55,8 @@ public abstract class ItemGene extends ItemCore implements IColoredItem { @Override public abstract String getItemStackDisplayName(final ItemStack itemStack); - @SideOnly(Side.CLIENT) @Override - public abstract void getSubItems(Item item, final CreativeTabs tab, final NonNullList subItems); + public abstract void getSubItems(CreativeTabs tab, NonNullList items); @Nullable public abstract IGeneItem getGeneItem(ItemStack itemStack); diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index fb85aac7..fffa7d31 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -1,15 +1,19 @@ package binnie.genetics.item; +import javax.annotation.Nullable; + import com.google.common.base.Preconditions; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -62,32 +66,33 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemStack, EntityPlayer player, List subItems, boolean advanced) { - subItems.add(I18N.localise("genetics.item.sequence." + (5 - itemStack.getItemDamage() % 6))); + public void addInformation(ItemStack itemStack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + tooltip.add(I18N.localise("genetics.item.sequence." + (5 - itemStack.getItemDamage() % 6))); SequencerItem gene = SequencerItem.create(itemStack); if (gene != null) { if (gene.analysed) { - gene.getInfo(subItems); + gene.getInfo(tooltip); } else { - subItems.add("<" + I18N.localise("genetics.item.sequence.unknown") + ">"); + tooltip.add("<" + I18N.localise("genetics.item.sequence.unknown") + ">"); } int seq = gene.sequenced; if (seq == 0) { - subItems.add(I18N.localise("genetics.item.sequence.unsequenced")); + tooltip.add(I18N.localise("genetics.item.sequence.unsequenced")); } else if (seq < 100) { - subItems.add(I18N.localise("genetics.genetics.item.sequence.partially", seq)); + tooltip.add(I18N.localise("genetics.genetics.item.sequence.partially", seq)); } else { - subItems.add(I18N.localise("genetics.item.sequence.sequenced")); + tooltip.add(I18N.localise("genetics.item.sequence.sequenced")); } } } - @SideOnly(Side.CLIENT) @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { - final IAlleleBeeSpecies species = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.speciesMeadows"); - Preconditions.checkNotNull(species); - subItems.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.GENETICS.getBeeRoot()), false)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + final IAlleleBeeSpecies species = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.speciesMeadows"); + Preconditions.checkNotNull(species); + items.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.GENETICS.getBeeRoot()), false)); + } } @Override diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index c3d58925..7206b1df 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -53,19 +53,22 @@ public class ItemSerum extends ItemGene implements IItemSerum { return stack.getMaxDamage(); } - @SideOnly(Side.CLIENT) @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { - for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { - Map> chromosomeMap = Binnie.GENETICS.getChromosomeMap(root); - for (Map.Entry> entry : chromosomeMap.entrySet()) { - IChromosomeType chromosome = entry.getKey(); - for (final IAllele allele : entry.getValue()) { - Gene gene = Gene.create(allele, chromosome, root); - IGeneItem geneItem = new GeneItem(gene); - ItemStack stack = new ItemStack(item); - geneItem.writeToItem(stack); - subItems.add(stack); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { + Map> chromosomeMap = Binnie.GENETICS.getChromosomeMap(root); + if (chromosomeMap != null) { + for (Map.Entry> entry : chromosomeMap.entrySet()) { + IChromosomeType chromosome = entry.getKey(); + for (final IAllele allele : entry.getValue()) { + Gene gene = Gene.create(allele, chromosome, root); + IGeneItem geneItem = new GeneItem(gene); + ItemStack stack = new ItemStack(this); + geneItem.writeToItem(stack); + items.add(stack); + } + } } } } diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index eb9cf26e..55ae6bc6 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -88,25 +88,26 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { return new GeneArrayItem(itemStack); } - @SideOnly(Side.CLIENT) @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { - for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { - for (IIndividual template : root.getIndividualTemplates()) { - if (template.getGenome().getPrimary().isSecret()) { - continue; - } - IGeneItem geneItem = new GeneArrayItem(); - for (IChromosomeType type : root.getKaryotype()) { - IChromosome chromosome = template.getGenome().getChromosomes()[type.ordinal()]; - if (chromosome != null) { - IAllele active = chromosome.getActiveAllele(); - geneItem.addGene(new Gene(active, type, root)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (this.isInCreativeTab(tab)) { + for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { + for (IIndividual template : root.getIndividualTemplates()) { + if (template.getGenome().getPrimary().isSecret()) { + continue; } + IGeneItem geneItem = new GeneArrayItem(); + for (IChromosomeType type : root.getKaryotype()) { + IChromosome chromosome = template.getGenome().getChromosomes()[type.ordinal()]; + if (chromosome != null) { + IAllele active = chromosome.getActiveAllele(); + geneItem.addGene(new Gene(active, type, root)); + } + } + ItemStack array = new ItemStack(this); + geneItem.writeToItem(array); + items.add(array); } - ItemStack array = new ItemStack(item); - geneItem.writeToItem(array); - subItems.add(array); } } } diff --git a/src/main/java/binnie/genetics/item/ModuleItems.java b/src/main/java/binnie/genetics/item/ModuleItems.java index 9cd7eacc..8846300d 100644 --- a/src/main/java/binnie/genetics/item/ModuleItems.java +++ b/src/main/java/binnie/genetics/item/ModuleItems.java @@ -1,5 +1,7 @@ package binnie.genetics.item; +import binnie.Constants; +import binnie.core.util.RecipeUtil; import com.google.common.base.Preconditions; import javax.annotation.Nullable; @@ -105,66 +107,61 @@ public class ModuleItems implements IInitializable { @Override public void postInit() { - GameRegistry.addShapelessRecipe(GeneticsItems.DNADye.get(8), + RecipeUtil recipeUtil = new RecipeUtil(Constants.GENETICS_MOD_ID); + recipeUtil.addShapelessRecipe("dna_dye_from_glowstone", GeneticsItems.DNADye.get(8), Items.GLOWSTONE_DUST, new ItemStack(Items.DYE, 1, 5) ); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.LaboratoryCasing.get(itemGenetics, 1), + recipeUtil.addRecipe("laboratory_casing", GeneticsItems.LaboratoryCasing.get(itemGenetics, 1), "iii", "iYi", "iii", 'i', "ingotIron", 'Y', Mods.Forestry.item("sturdy_machine") - )); - GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.DNADye.get(itemGenetics, 2), "dyePurple", "dyeMagenta", "dyePink")); - GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.FluorescentDye.get(itemGenetics, 2), "dyeOrange", "dyeYellow", "dustGlowstone")); - GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.GrowthMedium.get(itemGenetics, 2), new ItemStack(Items.DYE, 1, 15), Items.SUGAR)); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptySequencer.get(itemGenetics, 1), + ); + recipeUtil.addShapelessRecipe("dna_dye", GeneticsItems.DNADye.get(itemGenetics, 2), "dyePurple", "dyeMagenta", "dyePink"); + recipeUtil.addShapelessRecipe("fluorescent_dye", GeneticsItems.FluorescentDye.get(itemGenetics, 2), "dyeOrange", "dyeYellow", "dustGlowstone"); + recipeUtil.addShapelessRecipe("growth_medium", GeneticsItems.GrowthMedium.get(itemGenetics, 2), new ItemStack(Items.DYE, 1, 15), Items.SUGAR); + recipeUtil.addRecipe("empty_sequencer", GeneticsItems.EmptySequencer.get(itemGenetics, 1), " p ", "iGi", " p ", 'i', "ingotGold", 'G', Blocks.GLASS_PANE, 'p', Items.PAPER - )); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EMPTY_SERUM.get(itemGenetics, 1), + ); + recipeUtil.addRecipe("empty_serum", GeneticsItems.EMPTY_SERUM.get(itemGenetics, 1), " g ", " G ", "GGG", 'g', "ingotGold", 'G', Blocks.GLASS_PANE - )); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EMPTY_GENOME.get(itemGenetics, 1), + ); + recipeUtil.addRecipe("empty_genome", GeneticsItems.EMPTY_GENOME.get(itemGenetics, 1), "sss", "sss", "sss", 's', GeneticsItems.EMPTY_SERUM.get(itemGenetics, 1) - )); - GameRegistry.addRecipe(new ShapedOreRecipe(FluidContainerType.CYLINDER.get(8), + ); + recipeUtil.addRecipe("cylinder", FluidContainerType.CYLINDER.get(8), " g ", "g g", " ", 'g', Blocks.GLASS_PANE - )); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), + ); + recipeUtil.addRecipe("integrated_circuit", GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), "l g", " c ", "g l", 'c', Mods.Forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.DYE, 1, 4), 'g', "dustGlowstone" - )); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), - "g l", - " c ", - "l g", - 'c', Mods.Forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.DYE, 1, 4), 'g', "dustGlowstone" - )); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCasing.get(itemGenetics, 1), + ); + recipeUtil.addRecipe("integrated_casing", GeneticsItems.IntegratedCasing.get(itemGenetics, 1), "ccc", "cdc", "ccc", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', GeneticsItems.LaboratoryCasing.get(itemGenetics, 1) - )); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCPU.get(itemGenetics, 1), + ); + recipeUtil.addRecipe("integrated_cpu", GeneticsItems.IntegratedCPU.get(itemGenetics, 1), "ccc", "cdc", "ccc", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', Items.DIAMOND - )); + ); RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), ItemStack.EMPTY, @@ -178,25 +175,28 @@ public class ModuleItems implements IInitializable { GameRegistry.addSmelting(itemSerum, GeneticsItems.EMPTY_SERUM.get(itemGenetics, 1), 0.0f); GameRegistry.addSmelting(itemSerumArray, GeneticsItems.EMPTY_GENOME.get(itemGenetics, 1), 0.0f); - GameRegistry.addShapedRecipe(new ItemStack(analyst), + recipeUtil.addRecipe("analyst", new ItemStack(analyst), " c ", "cac", " d ", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'a', Mods.Forestry.item("portable_alyzer"), 'd', new ItemStack(Items.DIAMOND) ); + // TODO: make this crazy list of recipes into one custom recipe Item[] databases = {ExtraBeesIntegration.dictionary, ExtraTrees.items().itemDictionary, ExtraTrees.items().itemDictionaryLepi, Botany.database}; if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) { + int recipeNum = 0; for (Item databaseA : databases) { for (Item databaseB : databases) { for (Item databaseC : databases) { for (Item databaseD : databases) { if (databaseA != databaseB && databaseA != databaseC && databaseA != databaseD && databaseB != databaseC && databaseB != databaseD && databaseC != databaseD) { - GameRegistry.addShapedRecipe(new ItemStack(registry), + recipeUtil.addRecipe("registry_" + recipeNum, new ItemStack(registry), " b ", "fct", " l ", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'b', databaseA, 't', databaseB, 'f', databaseC, 'l', databaseD ); + recipeNum++; } } } diff --git a/src/main/java/binnie/genetics/machine/MachineRendererLab.java b/src/main/java/binnie/genetics/machine/MachineRendererLab.java index 24a3b287..c9841eb6 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererLab.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererLab.java @@ -50,7 +50,7 @@ public class MachineRendererLab { if (Minecraft.isFancyGraphicsEnabled()) { final ItemStack stack = holder.getStack(); this.dummyEntityItem.world = world; - this.dummyEntityItem.setEntityItemStack(stack); + this.dummyEntityItem.setItem(stack); if (world.getTotalWorldTime() != this.lastTick) { this.lastTick = world.getTotalWorldTime(); this.dummyEntityItem.onUpdate(); @@ -74,7 +74,7 @@ public class MachineRendererLab { for (EntityItem item : this.itemSides) { GlStateManager.pushMatrix(); item.world = world; - item.setEntityItemStack(stack); + item.setItem(stack); GlStateManager.rotate(rot, 0.0f, 1.0f, 0.0f); GlStateManager.rotate(180.0f, 1.0f, 0.0f, 0.0f); GlStateManager.translate(0.0, -1.13, 0.4); @@ -86,9 +86,9 @@ public class MachineRendererLab { break Label_0591; } } - this.dummyEntityItem.setEntityItemStack(ItemStack.EMPTY); + this.dummyEntityItem.setItem(ItemStack.EMPTY); for (final EntityItem item2 : this.itemSides) { - item2.setEntityItemStack(ItemStack.EMPTY); + item2.setItem(ItemStack.EMPTY); } } GlStateManager.popMatrix(); diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/src/main/java/binnie/genetics/machine/ModuleMachine.java index 727428df..859a77a6 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -1,9 +1,12 @@ package binnie.genetics.machine; +import binnie.Constants; +import binnie.core.util.RecipeUtil; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -51,6 +54,7 @@ public class ModuleMachine implements IInitializable { @Override public void postInit() { + RecipeUtil recipeUtil = new RecipeUtil(Constants.GENETICS_MOD_ID); Acclimatiser.setupRecipes(); final Object[] standardCircuit = {Mods.Forestry.stack("chipsets", 1, 1)}; final Object[] advCircuit = {GeneticsItems.IntegratedCircuit.get(1)}; @@ -58,19 +62,19 @@ public class ModuleMachine implements IInitializable { final String goldGear = !OreDictionary.getOres("gearGold").isEmpty() ? "gearIron" : "ingotIron"; final String diamondGear = !OreDictionary.getOres("gearDiamond").isEmpty() ? "gearIron" : "ingotIron"; for (final Object circuit : standardCircuit) { - GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Incubator.get(1), "gFg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'F', Blocks.FURNACE, 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', ironGear)); + recipeUtil.addRecipe("incubator", LaboratoryMachine.Incubator.get(1), "gFg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'F', Blocks.FURNACE, 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', ironGear); Item alyzer = Mods.Forestry.item("portable_alyzer"); - GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Analyser.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', alyzer, 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', GeneticsItems.DNADye.get(1))); - GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Genepool.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', "gearBronze", 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', Blocks.GLASS)); - GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Acclimatiser.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', Items.LAVA_BUCKET, 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', Items.WATER_BUCKET)); + recipeUtil.addRecipe("analyzer", LaboratoryMachine.Analyser.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', alyzer, 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', GeneticsItems.DNADye.get(1)); + recipeUtil.addRecipe("genepool", LaboratoryMachine.Genepool.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', "gearBronze", 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', Blocks.GLASS); + recipeUtil.addRecipe("acclimatizer", LaboratoryMachine.Acclimatiser.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', Items.LAVA_BUCKET, 'c', circuit, 'g', Blocks.GLASS_PANE, 'P', "gearBronze", 'a', Items.WATER_BUCKET); } for (final Object circuit : advCircuit) { - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticMachine.Isolator.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', goldGear, 'c', circuit, 'g', Items.GOLD_NUGGET, 'P', "gearBronze", 'a', GeneticsItems.Enzyme.get(1))); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticMachine.Polymeriser.get(1), "gBg", "cCc", "gPg", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', ironGear, 'c', circuit, 'g', Items.GOLD_NUGGET, 'P', "gearBronze")); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticMachine.Sequencer.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', "gearBronze", 'c', circuit, 'g', Items.GOLD_NUGGET, 'P', "gearBronze", 'a', GeneticsItems.FluorescentDye.get(1))); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticMachine.Inoculator.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', diamondGear, 'c', circuit, 'g', Items.GOLD_NUGGET, 'P', "gearBronze", 'a', Items.EMERALD)); + recipeUtil.addRecipe("isolator", GeneticMachine.Isolator.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', goldGear, 'c', circuit, 'g', Items.GOLD_NUGGET, 'P', "gearBronze", 'a', GeneticsItems.Enzyme.get(1)); + recipeUtil.addRecipe("polymeriser", GeneticMachine.Polymeriser.get(1), "gBg", "cCc", "gPg", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', ironGear, 'c', circuit, 'g', Items.GOLD_NUGGET, 'P', "gearBronze"); + recipeUtil.addRecipe("sequencer", GeneticMachine.Sequencer.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', "gearBronze", 'c', circuit, 'g', Items.GOLD_NUGGET, 'P', "gearBronze", 'a', GeneticsItems.FluorescentDye.get(1)); + recipeUtil.addRecipe("inoculator", GeneticMachine.Inoculator.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', diamondGear, 'c', circuit, 'g', Items.GOLD_NUGGET, 'P', "gearBronze", 'a', Items.EMERALD); } - GameRegistry.addRecipe(new ShapedOreRecipe(AdvGeneticMachine.Splicer.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.IntegratedCasing.get(1), 'B', diamondGear, 'c', GeneticsItems.IntegratedCPU.get(1), 'g', Items.GOLD_NUGGET, 'P', "gearBronze", 'a', Items.BLAZE_ROD)); - GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.LabMachine.get(1), "igi", "gCg", "igi", 'C', GeneticsItems.LaboratoryCasing.get(1), 'i', "ingotIron", 'g', Blocks.GLASS_PANE)); + recipeUtil.addRecipe("splicer", AdvGeneticMachine.Splicer.get(1), "gBg", "cCc", "aPa", 'C', GeneticsItems.IntegratedCasing.get(1), 'B', diamondGear, 'c', GeneticsItems.IntegratedCPU.get(1), 'g', Items.GOLD_NUGGET, 'P', "gearBronze", 'a', Items.BLAZE_ROD); + recipeUtil.addRecipe("lab_machine", LaboratoryMachine.LabMachine.get(1), "igi", "gCg", "igi", 'C', GeneticsItems.LaboratoryCasing.get(1), 'i', "ingotIron", 'g', Blocks.GLASS_PANE); } } diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java index 390ee69c..8f4a06e9 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java @@ -74,7 +74,7 @@ public class AnalyserFX extends MachineComponent implements IRender.DisplayTick, } final ItemStack stack = this.getUtil().getStack(6); this.dummyEntityItem.world = this.getMachine().getWorld(); - this.dummyEntityItem.setEntityItemStack(stack); + this.dummyEntityItem.setItem(stack); final EntityItem dummyEntityItem = this.dummyEntityItem; dummyEntityItem.setAgeToCreativeDespawnTime(); //++dummyEntityItem.age; this.dummyEntityItem.hoverStart = 0.0f; @@ -88,7 +88,7 @@ public class AnalyserFX extends MachineComponent implements IRender.DisplayTick, GlStateManager.pushMatrix(); GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f); GlStateManager.translate(0.0f, -0.2f, 0.0f); - BinnieCore.getBinnieProxy().getMinecraftInstance().getRenderItem().renderItem(dummyEntityItem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED);//doRender(this.dummyEntityItem.getEntityItem(), 0.0, 0.0, 0.0, 0.0f, 0.0f); + BinnieCore.getBinnieProxy().getMinecraftInstance().getRenderItem().renderItem(dummyEntityItem.getItem(), ItemCameraTransforms.TransformType.FIXED);//doRender(this.dummyEntityItem.getEntityItem(), 0.0, 0.0, 0.0, 0.0f, 0.0f); GlStateManager.popMatrix(); } diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java index c5603e09..af6d9d8d 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.craftgui; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -44,7 +45,7 @@ public class ControlGene extends Control implements IControlValue, IToolt } @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { BreedingSystem system = Binnie.GENETICS.getSystem(this.gene.getSpeciesRoot()); final String cName = system.getChromosomeName(this.gene.getChromosome()); tooltip.add(cName + ": " + this.gene.getName()); diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java index 476c9f1f..6c1d580a 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; @@ -119,7 +120,7 @@ public class WindowGeneBank extends WindowMachine { public ControlTab createTab(final int x, final int y, final int w, final int h, final BreedingSystem value) { return new ControlTabIcon(this, x, y, w, h, value) { @Override - public void getTooltip(final Tooltip tooltip) { + public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) { tooltip.add(this.getValue().toString()); int totalGenes = 0; int seqGenes = 0; diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java index 33b0ab43..8b62c296 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java @@ -47,7 +47,7 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic } final ItemStack stack = this.getUtil().getStack(9); this.dummyEntityItem.world = this.getMachine().getWorld(); - this.dummyEntityItem.setEntityItemStack(stack); + this.dummyEntityItem.setItem(stack); final EntityItem dummyEntityItem = this.dummyEntityItem; dummyEntityItem.setAgeToCreativeDespawnTime(); // ++dummyEntityItem.age; this.dummyEntityItem.hoverStart = 0.0f; @@ -61,7 +61,7 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic GlStateManager.pushMatrix(); GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f); GlStateManager.translate(0.0f, -0.25f, 0.0f); - BinnieCore.getBinnieProxy().getMinecraftInstance().getRenderItem().renderItem(this.dummyEntityItem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED); //, 0.0, 0.0, 0.0, 0.0f, 0.0f); + BinnieCore.getBinnieProxy().getMinecraftInstance().getRenderItem().renderItem(this.dummyEntityItem.getItem(), ItemCameraTransforms.TransformType.FIXED); //, 0.0, 0.0, 0.0, 0.0f, 0.0f); GlStateManager.popMatrix(); } diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java b/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java index 7aa650a5..fceb3a11 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java @@ -79,7 +79,7 @@ public class SplicerFX extends MachineComponent implements IRender.DisplayTick, } final ItemStack stack = this.getUtil().getStack(9); this.dummyEntityItem.world = this.getMachine().getWorld(); - this.dummyEntityItem.setEntityItemStack(stack); + this.dummyEntityItem.setItem(stack); final EntityItem dummyEntityItem = this.dummyEntityItem; dummyEntityItem.setAgeToCreativeDespawnTime(); //++dummyEntityItem.age; this.dummyEntityItem.hoverStart = 0.0f; @@ -93,7 +93,7 @@ public class SplicerFX extends MachineComponent implements IRender.DisplayTick, GlStateManager.pushMatrix(); GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f); GlStateManager.translate(0.0f, -0.25f, 0.0f); - BinnieCore.getBinnieProxy().getMinecraftInstance().getRenderItem().renderItem(dummyEntityItem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED);//doRender(this.dummyEntityItem, 0.0, 0.0, 0.0, 0.0f, 0.0f); + BinnieCore.getBinnieProxy().getMinecraftInstance().getRenderItem().renderItem(dummyEntityItem.getItem(), ItemCameraTransforms.TransformType.FIXED);//doRender(this.dummyEntityItem, 0.0, 0.0, 0.0, 0.0f, 0.0f); GlStateManager.popMatrix(); }