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

Changed Biome Finder recipe/texture, renamed Ornamental Artifact to Terrestrial Artifact

This commit is contained in:
Forstride 2016-02-01 21:51:28 -05:00
parent 29b6d4a992
commit da077d5d3d
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/biomesoplenty/api/achievement/BOPAchievements.java
View File

@ -30,10 +30,10 @@ public class BOPAchievements
public static Achievement obtain_pixie_dust;
public static Achievement obtain_soul;
public static Achievement obtain_celestial_crystal;
public static Achievement craft_ornamental_artifact;
public static Achievement craft_terrestrial_artifact;
public static Achievement craft_ambrosia;
public static Achievement explore_all_biomes;
public static Achievement use_enderporter;
public static Achievement use_biome_radar;
public static Achievement use_biome_finder;
}

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

@ -32,7 +32,7 @@ public class BOPItems
public static Item mudball;
public static Item turnip_seeds;
public static Item crystal_shard;
public static Item ornamental_artifact;
public static Item terrestrial_artifact;
public static Item flax_string;
public static Item honeycomb;
public static Item gem;

8
src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java
View File

@ -220,9 +220,9 @@ public class AchievementEventHandler
}
//By Your Powers Combined Achievement
if (item != null && item == BOPItems.ornamental_artifact)
if (item != null && item == BOPItems.terrestrial_artifact)
{
player.triggerAchievement(BOPAchievements.craft_ornamental_artifact);
player.triggerAchievement(BOPAchievements.craft_terrestrial_artifact);
}
//Darts and Crafts Achievement
@ -249,7 +249,7 @@ public class AchievementEventHandler
//Check every five seconds if the player has entered a new biome, if they haven't already gotten the achievement
if (player.ticksExisted % 20 * 5 == 0)
{
if (!player.getStatFile().hasAchievementUnlocked(BOPAchievements.use_biome_radar))
if (!player.getStatFile().hasAchievementUnlocked(BOPAchievements.use_biome_finder))
{
this.updateBiomeRadarExplore(player);
}
@ -280,7 +280,7 @@ public class AchievementEventHandler
//If the current biome id is the id on the radar, award the achievement and stop searching
if (biomeIdToFind == currentBiome.biomeID)
{
player.triggerAchievement(BOPAchievements.use_biome_radar);
player.triggerAchievement(BOPAchievements.use_biome_finder);
return;
}
}

14
src/main/java/biomesoplenty/common/init/ModAchievements.java
View File

@ -12,7 +12,7 @@ import static biomesoplenty.api.achievement.BOPAchievements.craft_amethyst_sword
import static biomesoplenty.api.achievement.BOPAchievements.craft_dart_blower;
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_ornamental_artifact;
import static biomesoplenty.api.achievement.BOPAchievements.craft_terrestrial_artifact;
import static biomesoplenty.api.achievement.BOPAchievements.craft_poison_jar;
import static biomesoplenty.api.achievement.BOPAchievements.eat_shroom_powder;
import static biomesoplenty.api.achievement.BOPAchievements.explore_all_biomes;
@ -29,7 +29,7 @@ import static biomesoplenty.api.achievement.BOPAchievements.obtain_soul;
import static biomesoplenty.api.achievement.BOPAchievements.obtain_thorn;
import static biomesoplenty.api.achievement.BOPAchievements.obtain_turnip;
import static biomesoplenty.api.achievement.BOPAchievements.obtain_wilted_lily;
import static biomesoplenty.api.achievement.BOPAchievements.use_biome_radar;
import static biomesoplenty.api.achievement.BOPAchievements.use_biome_finder;
import static biomesoplenty.api.achievement.BOPAchievements.use_enderporter;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
@ -81,11 +81,11 @@ public class ModAchievements
obtain_coral = addAchievement("achievement.obtain_coral", "obtain_coral", 2, -2, new ItemStack(BOPBlocks.coral), obtain_flowers);
obtain_miners_delight = addAchievement("achievement.obtain_miners_delight", "obtain_miners_delight", 3, -4, BlockBOPFlower.paging.getVariantItem(BOPFlowers.MINERS_DELIGHT), obtain_coral);
craft_ornamental_artifact = addAchievement("achievement.craft_ornamental_artifact", "craft_ornamental_artifact", 6, -4, new ItemStack(BOPItems.ornamental_artifact), obtain_miners_delight);
obtain_pixie_dust = addAchievement("achievement.obtain_pixie_dust", "obtain_pixie_dust", 7, -2, new ItemStack(BOPItems.pixie_dust), craft_ornamental_artifact);
obtain_wilted_lily = addAchievement("achievement.obtain_wilted_lily", "obtain_wilted_lily", 8, -5, BlockBOPFlower.paging.getVariantItem(BOPFlowers.WILTED_LILY), craft_ornamental_artifact);
use_biome_radar = addAchievement("achievement.use_biome_radar", "use_biome_radar", 5, -6, new ItemStack(BOPItems.biome_finder), craft_ornamental_artifact);
explore_all_biomes = addAchievement("achievement.explore_all_biomes", "explore_all_biomes", 2, -7, new ItemStack(BOPItems.earth), use_biome_radar).setSpecial();
craft_terrestrial_artifact = addAchievement("achievement.craft_terrestrial_artifact", "craft_terrestrial_artifact", 6, -4, new ItemStack(BOPItems.terrestrial_artifact), obtain_miners_delight);
obtain_pixie_dust = addAchievement("achievement.obtain_pixie_dust", "obtain_pixie_dust", 7, -2, new ItemStack(BOPItems.pixie_dust), craft_terrestrial_artifact);
obtain_wilted_lily = addAchievement("achievement.obtain_wilted_lily", "obtain_wilted_lily", 8, -5, BlockBOPFlower.paging.getVariantItem(BOPFlowers.WILTED_LILY), craft_terrestrial_artifact);
use_biome_finder = addAchievement("achievement.use_biome_finder", "use_biome_finder", 5, -6, new ItemStack(BOPItems.biome_finder), craft_terrestrial_artifact);
explore_all_biomes = addAchievement("achievement.explore_all_biomes", "explore_all_biomes", 2, -7, new ItemStack(BOPItems.earth), use_biome_finder).setSpecial();
}
private static Achievement addAchievement(String unlocalizedName, String identifier, int column, int row, ItemStack iconStack, Achievement parent)

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

@ -197,7 +197,7 @@ public class ModCrafting
/*** Biome Finder ***/
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.biome_finder), new Object[] {" E ", "ERE", " E ", 'E', new ItemStack(Items.emerald), 'R', new ItemStack(Items.redstone)});
GameRegistry.addShapedRecipe(new ItemStack(BOPItems.biome_finder), new Object[] {" A ", "AOA", " A ", 'A', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal()), 'O', new ItemStack(BOPItems.terrestrial_artifact)});
GameRegistry.addRecipe(new BiomeEssenceRecipe());
/*** Flower Basket ***/
@ -256,7 +256,7 @@ public class ModCrafting
GameRegistry.addShapelessRecipe(new ItemStack(BOPItems.ambrosia), new Object[] {new ItemStack(BOPItems.pixie_dust), new ItemStack(Items.potionitem, 1, 0), new ItemStack(BOPItems.ichor), new ItemStack(BOPBlocks.seaweed, 1, BlockBOPSeaweed.SeaweedType.KELP.ordinal()), BlockBOPPlant.paging.getVariantItem(BOPPlants.ROOT), new ItemStack(BOPItems.crystal_shard), new ItemStack(BOPItems.jar_filled, 1, ItemJarFilled.JarContents.HONEY.ordinal()), new ItemStack(BOPItems.berries), Items.sugar});
// Oranmental Artifact
GameRegistry.addShapelessRecipe(new ItemStack(BOPItems.ornamental_artifact), new Object[] {new ItemStack(BOPItems.gem, 1, BOPGems.RUBY.ordinal()), new ItemStack(BOPItems.gem, 1, BOPGems.TOPAZ.ordinal()), new ItemStack(BOPItems.gem, 1, BOPGems.AMBER.ordinal()), new ItemStack(BOPItems.gem, 1, BOPGems.PERIDOT.ordinal()), new ItemStack(BOPItems.gem, 1, BOPGems.MALACHITE.ordinal()), new ItemStack(BOPItems.gem, 1, BOPGems.SAPPHIRE.ordinal()), new ItemStack(BOPItems.gem, 1, BOPGems.TANZANITE.ordinal()), Items.emerald});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItems.terrestrial_artifact), new Object[] {new ItemStack(BOPItems.gem, 1, BOPGems.RUBY.ordinal()), new ItemStack(BOPItems.gem, 1, BOPGems.TOPAZ.ordinal()), new ItemStack(BOPItems.gem, 1, BOPGems.AMBER.ordinal()), new ItemStack(BOPItems.gem, 1, BOPGems.PERIDOT.ordinal()), new ItemStack(BOPItems.gem, 1, BOPGems.MALACHITE.ordinal()), new ItemStack(BOPItems.gem, 1, BOPGems.SAPPHIRE.ordinal()), new ItemStack(BOPItems.gem, 1, BOPGems.TANZANITE.ordinal()), Items.emerald});
// Flesh Block
GameRegistry.addShapedRecipe(new ItemStack(BOPBlocks.flesh), new Object[] {"##", "##", '#', new ItemStack(BOPItems.fleshchunk)});

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

@ -70,8 +70,8 @@ public class ModItems
mudball = registerItem(new ItemMudball(), "mudball");
turnip_seeds = registerItem(new ItemSeeds(BOPBlocks.turnip_block, Blocks.farmland), "turnip_seeds");
crystal_shard = registerItem(new Item(), "crystal_shard");
ornamental_artifact = registerItem(new Item(), "ornamental_artifact");
ornamental_artifact.setMaxStackSize(1);
terrestrial_artifact = registerItem(new Item(), "terrestrial_artifact");
terrestrial_artifact.setMaxStackSize(1);
flax_string = registerItem(new Item(), "flax_string");
honeycomb = registerItem(new Item(), "honeycomb");
gem = registerItem(new ItemGem(), "gem");

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

@ -36,16 +36,16 @@ achievement.obtain_pixie_dust=Don't Breathe This
achievement.obtain_pixie_dust.desc=Kill a pixie and collect its magical dust
achievement.obtain_celestial_crystal=Far Out...
achievement.obtain_celestial_crystal.desc=Mine a celestial crystal in the End
achievement.craft_ornamental_artifact=Your Powers Combined
achievement.craft_ornamental_artifact.desc=Combine all 8 biome-exclusive gems together
achievement.craft_terrestrial_artifact=Your Powers Combined
achievement.craft_terrestrial_artifact.desc=Combine all 8 biome-exclusive gems together
achievement.craft_ambrosia=Nectar of the Gods
achievement.craft_ambrosia.desc=Sugar, water, honey, berries, roots, kelp, ichor, pixie dust, and celestial crystals!
achievement.explore_all_biomes=The Wanderer
achievement.explore_all_biomes.desc=Truly discover all biomes
achievement.use_enderporter=Gone Home
achievement.use_enderporter.desc=Travel back to the origin point with an enderporter
achievement.use_biome_radar=Search Party
achievement.use_biome_radar.desc=Use the biome radar to locate a biome
achievement.use_biome_finder=Search Party
achievement.use_biome_finder.desc=Use the biome finder to locate a biome
biome_finder.searching=Searching for %s
biome_finder.found=Found %s!
@ -84,14 +84,14 @@ item.amethyst_sword.name=Amethyst Sword
item.ash.name=Pile of Ashes
item.berries.name=Berry
item.biome_essence.name=Biome Essence
item.biome_finder.name=Biome Radar
item.biome_finder.name=Biome Finder
item.black_dye.name=Black Dye
item.blood_bucket.name=Blood Bucket
item.blue_dye.name=Blue Dye
item.brown_dye.name=Brown Dye
item.cherry_door.name=Cherry Door
item.crystal_shard.name=Celestial Crystal Shard
item.ornamental_artifact.name=Ornamental Artifact
item.terrestrial_artifact.name=Terrestrial Artifact
item.flax_string.name=Flax String
item.dart.name=Dart
item.dart_blower.name=Dart Blower

2
src/main/resources/assets/biomesoplenty/models/item/ornamental_artifact.json → src/main/resources/assets/biomesoplenty/models/item/terrestrial_artifact.json
View File

@ -1,7 +1,7 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "biomesoplenty:items/ornamental_artifact"
"layer0": "biomesoplenty:items/terrestrial_artifact"
},
"display": {
"thirdperson": {

BIN
src/main/resources/assets/biomesoplenty/textures/items/biome_finder.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
src/main/resources/assets/biomesoplenty/textures/items/ornamental_artifact.png → src/main/resources/assets/biomesoplenty/textures/items/terrestrial_artifact.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 481 B