From 8ec95f911931f9748271cc7c897c5c3386168e79 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 2 Feb 2016 21:05:42 +0000 Subject: [PATCH] Now using new Forge Dynamic buckets, and prep for new update --- build.gradle | 4 +- .../blocks/fluid/TechRebornFluid.java | 2 +- src/main/java/techreborn/init/ModFluids.java | 47 ++++++++++--------- .../items/tools/ItemFluidbucket.java | 23 ++++++--- 4 files changed, 43 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index 0bd14cdce..c62e9801f 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ configurations { compile.extendsFrom shade } -version = "0.7.9" +version = "0.7.10" def ENV = System.getenv() if (ENV.BUILD_NUMBER) { @@ -109,7 +109,7 @@ dependencies { compile "com.github.azanor:baubles:1.1.2.0:deobf@jar" compile name: "CraftTweaker", version: "1.8.8-3.0.0", classifier: "Dev" // shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-5:api' - deobfCompile 'RebornCore:RebornCore-1.8.9:1.4.0.+:universal' + deobfCompile 'RebornCore:RebornCore-1.8.9:1.4.1.+:universal' deobfCompile "mezz.jei:jei_1.8.9:2.24.+" testCompile 'junit:junit:4.12' diff --git a/src/main/java/techreborn/blocks/fluid/TechRebornFluid.java b/src/main/java/techreborn/blocks/fluid/TechRebornFluid.java index 505000a8c..5d2b0ab86 100644 --- a/src/main/java/techreborn/blocks/fluid/TechRebornFluid.java +++ b/src/main/java/techreborn/blocks/fluid/TechRebornFluid.java @@ -5,6 +5,6 @@ import net.minecraftforge.fluids.Fluid; public class TechRebornFluid extends Fluid { public TechRebornFluid(String fluidName) { - super(fluidName, new ResourceLocation("techreborn:textures/block/" + fluidName + "_flowing"), new ResourceLocation("techreborn:textures/block/" + fluidName + "_flowing")); + super(fluidName, new ResourceLocation("techreborn:blocks/fluids/" + fluidName.replaceFirst("fluid", "") + "_flowing"), new ResourceLocation("techreborn:blocks/fluids/" + fluidName.replaceFirst("fluid", "") + "_flowing")); } } diff --git a/src/main/java/techreborn/init/ModFluids.java b/src/main/java/techreborn/init/ModFluids.java index 9a2fa6e22..07dba7358 100644 --- a/src/main/java/techreborn/init/ModFluids.java +++ b/src/main/java/techreborn/init/ModFluids.java @@ -6,6 +6,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import reborncore.api.fuel.FluidPowerManager; +import techreborn.blocks.fluid.BlockFluidBase; import techreborn.blocks.fluid.BlockFluidTechReborn; import techreborn.blocks.fluid.TechRebornFluid; import techreborn.lib.ModInfo; @@ -13,73 +14,73 @@ import techreborn.lib.ModInfo; public class ModFluids { public static Fluid fluidberylium = new TechRebornFluid("fluidberylium"); - public static Block BlockFluidBerylium; + public static BlockFluidBase BlockFluidBerylium; public static Fluid fluidcalcium = new TechRebornFluid("fluidcalcium"); - public static Block BlockFluidCalcium; + public static BlockFluidBase BlockFluidCalcium; public static Fluid fluidcalciumcarbonate = new TechRebornFluid("fluidcalciumcarbonate"); - public static Block BlockFluidCalciumCarbonate; + public static BlockFluidBase BlockFluidCalciumCarbonate; public static Fluid fluidChlorite = new TechRebornFluid("fluidchlorite"); - public static Block BlockFluidChlorite; + public static BlockFluidBase BlockFluidChlorite; public static Fluid fluidDeuterium = new TechRebornFluid("fluiddeuterium"); - public static Block BlockFluidDeuterium; + public static BlockFluidBase BlockFluidDeuterium; public static Fluid fluidGlyceryl = new TechRebornFluid("fluidglyceryl"); - public static Block BlockFluidGlyceryl; + public static BlockFluidBase BlockFluidGlyceryl; public static Fluid fluidHelium = new TechRebornFluid("fluidhelium"); - public static Block BlockFluidHelium; + public static BlockFluidBase BlockFluidHelium; public static Fluid fluidHelium3 = new TechRebornFluid("fluidhelium3"); - public static Block BlockFluidHelium3; + public static BlockFluidBase BlockFluidHelium3; public static Fluid fluidHeliumplasma = new TechRebornFluid("fluidheliumplasma"); - public static Block BlockFluidHeliumplasma; + public static BlockFluidBase BlockFluidHeliumplasma; public static Fluid fluidHydrogen = new TechRebornFluid("fluidhydrogen"); - public static Block BlockFluidHydrogen; + public static BlockFluidBase BlockFluidHydrogen; public static Fluid fluidLithium = new TechRebornFluid("fluidlithium"); - public static Block BlockFluidLithium; + public static BlockFluidBase BlockFluidLithium; public static Fluid fluidMercury = new TechRebornFluid("fluidmercury"); - public static Block BlockFluidMercury; + public static BlockFluidBase BlockFluidMercury; public static Fluid fluidMethane = new TechRebornFluid("fluidmethane"); - public static Block BlockFluidMethane; + public static BlockFluidBase BlockFluidMethane; public static Fluid fluidNitrocoalfuel = new TechRebornFluid("fluidnitrocoalfuel"); - public static Block BlockFluidNitrocoalfuel; + public static BlockFluidBase BlockFluidNitrocoalfuel; public static Fluid fluidNitrofuel = new TechRebornFluid("fluidnitrofuel"); - public static Block BlockFluidNitrofuel; + public static BlockFluidBase BlockFluidNitrofuel; public static Fluid fluidNitrogen = new TechRebornFluid("fluidnitrogen"); - public static Block BlockFluidNitrogen; + public static BlockFluidBase BlockFluidNitrogen; public static Fluid fluidNitrogendioxide = new TechRebornFluid("fluidnitrogendioxide"); - public static Block BlockFluidNitrogendioxide; + public static BlockFluidBase BlockFluidNitrogendioxide; public static Fluid fluidPotassium = new TechRebornFluid("fluidpotassium"); - public static Block BlockFluidPotassium; + public static BlockFluidBase BlockFluidPotassium; public static Fluid fluidSilicon = new TechRebornFluid("fluidsilicon"); - public static Block BlockFluidSilicon; + public static BlockFluidBase BlockFluidSilicon; public static Fluid fluidSodium = new TechRebornFluid("fluidsodium"); - public static Block BlockFluidSodium; + public static BlockFluidBase BlockFluidSodium; public static Fluid fluidSodiumpersulfate = new TechRebornFluid("fluidsodiumpersulfate"); - public static Block BlockFluidSodiumpersulfate; + public static BlockFluidBase BlockFluidSodiumpersulfate; public static Fluid fluidTritium = new TechRebornFluid("fluidtritium"); - public static Block BlockFluidTritium; + public static BlockFluidBase BlockFluidTritium; public static Fluid fluidWolframium = new TechRebornFluid("fluidwolframium"); - public static Block BlockFluidWolframium; + public static BlockFluidBase BlockFluidWolframium; public static void init() { FluidRegistry.registerFluid(fluidberylium); diff --git a/src/main/java/techreborn/items/tools/ItemFluidbucket.java b/src/main/java/techreborn/items/tools/ItemFluidbucket.java index 3a78aff90..02d3aa502 100644 --- a/src/main/java/techreborn/items/tools/ItemFluidbucket.java +++ b/src/main/java/techreborn/items/tools/ItemFluidbucket.java @@ -1,23 +1,26 @@ package techreborn.items.tools; -import me.modmuss50.jsonDestroyer.api.ITexturedItem; -import net.minecraft.block.Block; +import me.modmuss50.jsonDestroyer.api.ITexturedBucket; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBucket; +import net.minecraftforge.fluids.Fluid; import reborncore.RebornCore; +import techreborn.blocks.fluid.BlockFluidBase; import techreborn.client.TechRebornCreativeTabMisc; -import techreborn.lib.ModInfo; -public class ItemFluidbucket extends ItemBucket implements ITexturedItem { +public class ItemFluidbucket extends ItemBucket implements ITexturedBucket { private String iconName; - public ItemFluidbucket(Block block) { + Fluid containedFluid; + + public ItemFluidbucket(BlockFluidBase block) { super(block); setContainerItem(Items.bucket); setCreativeTab(TechRebornCreativeTabMisc.instance); setUnlocalizedName("techreborn.fluidbucket"); RebornCore.jsonDestroyer.registerObject(this); + containedFluid = block.getFluid(); } @Override @@ -26,9 +29,15 @@ public class ItemFluidbucket extends ItemBucket implements ITexturedItem { return super.setUnlocalizedName(par1Str); } + @Override - public String getTextureName(int damage) { - return ModInfo.MOD_ID + ":items/bucket/" + iconName; + public boolean isGas(int damage) { + return false; + } + + @Override + public Fluid getFluid(int damage) { + return containedFluid; } @Override