Changed wisteria. Now a plant rather than a vine-like block.

This commit is contained in:
Matt Caughey 2016-01-28 00:30:57 -05:00
parent b7452cfc4b
commit 623fceecd8
26 changed files with 18 additions and 386 deletions

View file

@ -131,7 +131,6 @@ public class BOPBlocks
public static Block ivy;
public static Block moss;
public static Block tree_moss;
public static Block wisteria;
public static Block plant_0;
public static Block plant_1;

View file

@ -25,6 +25,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemShears;
@ -181,7 +182,7 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable
ret.add(new ItemStack(BOPItems.wildcarrots));
break;
case CATTAIL: case RIVERCANE: case TINYCACTUS: case WITHERWART: case REED: case ROOT: case RAFFLESIA:
case CATTAIL: case RIVERCANE: case TINYCACTUS: case WITHERWART: case REED: case ROOT: case RAFFLESIA: case WISTERIA:
// these variants drop themselves as items
ret.add(paging.getVariantItem(plant));
break;
@ -375,6 +376,7 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable
public boolean canBlockStay(World world, BlockPos pos, IBlockState state)
{
BOPPlants plant = ((BOPPlants) state.getValue(this.variantProperty));
Block blockAbove = world.getBlockState(pos.up()).getBlock();
switch (plant)
{
@ -398,6 +400,9 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable
case ROOT:
// roots hang down - check against block above
return BlockQueries.fertile.matches(world, pos.up());
case WISTERIA:
// wisteria hangs on leaves - check against block above
return (blockAbove instanceof BlockBOPLeaves) || blockAbove == Blocks.leaves || blockAbove == Blocks.leaves2;
default:
return BlockQueries.litFertile.matches(world, pos.down());
}

View file

@ -14,7 +14,7 @@ import biomesoplenty.common.util.block.VariantPagingHelper.IPagedVariants;
public enum BOPPlants implements IStringSerializable, IPagedVariants
{
SHORTGRASS, MEDIUMGRASS, BUSH, SPROUT, POISONIVY, BERRYBUSH, SHRUB, WHEATGRASS, DAMPGRASS, KORU, CLOVERPATCH, LEAFPILE, DEADLEAFPILE, DEADGRASS, DESERTGRASS, DESERTSPROUTS, DUNEGRASS, SPECTRALFERN, THORN, WILDRICE, CATTAIL, RIVERCANE, WILDCARROT, TINYCACTUS, WITHERWART, REED, ROOT, RAFFLESIA;
SHORTGRASS, MEDIUMGRASS, BUSH, SPROUT, POISONIVY, BERRYBUSH, SHRUB, WHEATGRASS, DAMPGRASS, KORU, CLOVERPATCH, LEAFPILE, DEADLEAFPILE, DEADGRASS, DESERTGRASS, DESERTSPROUTS, DUNEGRASS, SPECTRALFERN, THORN, WILDRICE, CATTAIL, RIVERCANE, WILDCARROT, TINYCACTUS, WITHERWART, REED, ROOT, RAFFLESIA, WISTERIA;
@Override
public String getName() {

View file

@ -213,7 +213,6 @@ public class ModBlocks
ivy = registerBlock( new BlockBOPVine(true), "ivy" );
moss = registerBlock( new BlockBOPVine(true), "moss" );
tree_moss = registerBlock( new BlockBOPVine(false), "tree_moss" );
wisteria = registerBlock( new BlockBOPVine(false), "wisteria" );
BlockBOPPlant.createAllPages();
plant_0 = registerBlock( BlockBOPPlant.paging.getBlock(0), "plant_0" );

View file

@ -11,6 +11,7 @@
"variant=witherwart": { "model": "biomesoplenty:witherwart" },
"variant=reed": { "model": "biomesoplenty:reed" },
"variant=root": { "model": "biomesoplenty:root" },
"variant=rafflesia": { "model": "biomesoplenty:rafflesia" }
"variant=rafflesia": { "model": "biomesoplenty:rafflesia" },
"variant=wisteria": { "model": "biomesoplenty:wisteria" }
}
}

View file

@ -1,36 +0,0 @@
{
"variants": {
"east=false,north=false,south=false,up=false,west=false": { "model": "biomesoplenty:wisteria_1" },
"east=false,north=false,south=true,up=false,west=false": { "model": "biomesoplenty:wisteria_1" },
"east=false,north=false,south=false,up=false,west=true": { "model": "biomesoplenty:wisteria_1", "y": 90 },
"east=false,north=true,south=false,up=false,west=false": { "model": "biomesoplenty:wisteria_1", "y": 180 },
"east=true,north=false,south=false,up=false,west=false": { "model": "biomesoplenty:wisteria_1", "y": 270 },
"east=true,north=true,south=false,up=false,west=false": { "model": "biomesoplenty:wisteria_2" },
"east=true,north=false,south=true,up=false,west=false": { "model": "biomesoplenty:wisteria_2", "y": 90 },
"east=false,north=false,south=true,up=false,west=true": { "model": "biomesoplenty:wisteria_2", "y": 180 },
"east=false,north=true,south=false,up=false,west=true": { "model": "biomesoplenty:wisteria_2", "y": 270 },
"east=true,north=false,south=false,up=false,west=true": { "model": "biomesoplenty:wisteria_2_opposite" },
"east=false,north=true,south=true,up=false,west=false": { "model": "biomesoplenty:wisteria_2_opposite", "y": 90 },
"east=true,north=true,south=true,up=false,west=false": { "model": "biomesoplenty:wisteria_3" },
"east=true,north=false,south=true,up=false,west=true": { "model": "biomesoplenty:wisteria_3", "y": 90 },
"east=false,north=true,south=true,up=false,west=true": { "model": "biomesoplenty:wisteria_3", "y": 180 },
"east=true,north=true,south=false,up=false,west=true": { "model": "biomesoplenty:wisteria_3", "y": 270 },
"east=true,north=true,south=true,up=false,west=true": { "model": "biomesoplenty:wisteria_4" },
"east=false,north=false,south=false,up=true,west=false": { "model": "biomesoplenty:wisteria_u" },
"east=false,north=false,south=true,up=true,west=false": { "model": "biomesoplenty:wisteria_1u" },
"east=false,north=false,south=false,up=true,west=true": { "model": "biomesoplenty:wisteria_1u", "y": 90 },
"east=false,north=true,south=false,up=true,west=false": { "model": "biomesoplenty:wisteria_1u", "y": 180 },
"east=true,north=false,south=false,up=true,west=false": { "model": "biomesoplenty:wisteria_1u", "y": 270 },
"east=true,north=true,south=false,up=true,west=false": { "model": "biomesoplenty:wisteria_2u" },
"east=true,north=false,south=true,up=true,west=false": { "model": "biomesoplenty:wisteria_2u", "y": 90 },
"east=false,north=false,south=true,up=true,west=true": { "model": "biomesoplenty:wisteria_2u", "y": 180 },
"east=false,north=true,south=false,up=true,west=true": { "model": "biomesoplenty:wisteria_2u", "y": 270 },
"east=true,north=false,south=false,up=true,west=true": { "model": "biomesoplenty:wisteria_2u_opposite" },
"east=false,north=true,south=true,up=true,west=false": { "model": "biomesoplenty:wisteria_2u_opposite", "y": 90 },
"east=true,north=true,south=true,up=true,west=false": { "model": "biomesoplenty:wisteria_3u" },
"east=true,north=false,south=true,up=true,west=true": { "model": "biomesoplenty:wisteria_3u", "y": 90 },
"east=false,north=true,south=true,up=true,west=true": { "model": "biomesoplenty:wisteria_3u", "y": 180 },
"east=true,north=true,south=false,up=true,west=true": { "model": "biomesoplenty:wisteria_3u", "y": 270 },
"east=true,north=true,south=true,up=true,west=true": { "model": "biomesoplenty:wisteria_4u" }
}
}

View file

@ -394,6 +394,7 @@ tile.plant_1.witherwart.name=Wither Wart
tile.plant_1.reed.name=Reed
tile.plant_1.root.name=Root
tile.plant_1.rafflesia.name=Rafflesia
tile.plant_1.wisteria.name=Wisteria
tile.polished_limestone_slab.name=Polished Limestone Slab
tile.polished_siltstone_slab.name=Polished Siltstone Slab
tile.polished_shale_slab.name=Polished Shale Slab
@ -468,7 +469,6 @@ tile.willow_fence.name=Willow Fence
tile.willow_fence_gate.name=Willow Fence Gate
tile.willow_wood_slab.name=Willow Wood Slab
tile.willow_stairs.name=Willow Wood Stairs
tile.wisteria.name=Wisteria
tile.ash_stone.name=Ash Stone
tile.hard_sand.name=Hardened Sand
tile.hard_dirt.name=Hardened Dirt

View file

@ -0,0 +1,6 @@
{
"parent": "block/crop",
"textures": {
"crop": "biomesoplenty:blocks/wisteria"
}
}

View file

@ -1,17 +0,0 @@
{
"ambientocclusion": false,
"textures": {
"particle": "biomesoplenty:blocks/wisteria",
"vine": "biomesoplenty:blocks/wisteria"
},
"elements": [
{ "from": [ 0, 0, 15.2 ],
"to": [ 16, 16, 15.2 ],
"shade": false,
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
}
]
}

View file

@ -1,26 +0,0 @@
{
"ambientocclusion": false,
"textures": {
"particle": "biomesoplenty:blocks/wisteria",
"vine": "biomesoplenty:blocks/wisteria"
},
"elements": [
{ "from": [ 0, 15.2, 0 ],
"to": [ 16, 15.2, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 0, 0, 15.2 ],
"to": [ 16, 16, 15.2 ],
"shade": false,
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
}
]
}

View file

@ -1,25 +0,0 @@
{
"ambientocclusion": false,
"textures": {
"particle": "biomesoplenty:blocks/wisteria",
"vine": "biomesoplenty:blocks/wisteria"
},
"elements": [
{ "from": [ 0, 0, 0.8 ],
"to": [ 16, 16, 0.8 ],
"shade": false,
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 15.2, 0, 0 ],
"to": [ 15.2, 16, 16 ],
"shade": false,
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
}
]
}

View file

@ -1,25 +0,0 @@
{
"ambientocclusion": false,
"textures": {
"particle": "biomesoplenty:blocks/wisteria",
"vine": "biomesoplenty:blocks/wisteria"
},
"elements": [
{ "from": [ 15.2, 0, 0 ],
"to": [ 15.2, 16, 16 ],
"shade": false,
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 0.8, 0, 0 ],
"to": [ 0.8, 16, 16 ],
"shade": false,
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
}
]
}

View file

@ -1,34 +0,0 @@
{
"ambientocclusion": false,
"textures": {
"particle": "biomesoplenty:blocks/wisteria",
"vine": "biomesoplenty:blocks/wisteria"
},
"elements": [
{ "from": [ 0, 15.2, 0 ],
"to": [ 16, 15.2, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 0, 0, 0.8 ],
"to": [ 16, 16, 0.8 ],
"shade": false,
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 15.2, 0, 0 ],
"to": [ 15.2, 16, 16 ],
"shade": false,
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
}
]
}

View file

@ -1,34 +0,0 @@
{
"ambientocclusion": false,
"textures": {
"particle": "biomesoplenty:blocks/wisteria",
"vine": "biomesoplenty:blocks/wisteria"
},
"elements": [
{ "from": [ 0, 15.2, 0 ],
"to": [ 16, 15.2, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 15.2, 0, 0 ],
"to": [ 15.2, 16, 16 ],
"shade": false,
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 0.8, 0, 0 ],
"to": [ 0.8, 16, 16 ],
"shade": false,
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
}
]
}

View file

@ -1,34 +0,0 @@
{
"ambientocclusion": false,
"textures": {
"particle": "biomesoplenty:blocks/wisteria",
"vine": "biomesoplenty:blocks/wisteria"
},
"elements": [
{ "from": [ 15.2, 0, 0 ],
"to": [ 15.2, 16, 16 ],
"shade": false,
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 0, 0, 15.2 ],
"to": [ 16, 16, 15.2 ],
"shade": false,
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 0, 0, 0.8 ],
"to": [ 16, 16, 0.8 ],
"shade": false,
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
}
]
}

View file

@ -1,41 +0,0 @@
{
"ambientocclusion": false,
"textures": {
"particle": "biomesoplenty:blocks/wisteria",
"vine": "biomesoplenty:blocks/wisteria"
},
"elements": [
{ "from": [ 0, 15.2, 0 ],
"to": [ 16, 15.2, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 15.2, 0, 0 ],
"to": [ 15.2, 16, 16 ],
"shade": false,
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 0, 0, 15.2 ],
"to": [ 16, 16, 15.2 ],
"shade": false,
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 0, 0, 0.8 ],
"to": [ 16, 16, 0.8 ],
"shade": false,
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
}
]
}

View file

@ -1,41 +0,0 @@
{
"ambientocclusion": false,
"textures": {
"particle": "biomesoplenty:blocks/wisteria",
"vine": "biomesoplenty:blocks/wisteria"
},
"elements": [
{ "from": [ 0.8, 0, 0 ],
"to": [ 0.8, 16, 16 ],
"shade": false,
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 15.2, 0, 0 ],
"to": [ 15.2, 16, 16 ],
"shade": false,
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 0, 0, 15.2 ],
"to": [ 16, 16, 15.2 ],
"shade": false,
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 0, 0, 0.8 ],
"to": [ 16, 16, 0.8 ],
"shade": false,
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
}
]
}

View file

@ -1,49 +0,0 @@
{
"ambientocclusion": false,
"textures": {
"particle": "biomesoplenty:blocks/wisteria",
"vine": "biomesoplenty:blocks/wisteria"
},
"elements": [
{ "from": [ 0, 15.2, 0 ],
"to": [ 16, 15.2, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 0.8, 0, 0 ],
"to": [ 0.8, 16, 16 ],
"shade": false,
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 15.2, 0, 0 ],
"to": [ 15.2, 16, 16 ],
"shade": false,
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 0, 0, 15.2 ],
"to": [ 16, 16, 15.2 ],
"shade": false,
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
},
{ "from": [ 0, 0, 0.8 ],
"to": [ 16, 16, 0.8 ],
"shade": false,
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
}
]
}

View file

@ -1,17 +0,0 @@
{
"ambientocclusion": false,
"textures": {
"particle": "biomesoplenty:blocks/wisteria",
"vine": "biomesoplenty:blocks/wisteria"
},
"elements": [
{ "from": [ 0, 15.2, 0 ],
"to": [ 16, 15.2, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }
}
}
]
}

View file

@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "biomesoplenty:blocks/wisteria"
"layer0": "biomesoplenty:items/wisteria"
},
"display": {
"thirdperson": {
@ -16,3 +16,4 @@
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 439 B

After

Width:  |  Height:  |  Size: 447 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 298 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 673 B

After

Width:  |  Height:  |  Size: 353 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 B