diff --git a/gradle.properties b/gradle.properties index b937608d..127dcb30 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ mcversion=1.11.2 forgeversion=13.20.0.2230 mcp_mappings=snapshot_20161220 -forestry_version=5.3.2.60 +forestry_version=5.3.2.68 version_major=2 version_minor=0 diff --git a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java index 9ef4ff72..1e5b637c 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java +++ b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java @@ -9,8 +9,9 @@ import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.IPattern; import binnie.extratrees.carpentry.DesignerManager; import binnie.extratrees.carpentry.EnumPattern; -import forestry.core.render.TextureManager; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -79,9 +80,12 @@ public class CeramicDesignSystem implements IDesignSystem { @Override @SideOnly(Side.CLIENT) public void registerSprites() { + TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks(); for (EnumPattern pattern : EnumPattern.values()) { - this.primary.put(pattern.ordinal(), TextureManager.registerSprite(new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"))); - this.secondary.put(pattern.ordinal(), TextureManager.registerSprite(new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"))); + ResourceLocation primaryLocation = new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"); + ResourceLocation secondaryLocation = new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"); + this.primary.put(pattern.ordinal(), textureMap.registerSprite(primaryLocation)); + this.secondary.put(pattern.ordinal(), textureMap.registerSprite(secondaryLocation)); } } diff --git a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java index b760d0e6..ccc07938 100644 --- a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java @@ -19,16 +19,17 @@ import forestry.core.blocks.IColoredBlock; import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.BlockModelEntry; -import forestry.core.render.TextureManager; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; 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.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -238,10 +239,11 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock circuits = getCircuits(itemstack); if (!circuits.isEmpty()) { - if (Proxies.common.isShiftDown()) { + if (GuiScreen.isShiftKeyDown()) { for (ICircuitLayout circuitLayout : circuits.keys()) { String circuitLayoutName = circuitLayout.getUsage(); list.add(TextFormatting.WHITE.toString() + TextFormatting.UNDERLINE + circuitLayoutName); diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 4679f5f1..082944ff 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -55,7 +55,7 @@ import java.util.List; name = "Binnie Core", useMetadata = true, dependencies = "required-after:forge@[13.20.0.2230,);" + - "required-after:forestry@[5.3.1.34,);" + "required-after:forestry@[5.3.2.68,);" ) public final class BinnieCore extends AbstractMod { diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index 4fd13210..0c3d50f4 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -1,8 +1,9 @@ package binnie.core.liquid; import binnie.core.ManagerBase; -import forestry.core.render.TextureManager; import forestry.core.utils.OreDictUtil; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.TextureStitchEvent; @@ -72,9 +73,10 @@ public class ManagerLiquid extends ManagerBase { @SubscribeEvent @SideOnly(Side.CLIENT) public void registerSprites(TextureStitchEvent event) { + TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks(); for (IFluidType fluid : this.fluids.values()) { - TextureManager.registerSprite(fluid.getFlowing()); - TextureManager.registerSprite(fluid.getStill()); + textureMap.registerSprite(fluid.getFlowing()); + textureMap.registerSprite(fluid.getStill()); } } } diff --git a/src/main/java/binnie/core/resource/BinnieSprite.java b/src/main/java/binnie/core/resource/BinnieSprite.java index 208db6af..c70ed7ed 100644 --- a/src/main/java/binnie/core/resource/BinnieSprite.java +++ b/src/main/java/binnie/core/resource/BinnieSprite.java @@ -4,8 +4,9 @@ package binnie.core.resource; import binnie.Binnie; import binnie.core.AbstractMod; import com.google.common.base.Preconditions; -import forestry.core.render.TextureManager; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -29,6 +30,7 @@ public class BinnieSprite extends BinnieResource { @SideOnly(Side.CLIENT) public void registerSprites() { - sprite = TextureManager.registerSprite(getResourceLocation()); + TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks(); + sprite = textureMap.registerSprite(getResourceLocation()); } } diff --git a/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java b/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java index fed7f084..bfd3ed88 100644 --- a/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java +++ b/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java @@ -4,9 +4,8 @@ import binnie.core.BinnieCore; import binnie.craftgui.core.geometry.Area; import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; -import forestry.core.render.TextureManager; - import com.google.common.base.Preconditions; +import forestry.api.core.ForestryAPI; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; @@ -165,7 +164,7 @@ public class RenderUtil { public static void drawGuiSprite(final Point pos, final TextureAtlasSprite icon) { if (icon != null) { - BinnieCore.getBinnieProxy().bindTexture(TextureManager.LOCATION_FORESTRY_TEXTURE); + BinnieCore.getBinnieProxy().bindTexture(ForestryAPI.textureManager.getGuiTextureMap()); drawTexture(pos.x(), pos.y(), icon, 0, 0, 0); } } diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index b8869244..c9199ff1 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -8,9 +8,10 @@ import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IEffectData; -import forestry.core.proxy.Proxies; +import forestry.core.render.ParticleRender; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -37,10 +38,11 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.Calendar; -import java.util.Collections; import java.util.List; public enum ExtraBeesEffect implements IAlleleBeeEffect { @@ -488,11 +490,11 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } @Override + @SideOnly(Side.CLIENT) public IEffectData doFX(final IBeeGenome genome, final IEffectData storedData, final IBeeHousing housing) { - //Proxies.render.addBeeHiveFX("particles/swarm_bee", housing.getWorldObj(), housing.getBeeFXCoordinates().xCoord, housing.getBeeFXCoordinates().yCoord, housing.getBeeFXCoordinates().zCoord, genome.getPrimary().getSpriteColour(0)); - //TODO LAST ARGUMENT - Proxies.render.addBeeHiveFX(housing, genome, Collections.emptyList()); - + IBeekeepingLogic beekeepingLogic = housing.getBeekeepingLogic(); + List flowerPositions = beekeepingLogic.getFlowerPositions(); + ParticleRender.addBeeHiveFX(housing, genome, flowerPositions); return storedData; } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index cbab3a64..66b671ef 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -8,8 +8,9 @@ import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.IPattern; import binnie.extratrees.block.PlankType; import binnie.extratrees.item.ExtraTreeItems; -import forestry.core.render.TextureManager; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -63,7 +64,6 @@ public enum DesignSystem implements IDesignSystem { } @Override - @Nullable public IDesignMaterial getMaterial(final int id) { switch (this) { case Glass: { @@ -161,9 +161,12 @@ public enum DesignSystem implements IDesignSystem { @Override @SideOnly(Side.CLIENT) public void registerSprites() { + TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks(); for (final EnumPattern pattern : EnumPattern.values()) { - this.primary.put(pattern.ordinal(), TextureManager.registerSprite(new ResourceLocation(getMod().getModID(), "blocks/" + getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"))); - this.secondary.put(pattern.ordinal(), TextureManager.registerSprite(new ResourceLocation(getMod().getModID(), "blocks/" + getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"))); + ResourceLocation primaryLocation = new ResourceLocation(getMod().getModID(), "blocks/" + getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"); + ResourceLocation secondaryLocation = new ResourceLocation(getMod().getModID(), "blocks/" + getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"); + this.primary.put(pattern.ordinal(), textureMap.registerSprite(primaryLocation)); + this.secondary.put(pattern.ordinal(), textureMap.registerSprite(secondaryLocation)); } } diff --git a/src/main/java/binnie/extratrees/genetics/FruitSprite.java b/src/main/java/binnie/extratrees/genetics/FruitSprite.java index 976b772b..7fa12e36 100644 --- a/src/main/java/binnie/extratrees/genetics/FruitSprite.java +++ b/src/main/java/binnie/extratrees/genetics/FruitSprite.java @@ -1,7 +1,7 @@ package binnie.extratrees.genetics; import binnie.Constants; -import forestry.core.proxy.Proxies; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -30,7 +30,7 @@ public enum FruitSprite { @SideOnly(Side.CLIENT) public void registerSprites() { - TextureMap map = Proxies.common.getClientInstance().getTextureMapBlocks(); + TextureMap map = Minecraft.getMinecraft().getTextureMapBlocks(); map.registerSprite(location); } } diff --git a/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java b/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java index df10f765..ffe62e96 100644 --- a/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java @@ -11,6 +11,7 @@ import forestry.core.models.baker.ModelBaker; import forestry.core.proxy.Proxies; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -47,7 +48,7 @@ public class ModelETDecorativeLeaves extends ModelBlockCached