diff --git a/src/main/java/biomesoplenty/api/item/BOPItems.java b/src/main/java/biomesoplenty/api/item/BOPItems.java index 9e9ebeb57..abafe10e7 100644 --- a/src/main/java/biomesoplenty/api/item/BOPItems.java +++ b/src/main/java/biomesoplenty/api/item/BOPItems.java @@ -68,19 +68,13 @@ public class BOPItems public static Item wood_slab_0; public static Item wood_slab_1; - public static Item wading_boots; - public static Item flippers; - public static Item flower_band; - public static Item biome_finder; public static Item biome_essence; - public static Item enderporter; public static Item flower_basket; public static Item jar_empty; public static Item jar_filled; public static Item record_wanderer; - public static Item record_corruption; public static Item spawn_egg; diff --git a/src/main/java/biomesoplenty/api/item/BOPMaterials.java b/src/main/java/biomesoplenty/api/item/BOPMaterials.java deleted file mode 100644 index bae6504cb..000000000 --- a/src/main/java/biomesoplenty/api/item/BOPMaterials.java +++ /dev/null @@ -1,19 +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.api.item; - -import net.minecraft.item.Item.ToolMaterial; -import net.minecraft.item.ItemArmor.ArmorMaterial; - -public class BOPMaterials -{ - public static ArmorMaterial wading_boots_material; - public static ArmorMaterial flippers_material; - public static ArmorMaterial flower_band_material; -} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/api/sound/BOPSounds.java b/src/main/java/biomesoplenty/api/sound/BOPSounds.java index cc9ee33e1..d9590eb1b 100644 --- a/src/main/java/biomesoplenty/api/sound/BOPSounds.java +++ b/src/main/java/biomesoplenty/api/sound/BOPSounds.java @@ -15,6 +15,5 @@ public class BOPSounds public static SoundEvent pixie_hurt; public static SoundEvent wasp_ambient; public static SoundEvent wasp_hurt; - public static SoundEvent records_corruption; public static SoundEvent records_wanderer; } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPAsh.java b/src/main/java/biomesoplenty/common/block/BlockBOPAsh.java index 10fd47962..ce8564394 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPAsh.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPAsh.java @@ -50,12 +50,6 @@ public class BlockBOPAsh extends BlockBOPGeneric @Override public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity) { - if (entity instanceof EntityPlayer) { - InventoryPlayer inventory = ((EntityPlayer)entity).inventory; - if (inventory.armorInventory.get(0).getItem() == BOPItems.wading_boots) { - return; - } - } entity.motionX *= 0.8D; entity.motionZ *= 0.8D; } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java b/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java index afdc8b9d1..0c159bc92 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java @@ -65,14 +65,6 @@ public class BlockBOPFlesh extends Block implements IBOPBlock @Override public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity) { - - if (entity instanceof EntityPlayer) { - InventoryPlayer inventory = ((EntityPlayer)entity).inventory; - if (inventory.armorInventory.get(0).getItem() == BOPItems.wading_boots) { - return; - } - } - // slow you slightly entity.motionX *= 0.9D; entity.motionZ *= 0.9D; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPMud.java b/src/main/java/biomesoplenty/common/block/BlockBOPMud.java index c408f078c..db18d73ac 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPMud.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPMud.java @@ -118,16 +118,7 @@ public class BlockBOPMud extends Block implements IBOPBlock, ISustainsPlantType switch ((MudType) state.getValue(VARIANT)) { // mud slows you greatly unless you're wearing wading boots - case MUD: - if (entity instanceof EntityPlayer) - { - InventoryPlayer inventory = ((EntityPlayer)entity).inventory; - if (inventory.armorInventory.get(0).getItem() == BOPItems.wading_boots) - { - break; - } - } - + case MUD: entity.motionX *= 0.2D; entity.motionZ *= 0.2D; break; diff --git a/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java b/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java index cd8632733..f75a37768 100644 --- a/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java @@ -141,11 +141,6 @@ public class AchievementEventHandler { ItemStack stack = event.getItemStack(); EntityPlayer player = event.getEntityPlayer(); - - //Gone Home - if (!stack.isEmpty() && stack.getItem() == BOPItems.enderporter) { - player.addStat(BOPAchievements.use_enderporter); - } } @SubscribeEvent diff --git a/src/main/java/biomesoplenty/common/handler/FlippersEventHandler.java b/src/main/java/biomesoplenty/common/handler/FlippersEventHandler.java deleted file mode 100644 index e2a4f13a2..000000000 --- a/src/main/java/biomesoplenty/common/handler/FlippersEventHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package biomesoplenty.common.handler; - -import biomesoplenty.api.item.BOPItems; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -public class FlippersEventHandler -{ - @SubscribeEvent - public void onLivingUpdate(LivingUpdateEvent event) - { - if (event.getEntity() instanceof EntityPlayer) - { - EntityPlayer player = (EntityPlayer)event.getEntity(); - - InventoryPlayer inventory = player.inventory; - - if (player.isInWater() && !player.capabilities.isFlying) - { - if (inventory.armorInventory.get(0).getItem() == BOPItems.flippers) - { - player.motionX *= 1.125D; - player.motionY *= 1.1D; - player.motionZ *= 1.125D; - } - } - } - } -} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/handler/LootTableEventHandler.java b/src/main/java/biomesoplenty/common/handler/LootTableEventHandler.java index e10248d06..a65330bf2 100644 --- a/src/main/java/biomesoplenty/common/handler/LootTableEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/LootTableEventHandler.java @@ -34,15 +34,6 @@ public class LootTableEventHandler main.addEntry(new LootEntryItem(BOPItems.pear, 4, 2, new LootFunction[0], new LootCondition[0], "biomesoplenty:pear")); main.addEntry(new LootEntryItem(BOPItems.peach, 4, 2, new LootFunction[0], new LootCondition[0], "biomesoplenty:peach")); main.addEntry(new LootEntryItem(BOPItems.persimmon, 4, 2, new LootFunction[0], new LootCondition[0], "biomesoplenty:persimmon")); - } - } - if (event.getName().equals(LootTableList.CHESTS_VILLAGE_BLACKSMITH)) - { - LootPool main = event.getTable().getPool("main"); - if (main != null) - { - main.addEntry(new LootEntryItem(BOPItems.flippers, 3, 1, new LootFunction[0], new LootCondition[0], "biomesoplenty:flippers")); - main.addEntry(new LootEntryItem(BOPItems.wading_boots, 3, 1, new LootFunction[0], new LootCondition[0], "biomesoplenty:wading_boots")); } } if (event.getName().equals(LootTableList.GAMEPLAY_FISHING_JUNK)) diff --git a/src/main/java/biomesoplenty/common/init/ModAchievements.java b/src/main/java/biomesoplenty/common/init/ModAchievements.java index 1f68acc5d..dd39c785b 100644 --- a/src/main/java/biomesoplenty/common/init/ModAchievements.java +++ b/src/main/java/biomesoplenty/common/init/ModAchievements.java @@ -71,7 +71,6 @@ public class ModAchievements obtain_honeycomb = addAchievement("achievement.obtain_honeycomb", "obtain_honeycomb", 4, 1, new ItemStack(BOPItems.filled_honeycomb), eat_shroom_powder); obtain_soul = addAchievement("achievement.obtain_soul", "obtain_soul", 3, 4, new ItemStack(BOPItems.soul), obtain_honeycomb); obtain_celestial_crystal = addAchievement("achievement.obtain_celestial_crystal", "obtain_celestial_crystal", 6, 3, new ItemStack(BOPItems.crystal_shard), obtain_honeycomb); - use_enderporter = addAchievement("achievement.use_enderporter", "use_enderporter", 1, 7, new ItemStack(BOPItems.enderporter), obtain_soul).setSpecial(); craft_ambrosia = addAchievement("achievement.craft_ambrosia", "craft_ambrosia", 7, 5, new ItemStack(BOPItems.ambrosia), obtain_celestial_crystal).setSpecial(); obtain_coral = addAchievement("achievement.obtain_coral", "obtain_coral", 2, -2, new ItemStack(BOPBlocks.coral), obtain_flowers); diff --git a/src/main/java/biomesoplenty/common/init/ModCrafting.java b/src/main/java/biomesoplenty/common/init/ModCrafting.java index b638269e2..e53314d36 100644 --- a/src/main/java/biomesoplenty/common/init/ModCrafting.java +++ b/src/main/java/biomesoplenty/common/init/ModCrafting.java @@ -129,9 +129,6 @@ public class ModCrafting /*** Tools, weapons, armor ***/ - // Flower Bands - GameRegistry.addShapedRecipe(new ItemStack(BOPItems.flower_band), "CCC", "C C", "CCC", 'C', BlockBOPFlower.paging.getVariantItem(BOPFlowers.CLOVER)); - /*** Biome Finder ***/ GameRegistry.addShapedRecipe(new ItemStack(BOPItems.biome_finder), " A ", "AOA", " A ", 'A', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal()), 'O', new ItemStack(BOPItems.terrestrial_artifact)); @@ -174,14 +171,10 @@ public class ModCrafting GameRegistry.addShapedRecipe(new ItemStack(BOPBlocks.dirt, 4, BOPBlocks.dirt.getMetaFromState(BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SILTY).withProperty(BlockBOPDirt.COARSE, true))), "GD", "DG", 'G', Blocks.GRAVEL, 'D', new ItemStack(BOPBlocks.dirt, 4, BlockBOPDirt.BOPDirtType.SILTY.ordinal())); GameRegistry.addShapedRecipe(new ItemStack(BOPBlocks.dirt, 4, BOPBlocks.dirt.getMetaFromState(BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SILTY).withProperty(BlockBOPDirt.COARSE, true))), "DG", "GD", 'G', Blocks.GRAVEL, 'D', new ItemStack(BOPBlocks.dirt, 4, BlockBOPDirt.BOPDirtType.SILTY.ordinal())); - - // Enderporter - GameRegistry.addShapedRecipe(new ItemStack(BOPItems.enderporter), "IAI", "ATA", "IAI", 'I', Items.ENDER_EYE, 'A', new ItemStack(BOPItems.gem, 1, BOPGems.AMETHYST.ordinal()), 'T', BOPItems.terrestrial_artifact); - + // Records GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItems.record_wanderer), "TTT", "TRT", "TTT", 'T', BOPItems.terrestrial_artifact, 'R', "record")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItems.record_corruption), "MMM", "MRM", "MMM", 'M', "ballMud", 'R', BOPItems.record_wanderer)); - + // Bamboo Thatching GameRegistry.addShapedRecipe(new ItemStack(BOPBlocks.bamboo_thatching), "##", "##", '#', BOPBlocks.bamboo); @@ -324,7 +317,6 @@ public class ModCrafting OreDictionary.registerOre("dyeWhite", new ItemStack(BOPItems.white_dye)); OreDictionary.registerOre("dyeBlack", new ItemStack(BOPItems.black_dye)); - OreDictionary.registerOre("record", new ItemStack(BOPItems.record_corruption)); OreDictionary.registerOre("record", new ItemStack(BOPItems.record_wanderer)); for (BOPGems gem : BOPGems.values()) diff --git a/src/main/java/biomesoplenty/common/init/ModHandlers.java b/src/main/java/biomesoplenty/common/init/ModHandlers.java index e066ab3ce..1a5b2b95c 100644 --- a/src/main/java/biomesoplenty/common/init/ModHandlers.java +++ b/src/main/java/biomesoplenty/common/init/ModHandlers.java @@ -30,7 +30,6 @@ public class ModHandlers //MinecraftForge.TERRAIN_GEN_BUS.register(new VillageMaterialEventHandler()); MinecraftForge.ORE_GEN_BUS.register(decorateBiomeHandler); MinecraftForge.EVENT_BUS.register(new DyeEventHandler()); - MinecraftForge.EVENT_BUS.register(new FlippersEventHandler()); MinecraftForge.EVENT_BUS.register(new BucketEventHandler()); MinecraftForge.EVENT_BUS.register(new PotionParalysisEventHandler()); MinecraftForge.EVENT_BUS.register(new PotionPossessionEventHandler()); diff --git a/src/main/java/biomesoplenty/common/init/ModItems.java b/src/main/java/biomesoplenty/common/init/ModItems.java index f7aed8192..6260379e8 100644 --- a/src/main/java/biomesoplenty/common/init/ModItems.java +++ b/src/main/java/biomesoplenty/common/init/ModItems.java @@ -18,11 +18,8 @@ import static biomesoplenty.api.item.BOPItems.blue_dye; import static biomesoplenty.api.item.BOPItems.brown_dye; import static biomesoplenty.api.item.BOPItems.crystal_shard; import static biomesoplenty.api.item.BOPItems.earth; -import static biomesoplenty.api.item.BOPItems.enderporter; import static biomesoplenty.api.item.BOPItems.filled_honeycomb; import static biomesoplenty.api.item.BOPItems.fleshchunk; -import static biomesoplenty.api.item.BOPItems.flippers; -import static biomesoplenty.api.item.BOPItems.flower_band; import static biomesoplenty.api.item.BOPItems.flower_basket; import static biomesoplenty.api.item.BOPItems.gem; import static biomesoplenty.api.item.BOPItems.green_dye; @@ -36,7 +33,6 @@ import static biomesoplenty.api.item.BOPItems.pear; import static biomesoplenty.api.item.BOPItems.persimmon; import static biomesoplenty.api.item.BOPItems.pinecone; import static biomesoplenty.api.item.BOPItems.pixie_dust; -import static biomesoplenty.api.item.BOPItems.record_corruption; import static biomesoplenty.api.item.BOPItems.record_wanderer; import static biomesoplenty.api.item.BOPItems.ricebowl; import static biomesoplenty.api.item.BOPItems.saladfruit; @@ -47,11 +43,7 @@ import static biomesoplenty.api.item.BOPItems.spawn_egg; import static biomesoplenty.api.item.BOPItems.terrestrial_artifact; import static biomesoplenty.api.item.BOPItems.turnip; 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.BOPMaterials.flippers_material; -import static biomesoplenty.api.item.BOPMaterials.flower_band_material; -import static biomesoplenty.api.item.BOPMaterials.wading_boots_material; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.sound.BOPSounds; @@ -62,21 +54,16 @@ import biomesoplenty.common.item.ItemBOPRecord; import biomesoplenty.common.item.ItemBOPSpawnEgg; import biomesoplenty.common.item.ItemBiomeEssence; import biomesoplenty.common.item.ItemBiomeFinder; -import biomesoplenty.common.item.ItemEnderporter; -import biomesoplenty.common.item.ItemFlippers; -import biomesoplenty.common.item.ItemFlowerBand; import biomesoplenty.common.item.ItemFlowerBasket; import biomesoplenty.common.item.ItemGem; import biomesoplenty.common.item.ItemJarEmpty; import biomesoplenty.common.item.ItemJarFilled; import biomesoplenty.common.item.ItemMudball; -import biomesoplenty.common.item.ItemWadingBoots; import biomesoplenty.common.util.inventory.CreativeTabBOP; import biomesoplenty.core.BiomesOPlenty; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; @@ -140,36 +127,13 @@ public class ModItems green_dye = registerItem(new Item(), "green_dye"); white_dye = registerItem(new Item(), "white_dye"); black_dye = registerItem(new Item(), "black_dye"); - - // armor - - // addArmorMaterial arguments: - // (String name, String textureName, int durability, int[] reductionAmounts, int enchantability) - // Vanilla armor material values for comparison: - // LEATHER("leather", 5, new int[]{1, 3, 2, 1}, 15), - // CHAIN("chainmail", 15, new int[]{2, 5, 4, 1}, 12), - // IRON("iron", 15, new int[]{2, 6, 5, 2}, 9), - // GOLD("gold", 7, new int[]{2, 5, 3, 1}, 25), - // DIAMOND("diamond", 33, new int[]{3, 8, 6, 3}, 10); - - // TODO: do we really want durability of -1 for these unprotective armor items? does that mean it lasts forever? - wading_boots_material = addArmorMaterial("WADING_BOOTS", "biomesoplenty:wading_boots", -1, new int[]{0,0,0,0}, 0, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 0.0F); - flippers_material = addArmorMaterial("FLIPPERS", "biomesoplenty:flippers", -1, new int[]{0,0,0,0}, 0, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 0.0F); - flower_band_material = addArmorMaterial("FLOWER_BAND", "biomesoplenty:flower_band", -1, new int[]{0,0,0,0}, 0, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 0.0F); - - wading_boots = registerItem(new ItemWadingBoots(wading_boots_material, 0), "wading_boots"); - flippers = registerItem(new ItemFlippers(flippers_material, 0), "flippers"); - - flower_band = registerItem(new ItemFlowerBand(flower_band_material, 0), "flower_band"); jar_empty = registerItem(new ItemJarEmpty(), "jar_empty"); jar_filled = registerItem(new ItemJarFilled(), "jar_filled"); flower_basket = registerItem(new ItemFlowerBasket(), "flower_basket"); biome_finder = registerItem(new ItemBiomeFinder(), "biome_finder"); - enderporter = registerItem(new ItemEnderporter(), "enderporter"); record_wanderer = registerItem(new ItemBOPRecord("wanderer", BOPSounds.records_wanderer), "record_wanderer"); - record_corruption = registerItem(new ItemBOPRecord("corruption", BOPSounds.records_corruption), "record_corruption"); // TODO: use Forge for eggs now? https://github.com/MinecraftForge/MinecraftForge/commit/c158af902f2a689f612fd20427b5a1590fc2f1ba spawn_egg = registerItem(new ItemBOPSpawnEgg(), "spawn_egg"); diff --git a/src/main/java/biomesoplenty/common/init/ModSounds.java b/src/main/java/biomesoplenty/common/init/ModSounds.java index 487694af1..728bc5af0 100644 --- a/src/main/java/biomesoplenty/common/init/ModSounds.java +++ b/src/main/java/biomesoplenty/common/init/ModSounds.java @@ -9,7 +9,6 @@ package biomesoplenty.common.init; import static biomesoplenty.api.sound.BOPSounds.pixie_ambient; import static biomesoplenty.api.sound.BOPSounds.pixie_hurt; -import static biomesoplenty.api.sound.BOPSounds.records_corruption; import static biomesoplenty.api.sound.BOPSounds.records_wanderer; import static biomesoplenty.api.sound.BOPSounds.wasp_ambient; import static biomesoplenty.api.sound.BOPSounds.wasp_hurt; @@ -26,7 +25,6 @@ public class ModSounds pixie_hurt = registerSound("entity.pixie.hurt"); wasp_ambient = registerSound("entity.wasp.ambient"); wasp_hurt = registerSound("entity.wasp.hurt"); - records_corruption = registerSound("records.corruption"); records_wanderer = registerSound("records.wanderer"); } diff --git a/src/main/java/biomesoplenty/common/item/ItemFlippers.java b/src/main/java/biomesoplenty/common/item/ItemFlippers.java deleted file mode 100644 index 104722efa..000000000 --- a/src/main/java/biomesoplenty/common/item/ItemFlippers.java +++ /dev/null @@ -1,34 +0,0 @@ -package biomesoplenty.common.item; - -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.block.BlockBOPHive; -import biomesoplenty.common.entities.projectiles.EntityMudball; -import biomesoplenty.core.BiomesOPlenty; -import net.minecraft.block.BlockMobSpawner; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.SoundEvents; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.stats.StatList; -import net.minecraft.tileentity.MobSpawnerBaseLogic; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraft.util.*; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; - -public class ItemFlippers extends ItemArmor -{ - - public ItemFlippers(ItemArmor.ArmorMaterial material, int renderIndex) - { - // flippers are always on your feet - armorType = 3 - super(material, renderIndex, EntityEquipmentSlot.FEET); - } -} - diff --git a/src/main/java/biomesoplenty/common/item/ItemFlowerBand.java b/src/main/java/biomesoplenty/common/item/ItemFlowerBand.java deleted file mode 100644 index 0096165df..000000000 --- a/src/main/java/biomesoplenty/common/item/ItemFlowerBand.java +++ /dev/null @@ -1,17 +0,0 @@ -package biomesoplenty.common.item; - -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemArmor; - -public class ItemFlowerBand extends ItemArmor -{ - - public ItemFlowerBand(ItemArmor.ArmorMaterial material, int renderIndex) - { - // flower bands are always on your head - armorType = 0 - super(material, renderIndex, EntityEquipmentSlot.HEAD); - this.maxStackSize = 8; - } - - -} diff --git a/src/main/java/biomesoplenty/common/item/ItemWadingBoots.java b/src/main/java/biomesoplenty/common/item/ItemWadingBoots.java deleted file mode 100644 index 591a8c197..000000000 --- a/src/main/java/biomesoplenty/common/item/ItemWadingBoots.java +++ /dev/null @@ -1,16 +0,0 @@ -package biomesoplenty.common.item; - -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemArmor; - -public class ItemWadingBoots extends ItemArmor -{ - - public ItemWadingBoots(ItemArmor.ArmorMaterial material, int renderIndex) - { - // boots are always on your feet - armorType = 3 - super(material, renderIndex, EntityEquipmentSlot.FEET); - } - -} - diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index 263dae429..8f32d5b45 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -32,8 +32,6 @@ 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_finder=Search Party achievement.use_biome_finder.desc=Use the biome finder to locate a biome @@ -89,14 +87,11 @@ item.cherry_door.name=Cherry Door item.crystal_shard.name=Celestial Crystal Shard item.terrestrial_artifact.name=Terrestrial Artifact item.ebony_door.name=Ebony Door -item.enderporter.name=Enderporter item.ethereal_door.name=Ethereal Door item.eucalyptus_door.name=Eucalyptus Door item.filled_honeycomb.name=Filled Honeycomb item.fir_door.name=Fir Door item.fleshchunk.name=Chunk of Flesh -item.flippers.name=Flippers -item.flower_band.name=Flower Band item.flower_basket.name=Flower Basket item.gem_amber.name=Amber item.gem_amethyst.name=Ender Amethyst @@ -126,8 +121,6 @@ item.pear.name=Pear item.pinecone.name=Pinecone item.pine_door.name=Pine Door item.pixie_dust.name=Pixie Dust -item.record_corruption.name=Music Disc -item.record.corruption.desc=??? item.record_wanderer.name=Music Disc item.record.wanderer.desc=Tim Rurkowski - Wanderer item.redwood_door.name=Redwood Door @@ -144,7 +137,6 @@ item.spawn_egg_butterfly.name=Spawn Butterfly item.turnip.name=Turnip item.turnip_seeds.name=Turnip Seeds item.umbran_door.name=Umbran Door -item.wading_boots.name=Wading Boots item.white_dye.name=White Dye item.willow_door.name=Willow Door diff --git a/src/main/resources/assets/biomesoplenty/models/item/enderporter.json b/src/main/resources/assets/biomesoplenty/models/item/enderporter.json deleted file mode 100644 index 6870cef45..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/enderporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:items/enderporter" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/flippers.json b/src/main/resources/assets/biomesoplenty/models/item/flippers.json deleted file mode 100644 index 83604c9cd..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/flippers.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:items/flippers" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/flower_band.json b/src/main/resources/assets/biomesoplenty/models/item/flower_band.json deleted file mode 100644 index 2998a7651..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/flower_band.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:items/flower_band" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/record_corruption.json b/src/main/resources/assets/biomesoplenty/models/item/record_corruption.json deleted file mode 100644 index 1da16f445..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/record_corruption.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:items/record_corruption" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/wading_boots.json b/src/main/resources/assets/biomesoplenty/models/item/wading_boots.json deleted file mode 100644 index 43095f349..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/wading_boots.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:items/wading_boots" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -2.5 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} diff --git a/src/main/resources/assets/biomesoplenty/sounds.json b/src/main/resources/assets/biomesoplenty/sounds.json index b46f38668..966ac195f 100644 --- a/src/main/resources/assets/biomesoplenty/sounds.json +++ b/src/main/resources/assets/biomesoplenty/sounds.json @@ -26,13 +26,5 @@ "stream": true } ] - }, - "records.corruption": { - "sounds": [ - { - "name": "biomesoplenty:records/corruption", - "stream": true - } - ] } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/sounds/records/corruption.ogg b/src/main/resources/assets/biomesoplenty/sounds/records/corruption.ogg deleted file mode 100644 index 4e161657d..000000000 Binary files a/src/main/resources/assets/biomesoplenty/sounds/records/corruption.ogg and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png b/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png index 97cf9aa7d..e66b29d91 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png b/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png index 6ddc323f5..9ef672bde 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png and b/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/enderporter.png b/src/main/resources/assets/biomesoplenty/textures/items/enderporter.png deleted file mode 100644 index 518497b8b..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/enderporter.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/flippers.png b/src/main/resources/assets/biomesoplenty/textures/items/flippers.png deleted file mode 100644 index 6c03005db..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/flippers.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/flower_band.png b/src/main/resources/assets/biomesoplenty/textures/items/flower_band.png deleted file mode 100644 index a806fb62d..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/flower_band.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/record_corruption.png b/src/main/resources/assets/biomesoplenty/textures/items/record_corruption.png deleted file mode 100644 index 77be79663..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/record_corruption.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/wading_boots.png b/src/main/resources/assets/biomesoplenty/textures/items/wading_boots.png deleted file mode 100644 index 3d1c2a4ea..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/wading_boots.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/models/armor/flippers_layer_1.png b/src/main/resources/assets/biomesoplenty/textures/models/armor/flippers_layer_1.png deleted file mode 100644 index 9b349aa2f..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/models/armor/flippers_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/models/armor/flower_band_layer_1.png b/src/main/resources/assets/biomesoplenty/textures/models/armor/flower_band_layer_1.png deleted file mode 100644 index 43c91767a..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/models/armor/flower_band_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/models/armor/wading_boots_layer_1.png b/src/main/resources/assets/biomesoplenty/textures/models/armor/wading_boots_layer_1.png deleted file mode 100644 index d53f710fd..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/models/armor/wading_boots_layer_1.png and /dev/null differ