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

Buckets holding BOP Fluids will now cross over to 1.7 when the time comes

This commit is contained in:
Adubbz 2013-11-22 12:55:13 +11:00
parent 92e8a5136d
commit fde082074a
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/biomesoplenty/api/Fluids.java
View File

@ -12,9 +12,9 @@ public class Fluids
public static Optional<? extends Block> springWater = Optional.absent();
public static Optional<? extends Block> liquidPoison = Optional.absent();
public static Optional<? extends Block> honey = Optional.absent();
public static Optional<? extends Block> honey = Optional.absent();
public static Optional<? extends Fluid> springWaterFluid = Optional.absent();
public static Optional<? extends Fluid> liquidPoisonFluid = Optional.absent();
public static Optional<? extends Fluid> honeyFluid = Optional.absent();
public static Optional<? extends Fluid> honeyFluid = Optional.absent();
}

4
common/biomesoplenty/configuration/BOPBlocks.java
View File

@ -335,12 +335,12 @@ public class BOPBlocks
MinecraftForge.addGrassPlant(Blocks.foliage.get(), 11, 75);
}
private static void registerBlock(Block block)
public static void registerBlock(Block block)
{
GameRegistry.registerBlock(block, block.getUnlocalizedName().replace("tile.", ""));
}
private static void registerBlock(Block block, Class<? extends ItemBlock> itemBlockClass)
public static void registerBlock(Block block, Class<? extends ItemBlock> itemBlockClass)
{
GameRegistry.registerBlock(block, itemBlockClass, block.getUnlocalizedName().replace("tile.", ""));
}

15
common/biomesoplenty/configuration/BOPFluids.java
View File

@ -1,5 +1,8 @@
package biomesoplenty.configuration;
import static biomesoplenty.configuration.BOPBlocks.registerBlock;
import static biomesoplenty.configuration.BOPItems.registerItem;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -27,6 +30,7 @@ public class BOPFluids
initializeLiquids();
initializeContainers();
registerBlocks();
registerItems();
}
private static void registerFluids()
@ -61,8 +65,13 @@ public class BOPFluids
private static void registerBlocks()
{
GameRegistry.registerBlock(Fluids.liquidPoison.get(), "liquidPoison");
GameRegistry.registerBlock(Fluids.springWater.get(), "springWater");
GameRegistry.registerBlock(Fluids.honey.get(), "honey");
registerBlock(Fluids.liquidPoison.get());
registerBlock(Fluids.springWater.get());
registerBlock(Fluids.honey.get());
}
private static void registerItems()
{
registerItem(Fluids.bopBucket.get());
}
}

2
common/biomesoplenty/configuration/BOPItems.java
View File

@ -211,7 +211,7 @@ public class BOPItems {
registerItem(Items.flippers.get());
}
private static void registerItem(Item item)
public static void registerItem(Item item)
{
GameRegistry.registerItem(item, item.getUnlocalizedName().replace("item.", ""));
}