mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 04:09:43 +00:00
Removed Xp fluid block to remain consistent with Open Blocks.
This commit is contained in:
1 parent
daf4b0bf85
commit
eb43d878df
2 files changed
+4
-4
No files matched your search
@@ -242,7 +242,6 @@ public class EnderIO {
|
||||
|
||||
//Open block compatable liquid XP
|
||||
public static Fluid fluidXpJuice;
|
||||
public static BlockFluidEio blockXpJuice;
|
||||
public static ItemBucketEio itemBucketXpJuice;
|
||||
|
||||
// Items
|
||||
@@ -431,8 +430,6 @@ public class EnderIO {
|
||||
Log.info("XP Juice registered by Ender IO.");
|
||||
fluidXpJuice = new Fluid("xpjuice").setLuminosity(10).setDensity(800).setViscosity(1500).setUnlocalizedName("eio.xpjuice");
|
||||
FluidRegistry.registerFluid(fluidXpJuice);
|
||||
blockXpJuice = BlockFluidEio.create(fluidXpJuice, Material.water);
|
||||
fluidXpJuice.setBlock(blockXpJuice);
|
||||
itemBucketXpJuice = ItemBucketEio.create(fluidXpJuice);
|
||||
} else {
|
||||
Log.info("XP Juice regististration left to Open Blocks.");
|
||||
|
||||
@@ -4,9 +4,11 @@ import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemBucket;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
|
||||
@@ -22,7 +24,7 @@ import crazypants.enderio.gui.TooltipAddera;
|
||||
public class ItemBucketEio extends ItemBucket implements IAdvancedTooltipProvider{
|
||||
|
||||
public static ItemBucketEio create(Fluid fluid) {
|
||||
ItemBucketEio b = new ItemBucketEio(fluid.getBlock(), fluid.getName());
|
||||
ItemBucketEio b = new ItemBucketEio(fluid.getBlock() != null ? fluid.getBlock() : Blocks.air, fluid.getName());
|
||||
b.init();
|
||||
|
||||
FluidContainerRegistry.registerFluidContainer(fluid, new ItemStack(b), new ItemStack(Items.bucket));
|
||||
@@ -62,4 +64,5 @@ public class ItemBucketEio extends ItemBucket implements IAdvancedTooltipProvide
|
||||
public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
|
||||
TooltipAddera.instance.addTooltipForFluid(list, itemstack);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user