mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 02:45:13 +00:00
fluxfield model, fix pump crash, fix gaia render
This commit is contained in:
1 parent
0c062967a0
commit
2cc7e133cc
4 files changed
+23
-3
No files matched your search
@@ -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);
|
||||
|
||||
|
||||
@@ -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<EntityDoppleganger> {
|
||||
};
|
||||
|
||||
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<EntityDoppleganger> {
|
||||
|
||||
@Override
|
||||
protected ResourceLocation getEntityTexture(EntityDoppleganger par1Entity) {
|
||||
return Minecraft.getMinecraft().thePlayer.getLocationSkin();
|
||||
return DefaultPlayerSkin.getDefaultSkinLegacy();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user