diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java b/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java index d6f3139ac..da46be705 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java +++ b/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()); } diff --git a/src/main/java/biomesoplenty/common/enums/BOPPlants.java b/src/main/java/biomesoplenty/common/enums/BOPPlants.java index 17c1cda91..4aedab5b9 100644 --- a/src/main/java/biomesoplenty/common/enums/BOPPlants.java +++ b/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() { diff --git a/src/main/resources/assets/biomesoplenty/blockstates/plant_1.json b/src/main/resources/assets/biomesoplenty/blockstates/plant_1.json index cf0d26b19..449180eed 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/plant_1.json +++ b/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=wisteria": { "model": "biomesoplenty:wisteria" } + "variant=rafflesia": { "model": "biomesoplenty:rafflesia" } } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index d73750931..d941f8ddf 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/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 diff --git a/src/main/resources/assets/biomesoplenty/models/block/wisteria.json b/src/main/resources/assets/biomesoplenty/models/block/wisteria.json deleted file mode 100644 index 3be848d85..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/wisteria.json +++ /dev/null @@ -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" } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/wisteria.json b/src/main/resources/assets/biomesoplenty/models/item/wisteria.json deleted file mode 100644 index c6d57648c..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/wisteria.json +++ /dev/null @@ -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 ] - } - } -} - diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria.png b/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria.png deleted file mode 100644 index 8aedbaa6c..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria_bottom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria_bottom.png deleted file mode 100644 index 8c0bfb0d7..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/earth.png b/src/main/resources/assets/biomesoplenty/textures/items/earth.png index 6c9dd274f..502102643 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/earth.png and b/src/main/resources/assets/biomesoplenty/textures/items/earth.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/wisteria.png b/src/main/resources/assets/biomesoplenty/textures/items/wisteria.png deleted file mode 100644 index 0b346bd36..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/wisteria.png and /dev/null differ