mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
Update for new names in 1.4
This commit is contained in:
1 parent
bf14aefd28
commit
4a4166fe7e
5 files changed
+12
-10
No files matched your search
@@ -14,6 +14,7 @@ import net.minecraft.src.Block;
|
||||
import net.minecraft.src.EntityItem;
|
||||
import net.minecraft.src.EntityLiving;
|
||||
import net.minecraft.src.EntityPlayer;
|
||||
import net.minecraft.src.ITexturePack;
|
||||
import net.minecraft.src.Item;
|
||||
import net.minecraft.src.ItemBlock;
|
||||
import net.minecraft.src.ItemStack;
|
||||
@@ -23,7 +24,6 @@ import net.minecraft.src.RenderBlocks;
|
||||
import net.minecraft.src.RenderEngine;
|
||||
import net.minecraft.src.RenderGlobal;
|
||||
import net.minecraft.src.Tessellator;
|
||||
import net.minecraft.src.TexturePackBase;
|
||||
import net.minecraftforge.client.event.DrawBlockHighlightEvent;
|
||||
import net.minecraftforge.client.event.RenderWorldLastEvent;
|
||||
import net.minecraftforge.client.event.TextureLoadEvent;
|
||||
@@ -298,7 +298,7 @@ public class ForgeHooksClient
|
||||
|
||||
if(inColor)
|
||||
{
|
||||
int color = Item.itemsList[item.itemID].getColorFromDamage(item.getItemDamage(), 0);
|
||||
int color = Item.itemsList[item.itemID].func_82790_a(item, 0);
|
||||
float r = (float)(color >> 16 & 0xff) / 255F;
|
||||
float g = (float)(color >> 8 & 0xff) / 255F;
|
||||
float b = (float)(color & 0xff) / 255F;
|
||||
@@ -319,7 +319,7 @@ public class ForgeHooksClient
|
||||
|
||||
if (inColor)
|
||||
{
|
||||
int color = Item.itemsList[item.itemID].getColorFromDamage(item.getItemDamage(), 0);
|
||||
int color = Item.itemsList[item.itemID].func_82790_a(item, 0);
|
||||
float r = (float)(color >> 16 & 255) / 255.0F;
|
||||
float g = (float)(color >> 8 & 255) / 255.0F;
|
||||
float b = (float)(color & 255) / 255.0F;
|
||||
@@ -384,7 +384,7 @@ public class ForgeHooksClient
|
||||
MinecraftForge.EVENT_BUS.post(new RenderWorldLastEvent(context, partialTicks));
|
||||
}
|
||||
|
||||
public static void onTextureLoad(String texture, TexturePackBase pack)
|
||||
public static void onTextureLoad(String texture, ITexturePack pack)
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.post(new TextureLoadEvent(texture, pack));
|
||||
}
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
package net.minecraftforge.client.event;
|
||||
|
||||
import net.minecraft.src.TexturePackBase;
|
||||
import net.minecraft.src.ITexturePack;
|
||||
import net.minecraftforge.event.Event;
|
||||
|
||||
public class TextureLoadEvent extends Event
|
||||
{
|
||||
|
||||
public final String texture;
|
||||
public final TexturePackBase pack;
|
||||
public final ITexturePack pack;
|
||||
|
||||
public TextureLoadEvent(String texture, TexturePackBase pack)
|
||||
public TextureLoadEvent(String texture, ITexturePack pack)
|
||||
{
|
||||
this.texture = texture;
|
||||
this.pack = pack;
|
||||
|
||||
@@ -27,7 +27,7 @@ public class PlayerDropsEvent extends LivingDropsEvent
|
||||
{
|
||||
super(entity, source, drops,
|
||||
(source.getEntity() instanceof EntityPlayer) ?
|
||||
EnchantmentHelper.getLootingModifier(((EntityPlayer)source.getEntity()).inventory) : 0,
|
||||
EnchantmentHelper.getLootingModifier(((EntityPlayer)source.getEntity())) : 0,
|
||||
recentlyHit, 0);
|
||||
|
||||
this.entityPlayer = entity;
|
||||
|
||||
@@ -9,6 +9,7 @@ import net.minecraft.src.InventoryCrafting;
|
||||
import net.minecraft.src.Item;
|
||||
import net.minecraft.src.ItemStack;
|
||||
import net.minecraft.src.ShapedRecipes;
|
||||
import net.minecraft.src.World;
|
||||
|
||||
public class ShapedOreRecipe implements IRecipe
|
||||
{
|
||||
@@ -124,7 +125,7 @@ public class ShapedOreRecipe implements IRecipe
|
||||
public ItemStack getRecipeOutput(){ return output; }
|
||||
|
||||
@Override
|
||||
public boolean matches(InventoryCrafting inv)
|
||||
public boolean matches(InventoryCrafting inv, World world)
|
||||
{
|
||||
for (int x = 0; x <= MAX_CRAFT_GRID_WIDTH - width; x++)
|
||||
{
|
||||
|
||||
@@ -10,6 +10,7 @@ import net.minecraft.src.InventoryCrafting;
|
||||
import net.minecraft.src.Item;
|
||||
import net.minecraft.src.ItemStack;
|
||||
import net.minecraft.src.ShapelessRecipes;
|
||||
import net.minecraft.src.World;
|
||||
|
||||
public class ShapelessOreRecipe implements IRecipe
|
||||
{
|
||||
@@ -63,7 +64,7 @@ public class ShapelessOreRecipe implements IRecipe
|
||||
public ItemStack getCraftingResult(InventoryCrafting var1){ return output.copy(); }
|
||||
|
||||
@Override
|
||||
public boolean matches(InventoryCrafting var1)
|
||||
public boolean matches(InventoryCrafting var1, World world)
|
||||
{
|
||||
ArrayList required = new ArrayList(input);
|
||||
|
||||
|
||||
Reference in new issue
Block a user