diff --git a/src/main/java/biomesoplenty/common/enums/BOPPlants.java b/src/main/java/biomesoplenty/common/enums/BOPPlants.java index 2977f5543..dccb2eab0 100644 --- a/src/main/java/biomesoplenty/common/enums/BOPPlants.java +++ b/src/main/java/biomesoplenty/common/enums/BOPPlants.java @@ -14,7 +14,7 @@ import net.minecraft.util.IStringSerializable; public enum BOPPlants implements IStringSerializable, IPagedVariants { - SHORTGRASS, MEDIUMGRASS, BUSH, SPROUT, POISONIVY, BERRYBUSH, SHRUB, WHEATGRASS, DAMPGRASS, KORU, CLOVERPATCH, DEADGRASS, DESERTGRASS, DESERTSPROUTS, DUNEGRASS, SPECTRALFERN, LEAFPILE, DEADLEAFPILE, THORN, WILDRICE, CATTAIL, RIVERCANE, 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, TINYCACTUS, WITHERWART, REED, ROOT, RAFFLESIA; @Override public String getName() { diff --git a/src/main/resources/assets/biomesoplenty/blockstates/plant_0.json b/src/main/resources/assets/biomesoplenty/blockstates/plant_0.json index 95afd6955..b70d6d39d 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/plant_0.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/plant_0.json @@ -17,11 +17,23 @@ { "model": "biomesoplenty:cloverpatch", "y": 180 }, { "model": "biomesoplenty:cloverpatch", "y": 270 } ], + + "variant=leafpile": [ + { "model": "biomesoplenty:leafpile" }, + { "model": "biomesoplenty:leafpile", "y": 90 }, + { "model": "biomesoplenty:leafpile", "y": 180 }, + { "model": "biomesoplenty:leafpile", "y": 270 } + ], + + "variant=deadleafpile": [ + { "model": "biomesoplenty:deadleafpile" }, + { "model": "biomesoplenty:deadleafpile", "y": 90 }, + { "model": "biomesoplenty:deadleafpile", "y": 180 }, + { "model": "biomesoplenty:deadleafpile", "y": 270 } + ], "variant=deadgrass": { "model": "biomesoplenty:deadgrass" }, "variant=desertgrass": { "model": "biomesoplenty:desertgrass" }, - "variant=desertsprouts": { "model": "biomesoplenty:desertsprouts" }, - "variant=dunegrass": { "model": "biomesoplenty:dunegrass" }, - "variant=spectralfern": { "model": "biomesoplenty:spectralfern" } + "variant=desertsprouts": { "model": "biomesoplenty:desertsprouts" } } } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/plant_1.json b/src/main/resources/assets/biomesoplenty/blockstates/plant_1.json index 9002896e3..449180eed 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/plant_1.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/plant_1.json @@ -1,19 +1,7 @@ { "variants": { - "variant=leafpile": [ - { "model": "biomesoplenty:leafpile" }, - { "model": "biomesoplenty:leafpile", "y": 90 }, - { "model": "biomesoplenty:leafpile", "y": 180 }, - { "model": "biomesoplenty:leafpile", "y": 270 } - ], - - "variant=deadleafpile": [ - { "model": "biomesoplenty:deadleafpile" }, - { "model": "biomesoplenty:deadleafpile", "y": 90 }, - { "model": "biomesoplenty:deadleafpile", "y": 180 }, - { "model": "biomesoplenty:deadleafpile", "y": 270 } - ], - + "variant=dunegrass": { "model": "biomesoplenty:dunegrass" }, + "variant=spectralfern": { "model": "biomesoplenty:spectralfern" }, "variant=thorn": { "model": "biomesoplenty:thorn" }, "variant=wildrice": { "model": "biomesoplenty:wildrice" }, "variant=cattail": { "model": "biomesoplenty:cattail" }, diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index b94ca57e3..60b45a918 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -397,13 +397,13 @@ tile.plant_0.wheatgrass.name=Wheat Grass tile.plant_0.dampgrass.name=Damp Grass tile.plant_0.koru.name=Koru tile.plant_0.cloverpatch.name=Clover Patch +tile.plant_0.leafpile.name=Leaf Pile +tile.plant_0.deadleafpile.name=Dead Leaf Pile tile.plant_0.deadgrass.name=Dead Grass tile.plant_0.desertgrass.name=Desert Grass tile.plant_0.desertsprouts.name=Desert Sprouts -tile.plant_0.dunegrass.name=Dune Grass -tile.plant_0.spectralfern.name=Spectral Fern -tile.plant_1.leafpile.name=Leaf Pile -tile.plant_1.deadleafpile.name=Dead Leaf Pile +tile.plant_1.dunegrass.name=Dune Grass +tile.plant_1.spectralfern.name=Spectral Fern tile.plant_1.thorn.name=Thorns tile.plant_1.wildrice.name=Wild Rice tile.plant_1.cattail.name=Cattail