Interaction hooks need to be re-added but compiles {Doesn't run}

This commit is contained in:
LexManos committed 2016-03-09 14:11:56 -08:00
1 parent 846910b8c8
commit 7b7156e87f
11 files changed
+136 -74

No files matched your search

@@ -604,13 +604,19 @@ public class ForgeHooksClient
return (new SimpleBakedModel.Builder(state, ibakedmodel, texture, pos)).makeBakedModel();
}
public static boolean shouldCauseReequipAnimation(ItemStack from, ItemStack to)
private static int slotMainHand = 0;
public static boolean shouldCauseReequipAnimation(ItemStack from, ItemStack to, int slot)
{
if(!Objects.equal(from, to) || from == null)
{
return false;
}
// FIXME: 3rd argument?
return from.getItem().shouldCauseReequipAnimation(from, to);
boolean changed = false;
if (slot != -1)
{
changed = slot != slotMainHand;
slotMainHand = slot;
}
return from.getItem().shouldCauseReequipAnimation(from, to, changed);
}
}
@@ -249,7 +249,7 @@ public class ModelLoader extends ModelBakery
}
registerVariantNames();
List<String> itemVariants = Lists.newArrayList();
for(Item item : GameData.getItemRegistry().typeSafeIterable())
{
@@ -560,7 +560,7 @@ public class ModelLoader extends ModelBakery
return bakeNormal(model, perState, state.apply(Optional.<IModelPart>absent()).or(TRSRTransformation.identity()), newTransforms, format, bakedTextureGetter, uvlock);
}
private IBakedModel bakeNormal(ModelBlock model, IModelState perState, final TRSRTransformation modelState, List<TRSRTransformation> newTransforms, VertexFormat format, final Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter, boolean uvLocked)
private IBakedModel bakeNormal(ModelBlock model, IModelState perState, final TRSRTransformation modelState, List<TRSRTransformation> newTransforms, final VertexFormat format, final Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter, boolean uvLocked)
{
TextureAtlasSprite particle = bakedTextureGetter.apply(new ResourceLocation(model.resolveTextureName("particle")));
SimpleBakedModel.Builder builder = (new SimpleBakedModel.Builder(model, model.func_187967_g())).setTexture(particle);