Removed wisteria

src/main/java/biomesoplenty/common/block/BlockBOPPlant.java

@@ -177,7 +177,7 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable
                 }
                 break;
                 
-            case CATTAIL: case RIVERCANE: case TINYCACTUS: case WITHERWART: case REED: case ROOT: case RAFFLESIA: case WISTERIA:
+            case CATTAIL: case RIVERCANE: case TINYCACTUS: case WITHERWART: case REED: case ROOT: case RAFFLESIA:
                 // these variants drop themselves as items
                 ret.add(paging.getVariantItem(plant));
                 break;
@@ -395,9 +395,6 @@ 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());            
         }

src/main/java/biomesoplenty/common/enums/BOPPlants.java

@@ -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, TINYCACTUS, WITHERWART, REED, ROOT, RAFFLESIA, WISTERIA;
+    SHORTGRASS, MEDIUMGRASS, BUSH, SPROUT, POISONIVY, BERRYBUSH, SHRUB, WHEATGRASS, DAMPGRASS, KORU, CLOVERPATCH, LEAFPILE, DEADLEAFPILE, DEADGRASS, DESERTGRASS, DESERTSPROUTS, DUNEGRASS, SPECTRALFERN, THORN, WILDRICE, CATTAIL, RIVERCANE, TINYCACTUS, WITHERWART, REED, ROOT, RAFFLESIA;
     
     @Override
     public String getName() {

src/main/resources/assets/biomesoplenty/blockstates/plant_1.json

@@ -10,7 +10,6 @@
         "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" }
     }
 }

src/main/resources/assets/biomesoplenty/lang/en_US.lang

@@ -414,7 +414,6 @@ 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.redwood_fence.name=Redwood Fence
 tile.redwood_fence_gate.name=Redwood Fence Gate
 tile.redwood_wood_slab.name=Redwood Wood Slab

src/main/resources/assets/biomesoplenty/models/block/wisteria.json

@@ -1,46 +0,0 @@
-{
-    "ambientocclusion": false,
-    "textures": {
-    	"cross": "biomesoplenty:blocks/wisteria",
-		"cross_bottom": "biomesoplenty:blocks/wisteria_bottom",
-        "particle": "biomesoplenty:blocks/wisteria"
-    },
-    "elements": [
-        {   "from": [ 0.8, 0, 8 ],
-            "to": [ 15.2, 16, 8 ],
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
-            "shade": false,
-            "faces": {
-                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
-                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
-            }
-        },
-        {   "from": [ 8, 0, 0.8 ],
-            "to": [ 8, 16, 15.2 ],
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
-            "shade": false,
-            "faces": {
-                "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
-                "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
-            }
-        },
-        {   "from": [ 0.8, -16, 8 ],
-            "to": [ 15.2, 0, 8 ],
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
-            "shade": false,
-            "faces": {
-                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_bottom" },
-                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_bottom" }
-            }
-        },
-        {   "from": [ 8, -16, 0.8 ],
-            "to": [ 8, 0, 15.2 ],
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
-            "shade": false,
-            "faces": {
-                "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_bottom" },
-                "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_bottom" }
-            }
-        }
-    ]
-}

src/main/resources/assets/biomesoplenty/models/item/wisteria.json

@@ -1,19 +0,0 @@
-{
-    "parent": "builtin/generated",
-    "textures": {
-        "layer0": "biomesoplenty:items/wisteria"
-    },
-    "display": {
-        "thirdperson": {
-            "rotation": [ -90, 0, 0 ],
-            "translation": [ 0, 1, -3 ],
-            "scale": [ 0.55, 0.55, 0.55 ]
-        },
-        "firstperson": {
-            "rotation": [ 0, -135, 25 ],
-            "translation": [ 0, 4, 2 ],
-            "scale": [ 1.7, 1.7, 1.7 ]
-        }
-    }
-}
-