Removed flax string, shale, siltstone, limestone, ichor, and souls

This commit is contained in:
Forstride 2017-05-22 05:58:38 -04:00
parent 591d86586b
commit 1324d30ab9
35 changed files with 27 additions and 305 deletions

View file

@ -18,7 +18,6 @@ public class BOPAchievements
public static Achievement obtain_wilted_lily;
public static Achievement eat_shroom_powder;
public static Achievement obtain_thorn;
public static Achievement craft_flax_string;
public static Achievement craft_muddy_pickaxe;
public static Achievement obtain_deathbloom;
public static Achievement obtain_turnip;

View file

@ -13,7 +13,6 @@ import java.util.Random;
import javax.annotation.Nullable;
import biomesoplenty.api.block.BOPBlocks;
import biomesoplenty.common.block.BlockBOPStone.StoneType;
import biomesoplenty.common.item.ItemBOPBlock;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDirt;

View file

@ -1,123 +0,0 @@
/*******************************************************************************
* Copyright 2014-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.block;
import biomesoplenty.common.item.ItemBOPBlock;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyBool;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPStone extends Block implements IBOPBlock
{
// add properties
public static enum StoneType implements IStringSerializable
{
LIMESTONE, SILTSTONE, SHALE;
@Override
public String getName()
{
return this.name().toLowerCase();
}
@Override
public String toString()
{
return this.getName();
}
};
public static final PropertyEnum VARIANT = PropertyEnum.create("variant", StoneType.class);
public static PropertyBool POLISHED = PropertyBool.create("polished");
@Override
protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { VARIANT, POLISHED });}
// implement IBOPBlock
@Override
public Class<? extends ItemBlock> getItemClass() { return ItemBOPBlock.class; }
@Override
public IProperty[] getPresetProperties() { return new IProperty[] {VARIANT, POLISHED}; }
@Override
public IProperty[] getNonRenderingProperties() { return null; }
@Override
public String getStateName(IBlockState state)
{
return (Boolean.TRUE.equals(state.getValue(POLISHED)) ? "polished_" : "") + ((StoneType) state.getValue(VARIANT)).getName();
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPStone()
{
super(Material.ROCK);
// set some defaults
this.setSoundType(SoundType.STONE);
this.setHarvestLevel("pickaxe", 1, this.getDefaultState().withProperty(VARIANT, StoneType.LIMESTONE));
this.setHarvestLevel("pickaxe", 2, this.getDefaultState().withProperty(VARIANT, StoneType.SILTSTONE));
this.setHarvestLevel("pickaxe", 3, this.getDefaultState().withProperty(VARIANT, StoneType.SHALE));
this.setDefaultState( this.blockState.getBaseState().withProperty(VARIANT, StoneType.LIMESTONE).withProperty(POLISHED, Boolean.valueOf(false)) );
}
// TODO: can we get rid of these and just use a single hardness / resistance value?
// These don't work completely as expected - sometimes the block at pos is not this (when destroyed it becomes air for example)
@Override
public float getBlockHardness(IBlockState state, World world, BlockPos pos)
{
return (state.getBlock() == this && (Boolean)state.getValue(POLISHED)) ? 1.5F : 3.0F;
}
@Override
public float getExplosionResistance(World world, BlockPos pos, Entity exploder, Explosion explosion)
{
IBlockState state = world.getBlockState(pos);
return (state.getBlock() == this && (Boolean)state.getValue(POLISHED)) ? 7.0F : 5.0F;
}
// map from state to meta and vice verca - use highest bit for polished boolean, use low 2 bits for variant
@Override
public IBlockState getStateFromMeta(int meta)
{
boolean polished = (meta & 8) > 0;
int type = meta & 3;
return this.getDefaultState().withProperty(VARIANT, StoneType.values()[type]).withProperty(POLISHED, Boolean.valueOf(polished));
}
@Override
public int getMetaFromState(IBlockState state)
{
int type = ((StoneType) state.getValue(VARIANT)).ordinal();
boolean polished = (Boolean) state.getValue(POLISHED);
return type + (polished ? 8 : 0);
}
@Override
public int damageDropped(IBlockState state)
{
return this.getMetaFromState(state);
}
}

View file

@ -200,12 +200,6 @@ public class AchievementEventHandler
player.addStat(BOPAchievements.craft_ambrosia);
}
//Flaxen Fun Achievement
if (item == BOPItems.flax_string)
{
player.addStat(BOPAchievements.craft_flax_string);
}
//Getting a Downgrade Achievement
if (item == BOPItems.mud_pickaxe)
{

View file

@ -8,7 +8,6 @@
package biomesoplenty.common.init;
import static biomesoplenty.api.achievement.BOPAchievements.craft_ambrosia;
import static biomesoplenty.api.achievement.BOPAchievements.craft_flax_string;
import static biomesoplenty.api.achievement.BOPAchievements.craft_muddy_pickaxe;
import static biomesoplenty.api.achievement.BOPAchievements.craft_terrestrial_artifact;
import static biomesoplenty.api.achievement.BOPAchievements.eat_shroom_powder;
@ -61,7 +60,6 @@ public class ModAchievements
craft_muddy_pickaxe = addAchievement("achievement.craft_muddy_pickaxe", "craft_muddy_pickaxe", -1, -4, new ItemStack(BOPItems.mud_pickaxe), obtain_flowers);
obtain_turnip = addAchievement("achievement.obtain_turnip", "obtain_turnip", -1, -6, new ItemStack(BOPItems.turnip), craft_muddy_pickaxe);
grow_sacred_oak = addAchievement("achievement.grow_sacred_oak", "grow_sacred_oak", -5, -6, BlockBOPSapling.paging.getVariantItem(BOPTrees.SACRED_OAK), obtain_turnip).setSpecial();
craft_flax_string = addAchievement("achievement.craft_flax_string", "craft_flax_string", -4, -4, new ItemStack(BOPItems.flax_string), craft_muddy_pickaxe);
//craft_dart_blower = addAchievement("achievement.craft_dart_blower", "craft_dart_blower", -6, -3, new ItemStack(BOPItems.dart_blower), craft_flax_string);
//craft_amethyst_sword = addAchievement("achievement.craft_amethyst_sword", "craft_amethyst_sword", -7, 0, new ItemStack(BOPItems.amethyst_sword), craft_flax_string).setSpecial();

View file

@ -49,7 +49,6 @@ import biomesoplenty.common.block.BlockBOPPlanks;
import biomesoplenty.common.block.BlockBOPPlant;
import biomesoplenty.common.block.BlockBOPSapling;
import biomesoplenty.common.block.BlockBOPSeaweed;
import biomesoplenty.common.block.BlockBOPStone;
import biomesoplenty.common.block.BlockBOPStoneFormations;
import biomesoplenty.common.block.BlockBOPStoneStairs;
import biomesoplenty.common.block.BlockBOPTerrarium;
@ -108,7 +107,6 @@ public class ModBlocks
farmland_0 = registerBlock( BlockBOPFarmland.paging.getBlock(0), "farmland_0", null);
farmland_1 = registerBlock( BlockBOPFarmland.paging.getBlock(1), "farmland_1", null);
stone = registerBlock( new BlockBOPStone(), "stone" );
dried_sand = registerBlock( (new BlockBOPGeneric()).addSupportedPlantType(EnumPlantType.Desert), "dried_sand"); dried_sand.setHarvestLevel("pickaxe",0);
hard_ice = registerBlock( (new BlockBOPGeneric(Material.PACKED_ICE, SoundType.STONE)).setHardness(0.75F), "hard_ice" );
ash_block = registerBlock( new BlockBOPAsh(), "ash_block" );

View file

@ -162,12 +162,6 @@ public class ModCrafting
/*** Misc Others ***/
// Flax
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.flax_string), "FFF", "FFF", "FFF", 'F', ((BlockBOPDoublePlant)BOPBlocks.double_plant).getVariantItem(BlockBOPDoublePlant.DoublePlantType.FLAX));
// Flax String
GameRegistry.addShapedRecipe(new ItemStack(Items.STRING), "S", "S", "S", 'S', new ItemStack(BOPItems.flax_string));
// Overgrown Netherrack
GameRegistry.addShapedRecipe(new ItemStack(BOPBlocks.grass, 1, BlockBOPGrass.BOPGrassType.OVERGROWN_NETHERRACK.ordinal()), "SSS", "SNS", "SSS", 'S', Items.WHEAT_SEEDS, 'N', Blocks.NETHERRACK);

View file

@ -158,7 +158,6 @@ public class ModItems
earth = registerItem(new Item(), "earth");
earth.setCreativeTab(null);
flax_string = registerItem(new Item(), "flax_string");
mudball = registerItem(new ItemMudball(), "mudball");
mud_brick = registerItem(new Item(), "mud_brick");
ash = registerItem(new Item(), "ash");
@ -169,9 +168,7 @@ public class ModItems
crystal_shard = registerItem(new Item(), "crystal_shard");
biome_essence = registerItem(new ItemBiomeEssence(), "biome_essence");
pixie_dust = registerItem(new Item(), "pixie_dust");
ichor = registerItem(new Item(), "ichor");
soul = registerItem(new Item(), "soul");
soul.setMaxStackSize(1);
// TODO: move dyes to their own class?
blue_dye = registerItem(new Item(), "blue_dye");
brown_dye = registerItem(new Item(), "brown_dye");
@ -203,10 +200,11 @@ public class ModItems
wading_boots = registerItem(new ItemWadingBoots(wading_boots_material, 0), "wading_boots");
flippers = registerItem(new ItemFlippers(flippers_material, 0), "flippers");
dull_flower_band = registerItem(new ItemFlowerBand(dull_flower_band_material, 0), "dull_flower_band");
plain_flower_band = registerItem(new ItemFlowerBand(plain_flower_band_material, 0), "plain_flower_band");
lush_flower_band = registerItem(new ItemFlowerBand(lush_flower_band_material, 0), "lush_flower_band");
exotic_flower_band = registerItem(new ItemFlowerBand(exotic_flower_band_material, 0), "exotic_flower_band");
dull_flower_band = registerItem(new ItemFlowerBand(dull_flower_band_material, 0), "dull_flower_band");
mud_helmet = registerItem(new ItemArmor(mud_armor_material, 0, EntityEquipmentSlot.HEAD), "mud_helmet");
mud_chestplate = registerItem(new ItemArmor(mud_armor_material, 0, EntityEquipmentSlot.CHEST), "mud_chestplate");

View file

@ -1,10 +0,0 @@
{
"variants": {
"polished=false,variant=limestone": { "model": "biomesoplenty:limestone" },
"polished=true,variant=limestone": { "model": "biomesoplenty:polished_limestone" },
"polished=false,variant=siltstone": { "model": "biomesoplenty:siltstone" },
"polished=true,variant=siltstone": { "model": "biomesoplenty:polished_siltstone" },
"polished=false,variant=shale": { "model": "biomesoplenty:shale" },
"polished=true,variant=shale": { "model": "biomesoplenty:polished_shale" }
}
}

View file

@ -12,8 +12,6 @@ achievement.obtain_turnip=Stalk Market
achievement.obtain_turnip.desc=Harvest a turnip
achievement.grow_sacred_oak=Yggdrasil
achievement.grow_sacred_oak.desc=Plant a sacred oak sapling
achievement.craft_flax_string=Flaxen Fun
achievement.craft_flax_string.desc=Craft flax plants into flax string
achievement.craft_muddy_pickaxe=Getting a Downgrade
achievement.craft_muddy_pickaxe.desc=Build a...muddy pickaxe...?
achievement.obtain_thorn=Rather Thorny
@ -92,7 +90,6 @@ item.brown_dye.name=Brown Dye
item.cherry_door.name=Cherry Door
item.crystal_shard.name=Celestial Crystal Shard
item.terrestrial_artifact.name=Terrestrial Artifact
item.flax_string.name=Flax String
item.diamond_scythe.name=Diamond Scythe
item.dull_flower_band.name=Dull Flower Band
item.ebony_door.name=Ebony Door
@ -117,7 +114,6 @@ item.green_dye.name=Green Dye
item.gold_scythe.name=Golden Scythe
item.hellbark_door.name=Hellbark Door
item.honeycomb.name=Empty Honeycomb
item.ichor.name=Ichor
item.iron_scythe.name=Iron Scythe
item.jacaranda_door.name=Jacaranda Door
item.jar_empty.name=Empty Jar
@ -159,7 +155,6 @@ item.saladfruit.name=Fruit Salad
item.saladveggie.name=Veggie Salad
item.saladshroom.name=Shroom Salad
item.shroompowder.name=Shroom Powder
item.soul.name=Soul
item.spawn_egg_pixie.name=Spawn Pixie
item.spawn_egg_wasp.name=Spawn Wasp
item.spawn_egg_snail.name=Spawn Snail
@ -432,12 +427,6 @@ tile.sapling_2.mahogany_sapling.name=Mahogany Sapling
tile.sapling_2.ebony_sapling.name=Ebony Sapling
tile.sapling_2.eucalyptus_sapling.name=Eucalyptus Sapling
tile.seaweed.kelp.name=Kelp
tile.stone.limestone.name=Limestone
tile.stone.polished_limestone.name=Polished Limestone
tile.stone.siltstone.name=Siltstone
tile.stone.polished_siltstone.name=Polished Siltstone
tile.stone.shale.name=Shale
tile.stone.polished_shale.name=Polished Shale
tile.stone_formations.stone_formation.name=Rock Formation
tile.terrarium.terrarium_fern.name=Fern Terrarium
tile.terrarium.terrarium_mushroom.name=Mushroom Terrarium

View file

@ -11,8 +11,8 @@
"elements": [
{
"name": "Top 1",
"from": [ 0.0, 8.0, 0.0 ],
"to": [ 16.0, 8.0, 16.0 ],
"from": [ 0.0, 5.0, 0.0 ],
"to": [ 16.0, 5.0, 16.0 ],
"faces": {
"up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "tintindex": 0 },
"down": { "texture": "#0", "uv": [ 0.0, 16.0, 16.0, 0.0 ], "tintindex": 0 }
@ -20,8 +20,8 @@
},
{
"name": "Top 2",
"from": [ 0.0, 6.0, 0.0 ],
"to": [ 16.0, 6.0, 16.0 ],
"from": [ 0.0, 4.0, 0.0 ],
"to": [ 16.0, 4.0, 16.0 ],
"faces": {
"up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "tintindex": 0 },
"down": { "texture": "#1", "uv": [ 0.0, 16.0, 16.0, 0.0 ], "tintindex": 0 }
@ -29,8 +29,8 @@
},
{
"name": "Top 3",
"from": [ 0.0, 4.0, 0.0 ],
"to": [ 16.0, 4.0, 16.0 ],
"from": [ 0.0, 3.0, 0.0 ],
"to": [ 16.0, 3.0, 16.0 ],
"faces": {
"up": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "tintindex": 0 },
"down": { "texture": "#2", "uv": [ 0.0, 16.0, 16.0, 0.0 ], "tintindex": 0 }
@ -48,31 +48,19 @@
{
"name": "Stem 1",
"from": [ 4.0, 0.0, 4.0 ],
"to": [ 5.0, 8.0, 5.0 ],
"to": [ 5.0, 5.0, 5.0 ],
"shade": false,
"faces": {
"north": { "texture": "#4", "uv": [ 7.0, 8.0, 8.0, 16.0 ], "tintindex": 0 },
"east": { "texture": "#4", "uv": [ 7.0, 8.0, 8.0, 16.0 ], "tintindex": 0 },
"south": { "texture": "#4", "uv": [ 7.0, 8.0, 8.0, 16.0 ], "tintindex": 0 },
"west": { "texture": "#4", "uv": [ 7.0, 8.0, 8.0, 16.0 ], "tintindex": 0 }
"north": { "texture": "#4", "uv": [ 7.0, 11.0, 8.0, 16.0 ], "tintindex": 0 },
"east": { "texture": "#4", "uv": [ 7.0, 11.0, 8.0, 16.0 ], "tintindex": 0 },
"south": { "texture": "#4", "uv": [ 7.0, 11.0, 8.0, 16.0 ], "tintindex": 0 },
"west": { "texture": "#4", "uv": [ 7.0, 11.0, 8.0, 16.0 ], "tintindex": 0 }
}
},
{
"name": "Stem 2",
"from": [ 12.0, 0.0, 3.0 ],
"to": [ 13.0, 6.0, 4.0 ],
"shade": false,
"faces": {
"north": { "texture": "#4", "uv": [ 7.0, 10.0, 8.0, 16.0 ], "tintindex": 0 },
"east": { "texture": "#4", "uv": [ 7.0, 10.0, 8.0, 16.0 ], "tintindex": 0 },
"south": { "texture": "#4", "uv": [ 7.0, 10.0, 8.0, 16.0 ], "tintindex": 0 },
"west": { "texture": "#4", "uv": [ 7.0, 10.0, 8.0, 16.0 ], "tintindex": 0 }
}
},
{
"name": "Stem 3",
"from": [ 3.0, 0.0, 12.0 ],
"to": [ 4.0, 4.0, 13.0 ],
"to": [ 13.0, 4.0, 4.0 ],
"shade": false,
"faces": {
"north": { "texture": "#4", "uv": [ 7.0, 12.0, 8.0, 16.0 ], "tintindex": 0 },
@ -81,6 +69,18 @@
"west": { "texture": "#4", "uv": [ 7.0, 12.0, 8.0, 16.0 ], "tintindex": 0 }
}
},
{
"name": "Stem 3",
"from": [ 3.0, 0.0, 12.0 ],
"to": [ 4.0, 3.0, 13.0 ],
"shade": false,
"faces": {
"north": { "texture": "#4", "uv": [ 7.0, 13.0, 8.0, 16.0 ], "tintindex": 0 },
"east": { "texture": "#4", "uv": [ 7.0, 13.0, 8.0, 16.0 ], "tintindex": 0 },
"south": { "texture": "#4", "uv": [ 7.0, 13.0, 8.0, 16.0 ], "tintindex": 0 },
"west": { "texture": "#4", "uv": [ 7.0, 13.0, 8.0, 16.0 ], "tintindex": 0 }
}
},
{
"name": "Stem 4",
"from": [ 11.0, 0.0, 11.0 ],

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 660 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 416 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 820 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 871 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 299 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 317 B