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

Removed amethyst tools and armor. Tweaked Bayou grass/foliage color

Browse source
This commit is contained in:
Forstride 2016-08-03 13:35:08 -04:00
parent 767ba3a69f
commit b82dbfbc85
32 changed files with 4 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/biomesoplenty/api/achievement/BOPAchievements.java
View file

@ -21,7 +21,6 @@ public class BOPAchievements
public static Achievement craft_poison_jar;
public static Achievement craft_flax_string;
public static Achievement craft_muddy_pickaxe;
public static Achievement craft_amethyst_sword;
public static Achievement obtain_deathbloom;
public static Achievement obtain_turnip;
public static Achievement grow_sacred_oak;

10
src/main/java/biomesoplenty/api/item/BOPItems.java
View file

@ -79,21 +79,12 @@ public class BOPItems
public static Item mud_chestplate;
public static Item mud_leggings;
public static Item mud_boots;
public static Item amethyst_helmet;
public static Item amethyst_chestplate;
public static Item amethyst_leggings;
public static Item amethyst_boots;
public static Item mud_axe;
public static Item mud_hoe;
public static Item mud_pickaxe;
public static Item mud_shovel;
public static Item mud_sword;
public static Item amethyst_axe;
public static Item amethyst_hoe;
public static Item amethyst_pickaxe;
public static Item amethyst_shovel;
public static Item amethyst_sword;
public static Item mud_scythe;
public static Item wood_scythe;
@ -101,7 +92,6 @@ public class BOPItems
public static Item iron_scythe;
public static Item gold_scythe;
public static Item diamond_scythe;
public static Item amethyst_scythe;
public static Item biome_finder;
public static Item biome_essence;

2
src/main/java/biomesoplenty/api/item/BOPMaterials.java
View file

@ -21,7 +21,5 @@ public class BOPMaterials
public static ArmorMaterial dull_flower_band_material;
public static ArmorMaterial mud_armor_material;
public static ArmorMaterial amethyst_armor_material;
public static ToolMaterial mud_tool_material;
public static ToolMaterial amethyst_tool_material;
}

6
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java
View file

@ -46,7 +46,7 @@ public class BiomeGenBayou extends BOPBiome
public BiomeGenBayou()
{
super("bayou", new PropsBuilder("Bayou").withGuiColour(0x8BAF6B).withTemperature(0.85F).withRainfall(0.9F).withWaterColor(0xFFD932));
super("bayou", new PropsBuilder("Bayou").withGuiColour(0x7DAD51).withTemperature(0.85F).withRainfall(0.9F).withWaterColor(0xFFD932));
// terrain
this.terrainSettings.avgHeight(62).heightVariation(6, 3).octaves(1, 1, 1, 1, 0, 0).sidewaysNoise(0.0F);
@ -141,13 +141,13 @@ public class BiomeGenBayou extends BOPBiome
@Override
public int getGrassColorAtPos(BlockPos pos)
{
return 0x8BAF6B;
return 0x7DAD51;
}
@Override
public int getFoliageColorAtPos(BlockPos pos)
{
return 0xB0E088;
return 0x9DDD66;
}
// TODO: These 2 are copied from 1.7 - but are they used ever?

6
src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java
View file

@ -213,12 +213,6 @@ public class AchievementEventHandler
player.addStat(BOPAchievements.craft_flax_string);
}
//True Swordsman Achievement
if (item != null && item == BOPItems.amethyst_sword)
{
player.addStat(BOPAchievements.craft_amethyst_sword);
}
//Getting a Downgrade Achievement
if (item != null && item == BOPItems.mud_pickaxe)
{

3
src/main/java/biomesoplenty/common/init/ModAchievements.java
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_amethyst_sword;
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_poison_jar;
@ -65,7 +64,7 @@ public class ModAchievements
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();
//craft_amethyst_sword = addAchievement("achievement.craft_amethyst_sword", "craft_amethyst_sword", -7, 0, new ItemStack(BOPItems.amethyst_sword), craft_flax_string).setSpecial();
obtain_thorn = addAchievement("achievement.obtain_thorn", "obtain_thorn", -3, -1, BlockBOPPlant.paging.getVariantItem(BOPPlants.THORN), obtain_flowers);
craft_poison_jar = addAchievement("achievement.craft_poison_jar", "craft_poison_jar", -3, 1, new ItemStack(BOPItems.jar_filled, 1, ItemJarFilled.JarContents.POISON.ordinal()), obtain_thorn);

13
src/main/java/biomesoplenty/common/init/ModCrafting.java
View file

@ -168,19 +168,6 @@ public class ModCrafting
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItems.mud_scythe), new Object [] {" MM", "M S", " S", 'M', BOPItems.mudball, 'S', "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItems.mud_scythe), new Object [] {"MM ", "S M", "S ", 'M', BOPItems.mudball, 'S', "stickWood" }));
// Amethyst Tools and Armor
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.amethyst_pickaxe), new Object [] {"###", " X ", " X ", '#', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal()), 'X', Items.IRON_INGOT});
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.amethyst_shovel), new Object [] {"#", "X", "X", '#', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal()), 'X', Items.IRON_INGOT});
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.amethyst_sword), new Object [] {"#", "#", "X", '#', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal()), 'X', Items.IRON_INGOT});
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.amethyst_axe), new Object [] {"##", "#X", " X", '#', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal()), 'X', Items.IRON_INGOT});
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.amethyst_hoe), new Object [] {"##", " X", " X", '#', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal()), 'X', Items.IRON_INGOT});
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.amethyst_helmet), new Object [] {"###", "# #", '#', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal())});
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.amethyst_chestplate), new Object [] {"# #", "###", "###", '#', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal())});
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.amethyst_leggings), new Object [] {"###", "# #", "# #", '#', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal())});
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.amethyst_boots), new Object [] {"# #", "# #", '#', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal())});
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItems.amethyst_scythe), new Object [] {" MM", "M S", " S", 'M', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal()), 'S', Items.IRON_INGOT}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItems.amethyst_scythe), new Object [] {"MM ", "S M", "S ", 'M', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal()), 'S', Items.IRON_INGOT}));
// Flower Bands
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.dull_flower_band), new Object [] {"CCC", "C C", "CCC", 'C', BlockBOPFlower.paging.getVariantItem(BOPFlowers.CLOVER)});
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.plain_flower_band), new Object [] {"CDC", "D D", "CDC", 'C', BlockBOPFlower.paging.getVariantItem(BOPFlowers.CLOVER), 'D', BlockBOPFlower.paging.getVariantItem(BOPFlowers.ORANGE_COSMOS)});

26
src/main/java/biomesoplenty/common/init/ModItems.java
View file

@ -9,16 +9,6 @@
package biomesoplenty.common.init;
import static biomesoplenty.api.item.BOPItems.ambrosia;
import static biomesoplenty.api.item.BOPItems.amethyst_axe;
import static biomesoplenty.api.item.BOPItems.amethyst_boots;
import static biomesoplenty.api.item.BOPItems.amethyst_chestplate;
import static biomesoplenty.api.item.BOPItems.amethyst_helmet;
import static biomesoplenty.api.item.BOPItems.amethyst_hoe;
import static biomesoplenty.api.item.BOPItems.amethyst_leggings;
import static biomesoplenty.api.item.BOPItems.amethyst_pickaxe;
import static biomesoplenty.api.item.BOPItems.amethyst_scythe;
import static biomesoplenty.api.item.BOPItems.amethyst_shovel;
import static biomesoplenty.api.item.BOPItems.amethyst_sword;
import static biomesoplenty.api.item.BOPItems.ash;
import static biomesoplenty.api.item.BOPItems.berries;
import static biomesoplenty.api.item.BOPItems.biome_essence;
@ -80,8 +70,6 @@ import static biomesoplenty.api.item.BOPItems.turnip_seeds;
import static biomesoplenty.api.item.BOPItems.wading_boots;
import static biomesoplenty.api.item.BOPItems.white_dye;
import static biomesoplenty.api.item.BOPItems.wood_scythe;
import static biomesoplenty.api.item.BOPMaterials.amethyst_armor_material;
import static biomesoplenty.api.item.BOPMaterials.amethyst_tool_material;
import static biomesoplenty.api.item.BOPMaterials.dull_flower_band_material;
import static biomesoplenty.api.item.BOPMaterials.exotic_flower_band_material;
import static biomesoplenty.api.item.BOPMaterials.flippers_material;
@ -212,7 +200,6 @@ public class ModItems
mud_armor_material = addArmorMaterial("MUD", "biomesoplenty:mud_armor", 2, new int[]{1,1,1,1}, 5, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 0.0F);
mud_armor_material.customCraftingMaterial = mudball;
amethyst_armor_material = addArmorMaterial("AMETHYST", "biomesoplenty:amethyst_armor", 40, new int[]{3,8,8,3}, 20, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 2.0F);
wading_boots = registerItem(new ItemWadingBoots(wading_boots_material, 0), "wading_boots");
flippers = registerItem(new ItemFlippers(flippers_material, 0), "flippers");
@ -225,10 +212,6 @@ public class ModItems
mud_chestplate = registerItem(new ItemArmor(mud_armor_material, 0, EntityEquipmentSlot.CHEST), "mud_chestplate");
mud_leggings = registerItem(new ItemArmor(mud_armor_material, 0, EntityEquipmentSlot.LEGS), "mud_leggings");
mud_boots = registerItem(new ItemArmor(mud_armor_material, 0, EntityEquipmentSlot.FEET), "mud_boots");
amethyst_helmet = registerItem(new ItemArmor(amethyst_armor_material, 0, EntityEquipmentSlot.HEAD), "amethyst_helmet");
amethyst_chestplate = registerItem(new ItemArmor(amethyst_armor_material, 0, EntityEquipmentSlot.CHEST), "amethyst_chestplate");
amethyst_leggings = registerItem(new ItemArmor(amethyst_armor_material, 0, EntityEquipmentSlot.LEGS), "amethyst_leggings");
amethyst_boots = registerItem(new ItemArmor(amethyst_armor_material, 0, EntityEquipmentSlot.FEET), "amethyst_boots");
// tools
@ -242,24 +225,16 @@ public class ModItems
// GOLD(0, 32, 12.0F, 0.0F, 22);
mud_tool_material = EnumHelper.addToolMaterial("MUD", 0, 32, 0.5F, 0.0F, 1);
mud_tool_material.setRepairItem(new ItemStack(mudball));
amethyst_tool_material = EnumHelper.addToolMaterial("AMETHYST", 4, 2013, 15.0F, 5.0F, 16);
// no repair item for amethyst tool - they can't be repaired
setAxeDamageAndSpeed(mud_tool_material, 3.0F, -3.3F);
setAxeDamageAndSpeed(amethyst_tool_material, 8.0F, -2.8F);
// ItemAxe and ItemPickaxe have protected constructors - use reflection to construct
mud_axe = registerItem(BOPReflectionHelper.construct(ItemAxe.class, mud_tool_material), "mud_axe");
mud_pickaxe = registerItem(BOPReflectionHelper.construct(ItemPickaxe.class, mud_tool_material), "mud_pickaxe");
amethyst_axe = registerItem(BOPReflectionHelper.construct(ItemAxe.class, amethyst_tool_material), "amethyst_axe");
amethyst_pickaxe = registerItem(BOPReflectionHelper.construct(ItemPickaxe.class, amethyst_tool_material), "amethyst_pickaxe");
// the other tools have public constructors, so we create instances in the normal way
mud_hoe = registerItem(new ItemHoe(mud_tool_material), "mud_hoe");
mud_shovel = registerItem(new ItemSpade(mud_tool_material), "mud_shovel");
mud_sword = registerItem(new ItemSword(mud_tool_material), "mud_sword");
amethyst_hoe = registerItem(new ItemHoe(amethyst_tool_material), "amethyst_hoe");
amethyst_shovel = registerItem(new ItemSpade(amethyst_tool_material), "amethyst_shovel");
amethyst_sword = registerItem(new ItemSword(amethyst_tool_material), "amethyst_sword");
mud_scythe = registerItem(new ItemBOPScythe(mud_tool_material), "mud_scythe");
wood_scythe = registerItem(new ItemBOPScythe(ToolMaterial.WOOD), "wood_scythe");
@ -267,7 +242,6 @@ public class ModItems
iron_scythe = registerItem(new ItemBOPScythe(ToolMaterial.IRON), "iron_scythe");
gold_scythe = registerItem(new ItemBOPScythe(ToolMaterial.GOLD), "gold_scythe");
diamond_scythe = registerItem(new ItemBOPScythe(ToolMaterial.DIAMOND), "diamond_scythe");
amethyst_scythe = registerItem(new ItemBOPScythe(amethyst_tool_material), "amethyst_scythe");
jar_empty = registerItem(new ItemJarEmpty(), "jar_empty");
jar_filled = registerItem(new ItemJarFilled(), "jar_filled");

5
src/main/java/biomesoplenty/common/item/ItemBOPScythe.java
View file

@ -88,11 +88,6 @@ public class ItemBOPScythe extends Item
radius = 5;
height = 5;
}
else if (toolMaterial == BOPMaterials.amethyst_tool_material)
{
radius = 6;
height = 6;
}
// automatically damage the item once - for the block originally destroyed
stack.damageItem(1, entityLiving);

12
src/main/resources/assets/biomesoplenty/lang/en_US.lang
View file

@ -16,8 +16,6 @@ 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.craft_amethyst_sword=True Swordsman
achievement.craft_amethyst_sword.desc=Upgrade to an amethyst sword
achievement.obtain_thorn=Rather Thorny
achievement.obtain_thorn.desc=Collect a prickly thorn!
achievement.craft_poison_jar=Pick Your Poison
@ -78,16 +76,6 @@ generator.BIOMESOP.info=Notice: Biomes O' Plenty 1.8 is in a very early state
itemGroup.tabBiomesOPlenty=Biomes O' Plenty
item.ambrosia.name=Ambrosia
item.amethyst_axe.name=Amethyst Axe
item.amethyst_boots.name=Amethyst Boots
item.amethyst_chestplate.name=Amethyst Chestplate
item.amethyst_helmet.name=Amethyst Helmet
item.amethyst_hoe.name=Amethyst Hoe
item.amethyst_leggings.name=Amethyst Leggings
item.amethyst_pickaxe.name=Amethyst Pickaxe
item.amethyst_scythe.name=Amethyst Scythe
item.amethyst_shovel.name=Amethyst Shovel
item.amethyst_sword.name=Amethyst Sword
item.ash.name=Pile of Ashes
item.berries.name=Berry
item.biome_essence.name=Biome Essence

6
src/main/resources/assets/biomesoplenty/models/item/amethyst_axe.json
View file

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

6
src/main/resources/assets/biomesoplenty/models/item/amethyst_boots.json
View file

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

6
src/main/resources/assets/biomesoplenty/models/item/amethyst_chestplate.json
View file

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

6
src/main/resources/assets/biomesoplenty/models/item/amethyst_helmet.json
View file

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

6
src/main/resources/assets/biomesoplenty/models/item/amethyst_hoe.json
View file

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

6
src/main/resources/assets/biomesoplenty/models/item/amethyst_leggings.json
View file

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

6
src/main/resources/assets/biomesoplenty/models/item/amethyst_pickaxe.json
View file

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

6
src/main/resources/assets/biomesoplenty/models/item/amethyst_scythe.json
View file

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

6
src/main/resources/assets/biomesoplenty/models/item/amethyst_shovel.json
View file

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

6
src/main/resources/assets/biomesoplenty/models/item/amethyst_sword.json
View file

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

BIN
src/main/resources/assets/biomesoplenty/textures/items/amethyst_axe.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 288 B

BIN
src/main/resources/assets/biomesoplenty/textures/items/amethyst_boots.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 256 B

BIN
src/main/resources/assets/biomesoplenty/textures/items/amethyst_chestplate.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 284 B

BIN
src/main/resources/assets/biomesoplenty/textures/items/amethyst_helmet.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 259 B

BIN
src/main/resources/assets/biomesoplenty/textures/items/amethyst_hoe.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 286 B

BIN
src/main/resources/assets/biomesoplenty/textures/items/amethyst_leggings.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 234 B

BIN
src/main/resources/assets/biomesoplenty/textures/items/amethyst_pickaxe.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 293 B

BIN
src/main/resources/assets/biomesoplenty/textures/items/amethyst_scythe.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 268 B

BIN
src/main/resources/assets/biomesoplenty/textures/items/amethyst_shovel.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 279 B

BIN
src/main/resources/assets/biomesoplenty/textures/items/amethyst_sword.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 291 B

BIN
src/main/resources/assets/biomesoplenty/textures/models/armor/amethyst_armor_layer_1.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/main/resources/assets/biomesoplenty/textures/models/armor/amethyst_armor_layer_2.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 710 B