Partial claw model. Fix cell block being a debug floating island. Fix a pure daisy oredict bug by checking for drops instead of state

This commit is contained in:
Vincent Lee committed 2016-01-06 20:56:25 -06:00
1 parent 383cd059cc
commit 929860f8fa
8 files changed
+156 -12

No files matched your search

@@ -44,7 +44,7 @@ public class RecipePureDaisy {
if(input instanceof Block)
return state.getBlock() == input;
ItemStack stack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state));
ItemStack stack = new ItemStack(state.getBlock(), 1, state.getBlock().damageDropped(state));
String oredict = (String) input;
return isOreDict(stack, oredict);
}
@@ -56,7 +56,7 @@ public class SimpleWikiProvider implements IWikiProvider {
ItemStack stack = block.getPickBlock(pos, world, bPos, null);
if(stack == null || stack.getItem() == null)
stack = new ItemStack(block, 1, block.getMetaFromState(world.getBlockState(bPos)));
stack = new ItemStack(block, 1, block.getDamageValue(world, bPos));
if(stack.getItem() == null)
return null;
@@ -179,9 +179,9 @@ public final class ModelHandler {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack) {
if (ItemSpawnerMover.hasData(stack)) {
return new ModelResourceLocation("botania:spawnerMover", "inventory");
} else {
return new ModelResourceLocation("botania:spawnerMoverFull", "inventory");
} else {
return new ModelResourceLocation("botania:spawnerMover", "inventory");
}
}
});
@@ -405,6 +405,7 @@ public final class ModelHandler {
registerItemModel(ModBlocks.root);
registerItemModel(ModBlocks.cacophonium);
registerItemModel(ModBlocks.tinyPotato);
registerItemModel(ModBlocks.spawnerClaw);
registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length);
@@ -294,7 +294,7 @@ public class ClientProxy extends CommonProxy {
ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingFlower.class, renderTileFloatingFlower);
ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingSpecialFlower.class, renderTileFloatingFlower);
ClientRegistry.bindTileEntitySpecialRenderer(TileTinyPotato.class, new RenderTileTinyPotato());
ClientRegistry.bindTileEntitySpecialRenderer(TileSpawnerClaw.class, new RenderTileSpawnerClaw());
// ClientRegistry.bindTileEntitySpecialRenderer(TileSpawnerClaw.class, new RenderTileSpawnerClaw());
ClientRegistry.bindTileEntitySpecialRenderer(TileStarfield.class, new RenderTileStarfield());
ClientRegistry.bindTileEntitySpecialRenderer(TileBrewery.class, new RenderTileBrewery());
ClientRegistry.bindTileEntitySpecialRenderer(TileTerraPlate.class, new RenderTileTerraPlate());
@@ -57,11 +57,6 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable
return false;
}
@Override
public int getRenderType() {
return 2;
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
return new TileSpawnerClaw();