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

@@ -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();