Fix somde models

This commit is contained in:
Vincent Lee committed 2016-03-24 12:30:14 -05:00
1 parent 1b87160ef6
commit 674ba5c19d
7 files changed
+61 -59

No files matched your search

@@ -87,6 +87,7 @@ public class MiscellaneousIcons {
@SubscribeEvent
public void onModelBake(ModelBakeEvent evt) {
FMLLog.info("The baked model for botania:jadedAmaranthus#normal is: " + evt.getModelRegistry().getObject(new ModelResourceLocation("botania:jadedAmaranthus", "normal")));
// Floating flowers todo 1.9
/*evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE);
evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE);
@@ -74,6 +74,7 @@ public class SpecialFlowerModel implements IModelCustomData {
// Force island models to be loaded and baked. See FloatingFlowerModel.
builder.addAll(BotaniaAPIClient.getRegisteredIslandTypeModels().values());
FMLLog.info("Collected special flower dependencies: %s", builder.build());
return builder.build();
}
@@ -48,7 +48,7 @@ public class BlockManaGlass extends BlockMod implements ILexiconable {
@Override
public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) {
Block block = world.getBlockState(pos).getBlock();
Block block = world.getBlockState(pos.offset(side)).getBlock();
return block == this ? false : super.shouldSideBeRendered(state, world, pos, side);
}
@@ -6,23 +6,23 @@
"transform": "forge:default-block"
},
"variants": {
"east=false,north=true,south=true,up=false,variant=forest_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,variant=plains_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,variant=mountain_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,variant=fungal_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,variant=swamp_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,variant=desert_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,variant=taiga_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,variant=mesa_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,bswall_variant=forest_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,bswall_variant=plains_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,bswall_variant=mountain_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,bswall_variant=fungal_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,bswall_variant=swamp_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,bswall_variant=desert_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,bswall_variant=taiga_cobble,west=false": { "model": null },
"east=false,north=true,south=true,up=false,bswall_variant=mesa_cobble,west=false": { "model": null },
"east=true,north=false,south=false,up=false,variant=forest_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,variant=plains_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,variant=mountain_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,variant=fungal_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,variant=swamp_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,variant=desert_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,variant=taiga_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,variant=mesa_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,bswall_variant=forest_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,bswall_variant=plains_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,bswall_variant=mountain_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,bswall_variant=fungal_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,bswall_variant=swamp_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,bswall_variant=desert_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,bswall_variant=taiga_cobble,west=true": { "model": null },
"east=true,north=false,south=false,up=false,bswall_variant=mesa_cobble,west=true": { "model": null },
"north": {
"true": { "submodel": "botania:wall_connect" },
@@ -44,7 +44,7 @@
"true": {},
"false": {}
},
"variant": {
"bswall_variant": {
"forest_cobble": { "textures": { "wall": "botania:blocks/biomeStone8" } },
"plains_cobble": { "textures": { "wall": "botania:blocks/biomeStone9" } },
"mountain_cobble": { "textures": { "wall": "botania:blocks/biomeStone10" } },
@@ -4,22 +4,22 @@
"model": "minecraft:cross"
},
"variants": {
"half=lower,variant=white": [{ "textures": { "cross": "botania:blocks/flower0Tall0" } }],
"half=upper,variant=white": [{ "textures": { "cross": "botania:blocks/flower0Tall1" } }],
"half=lower,variant=orange": [{ "textures": { "cross": "botania:blocks/flower1Tall0" } }],
"half=upper,variant=orange": [{ "textures": { "cross": "botania:blocks/flower1Tall1" } }],
"half=lower,variant=magenta": [{ "textures": { "cross": "botania:blocks/flower2Tall0" } }],
"half=upper,variant=magenta": [{ "textures": { "cross": "botania:blocks/flower2Tall1" } }],
"half=lower,variant=light_blue": [{ "textures": { "cross": "botania:blocks/flower3Tall0" } }],
"half=upper,variant=light_blue": [{ "textures": { "cross": "botania:blocks/flower3Tall1" } }],
"half=lower,variant=yellow": [{ "textures": { "cross": "botania:blocks/flower4Tall0" } }],
"half=upper,variant=yellow": [{ "textures": { "cross": "botania:blocks/flower4Tall1" } }],
"half=lower,variant=lime": [{ "textures": { "cross": "botania:blocks/flower5Tall0" } }],
"half=upper,variant=lime": [{ "textures": { "cross": "botania:blocks/flower5Tall1" } }],
"half=lower,variant=pink": [{ "textures": { "cross": "botania:blocks/flower6Tall0" } }],
"half=upper,variant=pink": [{ "textures": { "cross": "botania:blocks/flower6Tall1" } }],
"half=lower,variant=gray": [{ "textures": { "cross": "botania:blocks/flower7Tall0" } }],
"half=upper,variant=gray": [{ "textures": { "cross": "botania:blocks/flower7Tall1" } }],
"df_variant=white,half=lower": [{ "textures": { "cross": "botania:blocks/flower0Tall0" } }],
"df_variant=white,half=upper": [{ "textures": { "cross": "botania:blocks/flower0Tall1" } }],
"df_variant=orange,half=lower": [{ "textures": { "cross": "botania:blocks/flower1Tall0" } }],
"df_variant=orange,half=upper": [{ "textures": { "cross": "botania:blocks/flower1Tall1" } }],
"df_variant=magenta,half=lower": [{ "textures": { "cross": "botania:blocks/flower2Tall0" } }],
"df_variant=magenta,half=upper": [{ "textures": { "cross": "botania:blocks/flower2Tall1" } }],
"df_variant=light_blue,half=lower": [{ "textures": { "cross": "botania:blocks/flower3Tall0" } }],
"df_variant=light_blue,half=upper": [{ "textures": { "cross": "botania:blocks/flower3Tall1" } }],
"df_variant=yellow,half=lower": [{ "textures": { "cross": "botania:blocks/flower4Tall0" } }],
"df_variant=yellow,half=upper": [{ "textures": { "cross": "botania:blocks/flower4Tall1" } }],
"df_variant=lime,half=lower": [{ "textures": { "cross": "botania:blocks/flower5Tall0" } }],
"df_variant=lime,half=upper": [{ "textures": { "cross": "botania:blocks/flower5Tall1" } }],
"df_variant=pink,half=lower": [{ "textures": { "cross": "botania:blocks/flower6Tall0" } }],
"df_variant=pink,half=upper": [{ "textures": { "cross": "botania:blocks/flower6Tall1" } }],
"df_variant=gray,half=lower": [{ "textures": { "cross": "botania:blocks/flower7Tall0" } }],
"df_variant=gray,half=upper": [{ "textures": { "cross": "botania:blocks/flower7Tall1" } }],
"inventory_white": [{
"model": "builtin/generated",
@@ -4,22 +4,22 @@
"model": "minecraft:cross"
},
"variants": {
"half=lower,variant=silver": [{ "textures": { "cross": "botania:blocks/flower8Tall0" } }],
"half=upper,variant=silver": [{ "textures": { "cross": "botania:blocks/flower8Tall1" } }],
"half=lower,variant=cyan": [{ "textures": { "cross": "botania:blocks/flower9Tall0" } }],
"half=upper,variant=cyan": [{ "textures": { "cross": "botania:blocks/flower9Tall1" } }],
"half=lower,variant=purple": [{ "textures": { "cross": "botania:blocks/flower10Tall0" } }],
"half=upper,variant=purple": [{ "textures": { "cross": "botania:blocks/flower10Tall1" } }],
"half=lower,variant=blue": [{ "textures": { "cross": "botania:blocks/flower11Tall0" } }],
"half=upper,variant=blue": [{ "textures": { "cross": "botania:blocks/flower11Tall1" } }],
"half=lower,variant=brown": [{ "textures": { "cross": "botania:blocks/flower12Tall0" } }],
"half=upper,variant=brown": [{ "textures": { "cross": "botania:blocks/flower12Tall1" } }],
"half=lower,variant=green": [{ "textures": { "cross": "botania:blocks/flower13Tall0" } }],
"half=upper,variant=green": [{ "textures": { "cross": "botania:blocks/flower13Tall1" } }],
"half=lower,variant=red": [{ "textures": { "cross": "botania:blocks/flower14Tall0" } }],
"half=upper,variant=red": [{ "textures": { "cross": "botania:blocks/flower14Tall1" } }],
"half=lower,variant=black": [{ "textures": { "cross": "botania:blocks/flower15Tall0" } }],
"half=upper,variant=black": [{ "textures": { "cross": "botania:blocks/flower15Tall1" } }],
"df_variant=silver,half=lower": [{ "textures": { "cross": "botania:blocks/flower8Tall0" } }],
"df_variant=silver,half=upper": [{ "textures": { "cross": "botania:blocks/flower8Tall1" } }],
"df_variant=cyan,half=lower": [{ "textures": { "cross": "botania:blocks/flower9Tall0" } }],
"df_variant=cyan,half=upper": [{ "textures": { "cross": "botania:blocks/flower9Tall1" } }],
"df_variant=purple,half=lower": [{ "textures": { "cross": "botania:blocks/flower10Tall0" } }],
"df_variant=purple,half=upper": [{ "textures": { "cross": "botania:blocks/flower10Tall1" } }],
"df_variant=blue,half=lower": [{ "textures": { "cross": "botania:blocks/flower11Tall0" } }],
"df_variant=blue,half=upper": [{ "textures": { "cross": "botania:blocks/flower11Tall1" } }],
"df_variant=brown,half=lower": [{ "textures": { "cross": "botania:blocks/flower12Tall0" } }],
"df_variant=brown,half=upper": [{ "textures": { "cross": "botania:blocks/flower12Tall1" } }],
"df_variant=green,half=lower": [{ "textures": { "cross": "botania:blocks/flower13Tall0" } }],
"df_variant=green,half=upper": [{ "textures": { "cross": "botania:blocks/flower13Tall1" } }],
"df_variant=red,half=lower": [{ "textures": { "cross": "botania:blocks/flower14Tall0" } }],
"df_variant=red,half=upper": [{ "textures": { "cross": "botania:blocks/flower14Tall1" } }],
"df_variant=black,half=lower": [{ "textures": { "cross": "botania:blocks/flower15Tall0" } }],
"df_variant=black,half=upper": [{ "textures": { "cross": "botania:blocks/flower15Tall1" } }],
"inventory_silver": [{
"model": "builtin/generated",
@@ -6,15 +6,15 @@
"transform": "forge:default-block"
},
"variants": {
"east=false,north=true,south=true,up=false,variant=andesite,west=false": { "model": null },
"east=false,north=true,south=true,up=false,variant=basalt,west=false": { "model": null },
"east=false,north=true,south=true,up=false,variant=diorite,west=false": { "model": null },
"east=false,north=true,south=true,up=false,variant=granite,west=false": { "model": null },
"east=false,north=true,south=true,up=false,fswall_variant=andesite,west=false": { "model": null },
"east=false,north=true,south=true,up=false,fswall_variant=basalt,west=false": { "model": null },
"east=false,north=true,south=true,up=false,fswall_variant=diorite,west=false": { "model": null },
"east=false,north=true,south=true,up=false,fswall_variant=granite,west=false": { "model": null },
"east=true,north=false,south=false,up=false,variant=andesite,west=true": { "model": null },
"east=true,north=false,south=false,up=false,variant=basalt,west=true": { "model": null },
"east=true,north=false,south=false,up=false,variant=diorite,west=true": { "model": null },
"east=true,north=false,south=false,up=false,variant=granite,west=true": { "model": null },
"east=true,north=false,south=false,up=false,fswall_variant=andesite,west=true": { "model": null },
"east=true,north=false,south=false,up=false,fswall_variant=basalt,west=true": { "model": null },
"east=true,north=false,south=false,up=false,fswall_variant=diorite,west=true": { "model": null },
"east=true,north=false,south=false,up=false,fswall_variant=granite,west=true": { "model": null },
"north": {
"true": { "submodel": "botania:wall_connect" },
@@ -36,7 +36,7 @@
"true": {},
"false": {}
},
"variant": {
"fswall_variant": {
"andesite": { "textures": { "wall": "botania:blocks/stone0" } },
"basalt": { "textures": { "wall": "botania:blocks/stone1" } },
"diorite": { "textures": { "wall": "botania:blocks/stone2" } },