Rewrote fluids

Now uses json files
Now uses forge bucket
Now not broken, closes #557
This commit is contained in:
modmuss50 2016-05-17 18:36:51 +01:00
parent c20c6d4722
commit 7e2db4a715
11 changed files with 178 additions and 305 deletions

View file

@ -15,7 +15,6 @@ public class BlockFluidBase extends BlockFluidClassic
public BlockFluidBase(Fluid fluid, Material material)
{
super(fluid, material);
RebornCore.jsonDestroyer.registerObject(this);
}
@Override

View file

@ -3,6 +3,8 @@ package techreborn.blocks.fluid;
import me.modmuss50.jsonDestroyer.api.ITexturedFluid;
import net.minecraft.block.material.Material;
import net.minecraftforge.fluids.Fluid;
import reborncore.RebornCore;
import techreborn.Core;
public class BlockFluidTechReborn extends BlockFluidBase implements ITexturedFluid
{
@ -14,6 +16,7 @@ public class BlockFluidTechReborn extends BlockFluidBase implements ITexturedFlu
super(fluid, material);
setUnlocalizedName(name);
this.name = name;
Core.proxy.registerFluidBlockRendering(this, name);
}
}

View file

@ -2,7 +2,9 @@ package techreborn.blocks.fluid;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import reborncore.common.util.Color;
import techreborn.Core;
public class TechRebornFluid extends Fluid
{
@ -11,5 +13,6 @@ public class TechRebornFluid extends Fluid
super(fluidName,
new ResourceLocation("techreborn:blocks/fluids/" + fluidName.replaceFirst("fluid", "") + "_flowing"),
new ResourceLocation("techreborn:blocks/fluids/" + fluidName.replaceFirst("fluid", "") + "_flowing"));
FluidRegistry.addBucketForFluid(this);
}
}