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 43b7232a8..96327c9e3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -12,6 +12,7 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockSkull; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; import net.minecraft.block.state.IBlockState; @@ -561,7 +562,7 @@ public final class ModelHandler { registerItemModelMetas(blackHoleTalisman, LibItemNames.BLACK_HOLE_TALISMAN, 2); registerItemModelMetas(slimeBottle, LibItemNames.SLIME_BOTTLE, 2); registerItemModelMetas(grassSeeds, LibItemNames.GRASS_SEEDS, 9); - registerItemModelMetas(quartz, LibItemNames.QUARTZ, 8); + registerItemModelMetas(quartz, LibItemNames.QUARTZ, 7); registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); registerItemModelMetas(virus, LibItemNames.VIRUS, 2); @@ -762,6 +763,14 @@ public final class ModelHandler { for (Block b : otherFullSlabs) { ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); } + + // Ignore everything in TESR items to suppress missing model errors + ModelLoader.setCustomStateMapper(ModBlocks.avatar, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); + ModelLoader.setCustomStateMapper(ModBlocks.bellows, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); + ModelLoader.setCustomStateMapper(ModBlocks.brewery, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + ModelLoader.setCustomStateMapper(ModBlocks.gaiaHead, new StateMap.Builder().ignore(BlockSkull.FACING, BlockSkull.NODROP).build()); + ModelLoader.setCustomStateMapper(ModBlocks.hourglass, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + ModelLoader.setCustomStateMapper(ModBlocks.pump, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); } private static void registerMushrooms() { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index 30cb9f1a0..a2ef45e2b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -43,18 +43,9 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { public void render(TileEntitySkull skull, float par1, float par2, float par3, EnumFacing par4, float par5, int par6, GameProfile gameProfile, int digProgress) { boolean gaia = skull == null || skull instanceof TileGaiaHead; - if(par6 == 3 || gaia) { - ResourceLocation resourcelocation = DefaultPlayerSkin.getDefaultSkinLegacy(); + if(gaia) { Minecraft minecraft = Minecraft.getMinecraft(); - if(gaia) - resourcelocation = minecraft.thePlayer.getLocationSkin(); - else if(gameProfile != null) { - Map map = minecraft.getSkinManager().loadSkinFromCache(gameProfile); - - if (map.containsKey(MinecraftProfileTexture.Type.SKIN)) { - resourcelocation = minecraft.getSkinManager().loadSkin((MinecraftProfileTexture)map.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN); - } - } + ResourceLocation resourcelocation = minecraft.thePlayer.getLocationSkin(); bindTexture(resourcelocation); GlStateManager.pushMatrix(); GlStateManager.disableCull(); @@ -81,13 +72,11 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { GlStateManager.enableRescaleNormal(); GlStateManager.scale(-1.0F, -1.0F, 1.0F); GlStateManager.enableAlpha(); - if(gaia) - ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); + ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); modelSkull.render(null, 0F, 0F, 0F, par5, 0F, 0.0625F); - if(gaia) - ShaderHelper.releaseShader(); + ShaderHelper.releaseShader(); GlStateManager.popMatrix(); } else super.renderSkull(par1, par2, par3, par4, par5, par6, gameProfile, digProgress); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index f2bcec8a1..035cc0d24 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -26,7 +26,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.block.tile.TileFakeAir; +import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lib.LibBlockNames; public class BlockFakeAir extends BlockModContainer { @@ -43,6 +45,17 @@ public class BlockFakeAir extends BlockModContainer { return -1; } + @Override + protected boolean shouldRegisterInNameSet() { + return false; + } + + @Override + public Block setUnlocalizedName(String par1Str) { + GameRegistry.registerBlock(this, null, par1Str); + return super.setUnlocalizedName(par1Str); + } + @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { if(shouldRemove(world, pos)) diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index be36d77a2..7504fc86d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -39,7 +39,7 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, Entity e) { + public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity e) { if(!world.isRemote && e instanceof EntityItem) { EntityItem item = (EntityItem) e; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index d64658100..aa4d22691 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -55,6 +55,9 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { @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/avatar.json b/src/main/resources/assets/botania/blockstates/avatar.json new file mode 100644 index 000000000..946bd2921 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/avatar.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/livingwood0" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bellows.json b/src/main/resources/assets/botania/blockstates/bellows.json new file mode 100644 index 000000000..946bd2921 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bellows.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/livingwood0" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/brewery.json b/src/main/resources/assets/botania/blockstates/brewery.json new file mode 100644 index 000000000..f458ec0ee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/brewery.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/livingrock0" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json b/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json new file mode 100644 index 000000000..dc3cd27b2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/storage2" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaIndex.json b/src/main/resources/assets/botania/blockstates/corporeaIndex.json new file mode 100644 index 000000000..dc3cd27b2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/corporeaIndex.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/storage2" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/fakeAir.json b/src/main/resources/assets/botania/blockstates/fakeAir.json new file mode 100644 index 000000000..482ea550e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/fakeAir.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "minecraft:items/barrier" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/gaiaHeadBlock.json b/src/main/resources/assets/botania/blockstates/gaiaHeadBlock.json new file mode 100644 index 000000000..4c72d6125 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/gaiaHeadBlock.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "minecraft:blocks/soul_sand" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hourglass.json b/src/main/resources/assets/botania/blockstates/hourglass.json new file mode 100644 index 000000000..4e63db707 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hourglass.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/manaGlass" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pump.json b/src/main/resources/assets/botania/blockstates/pump.json new file mode 100644 index 000000000..f458ec0ee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pump.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/livingrock0" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/teruTeruBozu.json b/src/main/resources/assets/botania/blockstates/teruTeruBozu.json new file mode 100644 index 000000000..d3d2b72a3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/teruTeruBozu.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "minecraft:blocks/wool_colored_white" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file