etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added Dead Plains sub-biome for the Dead Forest. Removed Ebony wood. Tweaked a handful of biomes

This commit is contained in:
Forstride 2018-12-19 17:43:34 -05:00
parent dc0d777a08
commit 241af7ba30
109 changed files with 156 additions and 857 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/biomesoplenty/api/biome/BOPBiomes.java
View File

@ -36,6 +36,7 @@ public class BOPBiomes
public static Optional<Biome> coniferous_forest = Optional.absent();
public static Optional<Biome> crag = Optional.absent();
public static Optional<Biome> dead_forest = Optional.absent();
public static Optional<Biome> dead_plains = Optional.absent();
public static Optional<Biome> dead_swamp = Optional.absent();
public static Optional<Biome> fen = Optional.absent();
public static Optional<Biome> floodplains = Optional.absent();

5
src/main/java/biomesoplenty/api/block/BOPBlocks.java
View File

@ -37,7 +37,6 @@ public class BOPBlocks
public static Block log_0;
public static Block log_1;
public static Block log_2;
public static Block log_3;
public static Block leaves_0;
public static Block leaves_1;
public static Block leaves_2;
@ -63,7 +62,6 @@ public class BOPBlocks
public static Block hellbark_stairs;
public static Block jacaranda_stairs;
public static Block mahogany_stairs;
public static Block ebony_stairs;
public static Block cherry_fence;
public static Block umbran_fence;
public static Block fir_fence;
@ -75,7 +73,6 @@ public class BOPBlocks
public static Block hellbark_fence;
public static Block jacaranda_fence;
public static Block mahogany_fence;
public static Block ebony_fence;
public static Block cherry_fence_gate;
public static Block umbran_fence_gate;
public static Block fir_fence_gate;
@ -87,7 +84,6 @@ public class BOPBlocks
public static Block hellbark_fence_gate;
public static Block jacaranda_fence_gate;
public static Block mahogany_fence_gate;
public static Block ebony_fence_gate;
public static Block cherry_door;
public static Block umbran_door;
public static Block fir_door;
@ -99,7 +95,6 @@ public class BOPBlocks
public static Block hellbark_door;
public static Block jacaranda_door;
public static Block mahogany_door;
public static Block ebony_door;
public static Block coral;
public static Block seaweed;

2
src/main/java/biomesoplenty/api/enums/BOPTrees.java
View File

@ -14,7 +14,7 @@ import net.minecraft.util.IStringSerializable;
public enum BOPTrees implements IStringSerializable, IPagedVariants
{
ORIGIN, FLOWERING, ORANGE_AUTUMN, YELLOW_AUTUMN, FIR, REDWOOD, WHITE_CHERRY, PINK_CHERRY, MAPLE, MAHOGANY, JACARANDA, PALM, WILLOW, EBONY, DEAD, MAGIC, UMBRAN, HELLBARK, ETHEREAL;
ORIGIN, FLOWERING, ORANGE_AUTUMN, YELLOW_AUTUMN, FIR, REDWOOD, WHITE_CHERRY, PINK_CHERRY, MAPLE, MAHOGANY, JACARANDA, PALM, WILLOW, DEAD, MAGIC, UMBRAN, HELLBARK, ETHEREAL;
@Override
public String getName() {

2
src/main/java/biomesoplenty/api/enums/BOPWoods.java
View File

@ -14,7 +14,7 @@ import net.minecraft.util.IStringSerializable;
public enum BOPWoods implements IStringSerializable, IPagedVariants
{
FIR, REDWOOD, CHERRY, MAHOGANY, JACARANDA, PALM, WILLOW, EBONY, DEAD, MAGIC, UMBRAN, HELLBARK, ETHEREAL;
FIR, REDWOOD, CHERRY, MAHOGANY, JACARANDA, PALM, WILLOW, DEAD, MAGIC, UMBRAN, HELLBARK, ETHEREAL;
@Override
public String getName() {

2
src/main/java/biomesoplenty/api/item/BOPItems.java
View File

@ -36,7 +36,6 @@ public class BOPItems
public static Item boat_hellbark;
public static Item boat_jacaranda;
public static Item boat_mahogany;
public static Item boat_ebony;
public static Item cherry_door;
public static Item umbran_door;
@ -49,7 +48,6 @@ public class BOPItems
public static Item hellbark_door;
public static Item jacaranda_door;
public static Item mahogany_door;
public static Item ebony_door;
public static Item wood_slab_0;
public static Item wood_slab_1;

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java
View File

@ -60,7 +60,7 @@ public class BiomeGenBrushland extends BOPOverworldBiome
this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
treeGenerator.add("dead_tree", 1, (new GeneratorBigTree.Builder()).minHeight(7).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BOPWoods.DEAD).leaves(Blocks.AIR.getDefaultState()).create());
treeGenerator.add("brush_twiglet", 18, (new GeneratorTwigletTree.Builder()).minHeight(1).maxHeight(4).log(BlockPlanks.EnumType.ACACIA).leaves(BOPTrees.DEAD).create());
treeGenerator.add("decaying_tree", 3, (new GeneratorBigTree.Builder()).amountPerChunk(1.0F).log(BOPWoods.EBONY).leaves(BOPTrees.EBONY).minHeight(4).maxHeight(11).foliageHeight(1).create());
treeGenerator.add("decaying_tree", 3, (new GeneratorBigTree.Builder()).amountPerChunk(1.0F).minHeight(4).maxHeight(11).foliageHeight(1).create());
// grasses
GeneratorWeighted grassGenerator = new GeneratorWeighted(1.0F);

12
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java
View File

@ -50,12 +50,12 @@ public class BiomeGenCherryBlossomGrove extends BOPOverworldBiome
this.addWeight(BOPClimates.COOL_TEMPERATE, 2);
// flowers
GeneratorWeighted flowerGenerator = new GeneratorWeighted(2.3F);
GeneratorWeighted flowerGenerator = new GeneratorWeighted(2.5F);
this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator);
flowerGenerator.add("pink_daffodil", 4, (new GeneratorFlora.Builder().with(BOPFlowers.PINK_DAFFODIL).create()));
flowerGenerator.add("syringa", 2, (new GeneratorDoubleFlora.Builder().with(BlockDoublePlant.EnumPlantType.SYRINGA).create()));
flowerGenerator.add("houstonia", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.HOUSTONIA).create()));
flowerGenerator.add("oxeye_daisy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.OXEYE_DAISY).create()));
flowerGenerator.add("pink_daffodil", 6, (new GeneratorFlora.Builder().with(BOPFlowers.PINK_DAFFODIL).create()));
flowerGenerator.add("syringa", 4, (new GeneratorDoubleFlora.Builder().with(BlockDoublePlant.EnumPlantType.SYRINGA).create()));
flowerGenerator.add("houstonia", 3, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.HOUSTONIA).create()));
flowerGenerator.add("oxeye_daisy", 3, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.OXEYE_DAISY).create()));
flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create()));
flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create()));
@ -74,7 +74,7 @@ public class BiomeGenCherryBlossomGrove extends BOPOverworldBiome
this.addGenerator("lily", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(Blocks.WATERLILY.getDefaultState()).create());
// grasses
GeneratorWeighted grassGenerator = new GeneratorWeighted(1.6F);
GeneratorWeighted grassGenerator = new GeneratorWeighted(3.0F);
this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
grassGenerator.add("shortgrass", 1, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
grassGenerator.add("tallgrass", 2, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());

3
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdTundra.java
View File

@ -78,9 +78,6 @@ public class BiomeGenColdTundra extends BOPOverworldBiome
// other plants
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.3F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());
// water plants
this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(0.2F).with(BOPPlants.REED).generationAttempts(32).create());
// grasses
GeneratorWeighted grassGenerator = new GeneratorWeighted(1.5F);
this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);

8
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java
View File

@ -66,14 +66,14 @@ public class BiomeGenDeadForest extends BOPOverworldBiome
treeGenerator.add("dead_tree", 1, (new GeneratorBigTree.Builder()).minHeight(5).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BOPWoods.DEAD).leaves(Blocks.AIR.getDefaultState()).create());
// other plants
this.addGenerator("thorns", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(0.3F).with(BOPPlants.THORN).create());
this.addGenerator("thorns", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(0.25F).with(BOPPlants.THORN).create());
this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(0.8F).with(BOPPlants.REED).generationAttempts(32).create());
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(3.5F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(3.0F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());
// grasses
GeneratorWeighted grassGenerator = new GeneratorWeighted(1.0F);
GeneratorWeighted grassGenerator = new GeneratorWeighted(2.0F);
this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
grassGenerator.add("shortgrass", 4, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
grassGenerator.add("shortgrass", 10, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
grassGenerator.add("dead_bushes", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.DEAD_BUSH).create());
}

89
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadPlains.java Normal file
View File

@ -0,0 +1,89 @@
/*******************************************************************************
* Copyright 2015-2016, the Biomes O' Plenty Team
*
* This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
*
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
******************************************************************************/
package biomesoplenty.common.biome.overworld;
import biomesoplenty.api.biome.BOPBiomes;
import biomesoplenty.api.block.BOPBlocks;
import biomesoplenty.api.block.BlockQueries;
import biomesoplenty.api.enums.BOPClimates;
import biomesoplenty.api.enums.BOPFoliage;
import biomesoplenty.api.enums.BOPPlants;
import biomesoplenty.api.enums.BOPTrees;
import biomesoplenty.api.enums.BOPWoods;
import biomesoplenty.api.generation.GeneratorStage;
import biomesoplenty.common.block.BlockBOPDirt;
import biomesoplenty.common.block.BlockBOPFlatPlant;
import biomesoplenty.common.block.BlockBOPGrass;
import biomesoplenty.common.world.generator.GeneratorFlora;
import biomesoplenty.common.world.generator.GeneratorGrass;
import biomesoplenty.common.world.generator.GeneratorWaterside;
import biomesoplenty.common.world.generator.GeneratorWeighted;
import biomesoplenty.common.world.generator.tree.GeneratorBasicTree;
import biomesoplenty.common.world.generator.tree.GeneratorBigTree;
import biomesoplenty.common.world.generator.tree.GeneratorTaigaTree;
import net.minecraft.block.BlockTallGrass;
import net.minecraft.init.Blocks;
import net.minecraft.util.math.BlockPos;
public class BiomeGenDeadPlains extends BOPOverworldBiome
{
public BiomeGenDeadPlains()
{
super("dead_plains", new PropsBuilder("Dead Plains").withGuiColour(0xD6BA7E).withTemperature(0.3F).withRainfall(0.3F));
// terrain
this.terrainSettings.avgHeight(67).heightVariation(6, 6);
this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
this.canSpawnInBiome = false;
this.canGenerateVillages = false;
if (BOPBiomes.gravel_beach.isPresent())
{
this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
}
this.clearWeights();
// gravel
this.addGenerator("gravel", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(4).maxRadius(7).with(Blocks.GRAVEL.getDefaultState()).create());
// trees
GeneratorWeighted treeGenerator = new GeneratorWeighted(0.2F);
this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
treeGenerator.add("oak", 3, (new GeneratorBasicTree.Builder()).leaves(BOPTrees.DEAD).create());
treeGenerator.add("dead_tree", 1, (new GeneratorBigTree.Builder()).minHeight(5).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BOPWoods.DEAD).leaves(Blocks.AIR.getDefaultState()).create());
// other plants
this.addGenerator("thorns", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(BOPPlants.THORN).create());
this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(1.0F).with(BOPPlants.REED).generationAttempts(32).create());
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(0.5F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());
// grasses
GeneratorWeighted grassGenerator = new GeneratorWeighted(4.5F);
this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
grassGenerator.add("shortgrass", 15, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
grassGenerator.add("tallgrass", 5, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
grassGenerator.add("dead_bushes", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.DEAD_BUSH).create());
}
@Override
public int getGrassColorAtPos(BlockPos pos)
{
return getModdedBiomeGrassColor(0xBCA165);
}
@Override
public int getFoliageColorAtPos(BlockPos pos)
{
return getModdedBiomeFoliageColor(0xBCA165);
}
}

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java
View File

@ -67,7 +67,7 @@ public class BiomeGenMapleWoods extends BOPOverworldBiome
flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create()));
// other plants
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(8.0F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).create());
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(3.0F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).create());
// water plants
this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(2.0F).with(BOPPlants.REED).generationAttempts(32).create());

6
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java
View File

@ -20,6 +20,7 @@ import biomesoplenty.common.block.BlockBOPDirt;
import biomesoplenty.common.block.BlockBOPFlatPlant;
import biomesoplenty.common.block.BlockBOPGrass;
import biomesoplenty.common.block.BlockBOPLeaves;
import biomesoplenty.common.block.BlockBOPMushroom;
import biomesoplenty.common.world.generator.GeneratorBigMushroom;
import biomesoplenty.common.world.generator.GeneratorDoubleFlora;
import biomesoplenty.common.world.generator.GeneratorFlora;
@ -74,8 +75,8 @@ public class BiomeGenMysticGrove extends BOPOverworldBiome
this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
treeGenerator.add("ivy_tree", 7, (new GeneratorBasicTree.Builder()).minHeight(5).maxHeight(9).maxLeavesRadius(2).leaves(Blocks.LEAVES.getDefaultState().withProperty(BlockOldLeaf.CHECK_DECAY, Boolean.valueOf(false))).vine(BOPBlocks.ivy.getDefaultState()).create());
treeGenerator.add("magic", 17, (new GeneratorBasicTree.Builder()).log(BOPWoods.MAGIC).leaves(BOPTrees.MAGIC).create());
treeGenerator.add("jacaranda", 9, (new GeneratorBasicTree.Builder()).minHeight(4).maxHeight(7).log(BOPWoods.JACARANDA).leaves(BOPTrees.JACARANDA).create());
treeGenerator.add("oak_large", 8, (new GeneratorBigTree.Builder()).altLeaves(BlockBOPLeaves.paging.getVariantState(BOPTrees.FLOWERING).withProperty(BlockOldLeaf.CHECK_DECAY, Boolean.valueOf(false))).create());
treeGenerator.add("jacaranda", 9, (new GeneratorBasicTree.Builder()).minHeight(5).maxHeight(7).log(BOPWoods.JACARANDA).leaves(BOPTrees.JACARANDA).create());
treeGenerator.add("oak_large", 8, (new GeneratorBigTree.Builder()).minHeight(9).altLeaves(BlockBOPLeaves.paging.getVariantState(BOPTrees.FLOWERING).withProperty(BlockOldLeaf.CHECK_DECAY, Boolean.valueOf(false))).create());
// grasses
GeneratorWeighted grassGenerator = new GeneratorWeighted(1.5F);
@ -102,6 +103,7 @@ public class BiomeGenMysticGrove extends BOPOverworldBiome
this.addGenerator("lily", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(Blocks.WATERLILY.getDefaultState()).create());
// shrooms
this.addGenerator("glowshrooms_surface", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.2F).generationAttempts(16).with(BlockBOPMushroom.MushroomType.GLOWSHROOM).create());
this.addGenerator("red_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.4F).generationAttempts(16).with(Blocks.RED_MUSHROOM.getDefaultState()).create());
this.addGenerator("brown_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).generationAttempts(16).with(Blocks.BROWN_MUSHROOM.getDefaultState()).create());
this.addGenerator("big_red_mushroom", GeneratorStage.BIG_SHROOM,(new GeneratorBigMushroom.Builder()).amountPerChunk(0.4F).mushroomType(GeneratorBigMushroom.BigMushroomType.RED).create());

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java
View File

@ -70,7 +70,6 @@ public class BiomeGenOutback extends BOPOverworldBiome
grassGenerator.add("tallgrass", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
// other plants
//this.addGenerator("shrubs", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.2F).with(BOPPlants.SHRUB).create());
this.addGenerator("tiny_cacti", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.5F).with(BOPPlants.TINYCACTUS).create());
this.addGenerator("dead_bushes", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.5F).with(Blocks.DEADBUSH.getDefaultState()).create());
this.addGenerator("cacti", GeneratorStage.FLOWERS,(new GeneratorColumns.Builder()).amountPerChunk(0.2F).generationAttempts(24).placeOn(this.topBlock).with(Blocks.CACTUS.getDefaultState()).minHeight(1).maxHeight(2).create());

3
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPasture.java
View File

@ -35,9 +35,6 @@ public class BiomeGenPasture extends BOPOverworldBiome
grassGenerator.add("tallgrass", 6, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
this.addGenerator("barley", GeneratorStage.GRASS,(new GeneratorFlora.Builder()).amountPerChunk(45.0F).with(BOPFoliage.BARLEY).create());
// other plants
this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(1).with(BOPPlants.REED).generationAttempts(32).create());
}
@Override

6
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java
View File

@ -53,9 +53,7 @@ public class BiomeGenPrairie extends BOPOverworldBiome
GeneratorWeighted grassGenerator = new GeneratorWeighted(10);
this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
grassGenerator.add("shortgrass", 2, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
grassGenerator.add("tallgrass", 6, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
this.addGenerator("doublegrass", GeneratorStage.GRASS,(new GeneratorDoubleFlora.Builder()).amountPerChunk(0.5F).with(BlockDoublePlant.EnumPlantType.GRASS).generationAttempts(128).create());
grassGenerator.add("tallgrass", 4, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
this.addGenerator("goldenrods", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).with(BOPFlowers.GOLDENROD).generationAttempts(64).create());
@ -68,8 +66,6 @@ public class BiomeGenPrairie extends BOPOverworldBiome
flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create()));
// other plants
//this.addGenerator("shrubs", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(BOPPlants.SHRUB).create());
this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(1).with(BOPPlants.REED).generationAttempts(32).create());
this.addGenerator("flax", GeneratorStage.FLOWERS, (new GeneratorDoubleFlora.Builder()).amountPerChunk(0.2F).with(BlockBOPDoublePlant.DoublePlantType.FLAX).generationAttempts(8).create());
}

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java
View File

@ -30,7 +30,7 @@ public class BiomeGenRainforest extends BOPOverworldBiome
{
public BiomeGenRainforest()
{
super("rainforest", new PropsBuilder("Rainforest").withGuiColour(0x14E26F).withTemperature(0.85F).withRainfall(1.5F));
super("rainforest", new PropsBuilder("Rainforest").withGuiColour(0x14E26F).withTemperature(0.85F).withRainfall(1.2F));
// terrain
this.terrainSettings.avgHeight(75).heightVariation(45, 60).sidewaysNoise(0.3D);

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java
View File

@ -52,7 +52,7 @@ public class BiomeGenSnowyConiferousForest extends BOPOverworldBiome
treeGenerator.add("mega_fir", 2, (new GeneratorTaigaTree.Builder()).log(BOPWoods.FIR).leaves(BOPTrees.FIR).minHeight(20).maxHeight(40).trunkWidth(2).create());
// other plants
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(2.0F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).create());
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).create());
// shrooms
this.addGenerator("brown_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.2F).generationAttempts(16).with(Blocks.BROWN_MUSHROOM.getDefaultState()).create());

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java
View File

@ -59,7 +59,7 @@ public class BiomeGenSnowyForest extends BOPOverworldBiome
grassGenerator.add("tallgrass", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
// other plants
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.4F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).create());
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.5F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).create());
// flowers
GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.3F);

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java
View File

@ -63,7 +63,7 @@ public class BiomeGenTemperateRainforest extends BOPOverworldBiome
treeGenerator.add("oak_tree", 1, (new GeneratorBigTree.Builder()).foliageHeight(3).minHeight(10).maxHeight(17).create());
// other plants
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.2F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).create());
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).create());
this.addGenerator("leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.2F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.LEAFPILE).generationAttempts(64).create());
this.addGenerator("double_fern", GeneratorStage.FLOWERS, (new GeneratorDoubleFlora.Builder()).amountPerChunk(7.0F).with(BlockDoublePlant.EnumPlantType.FERN).create());
this.addGenerator("cattail", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).with(BOPPlants.CATTAIL).create());

1
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java
View File

@ -68,7 +68,6 @@ public class BiomeGenTropicalRainforest extends BOPOverworldBiome
flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create()));
// other plants
//this.addGenerator("shrubs", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(BOPPlants.SHRUB).create());
this.addGenerator("leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.2F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.LEAFPILE).generationAttempts(64).create());
this.addGenerator("double_fern", GeneratorStage.FLOWERS, (new GeneratorDoubleFlora.Builder()).amountPerChunk(0.2F).with(BlockDoublePlant.EnumPlantType.FERN).create());
this.addGenerator("melons", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(0.015625F).placeOn(this.topBlock).with(Blocks.MELON_BLOCK.getDefaultState()).create());

4
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java
View File

@ -75,8 +75,8 @@ public class BiomeGenWoodland extends BOPOverworldBiome
// other plants
this.addGenerator("berry_bushes", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(BOPFoliage.BERRYBUSH).create());
this.addGenerator("leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.LEAFPILE).generationAttempts(64).create());
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(2.0F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());
this.addGenerator("leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.5F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.LEAFPILE).generationAttempts(64).create());
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.5F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());
this.addGenerator("flax", GeneratorStage.FLOWERS, (new GeneratorDoubleFlora.Builder()).amountPerChunk(0.1F).with(BlockBOPDoublePlant.DoublePlantType.FLAX).create());
// water plants

1
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java
View File

@ -22,7 +22,6 @@ public class BiomeExtExtremeHills extends ExtendedBiomeWrapper
grassGenerator.add("shortgrass", 2, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
// other plants
//this.addGenerator("shrubs", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(BOPPlants.SHRUB).create());
this.addGenerator("leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.LEAFPILE).generationAttempts(64).create());
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.3F).placeOn(BlockQueries.fertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());

2
src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java
View File

@ -110,7 +110,7 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock
return ColoringType.PLAIN;
case FLOWERING:
return ColoringType.OVERLAY;
case MAHOGANY: case PALM: case WILLOW: case EBONY: default:
case MAHOGANY: case PALM: case WILLOW: default:
return ColoringType.TINTED;
}
}

2
src/main/java/biomesoplenty/common/block/BlockBOPSapling.java
View File

@ -208,8 +208,6 @@ public class BlockBOPSapling extends BlockBOPDecoration implements IGrowable, IP
return new GeneratorBasicTree.Builder().log(BOPWoods.WILLOW).leaves(BlockBOPLeaves.paging.getVariantState(BOPTrees.WILLOW).withProperty(BlockOldLeaf.CHECK_DECAY, Boolean.valueOf(false))).minHeight(8).maxHeight(12).maxLeavesRadius(2).vine(BOPBlocks.willow_vine.getDefaultState()).leavesOffset(0).updateNeighbours(true).create();
case MAHOGANY:
return new GeneratorMahoganyTree.Builder().updateNeighbours(true).create();
case EBONY:
return new GeneratorBigTree.Builder().log(BOPWoods.EBONY).leaves(BOPTrees.EBONY).minHeight(4).maxHeight(10).foliageHeight(1).updateNeighbours(true).create();
default:
return null;
}

5
src/main/java/biomesoplenty/common/entities/item/EntityBOPBoat.java
View File

@ -225,8 +225,6 @@ public class EntityBOPBoat extends EntityBoat
return BOPItems.boat_jacaranda;
case MAHOGANY:
return BOPItems.boat_mahogany;
case EBONY:
return BOPItems.boat_ebony;
}
}
@ -1007,8 +1005,7 @@ public class EntityBOPBoat extends EntityBoat
WILLOW(BOPWoods.MAGIC.ordinal(), "willow"),
HELLBARK(BOPWoods.MAGIC.ordinal(), "hellbark"),
JACARANDA(BOPWoods.MAGIC.ordinal(), "jacaranda"),
MAHOGANY(BOPWoods.MAGIC.ordinal(), "mahogany"),
EBONY(BOPWoods.MAGIC.ordinal(), "ebony");
MAHOGANY(BOPWoods.MAGIC.ordinal(), "mahogany");
private final String name;
private final int metadata;

3
src/main/java/biomesoplenty/common/entities/item/RenderBOPBoat.java
View File

@ -27,8 +27,7 @@ public class RenderBOPBoat extends Render<EntityBOPBoat>
new ResourceLocation("biomesoplenty:textures/entity/boats/boat_ethereal.png"), new ResourceLocation("biomesoplenty:textures/entity/boats/boat_magic.png"),
new ResourceLocation("biomesoplenty:textures/entity/boats/boat_palm.png"), new ResourceLocation("biomesoplenty:textures/entity/boats/boat_redwood.png"),
new ResourceLocation("biomesoplenty:textures/entity/boats/boat_willow.png"), new ResourceLocation("biomesoplenty:textures/entity/boats/boat_hellbark.png"),
new ResourceLocation("biomesoplenty:textures/entity/boats/boat_jacaranda.png"), new ResourceLocation("biomesoplenty:textures/entity/boats/boat_mahogany.png"),
new ResourceLocation("biomesoplenty:textures/entity/boats/boat_ebony.png")};
new ResourceLocation("biomesoplenty:textures/entity/boats/boat_jacaranda.png"), new ResourceLocation("biomesoplenty:textures/entity/boats/boat_mahogany.png")};
protected ModelBase modelBOPBoat = new ModelBOPBoat();
public RenderBOPBoat(RenderManager renderManagerIn)

32
src/main/java/biomesoplenty/common/handler/VillageMaterialEventHandler.java
View File

@ -22,38 +22,6 @@ public class VillageMaterialEventHandler
@SubscribeEvent
public void getVillageBlockID(BiomeEvent.GetVillageBlockID event)
{
//Brushland
if (BOPBiomes.brushland.isPresent() && event.getBiome() == BOPBiomes.brushland.get())
{
if (event.getOriginal().getBlock() == Blocks.PLANKS)
{
event.setReplacement(BlockBOPPlanks.paging.getVariantState(BOPWoods.EBONY));
event.setResult(Result.DENY);
}
if (event.getOriginal().getBlock() == Blocks.LOG || event.getOriginal().getBlock() == Blocks.LOG2)
{
EnumAxis axis = event.getOriginal().getValue(BlockLog.LOG_AXIS);
event.setReplacement(BlockBOPLog.paging.getVariantState(BOPWoods.EBONY).withProperty(BlockLog.LOG_AXIS, axis));
event.setResult(Result.DENY);
}
if (event.getOriginal().getBlock() == Blocks.COBBLESTONE)
{
event.setReplacement(BlockBOPLog.paging.getVariantState(BOPWoods.EBONY).withProperty(BlockLog.LOG_AXIS, BlockLog.EnumAxis.Y));
event.setResult(Result.DENY);
}
if (event.getOriginal().getBlock() == Blocks.OAK_STAIRS)
{
EnumFacing facing = event.getOriginal().getValue(BlockStairs.FACING);
event.setReplacement(BOPBlocks.ebony_stairs.getDefaultState().withProperty(BlockStairs.FACING, facing));
event.setResult(Result.DENY);
}
if (event.getOriginal().getBlock() == Blocks.OAK_FENCE)
{
event.setReplacement(BOPBlocks.ebony_fence.getDefaultState());
event.setResult(Result.DENY);
}
}
//Coniferous Forest
if (BOPBiomes.coniferous_forest.isPresent() && event.getBiome() == BOPBiomes.coniferous_forest.get())
{

5
src/main/java/biomesoplenty/common/init/ModBiomes.java
View File

@ -27,6 +27,7 @@ import static biomesoplenty.api.biome.BOPBiomes.coral_reef;
import static biomesoplenty.api.biome.BOPBiomes.corrupted_sands;
import static biomesoplenty.api.biome.BOPBiomes.crag;
import static biomesoplenty.api.biome.BOPBiomes.dead_forest;
import static biomesoplenty.api.biome.BOPBiomes.dead_plains;
import static biomesoplenty.api.biome.BOPBiomes.dead_swamp;
import static biomesoplenty.api.biome.BOPBiomes.desert_extension;
import static biomesoplenty.api.biome.BOPBiomes.desert_hills_extension;
@ -143,6 +144,7 @@ import biomesoplenty.common.biome.overworld.BiomeGenConiferousForest;
import biomesoplenty.common.biome.overworld.BiomeGenCoralReef;
import biomesoplenty.common.biome.overworld.BiomeGenCrag;
import biomesoplenty.common.biome.overworld.BiomeGenDeadForest;
import biomesoplenty.common.biome.overworld.BiomeGenDeadPlains;
import biomesoplenty.common.biome.overworld.BiomeGenDeadSwamp;
import biomesoplenty.common.biome.overworld.BiomeGenFen;
import biomesoplenty.common.biome.overworld.BiomeGenFloodplains;
@ -403,6 +405,7 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
redwood_forest_edge = registerOverworldBiome(new BiomeGenRedwoodForestEdge());
cold_tundra = registerOverworldBiome(new BiomeGenColdTundra());
dead_plains = registerOverworldBiome(new BiomeGenDeadPlains());
flower_meadow = registerOverworldBiome(new BiomeGenFlowerMeadow());
highland_moor = registerOverworldBiome(new BiomeGenHighlandMoor());
mire = registerOverworldBiome(new BiomeGenMire());
@ -411,6 +414,7 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
coral_reef = registerOverworldBiome(new BiomeGenCoralReef());
kelp_forest = registerOverworldBiome(new BiomeGenKelpForest());
setSubBiome(BOPBiomes.dead_forest, BOPBiomes.dead_plains);
setSubBiome(BOPBiomes.dead_swamp, BOPBiomes.mire);
setSubBiome(BOPBiomes.highland, BOPBiomes.highland_moor);
setSubBiome(BOPBiomes.meadow, BOPBiomes.flower_meadow);
@ -523,6 +527,7 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
registerBiomeToDictionary(BOPBiomes.redwood_forest_edge, Type.FOREST, Type.DENSE);
registerBiomeToDictionary(BOPBiomes.cold_tundra, Type.SNOWY, Type.COLD, Type.WASTELAND, Type.DEAD, Type.WET, Type.SPARSE);
registerBiomeToDictionary(BOPBiomes.dead_plains, Type.PLAINS, Type.DEAD, Type.COLD, Type.DRY, Type.SPARSE);
registerBiomeToDictionary(BOPBiomes.flower_meadow, Type.PLAINS, Type.LUSH);
registerBiomeToDictionary(BOPBiomes.highland_moor, Type.HILLS, Type.WET);
registerBiomeToDictionary(BOPBiomes.mire, Type.SWAMP, Type.DEAD, Type.WASTELAND, Type.WET);

7
src/main/java/biomesoplenty/common/init/ModBlocks.java
View File

@ -114,12 +114,11 @@ public class ModBlocks
blue_fire = registerBlock( new BlockBOPBlueFire(), "blue_fire", null);
// Logs
// 16 wood types, 4 per BlockBOPLog instance, needs 4 'pages'
// 16 wood types, 4 per BlockBOPLog instance, needs 3 'pages'
BlockBOPLog.createAllPages();
log_0 = registerBlock( BlockBOPLog.paging.getBlock(0), "log_0" );
log_1 = registerBlock( BlockBOPLog.paging.getBlock(1), "log_1" );
log_2 = registerBlock( BlockBOPLog.paging.getBlock(2), "log_2" );
log_3 = registerBlock( BlockBOPLog.paging.getBlock(3), "log_3" );
//Leaves
// 22 tree types, 4 per BlockBOPLeaves instance, needs 6 'pages'
@ -142,7 +141,6 @@ public class ModBlocks
jacaranda_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.JACARANDA), "jacaranda_stairs" );
palm_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.PALM), "palm_stairs" );
willow_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.WILLOW), "willow_stairs" );
ebony_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.EBONY), "ebony_stairs" );
magic_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.MAGIC), "magic_stairs" );
umbran_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.UMBRAN), "umbran_stairs" );
hellbark_stairs = registerBlock( new BlockBOPWoodStairs(BOPWoods.HELLBARK), "hellbark_stairs" );
@ -168,7 +166,6 @@ public class ModBlocks
jacaranda_fence = registerBlock( new BlockBOPFence(BOPWoods.JACARANDA), "jacaranda_fence" );
palm_fence = registerBlock( new BlockBOPFence(BOPWoods.PALM), "palm_fence" );
willow_fence = registerBlock( new BlockBOPFence(BOPWoods.WILLOW), "willow_fence" );
ebony_fence = registerBlock( new BlockBOPFence(BOPWoods.EBONY), "ebony_fence" );
magic_fence = registerBlock( new BlockBOPFence(BOPWoods.MAGIC), "magic_fence" );
umbran_fence = registerBlock( new BlockBOPFence(BOPWoods.UMBRAN), "umbran_fence" );
hellbark_fence = registerBlock( new BlockBOPFence(BOPWoods.HELLBARK), "hellbark_fence" );
@ -182,7 +179,6 @@ public class ModBlocks
jacaranda_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.JACARANDA), "jacaranda_fence_gate" );
palm_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.PALM), "palm_fence_gate" );
willow_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.WILLOW), "willow_fence_gate" );
ebony_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.EBONY), "ebony_fence_gate" );
magic_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.MAGIC), "magic_fence_gate" );
umbran_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.UMBRAN), "umbran_fence_gate" );
hellbark_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.HELLBARK), "hellbark_fence_gate" );
@ -196,7 +192,6 @@ public class ModBlocks
jacaranda_door = registerDoor( new BlockBOPDoor(BOPWoods.JACARANDA), "jacaranda_door", BOPItems.jacaranda_door );
palm_door = registerDoor( new BlockBOPDoor(BOPWoods.PALM), "palm_door", BOPItems.palm_door );
willow_door = registerDoor( new BlockBOPDoor(BOPWoods.WILLOW), "willow_door", BOPItems.willow_door );
ebony_door = registerDoor( new BlockBOPDoor(BOPWoods.EBONY), "ebony_door", BOPItems.ebony_door );
magic_door = registerDoor( new BlockBOPDoor(BOPWoods.MAGIC), "magic_door", BOPItems.magic_door );
umbran_door = registerDoor( new BlockBOPDoor(BOPWoods.UMBRAN), "umbran_door", BOPItems.umbran_door );
hellbark_door = registerDoor( new BlockBOPDoor(BOPWoods.HELLBARK), "hellbark_door", BOPItems.hellbark_door );

1
src/main/java/biomesoplenty/common/init/ModCrafting.java
View File

@ -86,7 +86,6 @@ public class ModCrafting
bopFuel.addFuel(BOPItems.boat_hellbark, 400);
bopFuel.addFuel(BOPItems.boat_jacaranda, 400);
bopFuel.addFuel(BOPItems.boat_mahogany, 400);
bopFuel.addFuel(BOPItems.boat_ebony, 400);
bopFuel.addFuel(BOPItems.ash, 400);
}

27
src/main/java/biomesoplenty/common/init/ModItems.java
View File

@ -11,7 +11,6 @@ package biomesoplenty.common.init;
import static biomesoplenty.api.item.BOPItems.ash;
import static biomesoplenty.api.item.BOPItems.berries;
import static biomesoplenty.api.item.BOPItems.boat_cherry;
import static biomesoplenty.api.item.BOPItems.boat_ebony;
import static biomesoplenty.api.item.BOPItems.boat_ethereal;
import static biomesoplenty.api.item.BOPItems.boat_fir;
import static biomesoplenty.api.item.BOPItems.boat_hellbark;
@ -57,6 +56,18 @@ public class ModItems
public static void registerItems()
{
berries = registerItem(new ItemBOPFood(1, 0.1F, 8), "berries");
pear = registerItem(new ItemFood(5, 0.3F, false), "pear");
peach = registerItem(new ItemFood(5, 0.2F, false), "peach");
persimmon = registerItem(new ItemFood(5, 0.2F, false), "persimmon");
mudball = registerItem(new ItemMudball(), "mudball");
mud_brick = registerItem(new Item(), "mud_brick");
ash = registerItem(new Item(), "ash");
fleshchunk = registerItem(new Item(), "fleshchunk");
record_wanderer = registerItem(new ItemBOPRecord("wanderer", BOPSounds.records_wanderer), "record_wanderer");
boat_fir = registerItem(new ItemBOPBoat(EntityBOPBoat.Type.FIR), "boat_fir");
boat_redwood = registerItem(new ItemBOPBoat(EntityBOPBoat.Type.REDWOOD), "boat_redwood");
boat_cherry = registerItem(new ItemBOPBoat(EntityBOPBoat.Type.CHERRY), "boat_cherry");
@ -64,25 +75,11 @@ public class ModItems
boat_jacaranda = registerItem(new ItemBOPBoat(EntityBOPBoat.Type.JACARANDA), "boat_jacaranda");
boat_palm = registerItem(new ItemBOPBoat(EntityBOPBoat.Type.PALM), "boat_palm");
boat_willow = registerItem(new ItemBOPBoat(EntityBOPBoat.Type.WILLOW), "boat_willow");
boat_ebony = registerItem(new ItemBOPBoat(EntityBOPBoat.Type.EBONY), "boat_ebony");
boat_magic = registerItem(new ItemBOPBoat(EntityBOPBoat.Type.MAGIC), "boat_magic");
boat_umbran = registerItem(new ItemBOPBoat(EntityBOPBoat.Type.UMBRAN), "boat_umbran");
boat_hellbark = registerItem(new ItemBOPBoat(EntityBOPBoat.Type.HELLBARK), "boat_hellbark");
boat_ethereal = registerItem(new ItemBOPBoat(EntityBOPBoat.Type.ETHEREAL), "boat_ethereal");
mudball = registerItem(new ItemMudball(), "mudball");
mud_brick = registerItem(new Item(), "mud_brick");
ash = registerItem(new Item(), "ash");
fleshchunk = registerItem(new Item(), "fleshchunk");
// food
berries = registerItem(new ItemBOPFood(1, 0.1F, 8), "berries");
pear = registerItem(new ItemFood(5, 0.3F, false), "pear");
peach = registerItem(new ItemFood(5, 0.2F, false), "peach");
persimmon = registerItem(new ItemFood(5, 0.2F, false), "persimmon");
record_wanderer = registerItem(new ItemBOPRecord("wanderer", BOPSounds.records_wanderer), "record_wanderer");
bop_icon = registerItem(new Item(), "bop_icon", null);
}

1
src/main/java/biomesoplenty/common/init/ModVanillaCompat.java
View File

@ -44,6 +44,5 @@ public class ModVanillaCompat
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(BOPItems.boat_hellbark, new DispenserBehaviorBOPBoat(EntityBOPBoat.Type.HELLBARK));
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(BOPItems.boat_jacaranda, new DispenserBehaviorBOPBoat(EntityBOPBoat.Type.JACARANDA));
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(BOPItems.boat_mahogany, new DispenserBehaviorBOPBoat(EntityBOPBoat.Type.MAHOGANY));
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(BOPItems.boat_ebony, new DispenserBehaviorBOPBoat(EntityBOPBoat.Type.EBONY));
}
}

32
src/main/resources/assets/biomesoplenty/advancements/recipes/buildingBlocks/ebony_planks.json
View File

@ -1,32 +0,0 @@
{
"rewards": {
"recipes": [
"biomesoplenty:ebony_planks"
]
},
"criteria": {
"has_log": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "biomesoplenty:log_3",
"data": 6
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "biomesoplenty:ebony_planks"
}
}
},
"requirements": [
[
"has_log",
"has_the_recipe"
]
]
}

32
src/main/resources/assets/biomesoplenty/advancements/recipes/buildingBlocks/ebony_stairs.json
View File

@ -1,32 +0,0 @@
{
"rewards": {
"recipes": [
"biomesoplenty:ebony_stairs"
]
},
"criteria": {
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "biomesoplenty:ebony_stairs"
}
},
"has_planks": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "biomesoplenty:planks_0",
"data": 14
}
]
}
}
},
"requirements": [
[
"has_the_recipe",
"has_planks"
]
]
}

32
src/main/resources/assets/biomesoplenty/advancements/recipes/buildingBlocks/ebony_wooden_slab.json
View File

@ -1,32 +0,0 @@
{
"rewards": {
"recipes": [
"biomesoplenty:ebony_wooden_slab"
]
},
"criteria": {
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "biomesoplenty:ebony_wooden_slab"
}
},
"has_planks": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "biomesoplenty:planks_0",
"data": 14
}
]
}
}
},
"requirements": [
[
"has_the_recipe",
"has_planks"
]
]
}

32
src/main/resources/assets/biomesoplenty/advancements/recipes/decorations/ebony_fence.json
View File

@ -1,32 +0,0 @@
{
"rewards": {
"recipes": [
"biomesoplenty:ebony_fence"
]
},
"criteria": {
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "biomesoplenty:ebony_fence"
}
},
"has_planks": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "biomesoplenty:planks_0",
"data": 14
}
]
}
}
},
"requirements": [
[
"has_the_recipe",
"has_planks"
]
]
}

32
src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/ebony_door.json
View File

@ -1,32 +0,0 @@
{
"rewards": {
"recipes": [
"biomesoplenty:ebony_door"
]
},
"criteria": {
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "biomesoplenty:ebony_door"
}
},
"has_planks": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "biomesoplenty:planks_0",
"data": 14
}
]
}
}
},
"requirements": [
[
"has_the_recipe",
"has_planks"
]
]
}

32
src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/ebony_fence_gate.json
View File

@ -1,32 +0,0 @@
{
"rewards": {
"recipes": [
"biomesoplenty:ebony_fence_gate"
]
},
"criteria": {
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "biomesoplenty:ebony_fence_gate"
}
},
"has_planks": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "biomesoplenty:planks_0",
"data": 14
}
]
}
}
},
"requirements": [
[
"has_the_recipe",
"has_planks"
]
]
}

27
src/main/resources/assets/biomesoplenty/advancements/recipes/transportation/boat_ebony.json
View File

@ -1,27 +0,0 @@
{
"rewards": {
"recipes": [
"biomesoplenty:boat_ebony"
]
},
"criteria": {
"entered_water": {
"trigger": "minecraft:enter_block",
"conditions": {
"block": "minecraft:water"
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "biomesoplenty:boat_ebony"
}
}
},
"requirements": [
[
"entered_water",
"has_the_recipe"
]
]
}

2
src/main/resources/assets/biomesoplenty/blockstates/double_wood_slab_0.json
View File

@ -7,6 +7,6 @@
"variant=jacaranda": { "model": "biomesoplenty:jacaranda_planks" },
"variant=palm": { "model": "biomesoplenty:palm_planks" },
"variant=willow": { "model": "biomesoplenty:willow_planks" },
"variant=ebony": { "model": "biomesoplenty:ebony_planks" }
"variant=magic": { "model": "biomesoplenty:magic_planks" }
}
}

1
src/main/resources/assets/biomesoplenty/blockstates/double_wood_slab_1.json
View File

@ -1,6 +1,5 @@
{
"variants": {
"variant=magic": { "model": "biomesoplenty:magic_planks" },
"variant=umbran": { "model": "biomesoplenty:umbran_planks" },
"variant=hellbark": { "model": "biomesoplenty:hellbark_planks" },
"variant=ethereal": { "model": "biomesoplenty:ethereal_planks" }

36
src/main/resources/assets/biomesoplenty/blockstates/ebony_door_block.json
View File

@ -1,36 +0,0 @@
{
"variants": {
"facing=east,half=lower,hinge=left,open=false": { "model": "biomesoplenty:ebony_door_bottom" },
"facing=south,half=lower,hinge=left,open=false": { "model": "biomesoplenty:ebony_door_bottom", "y": 90 },
"facing=west,half=lower,hinge=left,open=false": { "model": "biomesoplenty:ebony_door_bottom", "y": 180 },
"facing=north,half=lower,hinge=left,open=false": { "model": "biomesoplenty:ebony_door_bottom", "y": 270 },
"facing=east,half=lower,hinge=right,open=false": { "model": "biomesoplenty:ebony_door_bottom_rh" },
"facing=south,half=lower,hinge=right,open=false": { "model": "biomesoplenty:ebony_door_bottom_rh", "y": 90 },
"facing=west,half=lower,hinge=right,open=false": { "model": "biomesoplenty:ebony_door_bottom_rh", "y": 180 },
"facing=north,half=lower,hinge=right,open=false": { "model": "biomesoplenty:ebony_door_bottom_rh", "y": 270 },
"facing=east,half=lower,hinge=left,open=true": { "model": "biomesoplenty:ebony_door_bottom_rh", "y": 90 },
"facing=south,half=lower,hinge=left,open=true": { "model": "biomesoplenty:ebony_door_bottom_rh", "y": 180 },
"facing=west,half=lower,hinge=left,open=true": { "model": "biomesoplenty:ebony_door_bottom_rh", "y": 270 },
"facing=north,half=lower,hinge=left,open=true": { "model": "biomesoplenty:ebony_door_bottom_rh" },
"facing=east,half=lower,hinge=right,open=true": { "model": "biomesoplenty:ebony_door_bottom", "y": 270 },
"facing=south,half=lower,hinge=right,open=true": { "model": "biomesoplenty:ebony_door_bottom" },
"facing=west,half=lower,hinge=right,open=true": { "model": "biomesoplenty:ebony_door_bottom", "y": 90 },
"facing=north,half=lower,hinge=right,open=true": { "model": "biomesoplenty:ebony_door_bottom", "y": 180 },
"facing=east,half=upper,hinge=left,open=false": { "model": "biomesoplenty:ebony_door_top" },
"facing=south,half=upper,hinge=left,open=false": { "model": "biomesoplenty:ebony_door_top", "y": 90 },
"facing=west,half=upper,hinge=left,open=false": { "model": "biomesoplenty:ebony_door_top", "y": 180 },
"facing=north,half=upper,hinge=left,open=false": { "model": "biomesoplenty:ebony_door_top", "y": 270 },
"facing=east,half=upper,hinge=right,open=false": { "model": "biomesoplenty:ebony_door_top_rh" },
"facing=south,half=upper,hinge=right,open=false": { "model": "biomesoplenty:ebony_door_top_rh", "y": 90 },
"facing=west,half=upper,hinge=right,open=false": { "model": "biomesoplenty:ebony_door_top_rh", "y": 180 },
"facing=north,half=upper,hinge=right,open=false": { "model": "biomesoplenty:ebony_door_top_rh", "y": 270 },
"facing=east,half=upper,hinge=left,open=true": { "model": "biomesoplenty:ebony_door_top_rh", "y": 90 },
"facing=south,half=upper,hinge=left,open=true": { "model": "biomesoplenty:ebony_door_top_rh", "y": 180 },
"facing=west,half=upper,hinge=left,open=true": { "model": "biomesoplenty:ebony_door_top_rh", "y": 270 },
"facing=north,half=upper,hinge=left,open=true": { "model": "biomesoplenty:ebony_door_top_rh" },
"facing=east,half=upper,hinge=right,open=true": { "model": "biomesoplenty:ebony_door_top", "y": 270 },
"facing=south,half=upper,hinge=right,open=true": { "model": "biomesoplenty:ebony_door_top" },
"facing=west,half=upper,hinge=right,open=true": { "model": "biomesoplenty:ebony_door_top", "y": 90 },
"facing=north,half=upper,hinge=right,open=true": { "model": "biomesoplenty:ebony_door_top", "y": 180 }
}
}

5
src/main/resources/assets/biomesoplenty/blockstates/ebony_double_slab.json
View File

@ -1,5 +0,0 @@
{
"variants": {
"normal": { biomesoplenty:ebony_planks" }
}
}

17
src/main/resources/assets/biomesoplenty/blockstates/ebony_fence.json
View File

@ -1,17 +0,0 @@
{
"multipart": [
{ "apply": { "model": "biomesoplenty:ebony_fence_post" }},
{ "when": { "north": "true" },
"apply": { "model": "biomesoplenty:ebony_fence_side", "uvlock": true }
},
{ "when": { "east": "true" },
"apply": { "model": "biomesoplenty:ebony_fence_side", "y": 90, "uvlock": true }
},
{ "when": { "south": "true" },
"apply": { "model": "biomesoplenty:ebony_fence_side", "y": 180, "uvlock": true }
},
{ "when": { "west": "true" },
"apply": { "model": "biomesoplenty:ebony_fence_side", "y": 270, "uvlock": true }
}
]
}

20
src/main/resources/assets/biomesoplenty/blockstates/ebony_fence_gate.json
View File

@ -1,20 +0,0 @@
{
"variants": {
"facing=south,in_wall=false,open=false": { "model": "biomesoplenty:ebony_fence_gate_closed" },
"facing=west,in_wall=false,open=false": { "model": "biomesoplenty:ebony_fence_gate_closed", "y": 90, "uvlock": true },
"facing=north,in_wall=false,open=false": { "model": "biomesoplenty:ebony_fence_gate_closed", "y": 180, "uvlock": true },
"facing=east,in_wall=false,open=false": { "model": "biomesoplenty:ebony_fence_gate_closed", "y": 270, "uvlock": true },
"facing=south,in_wall=false,open=true": { "model": "biomesoplenty:ebony_fence_gate_open" },
"facing=west,in_wall=false,open=true": { "model": "biomesoplenty:ebony_fence_gate_open", "y": 90, "uvlock": true },
"facing=north,in_wall=false,open=true": { "model": "biomesoplenty:ebony_fence_gate_open", "y": 180, "uvlock": true },
"facing=east,in_wall=false,open=true": { "model": "biomesoplenty:ebony_fence_gate_open", "y": 270, "uvlock": true },
"facing=south,in_wall=true,open=false": { "model": "biomesoplenty:ebony_wall_gate_closed" },
"facing=west,in_wall=true,open=false": { "model": "biomesoplenty:ebony_wall_gate_closed", "y": 90, "uvlock": true },
"facing=north,in_wall=true,open=false": { "model": "biomesoplenty:ebony_wall_gate_closed", "y": 180, "uvlock": true },
"facing=east,in_wall=true,open=false": { "model": "biomesoplenty:ebony_wall_gate_closed", "y": 270, "uvlock": true },
"facing=south,in_wall=true,open=true": { "model": "biomesoplenty:ebony_wall_gate_open" },
"facing=west,in_wall=true,open=true": { "model": "biomesoplenty:ebony_wall_gate_open", "y": 90, "uvlock": true },
"facing=north,in_wall=true,open=true": { "model": "biomesoplenty:ebony_wall_gate_open", "y": 180, "uvlock": true },
"facing=east,in_wall=true,open=true": { "model": "biomesoplenty:ebony_wall_gate_open", "y": 270, "uvlock": true }
}
}

6
src/main/resources/assets/biomesoplenty/blockstates/ebony_slab.json
View File

@ -1,6 +0,0 @@
{
"variants": {
"half=bottom": { "model": "biomesoplenty:half_slab_ebony" },
"half=top": { "model": "biomesoplenty:upper_slab_ebony" }
}
}

44
src/main/resources/assets/biomesoplenty/blockstates/ebony_stairs.json
View File

@ -1,44 +0,0 @@
{
"variants": {
"facing=east,half=bottom,shape=straight": { "model": "biomesoplenty:ebony_stairs" },
"facing=west,half=bottom,shape=straight": { "model": "biomesoplenty:ebony_stairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=straight": { "model": "biomesoplenty:ebony_stairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=straight": { "model": "biomesoplenty:ebony_stairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_right": { "model": "biomesoplenty:ebony_outer_stairs" },
"facing=west,half=bottom,shape=outer_right": { "model": "biomesoplenty:ebony_outer_stairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=outer_right": { "model": "biomesoplenty:ebony_outer_stairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=outer_right": { "model": "biomesoplenty:ebony_outer_stairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_left": { "model": "biomesoplenty:ebony_outer_stairs", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=outer_left": { "model": "biomesoplenty:ebony_outer_stairs", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=outer_left": { "model": "biomesoplenty:ebony_outer_stairs" },
"facing=north,half=bottom,shape=outer_left": { "model": "biomesoplenty:ebony_outer_stairs", "y": 180, "uvlock": true },
"facing=east,half=bottom,shape=inner_right": { "model": "biomesoplenty:ebony_inner_stairs" },
"facing=west,half=bottom,shape=inner_right": { "model": "biomesoplenty:ebony_inner_stairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=inner_right": { "model": "biomesoplenty:ebony_inner_stairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=inner_right": { "model": "biomesoplenty:ebony_inner_stairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=inner_left": { "model": "biomesoplenty:ebony_inner_stairs", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=inner_left": { "model": "biomesoplenty:ebony_inner_stairs", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=inner_left": { "model": "biomesoplenty:ebony_inner_stairs" },
"facing=north,half=bottom,shape=inner_left": { "model": "biomesoplenty:ebony_inner_stairs", "y": 180, "uvlock": true },
"facing=east,half=top,shape=straight": { "model": "biomesoplenty:ebony_stairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=straight": { "model": "biomesoplenty:ebony_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=straight": { "model": "biomesoplenty:ebony_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=straight": { "model": "biomesoplenty:ebony_stairs", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_right": { "model": "biomesoplenty:ebony_outer_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=outer_right": { "model": "biomesoplenty:ebony_outer_stairs", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=outer_right": { "model": "biomesoplenty:ebony_outer_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=outer_right": { "model": "biomesoplenty:ebony_outer_stairs", "x": 180, "uvlock": true },
"facing=east,half=top,shape=outer_left": { "model": "biomesoplenty:ebony_outer_stairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=outer_left": { "model": "biomesoplenty:ebony_outer_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=outer_left": { "model": "biomesoplenty:ebony_outer_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=outer_left": { "model": "biomesoplenty:ebony_outer_stairs", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=inner_right": { "model": "biomesoplenty:ebony_inner_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=inner_right": { "model": "biomesoplenty:ebony_inner_stairs", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=inner_right": { "model": "biomesoplenty:ebony_inner_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=inner_right": { "model": "biomesoplenty:ebony_inner_stairs", "x": 180, "uvlock": true },
"facing=east,half=top,shape=inner_left": { "model": "biomesoplenty:ebony_inner_stairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=inner_left": { "model": "biomesoplenty:ebony_inner_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=inner_left": { "model": "biomesoplenty:ebony_inner_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=inner_left": { "model": "biomesoplenty:ebony_inner_stairs", "x": 180, "y": 270, "uvlock": true }
}
}

4
src/main/resources/assets/biomesoplenty/blockstates/leaves_3.json
View File

@ -1,8 +1,8 @@
{
"variants": {
"variant=willow": { "model": "biomesoplenty:willow_leaves" },
"variant=ebony": { "model": "biomesoplenty:ebony_leaves" },
"variant=dead": { "model": "biomesoplenty:dead_leaves" },
"variant=magic": { "model": "biomesoplenty:magic_leaves" }
"variant=magic": { "model": "biomesoplenty:magic_leaves" },
"variant=umbran": { "model": "biomesoplenty:umbran_leaves" }
}
}

1
src/main/resources/assets/biomesoplenty/blockstates/leaves_4.json
View File

@ -1,6 +1,5 @@
{
"variants": {
"variant=umbran": { "model": "biomesoplenty:umbran_leaves" },
"variant=hellbark": { "model": "biomesoplenty:hellbark_leaves" },
"variant=ethereal": { "model": "biomesoplenty:ethereal_leaves" }
}

8
src/main/resources/assets/biomesoplenty/blockstates/log_1.json
View File

@ -12,10 +12,10 @@
"axis=z,variant=willow": { "model": "biomesoplenty:willow_log", "x": 90 },
"axis=x,variant=willow": { "model": "biomesoplenty:willow_log", "x": 90, "y": 90 },
"axis=none,variant=willow": { "model": "biomesoplenty:willow_bark" },
"axis=y,variant=ebony": { "model": "biomesoplenty:ebony_log" },
"axis=z,variant=ebony": { "model": "biomesoplenty:ebony_log", "x": 90 },
"axis=x,variant=ebony": { "model": "biomesoplenty:ebony_log", "x": 90, "y": 90 },
"axis=none,variant=ebony": { "model": "biomesoplenty:ebony_bark" }
"axis=y,variant=dead": { "model": "biomesoplenty:dead_log" },
"axis=z,variant=dead": { "model": "biomesoplenty:dead_log", "x": 90 },
"axis=x,variant=dead": { "model": "biomesoplenty:dead_log", "x": 90, "y": 90 },
"axis=none,variant=dead": { "model": "biomesoplenty:dead_bark" }
}
}

10
src/main/resources/assets/biomesoplenty/blockstates/log_2.json
View File

@ -1,9 +1,5 @@
{
"variants": {
"axis=y,variant=dead": { "model": "biomesoplenty:dead_log" },
"axis=z,variant=dead": { "model": "biomesoplenty:dead_log", "x": 90 },
"axis=x,variant=dead": { "model": "biomesoplenty:dead_log", "x": 90, "y": 90 },
"axis=none,variant=dead": { "model": "biomesoplenty:dead_bark" },
"axis=y,variant=magic": { "model": "biomesoplenty:magic_log" },
"axis=z,variant=magic": { "model": "biomesoplenty:magic_log", "x": 90 },
"axis=x,variant=magic": { "model": "biomesoplenty:magic_log", "x": 90, "y": 90 },
@ -15,7 +11,11 @@
"axis=y,variant=hellbark": { "model": "biomesoplenty:hellbark_log" },
"axis=z,variant=hellbark": { "model": "biomesoplenty:hellbark_log", "x": 90 },
"axis=x,variant=hellbark": { "model": "biomesoplenty:hellbark_log", "x": 90, "y": 90 },
"axis=none,variant=hellbark": { "model": "biomesoplenty:hellbark_bark" }
"axis=none,variant=hellbark": { "model": "biomesoplenty:hellbark_bark" },
"axis=y,variant=ethereal": { "model": "biomesoplenty:ethereal_log" },
"axis=z,variant=ethereal": { "model": "biomesoplenty:ethereal_log", "x": 90 },
"axis=x,variant=ethereal": { "model": "biomesoplenty:ethereal_log", "x": 90, "y": 90 },
"axis=none,variant=ethereal": { "model": "biomesoplenty:ethereal_bark" }
}
}

9
src/main/resources/assets/biomesoplenty/blockstates/log_3.json
View File

@ -1,9 +0,0 @@
{
"variants": {
"axis=y,variant=ethereal": { "model": "biomesoplenty:ethereal_log" },
"axis=z,variant=ethereal": { "model": "biomesoplenty:ethereal_log", "x": 90 },
"axis=x,variant=ethereal": { "model": "biomesoplenty:ethereal_log", "x": 90, "y": 90 },
"axis=none,variant=ethereal": { "model": "biomesoplenty:ethereal_bark" }
}
}

1
src/main/resources/assets/biomesoplenty/blockstates/planks_0.json
View File

@ -7,7 +7,6 @@
"variant=jacaranda": { "model": "biomesoplenty:jacaranda_planks" },
"variant=palm": { "model": "biomesoplenty:palm_planks" },
"variant=willow": { "model": "biomesoplenty:willow_planks" },
"variant=ebony": { "model": "biomesoplenty:ebony_planks" },
"variant=magic": { "model": "biomesoplenty:magic_planks" },
"variant=umbran": { "model": "biomesoplenty:umbran_planks" },
"variant=hellbark": { "model": "biomesoplenty:hellbark_planks" },

4
src/main/resources/assets/biomesoplenty/blockstates/sapling_1.json
View File

@ -5,8 +5,8 @@
"variant=jacaranda": { "model": "biomesoplenty:jacaranda_sapling" },
"variant=palm": { "model": "biomesoplenty:palm_sapling" },
"variant=willow": { "model": "biomesoplenty:willow_sapling" },
"variant=ebony": { "model": "biomesoplenty:ebony_sapling" },
"variant=dead": { "model": "biomesoplenty:dead_sapling" },
"variant=magic": { "model": "biomesoplenty:magic_sapling" }
"variant=magic": { "model": "biomesoplenty:magic_sapling" },
"variant=umbran": { "model": "biomesoplenty:umbran_sapling" }
}
}

1
src/main/resources/assets/biomesoplenty/blockstates/sapling_2.json
View File

@ -1,6 +1,5 @@
{
"variants": {
"variant=umbran": { "model": "biomesoplenty:umbran_sapling" },
"variant=hellbark": { "model": "biomesoplenty:hellbark_sapling" },
"variant=ethereal": { "model": "biomesoplenty:ethereal_sapling" }
}

4
src/main/resources/assets/biomesoplenty/blockstates/wood_slab_0.json
View File

@ -14,7 +14,7 @@
"half=top,variant=palm": { "model": "biomesoplenty:upper_slab_palm" },
"half=bottom,variant=willow": { "model": "biomesoplenty:half_slab_willow" },
"half=top,variant=willow": { "model": "biomesoplenty:upper_slab_willow" },
"half=bottom,variant=ebony": { "model": "biomesoplenty:half_slab_ebony" },
"half=top,variant=ebony": { "model": "biomesoplenty:upper_slab_ebony" }
"half=bottom,variant=magic": { "model": "biomesoplenty:half_slab_magic" },
"half=top,variant=magic": { "model": "biomesoplenty:upper_slab_magic" }
}
}

2
src/main/resources/assets/biomesoplenty/blockstates/wood_slab_1.json
View File

@ -1,7 +1,5 @@
{
"variants": {
"half=bottom,variant=magic": { "model": "biomesoplenty:half_slab_magic" },
"half=top,variant=magic": { "model": "biomesoplenty:upper_slab_magic" },
"half=bottom,variant=umbran": { "model": "biomesoplenty:half_slab_umbran" },
"half=top,variant=umbran": { "model": "biomesoplenty:upper_slab_umbran" },
"half=bottom,variant=hellbark": { "model": "biomesoplenty:half_slab_hellbark" },

18
src/main/resources/assets/biomesoplenty/lang/en_US.lang
View File

@ -47,7 +47,6 @@ potion.curse=Curse
item.ash.name=Pile of Ashes
item.berries.name=Berry
item.boat_cherry.name=Cherry Boat
item.boat_ebony.name=Ebony Boat
item.boat_ethereal.name=Ethereal Boat
item.boat_fir.name=Fir Boat
item.boat_hellbark.name=Hellbark Boat
@ -60,7 +59,6 @@ item.boat_umbran.name=Umbran Boat
item.boat_willow.name=Willow Boat
item.bop_icon.name=BOP Icon
item.cherry_door.name=Cherry Door
item.ebony_door.name=Ebony Door
item.ethereal_door.name=Ethereal Door
item.fir_door.name=Fir Door
item.fleshchunk.name=Chunk of Flesh
@ -101,10 +99,6 @@ tile.dirt.coarse_silty_dirt.name=Coarse Silty Dirt
tile.double_plant.flax.name=Flax
tile.double_plant.tall_cattail.name=Tall Cattail
tile.dried_sand.name=Dried Sand
tile.ebony_fence.name=Ebony Fence
tile.ebony_fence_gate.name=Ebony Fence Gate
tile.ebony_wood_slab.name=Ebony Wood Slab
tile.ebony_stairs.name=Ebony Wood Stairs
tile.ethereal_fence.name=Ethereal Fence
tile.ethereal_fence_gate.name=Ethereal Fence Gate
tile.ethereal_wood_slab.name=Ethereal Wood Slab
@ -176,10 +170,9 @@ tile.leaves_2.mahogany_leaves.name=Mahogany Leaves
tile.leaves_2.jacaranda_leaves.name=Jacaranda Leaves
tile.leaves_2.palm_leaves.name=Palm Leaves
tile.leaves_3.willow_leaves.name=Willow Leaves
tile.leaves_3.ebony_leaves.name=Ebony Leaves
tile.leaves_3.dead_leaves.name=Dead Leaves
tile.leaves_3.magic_leaves.name=Magic Leaves
tile.leaves_4.umbran_leaves.name=Umbran Leaves
tile.leaves_3.umbran_leaves.name=Umbran Leaves
tile.leaves_4.hellbark_leaves.name=Hellbark Leaves
tile.leaves_4.ethereal_leaves.name=Ethereal Leaves
tile.log_0.fir_log.name=Fir Wood
@ -189,12 +182,11 @@ tile.log_0.mahogany_log.name=Mahogany Wood
tile.log_1.jacaranda_log.name=Jacaranda Wood
tile.log_1.palm_log.name=Palm Wood
tile.log_1.willow_log.name=Willow Wood
tile.log_1.ebony_log.name=Ebony Wood
tile.log_2.dead_log.name=Dead Wood
tile.log_1.dead_log.name=Dead Wood
tile.log_2.magic_log.name=Magic Wood
tile.log_2.umbran_log.name=Umbran Wood
tile.log_2.hellbark_log.name=Hellbark Wood
tile.log_3.ethereal_log.name=Ethereal Wood
tile.log_2.ethereal_log.name=Ethereal Wood
tile.magic_fence.name=Magic Fence
tile.magic_fence_gate.name=Magic Fence Gate
tile.magic_wood_slab.name=Magic Wood Slab
@ -220,7 +212,6 @@ tile.planks_0.mahogany_planks.name=Mahogany Wood Planks
tile.planks_0.jacaranda_planks.name=Jacaranda Wood Planks
tile.planks_0.palm_planks.name=Palm Wood Planks
tile.planks_0.willow_planks.name=Willow Wood Planks
tile.planks_0.ebony_planks.name=Ebony Wood Planks
tile.planks_0.magic_planks.name=Magic Wood Planks
tile.planks_0.umbran_planks.name=Umbran Wood Planks
tile.planks_0.hellbark_planks.name=Hellbark Wood Planks
@ -248,10 +239,9 @@ tile.sapling_1.mahogany_sapling.name=Mahogany Sapling
tile.sapling_1.jacaranda_sapling.name=Jacaranda Sapling
tile.sapling_1.palm_sapling.name=Palm Sapling
tile.sapling_1.willow_sapling.name=Willow Sapling
tile.sapling_1.ebony_sapling.name=Ebony Sapling
tile.sapling_1.dead_sapling.name=Dead Sapling
tile.sapling_1.magic_sapling.name=Magic Sapling
tile.sapling_2.umbran_sapling.name=Umbran Sapling
tile.sapling_1.umbran_sapling.name=Umbran Sapling
tile.sapling_2.hellbark_sapling.name=Hellbark Sapling
tile.sapling_2.ethereal_sapling.name=Ethereal Sapling
tile.seaweed.kelp.name=Kelp

6
src/main/resources/assets/biomesoplenty/models/block/ebony_bark.json
View File

@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "biomesoplenty:blocks/ebony_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/ebony_door_bottom.json
View File

@ -1,7 +0,0 @@
{
"parent": "block/door_bottom",
"textures": {
"bottom": "biomesoplenty:blocks/door_ebony_lower",
"top": "biomesoplenty:blocks/door_ebony_upper"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/ebony_door_bottom_rh.json
View File

@ -1,7 +0,0 @@
{
"parent": "block/door_bottom_rh",
"textures": {
"bottom": "biomesoplenty:blocks/door_ebony_lower",
"top": "biomesoplenty:blocks/door_ebony_upper"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/ebony_door_top.json
View File

@ -1,7 +0,0 @@
{
"parent": "block/door_top",
"textures": {
"bottom": "biomesoplenty:blocks/door_ebony_lower",
"top": "biomesoplenty:blocks/door_ebony_upper"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/ebony_door_top_rh.json
View File

@ -1,7 +0,0 @@
{
"parent": "block/door_top_rh",
"textures": {
"bottom": "biomesoplenty:blocks/door_ebony_lower",
"top": "biomesoplenty:blocks/door_ebony_upper"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/ebony_fence_gate_closed.json
View File

@ -1,6 +0,0 @@
{
"parent": "block/fence_gate_closed",
"textures": {
"texture": "biomesoplenty:blocks/ebony_planks"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/ebony_fence_gate_open.json
View File

@ -1,6 +0,0 @@
{
"parent": "block/fence_gate_open",
"textures": {
"texture": "biomesoplenty:blocks/ebony_planks"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/ebony_fence_inventory.json
View File

@ -1,7 +0,0 @@
{
"parent": "block/fence_inventory",
"textures": {
"texture": "biomesoplenty:blocks/ebony_planks"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/ebony_fence_post.json
View File

@ -1,6 +0,0 @@
{
"parent": "block/fence_post",
"textures": {
"texture": "biomesoplenty:blocks/ebony_planks"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/ebony_fence_side.json
View File

@ -1,6 +0,0 @@
{
"parent": "block/fence_side",
"textures": {
"texture": "biomesoplenty:blocks/ebony_planks"
}
}

8
src/main/resources/assets/biomesoplenty/models/block/ebony_inner_stairs.json
View File

@ -1,8 +0,0 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "biomesoplenty:blocks/ebony_planks",
"top": "biomesoplenty:blocks/ebony_planks",
"side": "biomesoplenty:blocks/ebony_planks"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/ebony_leaves.json
View File

@ -1,6 +0,0 @@
{
"parent": "block/leaves",
"textures": {
"all": "biomesoplenty:blocks/leaves_ebony"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/ebony_log.json
View File

@ -1,7 +0,0 @@
{
"parent": "block/cube_column",
"textures": {
"end": "biomesoplenty:blocks/ebony_log_top",
"side": "biomesoplenty:blocks/ebony_log"
}
}

8
src/main/resources/assets/biomesoplenty/models/block/ebony_outer_stairs.json
View File

@ -1,8 +0,0 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "biomesoplenty:blocks/ebony_planks",
"top": "biomesoplenty:blocks/ebony_planks",
"side": "biomesoplenty:blocks/ebony_planks"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/ebony_planks.json
View File

@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "biomesoplenty:blocks/ebony_planks"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/ebony_sapling.json
View File

@ -1,6 +0,0 @@
{
"parent": "block/cross",
"textures": {
"cross": "biomesoplenty:blocks/sapling_ebony"
}
}

8
src/main/resources/assets/biomesoplenty/models/block/ebony_stairs.json
View File

@ -1,8 +0,0 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "biomesoplenty:blocks/ebony_planks",
"top": "biomesoplenty:blocks/ebony_planks",
"side": "biomesoplenty:blocks/ebony_planks"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/ebony_wall_gate_closed.json
View File

@ -1,6 +0,0 @@
{
"parent": "block/wall_gate_closed",
"textures": {
"texture": "biomesoplenty:blocks/ebony_planks"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/ebony_wall_gate_open.json
View File

@ -1,6 +0,0 @@
{
"parent": "block/wall_gate_open",
"textures": {
"texture": "biomesoplenty:blocks/ebony_planks"
}
}

8
src/main/resources/assets/biomesoplenty/models/block/half_slab_ebony.json
View File

@ -1,8 +0,0 @@
{
"parent": "block/half_slab",
"textures": {
"bottom": "biomesoplenty:blocks/ebony_planks",
"top": "biomesoplenty:blocks/ebony_planks",
"side": "biomesoplenty:blocks/ebony_planks"
}
}

8
src/main/resources/assets/biomesoplenty/models/block/upper_slab_ebony.json
View File

@ -1,8 +0,0 @@
{
"parent": "block/upper_slab",
"textures": {
"bottom": "biomesoplenty:blocks/ebony_planks",
"top": "biomesoplenty:blocks/ebony_planks",
"side": "biomesoplenty:blocks/ebony_planks"
}
}

6
src/main/resources/assets/biomesoplenty/models/item/boat_ebony.json
View File

@ -1,6 +0,0 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:items/boat_ebony"
}
}

6
src/main/resources/assets/biomesoplenty/models/item/ebony_door.json
View File

@ -1,6 +0,0 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:items/door_ebony"
}
}

4
src/main/resources/assets/biomesoplenty/models/item/ebony_fence.json
View File

@ -1,4 +0,0 @@
{
"parent": "biomesoplenty:block/ebony_fence_inventory"
}

15
src/main/resources/assets/biomesoplenty/models/item/ebony_fence_gate.json
View File

@ -1,15 +0,0 @@
{
"parent": "biomesoplenty:block/ebony_fence_gate_closed",
"display": {
"thirdperson": {
"rotation": [ 0, -90, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
},
"firstperson": {
"rotation": [ 0, 90, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 1, 1, 1 ]
}
}
}

10
src/main/resources/assets/biomesoplenty/models/item/ebony_leaves.json
View File

@ -1,10 +0,0 @@
{
"parent": "biomesoplenty:block/ebony_leaves",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

11
src/main/resources/assets/biomesoplenty/models/item/ebony_log.json
View File

@ -1,11 +0,0 @@
{
"parent": "biomesoplenty:block/ebony_log",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

10
src/main/resources/assets/biomesoplenty/models/item/ebony_planks.json
View File

@ -1,10 +0,0 @@
{
"parent": "biomesoplenty:block/ebony_planks",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

6
src/main/resources/assets/biomesoplenty/models/item/ebony_sapling.json
View File

@ -1,6 +0,0 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:blocks/sapling_ebony"
}
}

3
src/main/resources/assets/biomesoplenty/models/item/ebony_stairs.json
View File

@ -1,3 +0,0 @@
{
"parent": "biomesoplenty:block/ebony_stairs"
}

11
src/main/resources/assets/biomesoplenty/models/item/ebony_wood_slab.json
View File

@ -1,11 +0,0 @@
{
"parent": "biomesoplenty:block/half_slab_ebony",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

17
src/main/resources/assets/biomesoplenty/recipes/boat_ebony.json
View File

@ -1,17 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"group": "boat",
"pattern": [
"# #",
"###"
],
"key": {
"#": {
"item": "biomesoplenty:planks_0",
"data": 7
}
},
"result": {
"item": "biomesoplenty:boat_ebony"
}
}

19
src/main/resources/assets/biomesoplenty/recipes/ebony_door.json
View File

@ -1,19 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"group": "wooden_door",
"pattern": [
"##",
"##",
"##"
],
"key": {
"#": {
"item": "biomesoplenty:planks_0",
"data": 14
}
},
"result": {
"item": "biomesoplenty:ebony_door",
"count": 3
}
}

23
src/main/resources/assets/biomesoplenty/recipes/ebony_fence.json
View File

@ -1,23 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"group": "wooden_fence",
"pattern": [
"#S#",
"#S#"
],
"key": {
"#": {
"item": "biomesoplenty:planks_0",
"data": 14
},
"S": {
"item": "minecraft:stick",
"data": 32767
}
},
"result": {
"item": "biomesoplenty:ebony_fence",
"count": 3,
"data": 0
}
}

22
src/main/resources/assets/biomesoplenty/recipes/ebony_fence_gate.json
View File

@ -1,22 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"group": "wooden_fence_gate",
"pattern": [
"#P#",
"#P#"
],
"key": {
"#": {
"item": "minecraft:stick",
"data": 32767
},
"P": {
"item": "biomesoplenty:planks_0",
"data": 14
}
},
"result": {
"item": "biomesoplenty:ebony_fence_gate",
"data": 0
}
}

15
src/main/resources/assets/biomesoplenty/recipes/ebony_planks.json
View File

@ -1,15 +0,0 @@
{
"type": "minecraft:crafting_shapeless",
"group": "planks",
"ingredients": [
{
"item": "biomesoplenty:log_3",
"data": 6
}
],
"result": {
"item": "biomesoplenty:planks_0",
"count": 4,
"data": 14
}
}

20
src/main/resources/assets/biomesoplenty/recipes/ebony_stairs.json
View File

@ -1,20 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"group": "wooden_stairs",
"pattern": [
"# ",
"## ",
"###"
],
"key": {
"#": {
"item": "biomesoplenty:planks_0",
"data": 14
}
},
"result": {
"item": "biomesoplenty:ebony_stairs",
"count": 4,
"data": 0
}
}

18
src/main/resources/assets/biomesoplenty/recipes/ebony_wooden_slab.json
View File

@ -1,18 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"group": "wooden_slab",
"pattern": [
"###"
],
"key": {
"#": {
"item": "biomesoplenty:planks_0",
"data": 14
}
},
"result": {
"item": "biomesoplenty:wood_slab_1",
"count": 6,
"data": 6
}
}

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/deadleafpile.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 670 B

After

Width:  |  Height:  |  Size: 307 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/door_ebony_lower.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 431 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/door_ebony_upper.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 461 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/ebony_log.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 569 B

Some files were not shown because too many files have changed in this diff Show More