diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 5f4506926..e17e2ef4b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -340,6 +340,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.lightLauncher); registerItemModel(ModBlocks.manaDetector); registerItemModel(ModBlocks.manaBomb); + registerItemModel(ModBlocks.rfGenerator); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index c0d1dc218..fae42a6fe 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -12,8 +12,10 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.model.ModelPlayer; import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; @@ -61,7 +63,7 @@ public class RenderDoppleganger extends RenderBiped { }; public RenderDoppleganger(RenderManager renderManager) { - super(renderManager, new ModelBiped(0.5F), 0F); + super(renderManager, new ModelPlayer(0.0F, false), 0F); // todo 1.8 was ModelBiped(0.5) } @Override @@ -84,7 +86,7 @@ public class RenderDoppleganger extends RenderBiped { @Override protected ResourceLocation getEntityTexture(EntityDoppleganger par1Entity) { - return Minecraft.getMinecraft().thePlayer.getLocationSkin(); + return DefaultPlayerSkin.getDefaultSkinLegacy(); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 7b552bab6..3be8af538 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -50,11 +50,14 @@ public class BlockPump extends BlockModContainer implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex(); + return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } @Override public IBlockState getStateFromMeta(int meta) { + if (meta < 2 || meta > 5) { + meta = 2; + } return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); } diff --git a/src/main/resources/assets/botania/blockstates/rfGenerator.json b/src/main/resources/assets/botania/blockstates/rfGenerator.json new file mode 100644 index 000000000..1b7d47b4c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rfGenerator.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/rfGenerator" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file