Revert "Swapped leaf piles/dead leaf piles and dune grass/spectral ferns so shaders can be supported better."

This reverts commit 639d8079a3.
This commit is contained in:
Adubbz 2016-03-28 10:01:24 +11:00
parent 639d8079a3
commit 0e2803e2fd
4 changed files with 22 additions and 22 deletions

View file

@ -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() {

View file

@ -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" }
}
}

View file

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

View file

@ -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