Use forge universal bucket

src/main/java/biomesoplenty/api/item/BOPItems.java

@@ -99,11 +99,18 @@ public class BOPItems
     public static Item flower_basket;
     public static Item jar_empty;
     public static Item jar_filled;
-    public static Item sand_bucket;
-    public static Item honey_bucket;
-    public static Item blood_bucket;
-    public static Item poison_bucket;
-    public static Item hot_spring_water_bucket;
+    
+    /*
+     *  Use net.minecraftforge.fluids.UniversalBucket.getFilledBucket(
+     *          net.minecraftforge.common.ForgeModContainer.getInstance().universalBucket,
+     *          biomesoplenty.common.fluids.QuicksandFluid.instance
+     *      )
+     */
+    // public static Item sand_bucket;
+    // public static Item honey_bucket;
+    // public static Item blood_bucket;
+    // public static Item poison_bucket;
+    // public static Item hot_spring_water_bucket;
     
     public static Item record_wanderer;
     public static Item record_corruption;

src/main/java/biomesoplenty/common/handler/BucketEventHandler.java

@@ -9,7 +9,10 @@
 package biomesoplenty.common.handler;
 
 import biomesoplenty.api.block.BOPBlocks;
-import biomesoplenty.api.item.BOPItems;
+import biomesoplenty.common.fluids.BloodFluid;
+import biomesoplenty.common.fluids.HoneyFluid;
+import biomesoplenty.common.fluids.PoisonFluid;
+import biomesoplenty.common.fluids.QuicksandFluid;
 import biomesoplenty.common.fluids.blocks.BlockBloodFluid;
 import biomesoplenty.common.fluids.blocks.BlockHoneyFluid;
 import biomesoplenty.common.fluids.blocks.BlockHotSpringWaterFluid;
@@ -17,11 +20,13 @@ import biomesoplenty.common.fluids.blocks.BlockPoisonFluid;
 import biomesoplenty.common.fluids.blocks.BlockQuicksandFluid;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
+import net.minecraftforge.common.ForgeModContainer;
 import net.minecraftforge.event.entity.player.FillBucketEvent;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.UniversalBucket;
 import net.minecraftforge.fml.common.eventhandler.Event.Result;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
@@ -40,26 +45,26 @@ public class BucketEventHandler
         
         // determine if the block is one of our BOP fluids
         IBlockState iblockstate = event.getWorld().getBlockState(blockpos);
-        Item filled_bucket = null;
+        Fluid filled_fluid = null;
         if (iblockstate.getBlock() == BOPBlocks.sand && ((Integer)iblockstate.getValue(BlockQuicksandFluid.LEVEL)).intValue() == 0)
         {
-            filled_bucket = BOPItems.sand_bucket;
+            filled_fluid = QuicksandFluid.instance;
         }
         else if (iblockstate.getBlock() == BOPBlocks.honey && ((Integer)iblockstate.getValue(BlockHoneyFluid.LEVEL)).intValue() == 0)
         {
-            filled_bucket = BOPItems.honey_bucket;
+            filled_fluid = HoneyFluid.instance;
         }
         else if (iblockstate.getBlock() == BOPBlocks.blood && ((Integer)iblockstate.getValue(BlockBloodFluid.LEVEL)).intValue() == 0)
         {
-            filled_bucket = BOPItems.blood_bucket;
+            filled_fluid = BloodFluid.instance;
         }
         else if (iblockstate.getBlock() == BOPBlocks.poison && ((Integer)iblockstate.getValue(BlockPoisonFluid.LEVEL)).intValue() == 0)
         {
-            filled_bucket = BOPItems.poison_bucket;
+            filled_fluid = PoisonFluid.instance;
         }
         else if (iblockstate.getBlock() == BOPBlocks.hot_spring_water && ((Integer)iblockstate.getValue(BlockHotSpringWaterFluid.LEVEL)).intValue() == 0)
         {
-            filled_bucket = Items.WATER_BUCKET;
+            filled_fluid = FluidRegistry.WATER;
         }
         else
         {
@@ -68,7 +73,7 @@ public class BucketEventHandler
         
         // remove the fluid and return the appropriate filled bucket
         event.setResult(Result.ALLOW);
-        event.setFilledBucket(new ItemStack(filled_bucket));
+        event.setFilledBucket(UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, filled_fluid));
         event.getWorld().setBlockToAir(blockpos);
         //TODO: event.entityPlayer.triggerAchievement(StatList.objectUseStats[Item.getIdFromItem(event.getEmptyBucket().getItem())]);
     }

src/main/java/biomesoplenty/common/init/ModBlocks.java

@@ -9,11 +9,6 @@
 package biomesoplenty.common.init;
 
 import static biomesoplenty.api.block.BOPBlocks.*;
-import static biomesoplenty.api.item.BOPItems.blood_bucket;
-import static biomesoplenty.api.item.BOPItems.honey_bucket;
-import static biomesoplenty.api.item.BOPItems.hot_spring_water_bucket;
-import static biomesoplenty.api.item.BOPItems.poison_bucket;
-import static biomesoplenty.api.item.BOPItems.sand_bucket;
 
 import com.google.common.collect.ImmutableSet;
 
@@ -82,17 +77,13 @@ import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemBucket;
 import net.minecraft.item.ItemDoor;
 import net.minecraft.item.ItemSlab;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.EnumPlantType;
 import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
@@ -132,7 +123,7 @@ public class ModBlocks
         gem_block =             registerBlock( new BlockBOPGem(), "gem_block" );
         hive =                  registerBlock( new BlockBOPHive(), "hive" );
         honey_block =           registerBlock( new BlockBOPHoney(), "honey_block" );
-        jelled_poison =           registerBlock( new BlockBOPJelledPoison(), "jelled_poison" );
+        jelled_poison =         registerBlock( new BlockBOPJelledPoison(), "jelled_poison" );
         
         //Material Blocks
         bamboo_thatching =      registerBlock( (new BlockBOPGeneric(Material.WOOD, SoundType.WOOD)).setHardness(2.0F), "bamboo_thatching"); bamboo_thatching.setHarvestLevel("axe", 0);
@@ -172,7 +163,7 @@ public class ModBlocks
         // stairs have no variant metadata, use a new BlockBOPStairs instance for each (note there's no giant_flower_stairs or dead_stairs)
         sacred_oak_stairs =     registerBlock( new BlockBOPWoodStairs(BOPWoods.SACRED_OAK), "sacred_oak_stairs" );
         cherry_stairs =         registerBlock( new BlockBOPWoodStairs(BOPWoods.CHERRY), "cherry_stairs" );
-        umbran_stairs =           registerBlock( new BlockBOPWoodStairs(BOPWoods.UMBRAN), "umbran_stairs" );
+        umbran_stairs =         registerBlock( new BlockBOPWoodStairs(BOPWoods.UMBRAN), "umbran_stairs" );
         fir_stairs =            registerBlock( new BlockBOPWoodStairs(BOPWoods.FIR), "fir_stairs" );
         ethereal_stairs =       registerBlock( new BlockBOPWoodStairs(BOPWoods.ETHEREAL), "ethereal_stairs" );
         magic_stairs =          registerBlock( new BlockBOPWoodStairs(BOPWoods.MAGIC), "magic_stairs" );
@@ -202,7 +193,7 @@ public class ModBlocks
         // fences have no variant metadata, use a new BlockBOPFence instance for each (note there's no giant_flower_fence or dead_fence)
         sacred_oak_fence =      registerBlock( new BlockBOPFence(BOPWoods.SACRED_OAK), "sacred_oak_fence" );
         cherry_fence =          registerBlock( new BlockBOPFence(BOPWoods.CHERRY), "cherry_fence" );
-        umbran_fence =            registerBlock( new BlockBOPFence(BOPWoods.UMBRAN), "umbran_fence" );
+        umbran_fence =          registerBlock( new BlockBOPFence(BOPWoods.UMBRAN), "umbran_fence" );
         fir_fence =             registerBlock( new BlockBOPFence(BOPWoods.FIR), "fir_fence" );
         ethereal_fence =        registerBlock( new BlockBOPFence(BOPWoods.ETHEREAL), "ethereal_fence" );
         magic_fence =           registerBlock( new BlockBOPFence(BOPWoods.MAGIC), "magic_fence" );
@@ -220,7 +211,7 @@ public class ModBlocks
         // fence gates have no variant metadata, use a new BlockBOPFenceGate instance for each (note there's no giant_flower_fence_gate or dead_fence_gate)
         sacred_oak_fence_gate = registerBlock( new BlockBOPFenceGate(BOPWoods.SACRED_OAK), "sacred_oak_fence_gate" );
         cherry_fence_gate =     registerBlock( new BlockBOPFenceGate(BOPWoods.CHERRY), "cherry_fence_gate" );
-        umbran_fence_gate =       registerBlock( new BlockBOPFenceGate(BOPWoods.UMBRAN), "umbran_fence_gate" );
+        umbran_fence_gate =     registerBlock( new BlockBOPFenceGate(BOPWoods.UMBRAN), "umbran_fence_gate" );
         fir_fence_gate =        registerBlock( new BlockBOPFenceGate(BOPWoods.FIR), "fir_fence_gate" );
         ethereal_fence_gate =   registerBlock( new BlockBOPFenceGate(BOPWoods.ETHEREAL), "ethereal_fence_gate" );
         magic_fence_gate =      registerBlock( new BlockBOPFenceGate(BOPWoods.MAGIC), "magic_fence_gate" );
@@ -238,7 +229,7 @@ public class ModBlocks
         // doors have no variant metadata, use a new BlockBOPDoor instance for each (note there's no giant_flower_door or dead_door)
         sacred_oak_door =       registerDoor( new BlockBOPDoor(BOPWoods.SACRED_OAK), "sacred_oak_door", BOPItems.sacred_oak_door );
         cherry_door =           registerDoor( new BlockBOPDoor(BOPWoods.CHERRY), "cherry_door", BOPItems.cherry_door );
-        umbran_door =             registerDoor( new BlockBOPDoor(BOPWoods.UMBRAN), "umbran_door", BOPItems.umbran_door );
+        umbran_door =           registerDoor( new BlockBOPDoor(BOPWoods.UMBRAN), "umbran_door", BOPItems.umbran_door );
         fir_door =              registerDoor( new BlockBOPDoor(BOPWoods.FIR), "fir_door", BOPItems.fir_door );
         ethereal_door =         registerDoor( new BlockBOPDoor(BOPWoods.ETHEREAL), "ethereal_door", BOPItems.ethereal_door );
         magic_door =            registerDoor( new BlockBOPDoor(BOPWoods.MAGIC), "magic_door", BOPItems.magic_door );
@@ -255,7 +246,7 @@ public class ModBlocks
         
         // Plants
         
-        stone_formations =                 registerBlock( new BlockBOPStoneFormations(), "stone_formations" );
+        stone_formations =      registerBlock( new BlockBOPStoneFormations(), "stone_formations" );
         
         coral =                 registerBlock( new BlockBOPCoral(), "coral" );
         seaweed =               registerBlock( new BlockBOPSeaweed(), "seaweed" );
@@ -271,9 +262,9 @@ public class ModBlocks
         
         //Plants
         BlockBOPPlant.createAllPages();
-        plant_0 =           registerBlock( BlockBOPPlant.paging.getBlock(0), "plant_0" );
-        plant_1 =           registerBlock( BlockBOPPlant.paging.getBlock(1), "plant_1" );
-        double_plant =      registerBlock( new BlockBOPDoublePlant(), "double_plant" );
+        plant_0 =               registerBlock( BlockBOPPlant.paging.getBlock(0), "plant_0" );
+        plant_1 =               registerBlock( BlockBOPPlant.paging.getBlock(1), "plant_1" );
+        double_plant =          registerBlock( new BlockBOPDoublePlant(), "double_plant" );
         mushroom =              registerBlock( new BlockBOPMushroom(), "mushroom" );
         
         // 22 flower types 16 per BlockBOPFlower instance, needs 2 'pages'
@@ -283,49 +274,36 @@ public class ModBlocks
         
         //vines
         // TODO: special placement rules?
-        flower_vine =       registerBlock( new BlockBOPVine(false), "flower_vine" );
-        ivy =               registerBlock( new BlockBOPVine(true), "ivy" );
-        tree_moss =         registerBlock( new BlockBOPVine(false), "tree_moss" );
+        flower_vine =           registerBlock( new BlockBOPVine(false), "flower_vine" );
+        ivy =                   registerBlock( new BlockBOPVine(true), "ivy" );
+        tree_moss =             registerBlock( new BlockBOPVine(false), "tree_moss" );
         
-        terrarium =        registerBlock( new BlockBOPTerrarium(), "terrarium" );
+        terrarium =             registerBlock( new BlockBOPTerrarium(), "terrarium" );
         
         
         // fluids
-        
         sand_fluid = QuicksandFluid.instance;
         sand_fluid.setViscosity(10000);
         sand_fluid.setDensity(50000);
-        FluidRegistry.registerFluid(sand_fluid);
+        FluidRegistry.addBucketForFluid(sand_fluid);
         sand = registerFluidBlock(sand_fluid, new BlockQuicksandFluid(sand_fluid), "sand");
         
         honey_fluid = HoneyFluid.instance;
         honey_fluid.setViscosity(1500);
-        FluidRegistry.registerFluid(honey_fluid);
+        FluidRegistry.addBucketForFluid(honey_fluid);
         honey = registerFluidBlock(honey_fluid, new BlockHoneyFluid(honey_fluid), "honey");
         
         blood_fluid = BloodFluid.instance;
-        FluidRegistry.registerFluid(blood_fluid);
+        FluidRegistry.addBucketForFluid(blood_fluid);
         blood = registerFluidBlock(blood_fluid, new BlockBloodFluid(blood_fluid), "blood");
         
         poison_fluid = PoisonFluid.instance;
-        FluidRegistry.registerFluid(poison_fluid);
+        FluidRegistry.addBucketForFluid(poison_fluid);
         poison = registerFluidBlock(poison_fluid, new BlockPoisonFluid(poison_fluid), "poison");
         
         hot_spring_water_fluid = HotSpringWaterFluid.instance;
-        FluidRegistry.registerFluid(hot_spring_water_fluid);
+        FluidRegistry.addBucketForFluid(hot_spring_water_fluid);
         hot_spring_water = registerFluidBlock(hot_spring_water_fluid, new BlockHotSpringWaterFluid(hot_spring_water_fluid), "hot_spring_water");
-        
-        sand_bucket = ModItems.registerItem((new ItemBucket(sand)).setContainerItem(Items.BUCKET), "sand_bucket");
-        honey_bucket = ModItems.registerItem((new ItemBucket(honey)).setContainerItem(Items.BUCKET), "honey_bucket");
-        blood_bucket = ModItems.registerItem((new ItemBucket(blood)).setContainerItem(Items.BUCKET), "blood_bucket");
-        poison_bucket = ModItems.registerItem((new ItemBucket(poison)).setContainerItem(Items.BUCKET), "poison_bucket");
-        hot_spring_water_bucket = ModItems.registerItem((new ItemBucket(hot_spring_water)).setContainerItem(Items.BUCKET), "hot_spring_water_bucket");
-    
-        FluidContainerRegistry.registerFluidContainer(sand_fluid, new ItemStack(sand_bucket));
-        FluidContainerRegistry.registerFluidContainer(honey_fluid, new ItemStack(honey_bucket));
-        FluidContainerRegistry.registerFluidContainer(blood_fluid, new ItemStack(blood_bucket));
-        FluidContainerRegistry.registerFluidContainer(poison_fluid, new ItemStack(poison_bucket));
-        FluidContainerRegistry.registerFluidContainer(hot_spring_water_fluid, new ItemStack(hot_spring_water_bucket));
     }
 
     

src/main/java/biomesoplenty/core/BiomesOPlenty.java

@@ -31,10 +31,12 @@ import biomesoplenty.common.init.ModPotions;
 import biomesoplenty.common.init.ModSounds;
 import biomesoplenty.common.init.ModVanillaCompat;
 import biomesoplenty.common.remote.TrailManager;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.Mod.Instance;
 import net.minecraftforge.fml.common.SidedProxy;
+import net.minecraftforge.fml.common.event.FMLConstructionEvent;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -57,6 +59,13 @@ public class BiomesOPlenty
 
     public static Logger logger = LogManager.getLogger(MOD_ID);
     public static File configDirectory;
+    
+    @EventHandler
+    public void construction(FMLConstructionEvent event)
+    {
+        // Use forge universal bucket
+        FluidRegistry.enableUniversalBucket();
+    }
 
     @EventHandler
     public void preInit(FMLPreInitializationEvent event)

src/main/resources/assets/biomesoplenty/lang/de_DE.lang

@@ -73,13 +73,20 @@ generator.BIOMESOP.info=Hinweis: Biomes O' Plenty 1.8 ist in einem sehr frühen
 
 itemGroup.tabBiomesOPlenty=Biomes O' Plenty
 
+fluid.blood=Blut
+fluid.honey=Honig
+fluid.hot_spring_water=heißem Quellwasser
+fluid.poison=Gift
+fluid.sand=Treibsand
+
+item.forge.bucketFilled.name=Eimer mit %s
+
 item.ambrosia.name=Ambrosia
 item.ash.name=Asche
 item.berries.name=Beeren
 item.biome_essence.name=Biomessenz
 item.biome_finder.name=Biomfinder
 item.black_dye.name=Schwarzer Farbstoff
-item.blood_bucket.name=Eimer mit Blut
 item.blue_dye.name=Blauer Farbstoff
 item.brown_dye.name=Brauner Farbstoff
 item.cherry_door.name=Kirschholztür
@@ -109,9 +116,7 @@ item.gem_topaz.name=Topas
 item.green_dye.name=Grüner Farbstoff
 item.gold_scythe.name=Goldsense
 item.hellbark_door.name=Höllenborkentür
-item.honey_bucket.name=Eimer mit Honig
 item.honeycomb.name=Leere Honigwabe
-item.hot_spring_water_bucket.name=Eimer mit heißem Quellwasser
 item.ichor.name=Ichor
 item.iron_scythe.name=Eisensense
 item.jacaranda_door.name=Palisanderholztür
@@ -143,7 +148,6 @@ item.pinecone.name=Kiefernzapfen
 item.pine_door.name=Kiefernholztür
 item.pixie_dust.name=Elfenstaub
 item.plain_flower_band.name=Einfaches Blumenband
-item.poison_bucket.name=Eimer mit Gift
 item.record_corruption.name=Schallplatte
 item.record.corruption.desc=???
 item.record_wanderer.name=Schallplatte
@@ -154,7 +158,6 @@ item.sacred_oak_door.name=Himmelseichentür
 item.saladfruit.name=Obstsalat
 item.saladveggie.name=Gemischter Salat
 item.saladshroom.name=Pilzsalat
-item.sand_bucket.name=Eimer mit Treibsand
 item.shroompowder.name=Kahlkopfpilzpulver
 item.soul.name=Seele
 item.spawn_egg_pixie.name=Erschaffe Elfe

src/main/resources/assets/biomesoplenty/lang/en_US.lang

@@ -73,13 +73,20 @@ generator.BIOMESOP.info=Notice: Biomes O' Plenty 1.8 is in a very early state
 
 itemGroup.tabBiomesOPlenty=Biomes O' Plenty
 
+fluid.blood=Blood
+fluid.honey=Honey
+fluid.hot_spring_water=Hot Spring Water
+fluid.poison=Poison
+fluid.sand=Quicksand
+
+item.forge.bucketFilled.name=%s Bucket
+
 item.ambrosia.name=Ambrosia
 item.ash.name=Pile of Ashes
 item.berries.name=Berry
 item.biome_essence.name=Biome Essence
 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
@@ -109,9 +116,7 @@ item.gem_topaz.name=Topaz
 item.green_dye.name=Green Dye
 item.gold_scythe.name=Golden Scythe
 item.hellbark_door.name=Hellbark Door
-item.honey_bucket.name=Honey Bucket
 item.honeycomb.name=Empty Honeycomb
-item.hot_spring_water_bucket.name=Hot Spring Water Bucket
 item.ichor.name=Ichor
 item.iron_scythe.name=Iron Scythe
 item.jacaranda_door.name=Jacaranda Door
@@ -143,7 +148,6 @@ item.pinecone.name=Pinecone
 item.pine_door.name=Pine Door
 item.pixie_dust.name=Pixie Dust
 item.plain_flower_band.name=Plain Flower Band
-item.poison_bucket.name=Poison Bucket
 item.record_corruption.name=Music Disc
 item.record.corruption.desc=???
 item.record_wanderer.name=Music Disc
@@ -154,7 +158,6 @@ item.sacred_oak_door.name=Sacred Oak Door
 item.saladfruit.name=Fruit Salad
 item.saladveggie.name=Veggie Salad
 item.saladshroom.name=Shroom Salad
-item.sand_bucket.name=Quicksand Bucket
 item.shroompowder.name=Shroom Powder
 item.soul.name=Soul
 item.spawn_egg_pixie.name=Spawn Pixie

src/main/resources/assets/biomesoplenty/lang/es_ES.lang

@@ -110,6 +110,13 @@ generator.BIOMESOP.info=Noticia: Biomes O' Plenty 1.8 esta en una fase muy tempr
 
 itemGroup.tabBiomesOPlenty=Biomes O' Plenty
 
+fluid.blood=sangre
+fluid.honey=miel
+fluid.hot_spring_water=agua de manantial
+fluid.poison=veneno
+fluid.sand=arena movediza
+
+item.forge.bucketFilled.name=Cubo de %s
 
 item.ambrosia.name=Ambrosia
 
@@ -118,7 +125,6 @@ item.berries.name=Baya
 item.biome_essence.name=Esencia de bioma
 item.biome_finder.name=Buscabiomas
 item.black_dye.name=Tinte negro
-item.blood_bucket.name=Cubo de sangre
 item.blue_dye.name=Tinte azul
 item.brown_dye.name=Tinte marrón
 item.cherry_door.name=Puerta de cerezo
@@ -152,9 +158,7 @@ item.gem_topaz.name=Topacio
 item.green_dye.name=Tinte verde
 item.gold_scythe.name=Guadaña de oro
 item.hellbark_door.name=Puerta infernal
-item.honey_bucket.name=Cubo de miel
 item.honeycomb.name=Panal vacío
-item.hot_spring_water_bucket.name=Cubo de agua de manantial
 item.ichor.name=Icor
 
 item.iron_scythe.name=Guadaña de hierro
@@ -190,7 +194,6 @@ item.pinecone.name=Piña
 item.pine_door.name=Puerta de pino
 item.pixie_dust.name=Polvo de hadas
 item.plain_flower_band.name=Banda de flores simple
-item.poison_bucket.name=Cubo de veneno
 item.record_corruption.name=Disco de música
 item.record.corruption.desc=???
 
@@ -203,7 +206,6 @@ item.sacred_oak_door.name=Puerta de roble sagrado
 item.saladfruit.name=Ensalada de frutas
 item.saladveggie.name=Ensalada de verduras
 item.saladshroom.name=Ensalada de setas
-item.sand_bucket.name=Cubo de arena movediza
 item.shroompowder.name=Polvo de seta
 item.soul.name=Alma
 item.spawn_egg_pixie.name=Generar Hada

src/main/resources/assets/biomesoplenty/lang/pt_PT.lang

@@ -79,6 +79,14 @@ generator.BIOMESOP.info=Notice: Biomes O' Plenty 1.8 is in a very early state
 
 itemGroup.tabBiomesOPlenty=Biomes O' Plenty
 
+fluid.blood=Sangue
+fluid.honey=Mel
+fluid.hot_spring_water=Água de Fonte Termal
+fluid.poison=Veneno
+fluid.sand=Areia movediça
+
+item.forge.bucketFilled.name=Balde de %s
+
 item.ambrosia.name=Ambrosia
 item.amethyst_axe.name=Machado de Ametista
 item.amethyst_boots.name=Botas de Ametista
@@ -95,7 +103,6 @@ item.berries.name=Baga
 item.biome_essence.name=Essência de Bioma
 item.biome_finder.name=Localizador de Bioma
 item.black_dye.name=Tinta Preta
-item.blood_bucket.name=Balde de Sangue
 item.blue_dye.name=Tinta Azul
 item.brown_dye.name=Tinta Castanha
 item.cherry_door.name=Porta de Cerejeira
@@ -127,9 +134,7 @@ item.gem_topaz.name=Topázio
 item.green_dye.name=Tinta Verde
 item.gold_scythe.name=Foice de Ouro
 item.hellbark_door.name=Porta de Casca do Inferno
-item.honey_bucket.name=Balde de Mel
 item.honeycomb.name=Favo de Mel Vazio
-item.hot_spring_water_bucket.name=Balde de Água de Fonte Termal
 item.ichor.name=Ichor
 item.iron_scythe.name=Foice de Ferro
 item.jacaranda_door.name=Porta de Jacarandá
@@ -161,7 +166,6 @@ item.pinecone.name=Pinha
 item.pine_door.name=Porta de Pinho
 item.pixie_dust.name=Pó de Pixie
 item.plain_flower_band.name=Coroa de Flores Simples
-item.poison_bucket.name=Balde de Veneno
 item.poisondart.name=Dardo de Veneno
 item.record_corruption.name=Disco de Música
 item.record.corruption.desc=???

src/main/resources/assets/biomesoplenty/lang/ru_RU.lang

@@ -19,6 +19,14 @@ generator.BIOMESOP.info=Примечание: Biomes O' Plenty для Minecraft
 
 itemGroup.tabBiomesOPlenty=Biomes O' Plenty
 
+fluid.blood=крови
+fluid.honey=мёда
+fluid.hot_spring_water=Горячая минеральная вода
+fluid.poison=яда
+fluid.sand=Плывун
+
+item.forge.bucketFilled.name=Ведро %s
+
 item.ambrosia.name=Амброзия
 item.amethyst_axe.name=Аметистовый топор
 item.amethyst_boots.name=Аметистовые ботинки
@@ -35,7 +43,6 @@ item.berries.name=Ягода
 item.biome_essence.name=Эссенция биомов
 item.biome_finder.name=Радар биомов
 item.black_dye.name=Чёрный краситель
-item.blood_bucket.name=Ведро крови
 item.blue_dye.name=Синий краситель
 item.brown_dye.name=Коричневый краситель
 item.cherry_door.name=Дверь из вишнёвого дерева
@@ -64,7 +71,6 @@ item.ghastly_soul.name=Жуткая душа
 item.green_dye.name=Зелёный краситель
 item.gold_scythe.name=Золотая коса
 item.hellbark_door.name=Дверь из адского дерева
-item.honey_bucket.name=Ведро мёда
 item.honeycomb.name=Пустые медовые соты
 item.ichor.name=Ихор
 item.iron_scythe.name=Железная коса
@@ -97,7 +103,6 @@ item.pinecone.name=Сосновая шишка
 item.pine_door.name=Дверь из сосны
 item.pixie_dust.name=Пыльца феи
 item.plain_flower_band.name=Обычный венок
-item.poison_bucket.name=Ведро яда
 item.poisondart.name=Отравленный дротик
 item.record_corruption.name=Музыкальная пластинка
 item.record.corruption.desc=???

src/main/resources/assets/biomesoplenty/lang/zh_CN.lang

@@ -75,13 +75,20 @@ generator.BIOMESOP.info=注意: 1.8版本的超多生物群系仍在开发阶段
 
 itemGroup.tabBiomesOPlenty=超多生物群系
 
+fluid.blood=血
+fluid.honey=蜂蜜
+fluid.hot_spring_water=温泉水
+fluid.poison=毒液
+fluid.sand=流沙
+
+item.forge.bucketFilled.name=%s桶
+
 item.ambrosia.name=仙馔蜜酒
 item.ash.name=灰烬堆
 item.berries.name=浆果
 item.biome_essence.name=生物群系精华
 item.biome_finder.name=生物群系雷达
 item.black_dye.name=黑色染料
-item.blood_bucket.name=血桶
 item.blue_dye.name=蓝色染料
 item.brown_dye.name=棕色染料
 item.cherry_door.name=樱花树门
@@ -111,9 +118,7 @@ item.gem_topaz.name=黄玉
 item.green_dye.name=绿色染料
 item.gold_scythe.name=金镰刀
 item.hellbark_door.name=地狱皮树门
-item.honey_bucket.name=蜂蜜桶
 item.honeycomb.name=空蜂窝
-item.hot_spring_water_bucket.name=温泉水桶
 item.ichor.name=脓血
 item.iron_scythe.name=铁镰刀
 item.jacaranda_door.name=蓝花楹门
@@ -145,7 +150,6 @@ item.pinecone.name=松果
 item.pine_door.name=松木门
 item.pixie_dust.name=精灵之尘
 item.plain_flower_band.name=平原花环
-item.poison_bucket.name=毒液桶
 item.record_corruption.name=音乐唱片
 item.record.corruption.desc=???
 item.record_wanderer.name=音乐唱片
@@ -156,7 +160,6 @@ item.sacred_oak_door.name=神圣橡木门
 item.saladfruit.name=水果沙拉
 item.saladveggie.name=蔬菜沙拉
 item.saladshroom.name=蘑菇沙拉
-item.sand_bucket.name=流沙桶
 item.shroompowder.name=蘑菇粉
 item.soul.name=灵魂
 item.spawn_egg_pixie.name=生成 精灵

src/main/resources/assets/biomesoplenty/lang/zh_TW.lang

@@ -73,13 +73,20 @@ generator.BIOMESOP.info=Notice: Biomes O' Plenty 1.8 is in a very early state
 
 itemGroup.tabBiomesOPlenty=Biomes O' Plenty
 
+fluid.blood=血
+fluid.honey=蜂蜜
+fluid.hot_spring_water=溫泉水
+fluid.poison=毒液
+fluid.sand=流沙
+
+item.forge.bucketFilled.name=%s桶
+
 item.ambrosia.name=仙饌酒
 item.ash.name=灰燼
 item.berries.name=莓果
 item.biome_essence.name=生態系精華
 item.biome_finder.name=生態系雷達
 item.black_dye.name=黑色染料
-item.blood_bucket.name=血桶
 item.blue_dye.name=藍色染料
 item.brown_dye.name=棕色染料
 item.cherry_door.name=櫻木門
@@ -109,9 +116,7 @@ item.gem_topaz.name=黃玉
 item.green_dye.name=綠色染料
 item.gold_scythe.name=黃金鐮
 item.hellbark_door.name=獄皮木門
-item.honey_bucket.name=蜂蜜桶
 item.honeycomb.name=空的蜂巢
-item.hot_spring_water_bucket.name=溫泉水桶
 item.ichor.name=膿血
 item.iron_scythe.name=鐵鐮
 item.jacaranda_door.name=藍花楹門
@@ -143,7 +148,6 @@ item.pinecone.name=松果
 item.pine_door.name=松木門
 item.pixie_dust.name=小精靈粉塵
 item.plain_flower_band.name=樸素花環
-item.poison_bucket.name=毒液桶
 item.poisondart.name=塗毒飛鏢
 item.record_corruption.name=唱片
 item.record.corruption.desc=？？？

src/main/resources/assets/biomesoplenty/models/item/blood_bucket.json

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

src/main/resources/assets/biomesoplenty/models/item/honey_bucket.json

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

src/main/resources/assets/biomesoplenty/models/item/hot_spring_water_bucket.json

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

src/main/resources/assets/biomesoplenty/models/item/poison_bucket.json

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

src/main/resources/assets/biomesoplenty/models/item/sand_bucket.json

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