Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Author:
- Committer:
- Parent: 0be30db5637fdeccc782f21fbef3513e4852d0d9 (Travel isn't an upgrade for the Travel Stuff)
- Branch:
- Follows:
- Precedes:
- Local uncommitted changes, not checked in to index
- ----- enderio-base/src/main/java/crazypants/enderio/base/fluid/Fluids.java -----
- index 284c380a5..f3b8322aa 100644
- @@ -137,6 +137,11 @@ public enum Fluids {
- private final boolean hasBlock;
- protected final @Nonnull Material material;
- protected final int color;
- + /**
- + * INTERNAL ONLY - PERIOD
- + */
- + @Deprecated
- + private Fluid fluidUnsafe;
- private Fluids(@Nonnull String name) {
- this.name = name;
- @@ -207,7 +212,10 @@ public enum Fluids {
- @SubscribeEvent(priority = EventPriority.HIGH)
- public static void registerFluids(@Nonnull RegistryEvent.Register<Block> event) {
- for (Fluids fluid : values()) {
- - FluidRegistry.registerFluid(fluid.init(new Fluid(fluid.name, fluid.getStill(), fluid.getFlowing())));
- + // We need a hard reference to the Fluid to make sure we register a bucket for it
- + Fluid f = new Fluid(fluid.name, fluid.getStill(), fluid.getFlowing());
- + FluidRegistry.registerFluid(fluid.init(f));
- + fluid.fluidUnsafe = f;
- }
- }
- @@ -223,9 +231,8 @@ public enum Fluids {
- @SubscribeEvent
- public static void registerItems(@Nonnull RegistryEvent.Register<Item> event) {
- for (Fluids fluid : values()) {
- - if (!FluidRegistry.getBucketFluids().contains(fluid.getFluid())) {
- - FluidRegistry.addBucketForFluid(fluid.getFluid());
- - }
- + // Always add a bucket for our Fluid, avoids bugs when EIO is installed to an existing world
- + FluidRegistry.addBucketForFluid(fluid.fluidUnsafe);
- }
- }
- enderio-integration-tic/src/main/java/crazypants/enderio/integration/tic/fluids/Ender.java
- index 5c6305be2..333e147fc 100644
- @@ -35,9 +35,8 @@ public class Ender {
- }
- }.setUnlocalizedName(EnderIO.DOMAIN + "." + TicProxy.ENDER_FLUID_NAME).setDensity(4000);
- fluid.setLuminosity(3).setTemperature(1000 + 273).setViscosity(35);
- - if (FluidRegistry.registerFluid(fluid)) {
- - FluidRegistry.addBucketForFluid(fluid);
- - }
- + FluidRegistry.registerFluid(fluid);
- + FluidRegistry.addBucketForFluid(fluid);
- }
- public static Block createFluidBlock() {
- enderio-integration-tic/src/main/java/crazypants/enderio/integration/tic/fluids/Glowstone.java
- index 72f755743..03f969ef9 100644
- @@ -33,9 +33,8 @@ public class Glowstone {
- return 0x80FFFFFF; // | 0xffbc5e;
- }
- }.setUnlocalizedName(EnderIO.DOMAIN + "." + TicProxy.GLOWSTONE_FLUID_NAME).setDensity(-500).setGaseous(true).setTemperature(1500 + 273).setViscosity(100);
- - if (FluidRegistry.registerFluid(fluid)) {
- - FluidRegistry.addBucketForFluid(fluid);
- - }
- + FluidRegistry.registerFluid(fluid);
- + FluidRegistry.addBucketForFluid(fluid);
- }
- public static Block createFluidBlock() {
- enderio-integration-tic/src/main/java/crazypants/enderio/integration/tic/fluids/Redstone.java
- index bc49efab7..2ef3c5ae2 100644
- @@ -33,9 +33,8 @@ public class Redstone {
- return 0xFF000000 | 0xff0000;
- }
- }.setUnlocalizedName(EnderIO.DOMAIN + "." + TicProxy.REDSTONE_FLUID_NAME).setDensity(1200).setTemperature(1700 + 273).setViscosity(1500);
- - if (FluidRegistry.registerFluid(fluid)) {
- - FluidRegistry.addBucketForFluid(fluid);
- - }
- + FluidRegistry.registerFluid(fluid);
- + FluidRegistry.addBucketForFluid(fluid);
- }
- public static Block createFluidBlock() {
Advertisement
Add Comment
Please, Sign In to add comment
