mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
TESRs and fixed quite a few todos
This commit is contained in:
1 parent
4a4763b075
commit
a9baf71924
50 files changed
+373
-238
No files matched your search
@@ -11,14 +11,16 @@
|
||||
package vazkii.botania.api.item;
|
||||
|
||||
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
|
||||
/**
|
||||
* Used to define a Mana Pool that can be dyed through floral powder.
|
||||
*/
|
||||
public interface IDyablePool {
|
||||
|
||||
public int getColor();
|
||||
public EnumDyeColor getColor();
|
||||
|
||||
public void setColor(int color);
|
||||
public void setColor(EnumDyeColor color);
|
||||
|
||||
|
||||
}
|
||||
@@ -10,7 +10,8 @@
|
||||
*/
|
||||
package vazkii.botania.api.mana;
|
||||
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
/**
|
||||
@@ -20,6 +21,6 @@ import net.minecraft.world.World;
|
||||
*/
|
||||
public interface IPoolOverlayProvider {
|
||||
|
||||
public IIcon getIcon(World world, int x, int y, int z);
|
||||
public TextureAtlasSprite getIcon(World world, BlockPos pos);
|
||||
|
||||
}
|
||||
@@ -24,6 +24,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.settings.GameSettings.Options;
|
||||
import net.minecraft.entity.player.EnumPlayerModelParts;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.client.event.RenderPlayerEvent;
|
||||
|
||||
@@ -42,7 +43,7 @@ import net.minecraftforge.fml.common.FMLLog;
|
||||
|
||||
public final class ContributorFancinessHandler {
|
||||
|
||||
public volatile static Map<String, TextureAtlasSprite> flowerMap = null;
|
||||
public volatile static Map<String, ItemStack> flowerMap = null;
|
||||
private volatile static boolean startedLoading = false;
|
||||
|
||||
private static boolean phi = true;
|
||||
@@ -82,7 +83,7 @@ public final class ContributorFancinessHandler {
|
||||
} catch(NumberFormatException e) {
|
||||
SubTileSignature sig = BotaniaAPI.getSignatureForName(value);
|
||||
if(sig != null)
|
||||
flowerMap.put(key, ItemBlockSpecialFlower.ofType(value).getIconIndex());
|
||||
flowerMap.put(key, ItemBlockSpecialFlower.ofType(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -155,7 +156,7 @@ public final class ContributorFancinessHandler {
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
private static void renderFlower(RenderPlayerEvent event, TextureAtlasSprite icon) {
|
||||
private static void renderFlower(RenderPlayerEvent event, ItemStack flower) {
|
||||
GlStateManager.pushMatrix();
|
||||
Helper.translateToHeadLevel(event.entityPlayer);
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
|
||||
@@ -11,50 +11,51 @@
|
||||
package vazkii.botania.client.core.helper;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
|
||||
public final class IconHelper {
|
||||
|
||||
public static IIcon forName(IIconRegister ir, String name) {
|
||||
return ir.registerIcon(LibResources.PREFIX_MOD + name);
|
||||
public static TextureAtlasSprite forName(TextureMap ir, String name) {
|
||||
return ir.registerSprite(new ResourceLocation(LibResources.PREFIX_MOD, name));
|
||||
}
|
||||
|
||||
public static IIcon forName(IIconRegister ir, String name, String dir) {
|
||||
return ir.registerIcon(LibResources.PREFIX_MOD + dir + "/" + name);
|
||||
public static TextureAtlasSprite forName(TextureMap ir, String name, String dir) {
|
||||
return ir.registerSprite(new ResourceLocation(LibResources.PREFIX_MOD, dir + "/" + name));
|
||||
}
|
||||
|
||||
public static IIcon forBlock(IIconRegister ir, Block block) {
|
||||
public static TextureAtlasSprite forBlock(TextureMap ir, Block block) {
|
||||
return forName(ir, block.getUnlocalizedName().replaceAll("tile\\.", ""));
|
||||
}
|
||||
|
||||
public static IIcon forBlock(IIconRegister ir, Block block, int i) {
|
||||
public static TextureAtlasSprite forBlock(TextureMap ir, Block block, int i) {
|
||||
return forBlock(ir, block, Integer.toString(i));
|
||||
}
|
||||
|
||||
public static IIcon forBlock(IIconRegister ir, Block block, int i, String dir) {
|
||||
public static TextureAtlasSprite forBlock(TextureMap ir, Block block, int i, String dir) {
|
||||
return forBlock(ir, block, Integer.toString(i), dir);
|
||||
}
|
||||
|
||||
public static IIcon forBlock(IIconRegister ir, Block block, String s) {
|
||||
public static TextureAtlasSprite forBlock(TextureMap ir, Block block, String s) {
|
||||
return forName(ir, block.getUnlocalizedName().replaceAll("tile\\.", "") + s);
|
||||
}
|
||||
|
||||
public static IIcon forBlock(IIconRegister ir, Block block, String s, String dir) {
|
||||
public static TextureAtlasSprite forBlock(TextureMap ir, Block block, String s, String dir) {
|
||||
return forName(ir, block.getUnlocalizedName().replaceAll("tile\\.", "") + s, dir);
|
||||
}
|
||||
|
||||
public static IIcon forItem(IIconRegister ir, Item item) {
|
||||
public static TextureAtlasSprite forItem(TextureMap ir, Item item) {
|
||||
return forName(ir, item.getUnlocalizedName().replaceAll("item\\.", ""));
|
||||
}
|
||||
|
||||
public static IIcon forItem(IIconRegister ir, Item item, int i) {
|
||||
public static TextureAtlasSprite forItem(TextureMap ir, Item item, int i) {
|
||||
return forItem(ir, item, Integer.toString(i));
|
||||
}
|
||||
|
||||
public static IIcon forItem(IIconRegister ir, Item item, String s) {
|
||||
public static TextureAtlasSprite forItem(TextureMap ir, Item item, String s) {
|
||||
return forName(ir, item.getUnlocalizedName().replaceAll("item\\.", "") + s);
|
||||
}
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ import net.minecraft.world.World;
|
||||
public class ContainerCraftingHalo extends ContainerWorkbench {
|
||||
|
||||
public ContainerCraftingHalo(InventoryPlayer p_i1808_1_, World p_i1808_2_) {
|
||||
super(p_i1808_1_, p_i1808_2_, BlockPos.ORIGIN); // todo 1.8 verify
|
||||
super(p_i1808_1_, p_i1808_2_, BlockPos.ORIGIN);
|
||||
|
||||
craftMatrix = new InventoryCraftingHalo(this, 3, 3);
|
||||
|
||||
|
||||
@@ -401,7 +401,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
|
||||
|
||||
@Override
|
||||
public GuiLexicon copy() {
|
||||
GuiLexiconEntry gui = new GuiLexiconEntry(entry, new GuiScreen() {}); // todo 1.8 check anonymous class
|
||||
GuiLexiconEntry gui = new GuiLexiconEntry(entry, this.parent); // todo 1.8 recheck last param (was new GuiScreen())
|
||||
gui.page = page;
|
||||
gui.setTitle();
|
||||
return gui;
|
||||
|
||||
@@ -18,6 +18,7 @@ import java.util.List;
|
||||
import net.minecraft.client.gui.Gui;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.client.gui.GuiTextField;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -217,7 +218,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
ItemStack paper = new ItemStack(Items.paper, currentEntry.pages.size());
|
||||
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(paper, 14, -28);
|
||||
mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, paper, 14, -28, ""); // todo 1.8 text
|
||||
mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, paper, 14, -28, "");
|
||||
List<ItemStack> stacks = currentEntry.getDisplayedRecipes();
|
||||
|
||||
if(stacks.size() > 0) {
|
||||
@@ -370,7 +371,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void keyTyped(char par1, int par2) {
|
||||
protected void keyTyped(char par1, int par2) throws IOException {
|
||||
if(par2 == 203 || par2 == 200 || par2 == 201) // Left, Up, Page Up
|
||||
prevPage();
|
||||
else if(par2 == 205 || par2 == 208 || par2 == 209) // Right, Down Page Down
|
||||
|
||||
@@ -121,17 +121,18 @@ public class RenderTileAltar extends TileEntitySpecialRenderer {
|
||||
|
||||
ItemStack stack = altar.getStackInSlot(i);
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
IIcon icon = stack.getItem().getIcon(stack, 0);
|
||||
if(icon != null) {
|
||||
Color color = new Color(stack.getItem().getColorFromItemStack(stack, 0));
|
||||
GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
|
||||
float f = icon.getMinU();
|
||||
float f1 = icon.getMaxU();
|
||||
float f2 = icon.getMinV();
|
||||
float f3 = icon.getMaxV();
|
||||
ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
}
|
||||
Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8
|
||||
// IIcon icon = stack.getItem().getIcon(stack, 0);
|
||||
// if(icon != null) {
|
||||
// Color color = new Color(stack.getItem().getColorFromItemStack(stack, 0));
|
||||
// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
|
||||
// float f = icon.getMinU();
|
||||
// float f1 = icon.getMaxU();
|
||||
// float f2 = icon.getMinV();
|
||||
// float f3 = icon.getMaxV();
|
||||
// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
|
||||
// GlStateManager.color(1F, 1F, 1F);
|
||||
// }
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
@@ -140,27 +141,28 @@ public class RenderTileAltar extends TileEntitySpecialRenderer {
|
||||
}
|
||||
}
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
Block block = lava ? Blocks.lava : Blocks.water;
|
||||
int brightness = lava ? 240 : -1;
|
||||
float alpha = lava ? 1F : 0.7F;
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.disableAlpha();
|
||||
if(lava)
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.color(1F, 1F, 1F, alpha);
|
||||
GlStateManager.translate(w, -0.3F, w);
|
||||
GlStateManager.rotate(90F, 1F, 0F, 0F);
|
||||
GlStateManager.scale(s, s, s);
|
||||
|
||||
renderIcon(0, 0, block.getIcon(0, 0), 16, 16, brightness);
|
||||
if(lava)
|
||||
GlStateManager.enableLighting();
|
||||
GlStateManager.enableAlpha();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.popMatrix();
|
||||
// todo 1.8 this theoretically would be completely done in models and getActualState
|
||||
// Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
// Block block = lava ? Blocks.lava : Blocks.water;
|
||||
// int brightness = lava ? 240 : -1;
|
||||
// float alpha = lava ? 1F : 0.7F;
|
||||
//
|
||||
// GlStateManager.enableBlend();
|
||||
// GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
// GlStateManager.disableAlpha();
|
||||
// if(lava)
|
||||
// GlStateManager.disableLighting();
|
||||
// GlStateManager.color(1F, 1F, 1F, alpha);
|
||||
// GlStateManager.translate(w, -0.3F, w);
|
||||
// GlStateManager.rotate(90F, 1F, 0F, 0F);
|
||||
// GlStateManager.scale(s, s, s);
|
||||
//
|
||||
// renderIcon(0, 0, block.getIcon(0, 0), 16, 16, brightness);
|
||||
// if(lava)
|
||||
// GlStateManager.enableLighting();
|
||||
// GlStateManager.enableAlpha();
|
||||
// GlStateManager.disableBlend();
|
||||
// GlStateManager.popMatrix();
|
||||
}
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile;
|
||||
import java.awt.Color;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
@@ -20,7 +21,6 @@ import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
@@ -69,21 +69,22 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer {
|
||||
GlStateManager.translate(-1.2F, -3.5F, -0.65F);
|
||||
GlStateManager.rotate(20F, 0F, 0F, 1F);
|
||||
|
||||
int renderPass = 0;
|
||||
do {
|
||||
IIcon icon = stack.getItem().getIcon(stack, renderPass);
|
||||
if(icon != null) {
|
||||
Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass));
|
||||
GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
|
||||
float f = icon.getMinU();
|
||||
float f1 = icon.getMaxU();
|
||||
float f2 = icon.getMinV();
|
||||
float f3 = icon.getMaxV();
|
||||
ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
}
|
||||
renderPass++;
|
||||
} while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage()));
|
||||
Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8
|
||||
// int renderPass = 0;
|
||||
// do {
|
||||
// IIcon icon = stack.getItem().getIcon(stack, renderPass);
|
||||
// if(icon != null) {
|
||||
// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass));
|
||||
// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
|
||||
// float f = icon.getMinU();
|
||||
// float f1 = icon.getMaxU();
|
||||
// float f2 = icon.getMinV();
|
||||
// float f3 = icon.getMaxV();
|
||||
// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
|
||||
// GlStateManager.color(1F, 1F, 1F);
|
||||
// }
|
||||
// renderPass++;
|
||||
// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage()));
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem();
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
@@ -14,6 +14,7 @@ import java.awt.Color;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
@@ -64,40 +65,41 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer {
|
||||
public void renderItemStack(ItemStack stack) {
|
||||
if(stack != null) {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
mc.renderEngine.bindTexture(stack.getItem() instanceof ItemBlock ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture);
|
||||
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
|
||||
float s = 0.25F;
|
||||
GlStateManager.scale(s, s, s);
|
||||
GlStateManager.scale(2F, 2F, 2F);
|
||||
if(!ForgeHooksClient.renderEntityItem(new EntityItem(brewery.getWorld(), brewery.xCoord, brewery.yCoord, brewery.zCoord, stack), stack, 0F, 0F, brewery.getWorld().rand, mc.renderEngine, RenderBlocks.getInstance(), 1)) {
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) {
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
GlStateManager.translate(1F, 1.1F, 0F);
|
||||
GlStateManager.pushMatrix();
|
||||
RenderBlocks.getInstance().renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F);
|
||||
GlStateManager.popMatrix();
|
||||
GlStateManager.translate(-1F, -1.1F, 0F);
|
||||
GlStateManager.scale(2F, 2F, 2F);
|
||||
} else {
|
||||
int renderPass = 0;
|
||||
do {
|
||||
IIcon icon = stack.getItem().getIcon(stack, renderPass);
|
||||
if(icon != null) {
|
||||
Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass));
|
||||
GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
|
||||
float f = icon.getMinU();
|
||||
float f1 = icon.getMaxU();
|
||||
float f2 = icon.getMinV();
|
||||
float f3 = icon.getMaxV();
|
||||
|
||||
ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
}
|
||||
renderPass++;
|
||||
} while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage()));
|
||||
}
|
||||
}
|
||||
mc.getRenderItem().renderItemModel(stack); // todo 1.8
|
||||
// if(!ForgeHooksClient.renderEntityItem(new EntityItem(brewery.getWorld(), brewery.xCoord, brewery.yCoord, brewery.zCoord, stack), stack, 0F, 0F, brewery.getWorld().rand, mc.renderEngine, RenderBlocks.getInstance(), 1)) {
|
||||
// GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
// if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) {
|
||||
// GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
// GlStateManager.translate(1F, 1.1F, 0F);
|
||||
// GlStateManager.pushMatrix();
|
||||
// RenderBlocks.getInstance().renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F);
|
||||
// GlStateManager.popMatrix();
|
||||
// GlStateManager.translate(-1F, -1.1F, 0F);
|
||||
// GlStateManager.scale(2F, 2F, 2F);
|
||||
// } else {
|
||||
// int renderPass = 0;
|
||||
// do {
|
||||
// IIcon icon = stack.getItem().getIcon(stack, renderPass);
|
||||
// if(icon != null) {
|
||||
// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass));
|
||||
// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
|
||||
// float f = icon.getMinU();
|
||||
// float f1 = icon.getMaxU();
|
||||
// float f2 = icon.getMinV();
|
||||
// float f3 = icon.getMaxV();
|
||||
//
|
||||
// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
|
||||
// GlStateManager.color(1F, 1F, 1F);
|
||||
// }
|
||||
// renderPass++;
|
||||
// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage()));
|
||||
// }
|
||||
// }
|
||||
GlStateManager.scale(1F / s, 1F / s, 1F / s);
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
@@ -21,6 +22,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
@@ -28,6 +30,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.client.model.ModelCrystalCube;
|
||||
import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube;
|
||||
import vazkii.botania.common.lib.LibObfuscation;
|
||||
|
||||
public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer {
|
||||
|
||||
@@ -42,7 +45,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer {
|
||||
if(entity == null)
|
||||
entity = new EntityItem(cube.getWorld(), cube.getPos().getX(), cube.getPos().getY(), cube.getPos().getZ(), new ItemStack(Blocks.stone));
|
||||
|
||||
entity.age = ClientTickHandler.ticksInGame;
|
||||
ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, entity, ClientTickHandler.ticksInGame, LibObfuscation.AGE);
|
||||
ItemStack stack = cube.getRequestTarget();
|
||||
entity.setEntityItemStack(stack);
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.model.ModelEnderCrystal;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
@@ -11,22 +11,26 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.common.block.mana.BlockEnchanter;
|
||||
import vazkii.botania.common.block.tile.TileEnchanter;
|
||||
import vazkii.botania.common.lib.LibObfuscation;
|
||||
|
||||
public class RenderTileEnchanter extends TileEntitySpecialRenderer {
|
||||
|
||||
@@ -48,7 +52,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer {
|
||||
if(item == null)
|
||||
item = new EntityItem(enchanter.getWorld(), enchanter.getPos().getX(), enchanter.getPos().getY() + 1, enchanter.getPos().getZ(), enchanter.itemToEnchant);
|
||||
|
||||
item.age = ClientTickHandler.ticksInGame;
|
||||
ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, item, ClientTickHandler.ticksInGame, LibObfuscation.AGE);
|
||||
item.setEntityItemStack(enchanter.itemToEnchant);
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
@@ -105,10 +109,10 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer {
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) {
|
||||
public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) {
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
tessellator.getWorldRenderer().startDrawingQuads();
|
||||
tessellator.setBrightness(brightness);
|
||||
tessellator.getWorldRenderer().setBrightness(brightness);
|
||||
tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV());
|
||||
tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV());
|
||||
tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV());
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
@@ -58,16 +59,17 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer {
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
ItemStack stack = flower.getDisplayStack();
|
||||
IIcon icon = stack.getIconIndex();
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
float f = icon.getMinU();
|
||||
float f1 = icon.getMaxU();
|
||||
float f2 = icon.getMinV();
|
||||
float f3 = icon.getMaxV();
|
||||
GlStateManager.translate(0.25F, 0.4F, 0.5F);
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F);
|
||||
Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8
|
||||
// IIcon icon = stack.getIconIndex();
|
||||
//
|
||||
// Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
// float f = icon.getMinU();
|
||||
// float f1 = icon.getMaxU();
|
||||
// float f2 = icon.getMinV();
|
||||
// float f3 = icon.getMaxV();
|
||||
// GlStateManager.translate(0.25F, 0.4F, 0.5F);
|
||||
// GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F);
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
@@ -13,17 +13,20 @@ package vazkii.botania.client.render.tile;
|
||||
import java.awt.Color;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.client.model.ModelIncensePlate;
|
||||
import vazkii.botania.common.block.tile.TileIncensePlate;
|
||||
@@ -41,7 +44,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer {
|
||||
public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) {
|
||||
TileIncensePlate plate = (TileIncensePlate) tileentity;
|
||||
|
||||
int meta = plate.getWorld() != null ? plate.getBlockMetadata() : 0;
|
||||
EnumFacing facing = plate.getWorld() != null ? ((EnumFacing) plate.getWorld().getBlockState(plate.getPos()).getValue(BotaniaStateProps.CARDINALS)) : EnumFacing.SOUTH;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
@@ -52,7 +55,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer {
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||
GlStateManager.translate(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F);
|
||||
GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length, facing.getIndex() - 2), 0)], 0F, 1F, 0F);
|
||||
model.render();
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
|
||||
@@ -64,22 +67,22 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer {
|
||||
GlStateManager.translate(0.1F, -1.46F, 0F);
|
||||
GlStateManager.scale(s, s, s);
|
||||
GlStateManager.rotate(180F, 0F, 1F, 0F);
|
||||
|
||||
int renderPass = 0;
|
||||
do {
|
||||
IIcon icon = stack.getItem().getIcon(stack, renderPass);
|
||||
if(icon != null) {
|
||||
Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass));
|
||||
GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
|
||||
float f = icon.getMinU();
|
||||
float f1 = icon.getMaxU();
|
||||
float f2 = icon.getMinV();
|
||||
float f3 = icon.getMaxV();
|
||||
ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F);
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
}
|
||||
renderPass++;
|
||||
} while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage()));
|
||||
Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8
|
||||
// int renderPass = 0;
|
||||
// do {
|
||||
// IIcon icon = stack.getItem().getIcon(stack, renderPass);
|
||||
// if(icon != null) {
|
||||
// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass));
|
||||
// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
|
||||
// float f = icon.getMinU();
|
||||
// float f1 = icon.getMaxU();
|
||||
// float f2 = icon.getMinV();
|
||||
// float f3 = icon.getMaxV();
|
||||
// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F);
|
||||
// GlStateManager.color(1F, 1F, 1F);
|
||||
// }
|
||||
// renderPass++;
|
||||
// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage()));
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
|
||||
@@ -14,10 +14,10 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
@@ -30,7 +30,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer {
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float pticks, int digProgress) {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
IIcon iicon = tile.getBlockMetadata() > 0 ? BlockLightRelay.worldIconRed : BlockLightRelay.worldIcon;
|
||||
TextureAtlasSprite iicon = tile.getBlockMetadata() > 0 ? BlockLightRelay.worldIconRed : BlockLightRelay.worldIcon;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(x + 0.5, y + 0.3, z + 0.5);
|
||||
@@ -53,7 +53,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer {
|
||||
|
||||
float off = 0.25F;
|
||||
GlStateManager.translate(0F, off, 0F);
|
||||
GlStateManager.rotate(time, 0F, 0F, 1F);
|
||||
GlStateManager.rotate(((float) time), 0F, 0F, 1F);
|
||||
GlStateManager.translate(0F, -off, 0F);
|
||||
|
||||
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
@@ -65,8 +65,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer {
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
// todo 1.8 looks like vanilla copypasta, update it
|
||||
private void func_77026_a(Tessellator p_77026_1_, IIcon p_77026_2_) {
|
||||
private void func_77026_a(Tessellator p_77026_1_, TextureAtlasSprite p_77026_2_) {
|
||||
float f = p_77026_2_.getMinU();
|
||||
float f1 = p_77026_2_.getMaxU();
|
||||
float f2 = p_77026_2_.getMinV();
|
||||
|
||||
@@ -12,17 +12,15 @@ package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.entity.passive.EntitySheep;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import vazkii.botania.api.mana.IPoolOverlayProvider;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
@@ -63,9 +61,11 @@ public class RenderTilePool extends TileEntitySpecialRenderer {
|
||||
|
||||
GlStateManager.translate(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
int color = pool.color;
|
||||
float[] acolor = EntitySheep.fleeceColorTable[color];
|
||||
GlStateManager.color(acolor[0], acolor[1], acolor[2], a);
|
||||
int hex = pool.color.getMapColor().colorValue;
|
||||
int r = (hex & 0xFF0000) >> 16;
|
||||
int g = (hex & 0xFF00) >> 8;
|
||||
int b = (hex & 0xFF);
|
||||
GlStateManager.color(r, g, b, a);
|
||||
model.render();
|
||||
GlStateManager.color(1F, 1F, 1F, a);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
@@ -91,7 +91,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer {
|
||||
if(pool.getWorld() != null) {
|
||||
Block below = pool.getWorld().getBlockState(pool.getPos().down()).getBlock();
|
||||
if(below instanceof IPoolOverlayProvider) {
|
||||
IIcon overlay = ((IPoolOverlayProvider) below).getIcon(pool.getWorld(), pool.xCoord, pool.yCoord - 1, pool.zCoord);
|
||||
TextureAtlasSprite overlay = ((IPoolOverlayProvider) below).getIcon(pool.getWorld(), pool.getPos());
|
||||
if(overlay != null) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableBlend();
|
||||
@@ -137,7 +137,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer {
|
||||
forceManaNumber = -1;
|
||||
}
|
||||
|
||||
public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) {
|
||||
public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) {
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
tessellator.getWorldRenderer().startDrawingQuads();
|
||||
tessellator.getWorldRenderer().setBrightness(brightness);
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
@@ -14,6 +14,7 @@ import java.awt.Color;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
@@ -34,7 +35,6 @@ import vazkii.botania.common.block.tile.TileRuneAltar;
|
||||
public class RenderTileRuneAltar extends TileEntitySpecialRenderer {
|
||||
|
||||
ModelSpinningCubes cubes = new ModelSpinningCubes();
|
||||
RenderBlocks renderBlocks = new RenderBlocks();
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partticks, int digProgress) {
|
||||
@@ -69,35 +69,36 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer {
|
||||
ItemStack stack = altar.getStackInSlot(i);
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
if(stack != null) {
|
||||
mc.renderEngine.bindTexture(stack.getItem() instanceof ItemBlock ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture);
|
||||
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
|
||||
GlStateManager.scale(2F, 2F, 2F);
|
||||
if(!ForgeHooksClient.renderEntityItem(new EntityItem(altar.getWorld(), altar.xCoord, altar.yCoord, altar.zCoord, stack), stack, 0F, 0F, altar.getWorld().rand, mc.renderEngine, renderBlocks, 1)) {
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) {
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
GlStateManager.translate(1F, 1.1F, 0F);
|
||||
renderBlocks.renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F);
|
||||
GlStateManager.translate(-1F, -1.1F, 0F);
|
||||
GlStateManager.scale(2F, 2F, 2F);
|
||||
} else {
|
||||
int renderPass = 0;
|
||||
do {
|
||||
IIcon icon = stack.getItem().getIcon(stack, renderPass);
|
||||
if(icon != null) {
|
||||
Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass));
|
||||
GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
|
||||
float f = icon.getMinU();
|
||||
float f1 = icon.getMaxU();
|
||||
float f2 = icon.getMinV();
|
||||
float f3 = icon.getMaxV();
|
||||
ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
}
|
||||
renderPass++;
|
||||
} while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage()));
|
||||
}
|
||||
}
|
||||
mc.getRenderItem().renderItemModel(stack);
|
||||
// if(!ForgeHooksClient.renderEntityItem(new EntityItem(altar.getWorld(), altar.xCoord, altar.yCoord, altar.zCoord, stack), stack, 0F, 0F, altar.getWorld().rand, mc.renderEngine, renderBlocks, 1)) {
|
||||
// GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
// if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) {
|
||||
// GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
// GlStateManager.translate(1F, 1.1F, 0F);
|
||||
// renderBlocks.renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F);
|
||||
// GlStateManager.translate(-1F, -1.1F, 0F);
|
||||
// GlStateManager.scale(2F, 2F, 2F);
|
||||
// } else {
|
||||
// int renderPass = 0;
|
||||
// do {
|
||||
// IIcon icon = stack.getItem().getIcon(stack, renderPass);
|
||||
// if(icon != null) {
|
||||
// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass));
|
||||
// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
|
||||
// float f = icon.getMinU();
|
||||
// float f1 = icon.getMaxU();
|
||||
// float f2 = icon.getMinV();
|
||||
// float f3 = icon.getMaxV();
|
||||
// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
|
||||
// GlStateManager.color(1F, 1F, 1F);
|
||||
// }
|
||||
// renderPass++;
|
||||
// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage()));
|
||||
// }
|
||||
// }
|
||||
}
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
@@ -14,8 +14,12 @@ import java.util.Map;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.AbstractClientPlayer;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer;
|
||||
import net.minecraft.client.resources.DefaultPlayerSkin;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.tileentity.TileEntitySkull;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
@@ -34,41 +38,44 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer {
|
||||
public static final ModelSkullOverride modelSkull = new ModelSkullOverride();
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntitySkull p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) {
|
||||
render(p_147500_1_, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, p_147500_1_.getBlockMetadata() & 7, p_147500_1_.func_145906_b() * 360 / 16.0F, p_147500_1_.func_145904_a(), p_147500_1_.func_152108_a());
|
||||
public void renderTileEntityAt(TileEntity p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) {
|
||||
if (p_147500_1_ instanceof TileEntitySkull) {
|
||||
TileEntitySkull skull = ((TileEntitySkull) p_147500_1_);
|
||||
render(skull, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7) /*todo 1.8*/, skull.getSkullRotation() * 360 / 16.0F, skull.getSkullType(), skull.getPlayerProfile(), digProgress);
|
||||
}
|
||||
}
|
||||
|
||||
public void render(TileEntitySkull skull, float par1, float par2, float par3, int par4, float par5, int par6, GameProfile gameProfile) {
|
||||
public void render(TileEntitySkull skull, float par1, float par2, float par3, EnumFacing par4, float par5, int par6, GameProfile gameProfile, int digProgress) {
|
||||
boolean gaia = skull instanceof TileGaiaHead;
|
||||
if(par6 == 3 || gaia) {
|
||||
ResourceLocation resourcelocation = AbstractClientPlayer.locationStevePng;
|
||||
ResourceLocation resourcelocation = DefaultPlayerSkin.getDefaultSkinLegacy();
|
||||
Minecraft minecraft = Minecraft.getMinecraft();
|
||||
if(gaia)
|
||||
resourcelocation = minecraft.thePlayer.getLocationSkin();
|
||||
else if(gameProfile != null) {
|
||||
Map map = minecraft.func_152342_ad().func_152788_a(gameProfile);
|
||||
Map map = minecraft.getSkinManager().loadSkinFromCache(gameProfile);
|
||||
|
||||
if (map.containsKey(MinecraftProfileTexture.Type.SKIN)) {
|
||||
resourcelocation = minecraft.func_152342_ad().func_152792_a((MinecraftProfileTexture)map.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN);
|
||||
resourcelocation = minecraft.getSkinManager().loadSkin((MinecraftProfileTexture)map.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN);
|
||||
}
|
||||
}
|
||||
bindTexture(resourcelocation);
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.disableCull();
|
||||
if (par4 != 1) {
|
||||
if (par4 != EnumFacing.UP) {
|
||||
switch (par4) {
|
||||
case 2:
|
||||
case NORTH:
|
||||
GlStateManager.translate(par1 + 0.5F, par2 + 0.25F, par3 + 0.74F);
|
||||
break;
|
||||
case 3:
|
||||
case SOUTH:
|
||||
GlStateManager.translate(par1 + 0.5F, par2 + 0.25F, par3 + 0.26F);
|
||||
par5 = 180.0F;
|
||||
break;
|
||||
case 4:
|
||||
case WEST:
|
||||
GlStateManager.translate(par1 + 0.74F, par2 + 0.25F, par3 + 0.5F);
|
||||
par5 = 270.0F;
|
||||
break;
|
||||
case 5:
|
||||
case EAST:
|
||||
default:
|
||||
GlStateManager.translate(par1 + 0.26F, par2 + 0.25F, par3 + 0.5F);
|
||||
par5 = 90.0F;
|
||||
@@ -86,6 +93,6 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer {
|
||||
if(gaia)
|
||||
ShaderHelper.releaseShader();
|
||||
GlStateManager.popMatrix();
|
||||
} else super.func_152674_a(par1, par2, par3, par4, par5, par6, gameProfile);
|
||||
} else super.renderSkull(par1, par2, par3, par4, par5, par6, gameProfile, digProgress);
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
@@ -15,6 +15,7 @@ import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
|
||||
@@ -11,12 +11,13 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@@ -66,7 +67,7 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer {
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) {
|
||||
public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) {
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
tessellator.getWorldRenderer().startDrawingQuads();
|
||||
tessellator.getWorldRenderer().setBrightness(brightness);
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -49,7 +50,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer {
|
||||
|
||||
GlStateManager.translate(0.5F, -1.25F + (hasWorld ? (float) Math.sin(time * 0.01F) * 0.05F : 0F), -0.5F);
|
||||
if(hasWorld) {
|
||||
GlStateManager.rotate(time * 0.3, 0F, 1F, 0F);
|
||||
GlStateManager.rotate(((float) (time * 0.3)), 0F, 1F, 0F);
|
||||
GlStateManager.rotate(4F * (float) Math.sin(time * 0.05F), 0F, 0F, 1F);
|
||||
float s = 0.75F;
|
||||
GlStateManager.scale(s, s, s);
|
||||
|
||||
@@ -17,6 +17,7 @@ import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.init.Blocks;
|
||||
@@ -391,7 +392,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
public void renderIcon(IIcon icon) {
|
||||
public void renderIcon(TextureAtlasSprite icon) {
|
||||
float f = icon.getMinU();
|
||||
float f1 = icon.getMaxU();
|
||||
float f2 = icon.getMinV();
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.common.block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.BlockState;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -20,6 +21,9 @@ import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
@@ -32,12 +36,20 @@ import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockAlfPortal extends BlockModContainer implements IWandable, ILexiconable {
|
||||
|
||||
public static TextureAtlasSprite portalTex;
|
||||
|
||||
public BlockAlfPortal() {
|
||||
super(Material.wood);
|
||||
setHardness(10F);
|
||||
setStepSound(soundTypeWood);
|
||||
setUnlocalizedName(LibBlockNames.ALF_PORTAL);
|
||||
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onTextureStitch(TextureStitchEvent.Pre evt) {
|
||||
portalTex = IconHelper.forBlock(evt.map, this, "Inside");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -20,6 +20,7 @@ import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -33,6 +34,7 @@ import net.minecraftforge.oredict.RecipeSorter.Category;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.subtile.ISpecialFlower;
|
||||
import vazkii.botania.api.wand.IWandHUD;
|
||||
import vazkii.botania.api.wand.IWandable;
|
||||
@@ -55,13 +57,13 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
|
||||
RecipeSorter.register("botania:floatingSpecialFlower", SpecialFloatingFlowerRecipe.class, Category.SHAPELESS, "");
|
||||
}
|
||||
|
||||
// @Override todo 1.8 coloredlights dep
|
||||
// public int getLightValue(IBlockAccess world, int x, int y, int z) {
|
||||
// int currentLight = ((TileSpecialFlower) world.getTileEntity(x, y, z)).getLightValue();
|
||||
// if(currentLight == -1)
|
||||
// currentLight = originalLight;
|
||||
// return LightHelper.getPackedColor(world.getBlockMetadata(x, y, z), currentLight);
|
||||
// }
|
||||
@Override
|
||||
public int getLightValue(IBlockAccess world, BlockPos pos) {
|
||||
int currentLight = ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue();
|
||||
if(currentLight == -1)
|
||||
currentLight = originalLight;
|
||||
return LightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), currentLight);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasComparatorInputOverride() {
|
||||
|
||||
@@ -59,7 +59,7 @@ public class BlockGaiaHead extends BlockSkull {
|
||||
public List<ItemStack> getDrops(IBlockAccess p_149749_1_, BlockPos pos, IBlockState state, int fortune) {
|
||||
ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
|
||||
|
||||
if((p_149749_6_ & 8) == 0) { // todo 1.8 p_<>_6 is meta
|
||||
if(!((Boolean) state.getValue(NODROP))) {
|
||||
ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1);
|
||||
TileEntitySkull tileentityskull = (TileEntitySkull)p_149749_1_.getTileEntity(pos);
|
||||
|
||||
|
||||
@@ -49,12 +49,12 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable
|
||||
|
||||
@Override
|
||||
public int getMetaFromState(IBlockState state) {
|
||||
return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getHorizontalIndex();
|
||||
return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBlockState getStateFromMeta(int meta) {
|
||||
return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getHorizontal(meta));
|
||||
return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,6 +16,7 @@ import java.util.Random;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -26,6 +27,11 @@ import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.wand.IWandable;
|
||||
@@ -39,13 +45,21 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public class BlockLightRelay extends BlockModContainer implements IWandable, ILexiconable {
|
||||
|
||||
public static IIcon invIcon, worldIcon, invIconRed, worldIconRed;
|
||||
public static TextureAtlasSprite worldIcon, worldIconRed;
|
||||
|
||||
protected BlockLightRelay() {
|
||||
super(Material.glass);
|
||||
float f = 5F / 16F;
|
||||
setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f);
|
||||
setUnlocalizedName(LibBlockNames.LIGHT_RELAY);
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void onTextureStitch(TextureStitchEvent.Pre evt) {
|
||||
worldIcon = IconHelper.forBlock(evt.map, this, 1);
|
||||
worldIconRed = IconHelper.forBlock(evt.map, this, 3);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -133,13 +133,13 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid
|
||||
return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta));
|
||||
}
|
||||
|
||||
// @Override todo 1.8 coloredlightscore dep
|
||||
// public int getLightValue(IBlockAccess world, BlockPos pos) {
|
||||
// int currentLight = ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue();
|
||||
// if(currentLight == -1)
|
||||
// currentLight = 0;
|
||||
// return LightHelper.getPackedColor(world.getBlockMetadata(x, y, z), currentLight);
|
||||
// }
|
||||
@Override
|
||||
public int getLightValue(IBlockAccess world, BlockPos pos) {
|
||||
int currentLight = ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue();
|
||||
if(currentLight == -1)
|
||||
currentLight = 0;
|
||||
return LightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), currentLight);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasComparatorInputOverride() {
|
||||
|
||||
@@ -87,11 +87,11 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab
|
||||
return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta));
|
||||
}
|
||||
|
||||
// @Override todo 1.8 coloredlights dep
|
||||
// @Optional.Method(modid = "easycoloredlights")
|
||||
// public int getLightValue(IBlockAccess world, int x, int y, int z) {
|
||||
// return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight);
|
||||
// }
|
||||
@Override
|
||||
@Optional.Method(modid = "easycoloredlights")
|
||||
public int getLightValue(IBlockAccess world, BlockPos pos) {
|
||||
return ColoredLightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), originalLight);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean shouldRegisterInNameSet() {
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.common.block.mana;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.BlockPos;
|
||||
@@ -21,7 +22,6 @@ import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.mana.IPoolOverlayProvider;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
@@ -46,7 +46,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(World world, int x, int y, int z) {
|
||||
public TextureAtlasSprite getIcon(World world, BlockPos pos) {
|
||||
return icons[3];
|
||||
}
|
||||
|
||||
|
||||
@@ -18,6 +18,7 @@ import net.minecraft.block.state.BlockState;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
@@ -30,6 +31,11 @@ import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.util.ChatComponentTranslation;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
@@ -45,6 +51,7 @@ import vazkii.botania.common.lib.LibBlockNames;
|
||||
public class BlockEnchanter extends BlockModContainer implements IWandable, ILexiconable, IWandHUD {
|
||||
|
||||
Random random;
|
||||
public static TextureAtlasSprite overlay;
|
||||
|
||||
public BlockEnchanter() {
|
||||
super(Material.rock);
|
||||
@@ -55,6 +62,13 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex
|
||||
setUnlocalizedName(LibBlockNames.ENCHANTER);
|
||||
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X));
|
||||
random = new Random();
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void onTextureStitch(TextureStitchEvent.Pre evt) {
|
||||
overlay = IconHelper.forBlock(evt.map, this, "Overlay");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -12,11 +12,17 @@ package vazkii.botania.common.block.mana;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.mana.IPoolOverlayProvider;
|
||||
@@ -28,7 +34,7 @@ import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockManaVoid extends BlockModContainer implements ILexiconable, IPoolOverlayProvider {
|
||||
|
||||
IIcon overlay;
|
||||
TextureAtlasSprite overlay;
|
||||
|
||||
public BlockManaVoid() {
|
||||
super(Material.rock);
|
||||
@@ -36,6 +42,13 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP
|
||||
setResistance(2000F);
|
||||
setStepSound(Block.soundTypeStone);
|
||||
setUnlocalizedName(LibBlockNames.MANA_VOID);
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void onTextureStitch(TextureStitchEvent.Pre evt) {
|
||||
overlay = IconHelper.forBlock(evt.map, this, 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -49,7 +62,7 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(World world, int x, int y, int z) {
|
||||
public TextureAtlasSprite getIcon(World world, BlockPos pos) {
|
||||
return overlay;
|
||||
}
|
||||
|
||||
|
||||
@@ -18,6 +18,7 @@ import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
@@ -31,6 +32,11 @@ import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
@@ -52,6 +58,8 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable,
|
||||
|
||||
boolean lastFragile = false;
|
||||
|
||||
public static TextureAtlasSprite manaIcon;
|
||||
|
||||
public BlockPool() {
|
||||
super(Material.rock);
|
||||
setHardness(2.0F);
|
||||
@@ -59,6 +67,13 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable,
|
||||
setStepSound(soundTypeStone);
|
||||
setUnlocalizedName(LibBlockNames.POOL);
|
||||
setBlockBounds(0F, 0F, 0F, 1F, 0.5F, 1F);
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void onTextureStitch(TextureStitchEvent.Pre evt) {
|
||||
manaIcon = IconHelper.forName(evt.map, "manaWater");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -11,12 +11,18 @@
|
||||
package vazkii.botania.common.block.mana;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
@@ -27,6 +33,8 @@ import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockTerraPlate extends BlockModContainer implements ILexiconable {
|
||||
|
||||
public static TextureAtlasSprite overlay;
|
||||
|
||||
public BlockTerraPlate() {
|
||||
super(Material.iron);
|
||||
setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F);
|
||||
@@ -34,6 +42,13 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable {
|
||||
setResistance(10F);
|
||||
setStepSound(soundTypeMetal);
|
||||
setUnlocalizedName(LibBlockNames.TERRA_PLATE);
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void onTextureStitch(TextureStitchEvent.Pre evt) {
|
||||
overlay = IconHelper.forBlock(evt.map, this, "Overlay");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -18,6 +18,8 @@ import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.IChatComponent;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
public abstract class TileSimpleInventory extends TileMod implements IInventory {
|
||||
|
||||
ItemStack[] inventorySlots = new ItemStack[getSizeInventory()];
|
||||
@@ -130,11 +132,11 @@ public abstract class TileSimpleInventory extends TileMod implements IInventory
|
||||
|
||||
@Override
|
||||
public void clear() {
|
||||
// todo 1.8
|
||||
Arrays.fill(inventorySlots, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IChatComponent getDisplayName() {
|
||||
return new ChatComponentText(getCommandSenderName()); // todo 1.8
|
||||
return new ChatComponentText(getCommandSenderName());
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,7 @@ import net.minecraft.tileentity.TileEntityFurnace;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.EnumParticleTypes;
|
||||
import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.subtile.functional.SubTileExoflame;
|
||||
import vazkii.botania.common.block.tile.TileMod;
|
||||
|
||||
@@ -115,9 +116,8 @@ public class TileBellows extends TileMod implements IUpdatePlayerListBox {
|
||||
}
|
||||
|
||||
public TileEntity getLinkedTile() {
|
||||
int meta = getBlockMetadata();
|
||||
EnumFacing dir = EnumFacing.getFront(meta); // todo 1.8 states
|
||||
return worldObj.getTileEntity(getPos().offset(dir));
|
||||
EnumFacing side = ((EnumFacing) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS));
|
||||
return worldObj.getTileEntity(getPos().offset(side));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,11 +16,13 @@ import java.util.List;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -31,6 +33,7 @@ import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
@@ -58,6 +61,7 @@ import vazkii.botania.common.core.helper.Vector3;
|
||||
import vazkii.botania.common.item.ItemManaTablet;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
import vazkii.botania.common.lib.LibObfuscation;
|
||||
|
||||
public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket, IUpdatePlayerListBox {
|
||||
|
||||
@@ -80,7 +84,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc
|
||||
public boolean conjuration = false;
|
||||
boolean catalystsRegistered = false;
|
||||
|
||||
public int color = 0;
|
||||
public EnumDyeColor color = EnumDyeColor.WHITE;
|
||||
int mana;
|
||||
int knownMana = -1;
|
||||
|
||||
@@ -158,7 +162,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc
|
||||
|
||||
ItemStack output = recipe.getOutput().copy();
|
||||
EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output);
|
||||
outputItem.age = 105;
|
||||
ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, outputItem, 105, LibObfuscation.AGE);
|
||||
worldObj.spawnEntityInWorld(outputItem);
|
||||
}
|
||||
|
||||
@@ -285,7 +289,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc
|
||||
public void writeCustomNBT(NBTTagCompound cmp) {
|
||||
cmp.setInteger(TAG_MANA, mana);
|
||||
cmp.setBoolean(TAG_OUTPUTTING, outputting);
|
||||
cmp.setInteger(TAG_COLOR, color);
|
||||
cmp.setInteger(TAG_COLOR, color.getMetadata());
|
||||
|
||||
cmp.setInteger(TAG_MANA_CAP, manaCap);
|
||||
cmp.setBoolean(TAG_CAN_ACCEPT, canAccept);
|
||||
@@ -300,7 +304,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc
|
||||
public void readCustomNBT(NBTTagCompound cmp) {
|
||||
mana = cmp.getInteger(TAG_MANA);
|
||||
outputting = cmp.getBoolean(TAG_OUTPUTTING);
|
||||
color = cmp.getInteger(TAG_COLOR);
|
||||
color = EnumDyeColor.byMetadata(cmp.getInteger(TAG_COLOR));
|
||||
|
||||
if(cmp.hasKey(TAG_MANA_CAP))
|
||||
manaCap = cmp.getInteger(TAG_MANA_CAP);
|
||||
@@ -427,12 +431,12 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColor() {
|
||||
public EnumDyeColor getColor() {
|
||||
return color;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setColor(int color) {
|
||||
public void setColor(EnumDyeColor color) {
|
||||
this.color = color;
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.integration.coloredlights;
|
||||
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import vazkii.botania.common.Botania;
|
||||
|
||||
/*
|
||||
@@ -21,7 +22,7 @@ public class LightHelper {
|
||||
return Botania.lightHelper.makeRGBLightValue(r, g, b, (int) currentLightValue);
|
||||
}
|
||||
|
||||
public static int getPackedColor(int meta, int light) {
|
||||
public static int getPackedColor(EnumDyeColor meta, int light) {
|
||||
return Botania.lightHelper.getPackedColor(meta, light);
|
||||
}
|
||||
}
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.common.item.equipment.bauble;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
|
||||
@@ -38,7 +38,7 @@ public class ItemDye extends Item16Colors implements IManaDissolvable {
|
||||
@Override
|
||||
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) {
|
||||
if (par3World.getBlockState(pos).getBlock().recolorBlock(par3World, pos, side, EnumDyeColor.byMetadata(par1ItemStack.getItemDamage()))) {
|
||||
par1ItemStack.stackSize--; // todo 1.8 recheck ^^
|
||||
par1ItemStack.stackSize--;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -49,9 +49,9 @@ public class ItemDye extends Item16Colors implements IManaDissolvable {
|
||||
if(!item.worldObj.isRemote && pool instanceof IDyablePool) {
|
||||
IDyablePool dyable = (IDyablePool) pool;
|
||||
TileEntity tile = (TileEntity) pool;
|
||||
int meta = stack.getItemDamage();
|
||||
if(meta != dyable.getColor()) {
|
||||
dyable.setColor(meta);
|
||||
EnumDyeColor color = EnumDyeColor.byMetadata(stack.getItemDamage());
|
||||
if(color != dyable.getColor()) {
|
||||
dyable.setColor(color);
|
||||
stack.stackSize--;
|
||||
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, tile.getPos());
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ public class PageEntity extends LexiconPage{
|
||||
GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F);
|
||||
GlStateManager.rotate(rotation, 0.0F, 1.0F, 0.0F);
|
||||
RenderHelper.enableStandardItemLighting();
|
||||
GlStateManager.translate(0.0F, 0.0F, 0.0F); // todo 1.8 yOffset gone
|
||||
// todo 1.8 yOffset gone GlStateManager.translate(0.0F, 0.0F, 0.0F);
|
||||
Minecraft.getMinecraft().getRenderManager().playerViewY = 180.0F;
|
||||
Minecraft.getMinecraft().getRenderManager().renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F);
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
@@ -128,7 +128,7 @@ public final class SkyblockWorldEvents {
|
||||
if(player instanceof EntityPlayerMP) {
|
||||
EntityPlayerMP pmp = (EntityPlayerMP) player;
|
||||
pmp.setPositionAndUpdate(pos.getX() + 0.5, pos.getY() + 1.6, pos.getZ() + 0.5);
|
||||
pmp.setSpawnChunk(pos, true, 0); // todo 1.8 verify last parm
|
||||
pmp.setSpawnChunk(pos, true, player.worldObj.provider.getDimensionId());
|
||||
player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon));
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user