From dd5eab75020c7e202cdb8d65ebd39dadb5dd7625 Mon Sep 17 00:00:00 2001 From: Forstride Date: Sun, 14 Feb 2016 01:47:31 -0500 Subject: [PATCH] Removed wisteria --- .../common/block/BlockBOPPlant.java | 5 +- .../biomesoplenty/common/enums/BOPPlants.java | 2 +- .../biomesoplenty/blockstates/plant_1.json | 3 +- .../assets/biomesoplenty/lang/en_US.lang | 1 - .../biomesoplenty/models/block/wisteria.json | 46 ------------------ .../biomesoplenty/models/item/wisteria.json | 19 -------- .../textures/blocks/wisteria.png | Bin 332 -> 0 bytes .../textures/blocks/wisteria_bottom.png | Bin 290 -> 0 bytes .../biomesoplenty/textures/items/earth.png | Bin 301 -> 314 bytes .../biomesoplenty/textures/items/wisteria.png | Bin 358 -> 0 bytes 10 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/wisteria.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/item/wisteria.json delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/wisteria.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/wisteria_bottom.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/items/wisteria.png 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 8aedbaa6c954ac544c52edc1da0179800a6ebf2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J&12%Ft&t;ucLK6TVQ-yQ@ 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 8c0bfb0d78a7578cd3ea1a1f5666e67bf7f1a7ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33JJkeSzpt3ic;MMRp6yHq)sFX1Pf^;yx~hJHrmNwS>&8npHh*3y@^n4- hyBP~bQso5Ra#t#T=PpZ~r3G{=gQu&X%Q~loCIC?KYO??U diff --git a/src/main/resources/assets/biomesoplenty/textures/items/earth.png b/src/main/resources/assets/biomesoplenty/textures/items/earth.png index 6c9dd274f2ca42438e47d959c9e2b0bfd53eaef1..5021026434edf1d8b0a86403074331dcde48e7c7 100644 GIT binary patch delta 227 zcmV<90383V0=fc_JPN)501mzZ>O!%=kwzzfxJg7oR5(wSk}(RxKoCX4p2H&qtCU_K zRS1ZX!pg?RR>aB+r1c1vUUB6weE2iFYm(wYb~5h;k~A?!LkM9L)xd7wM@1zi8+2ov zg#I!cY9Vuge0`sjaJqjC8d4{dftN`sk_DdMTY{3m#twE(0E6i@m;j+nu!CJjRtI=a z-W1R$GqM=ah!6077Vr_gX&>MhQ2B4b!+ABJkx~e=!|`EcU;+RO3_&26E&j?11yb4p d#o>BF^8;+AT`xAbBKrUU002ovPDHLkV1md(UljlV delta 214 zcmV;{04e{v0<8j&JPN-601m$aI0aKAkwzzft4TybR5(wSk}(d0Fc1Wh-@y|iDn3D( zhK`DchBgI%NSi05k 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 0b346bd36e9a1c7d6394bb09a3c4e02a5a6aae4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33JZMeVwjxOyuP?0NN%TPK$Jk&$AFG6nF-?W}DPWRc_ z7WQ_OGFLTOytZ5@X~3~x(m=RL&&12&sKfcRR>S|5&D$)eKK>RXxnfT06YCa6j+B(m zS_abtBObH1oLJ%TpzI#cwVY>jIUW5OoH#zaCGsk9CT^P-ay_lloGbfF@|LMHnU-{J zaJyZpK2vktnY3>|1x;G`njxgN@xNA(aDDQ