diff --git a/build.gradle b/build.gradle index fd1a47e1c..09914e585 100644 --- a/build.gradle +++ b/build.gradle @@ -79,7 +79,7 @@ minecraft { mappings = 'snapshot_20151126' replace "@MODVERSION@", project.version makeObfSourceJar = false - useDepAts = true + // useDepAts = true } group = 'TechReborn' @@ -108,7 +108,7 @@ dependencies { // compile name: "MineTweaker3", version: "1.7.10-3.0.9C", classifier: "Dev" // shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-5:api' compile 'RebornCore:RebornCore-1.8.8:1.0.0.+:dev' - deobfCompile "mezz.jei:jei_1.8.8:2.0.4.5" + // deobfCompile "mezz.jei:jei_1.8.8:2.0.4.5" testCompile 'junit:junit:4.12' } diff --git a/src/main/java/techreborn/blocks/fluid/BlockFluidBase.java b/src/main/java/techreborn/blocks/fluid/BlockFluidBase.java index b4f3237a0..351abfbdf 100644 --- a/src/main/java/techreborn/blocks/fluid/BlockFluidBase.java +++ b/src/main/java/techreborn/blocks/fluid/BlockFluidBase.java @@ -6,7 +6,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; -import reborncore.api.TextureRegistry; import techreborn.client.TechRebornCreativeTabMisc; public class BlockFluidBase extends BlockFluidClassic { @@ -14,7 +13,6 @@ public class BlockFluidBase extends BlockFluidClassic { public BlockFluidBase(Fluid fluid, Material material) { super(fluid, material); setCreativeTab(TechRebornCreativeTabMisc.instance); - TextureRegistry.registerFluid(this); } diff --git a/src/main/java/techreborn/init/ModFluids.java b/src/main/java/techreborn/init/ModFluids.java index e0a17ea03..9a2fa6e22 100644 --- a/src/main/java/techreborn/init/ModFluids.java +++ b/src/main/java/techreborn/init/ModFluids.java @@ -6,7 +6,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import reborncore.api.fuel.FluidPowerManager; -import reborncore.jsonDestroyers.fluid.FluidModelGenerator; import techreborn.blocks.fluid.BlockFluidTechReborn; import techreborn.blocks.fluid.TechRebornFluid; import techreborn.lib.ModInfo; @@ -199,7 +198,5 @@ public class ModFluids { GameRegistry.registerBlock(BlockFluidWolframium, ModInfo.MOD_ID + "_" + BlockFluidWolframium.getUnlocalizedName().substring(5)); fluidWolframium.setUnlocalizedName(fluidWolframium.getUnlocalizedName()); - - FluidModelGenerator.postInit(); } }