Update Forestry integration

This commit is contained in:
mezz committed 2017-04-03 18:03:54 -07:00
1 parent d3dd0467d9
commit 2c277cc311
13 files changed
+50 -32

No files matched your search

@@ -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));
}
}
@@ -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<CeramicB
@Override
@SideOnly(Side.CLIENT)
public void registerSprites(ITextureManager manager) {
TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks();
for (CeramicBrickType type : CeramicBrickType.VALUES) {
type.sprites = new TextureAtlasSprite[3];
for (int i = 0; i < 3; ++i) {
type.sprites[i] = TextureManager.registerSprite(new ResourceLocation(Constants.BOTANY_MOD_ID + ":blocks/ceramic." + type.id + "." + i));
type.sprites[i] = textureMap.registerSprite(new ResourceLocation(Constants.BOTANY_MOD_ID + ":blocks/ceramic." + type.id + "." + i));
}
}
}
@@ -10,8 +10,8 @@ import forestry.api.circuits.ICircuitLayout;
import forestry.api.core.IModelManager;
import forestry.core.circuits.SolderManager;
import forestry.core.items.IColoredItem;
import forestry.core.proxy.Proxies;
import forestry.core.utils.Translator;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@@ -70,7 +70,7 @@ public class ItemInsulatedTube extends ItemCore implements IColoredItem {
super.addInformation(itemstack, player, list, flag);
Multimap<ICircuitLayout, ICircuit> 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);
+1 -1
View File
@@ -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 {
@@ -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());
}
}
}
@@ -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());
}
}
@@ -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);
}
}
@@ -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<BlockPos> flowerPositions = beekeepingLogic.getFlowerPositions();
ParticleRender.addBeeHiveFX(housing, genome, flowerPositions);
return storedData;
}
@@ -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));
}
}
@@ -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);
}
}
@@ -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<BlockETDecorativeL
@Override
protected void bakeBlock(BlockETDecorativeLeaves block, ETTreeDefinition treeDefinition, IModelBaker baker, boolean inventory) {
TextureMap map = Proxies.common.getClientInstance().getTextureMapBlocks();
TextureMap map = Minecraft.getMinecraft().getTextureMapBlocks();
ITreeGenome genome = treeDefinition.getGenome();
IAlleleTreeSpecies species = genome.getPrimary();
@@ -6,10 +6,12 @@ import binnie.craftgui.core.IWidget;
import binnie.craftgui.core.Tooltip;
import binnie.craftgui.core.geometry.Point;
import binnie.craftgui.core.renderer.RenderUtil;
import forestry.core.render.TextureManager;
import forestry.api.core.ForestryAPI;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.world.biome.Biome;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class ControlBiome extends Control implements ITooltip {
private final Biome biome;
@@ -22,6 +24,7 @@ public class ControlBiome extends Control implements ITooltip {
}
@Override
@SideOnly(Side.CLIENT)
public void onRenderBackground(int guiWidth, int guiHeight) {
if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.MOUNTAIN) || BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.HILLS)) {
this.iconCategory = "hills";
@@ -56,7 +59,7 @@ public class ControlBiome extends Control implements ITooltip {
if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.END)) {
this.iconCategory = "end";
}
TextureAtlasSprite sprite = TextureManager.getInstance().getDefault("habitats/" + this.iconCategory);
TextureAtlasSprite sprite = ForestryAPI.textureManager.getDefault("habitats/" + this.iconCategory);
RenderUtil.drawGuiSprite(Point.ZERO, sprite);
}