From c7635db7e8cf70ebaf900c2f1eefe9af0e339dbe Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 14 Jan 2017 23:56:44 +0100 Subject: [PATCH] Clean Up and fluid texture fix --- .../botany/genetics/FlowerBreedingSystem.java | 1 - .../binnie/core/genetics/BeeBreedingSystem.java | 1 - .../core/genetics/MothBreedingSystem.java | 1 - .../core/genetics/TreeBreedingSystem.java | 1 - .../extrabees/liquids/ExtraBeeLiquid.java | 15 ++------------- .../java/binnie/extratrees/alcohol/Alcohol.java | 17 ++--------------- .../java/binnie/extratrees/alcohol/Juice.java | 14 ++------------ .../java/binnie/extratrees/alcohol/Liqueur.java | 15 ++------------- .../binnie/extratrees/alcohol/MiscFluid.java | 5 +++-- .../extratrees/alcohol/ModuleAlcohol.java | 1 - .../java/binnie/extratrees/alcohol/Spirit.java | 5 ++--- .../extratrees/block/EnumExtraTreeLog.java | 1 - .../binnie/extratrees/block/IPlankType.java | 1 - .../binnie/extratrees/block/log/BlockETLog.java | 3 ++- .../extratrees/block/plank/BlockETPlank.java | 5 +---- .../extratrees/block/slab/BlockETSlab.java | 3 +-- .../extratrees/block/slab/ItemETSlab.java | 5 ----- .../extratrees/block/stairs/BlockETStairs.java | 15 --------------- .../binnie/extratrees/gen/WorldGenDefault.java | 1 - .../extratrees/genetics/WoodProvider.java | 2 -- .../binnie/extratrees/item/ExtraTreeLiquid.java | 15 ++------------- .../binnie/genetics/item/GeneticLiquid.java | 10 ---------- 22 files changed, 19 insertions(+), 118 deletions(-) diff --git a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index 91a3a1dc..1bc12b49 100644 --- a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -4,7 +4,6 @@ import binnie.Binnie; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.IBotanistTracker; -import binnie.botany.api.IFlowerRoot; import binnie.botany.core.BotanyCore; import binnie.core.BinnieCore; import binnie.core.genetics.BreedingSystem; diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index 1dccf03b..c2d63d58 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -9,7 +9,6 @@ import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IApiaristTracker; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeMutation; -import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.IAllele; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IChromosomeType; diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index 215963ae..43eacd09 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -12,7 +12,6 @@ import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.EnumFlutterType; -import forestry.api.lepidopterology.IButterflyRoot; import forestry.api.lepidopterology.ILepidopteristTracker; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 91b57973..ed7f4ee3 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -14,7 +14,6 @@ import forestry.api.arboriculture.IArboristTracker; import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.ITreeGenome; import forestry.api.arboriculture.ITreeMutation; -import forestry.api.arboriculture.ITreeRoot; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleInteger; diff --git a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java index c6335751..6251db71 100644 --- a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java +++ b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java @@ -14,7 +14,6 @@ public enum ExtraBeeLiquid implements ILiquidType { GLACIAL("liquidnitrogen", 9881800); String ident; - // IIcon icon; int colour; ExtraBeeLiquid(final String ident, final int colour) { @@ -24,23 +23,13 @@ public enum ExtraBeeLiquid implements ILiquidType { @Override public ResourceLocation getFlowing() { - return new ResourceLocation(Constants.EXTRA_BEES_MOD_ID, "liquids/" + this.getIdentifier()); + return new ResourceLocation(Constants.EXTRA_BEES_MOD_ID, "blocks/liquids/" + this.getIdentifier()); } @Override public ResourceLocation getStill() { - return new ResourceLocation(Constants.EXTRA_BEES_MOD_ID, "liquids/" + this.getIdentifier()); + return new ResourceLocation(Constants.EXTRA_BEES_MOD_ID, "blocks/liquids/" + this.getIdentifier()); } -// @Override -// public IIcon getIcon() { -// return this.icon; -// } -// -// @SideOnly(Side.CLIENT) -// @Override -// public void registerIcon(final IIconRegister register) { -// this.icon = ExtraBees.proxy.getIcon(register, "liquids/" + this.getIdentifier()); -// } @Override public String getName() { diff --git a/src/main/java/binnie/extratrees/alcohol/Alcohol.java b/src/main/java/binnie/extratrees/alcohol/Alcohol.java index f5e7d484..186a2614 100644 --- a/src/main/java/binnie/extratrees/alcohol/Alcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/Alcohol.java @@ -45,7 +45,6 @@ public enum Alcohol implements IFluidType, ICocktailLiquid { List fermentationLiquid; String fermentationSolid; String ident; - // IIcon icon; int colour; float transparency; float abv; @@ -72,28 +71,16 @@ public enum Alcohol implements IFluidType, ICocktailLiquid { return this.getName(); } -// @Override -// public IIcon getIcon() { -// return this.icon; -// } -// -// @Override -// public void registerIcon(final IIconRegister register) { -// this.icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); -// } - - //TODO TEXTURE @Override public ResourceLocation getFlowing() { - return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/liquid"); } @Override public ResourceLocation getStill() { - return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/liquid"); } - @Override public String getName() { return ExtraTrees.proxy.localise("fluid.alcohol." + this.name().toLowerCase()); diff --git a/src/main/java/binnie/extratrees/alcohol/Juice.java b/src/main/java/binnie/extratrees/alcohol/Juice.java index 73c78af2..86d39a6b 100644 --- a/src/main/java/binnie/extratrees/alcohol/Juice.java +++ b/src/main/java/binnie/extratrees/alcohol/Juice.java @@ -62,25 +62,15 @@ public enum Juice implements IFluidType, ICocktailLiquid { return container == FluidContainer.Glass; } -// @Override -// public IIcon getIcon() { -// return this.icon; -// } -// -// @Override -// public void registerIcon(final IIconRegister register) { -// this.icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); -// } - @Override public ResourceLocation getFlowing() { - return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/liquid"); } @Override public ResourceLocation getStill() { - return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/liquid"); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/Liqueur.java b/src/main/java/binnie/extratrees/alcohol/Liqueur.java index 5b63b03d..38616839 100644 --- a/src/main/java/binnie/extratrees/alcohol/Liqueur.java +++ b/src/main/java/binnie/extratrees/alcohol/Liqueur.java @@ -28,7 +28,6 @@ public enum Liqueur implements IFluidType, ICocktailLiquid { String name; String ident; - // IIcon icon; int colour; float transparency; float abv; @@ -63,24 +62,14 @@ public enum Liqueur implements IFluidType, ICocktailLiquid { return container == FluidContainer.Glass; } -// @Override -// public IIcon getIcon() { -// return this.icon; -// } -// -// @Override -// public void registerIcon(final IIconRegister register) { -// this.icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); -// } - @Override public ResourceLocation getFlowing() { - return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/liquid"); } @Override public ResourceLocation getStill() { - return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/liquid"); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java b/src/main/java/binnie/extratrees/alcohol/MiscFluid.java index 48e31f37..b3296e4e 100644 --- a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java +++ b/src/main/java/binnie/extratrees/alcohol/MiscFluid.java @@ -1,6 +1,7 @@ package binnie.extratrees.alcohol; import binnie.Binnie; +import binnie.Constants; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.IFluidType; import net.minecraft.util.ResourceLocation; @@ -46,12 +47,12 @@ public enum MiscFluid implements IFluidType, ICocktailLiquid { @Override public ResourceLocation getFlowing() { - return new ResourceLocation("liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/liquid"); } @Override public ResourceLocation getStill() { - return new ResourceLocation("liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/liquid"); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index 033d0d05..a86025b3 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -18,7 +18,6 @@ import forestry.api.recipes.RecipeManagers; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; - import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/src/main/java/binnie/extratrees/alcohol/Spirit.java b/src/main/java/binnie/extratrees/alcohol/Spirit.java index 40ad579b..7578188f 100644 --- a/src/main/java/binnie/extratrees/alcohol/Spirit.java +++ b/src/main/java/binnie/extratrees/alcohol/Spirit.java @@ -38,7 +38,6 @@ public enum Spirit implements IFluidType, ICocktailLiquid { String name; String ident; - // IIcon icon; int colour; float transparency; float abv; @@ -68,12 +67,12 @@ public enum Spirit implements IFluidType, ICocktailLiquid { @Override public ResourceLocation getFlowing() { - return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/liquid"); } @Override public ResourceLocation getStill() { - return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid"); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/liquid"); } @Override diff --git a/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java b/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java index 5ad9dc6b..b1f7b6b0 100644 --- a/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java +++ b/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java @@ -1,7 +1,6 @@ package binnie.extratrees.block; import binnie.Constants; -import binnie.extratrees.api.IDesignMaterial; import forestry.api.arboriculture.IWoodType; public enum EnumExtraTreeLog implements IWoodType { diff --git a/src/main/java/binnie/extratrees/block/IPlankType.java b/src/main/java/binnie/extratrees/block/IPlankType.java index 5c93a7f1..a41ca22f 100644 --- a/src/main/java/binnie/extratrees/block/IPlankType.java +++ b/src/main/java/binnie/extratrees/block/IPlankType.java @@ -1,6 +1,5 @@ package binnie.extratrees.block; -import binnie.craftgui.resource.Texture; import binnie.extratrees.api.IDesignMaterial; public interface IPlankType extends IDesignMaterial { diff --git a/src/main/java/binnie/extratrees/block/log/BlockETLog.java b/src/main/java/binnie/extratrees/block/log/BlockETLog.java index 68097695..2b7b75bd 100644 --- a/src/main/java/binnie/extratrees/block/log/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/log/BlockETLog.java @@ -16,7 +16,6 @@ import net.minecraft.block.SoundType; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -52,8 +51,10 @@ public abstract class BlockETLog extends BlockLog implements IWoodKind, IStateMa } + @Override public abstract PropertyEnum getVariant(); + @Override public EnumExtraTreeLog getWoodType(int meta) { return EnumExtraTreeLog.values()[offset * VARIANTS_PER_BLOCK + (meta & VARIANTS_META_MASK)]; } diff --git a/src/main/java/binnie/extratrees/block/plank/BlockETPlank.java b/src/main/java/binnie/extratrees/block/plank/BlockETPlank.java index 6cbbc858..b5bd9343 100644 --- a/src/main/java/binnie/extratrees/block/plank/BlockETPlank.java +++ b/src/main/java/binnie/extratrees/block/plank/BlockETPlank.java @@ -5,8 +5,6 @@ import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.EnumExtraTreeLog; import binnie.extratrees.block.IWoodKind; import binnie.extratrees.block.PropertyEnumWoodType; -import binnie.extratrees.block.log.BlockETLog; -import binnie.extratrees.block.log.ItemETLog; import binnie.extratrees.genetics.WoodAccess; import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.IItemModelRegister; @@ -23,7 +21,6 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; @@ -31,7 +28,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -111,6 +107,7 @@ public abstract class BlockETPlank extends Block implements IWoodKind, IItemMode return getDefaultState().withProperty(getVariant(), woodType); } + @Override public EnumExtraTreeLog getWoodType(int meta) { return EnumExtraTreeLog.values()[offset * VARIANTS_PER_BLOCK + (meta & VARIANTS_META_MASK)]; } diff --git a/src/main/java/binnie/extratrees/block/slab/BlockETSlab.java b/src/main/java/binnie/extratrees/block/slab/BlockETSlab.java index e51d83b8..b58d25c5 100644 --- a/src/main/java/binnie/extratrees/block/slab/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/slab/BlockETSlab.java @@ -5,8 +5,6 @@ import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.EnumExtraTreeLog; import binnie.extratrees.block.IWoodKind; import binnie.extratrees.block.PropertyEnumWoodType; -import binnie.extratrees.block.log.BlockETLog; -import binnie.extratrees.block.log.ItemETLog; import binnie.extratrees.block.plank.BlockETPlank; import binnie.extratrees.genetics.WoodAccess; import forestry.api.arboriculture.WoodBlockKind; @@ -56,6 +54,7 @@ public abstract class BlockETSlab extends BlockSlab implements IWoodKind, IItemM setRegistryName(BLOCK_NAME + "." + (fireproof ? "fireproof." : "") + (isDouble()?"double.":"") + offset); } + @Override public EnumExtraTreeLog getWoodType(int meta) { return EnumExtraTreeLog.values()[offset * VARIANTS_PER_BLOCK + (meta & VARIANTS_META_MASK)]; } diff --git a/src/main/java/binnie/extratrees/block/slab/ItemETSlab.java b/src/main/java/binnie/extratrees/block/slab/ItemETSlab.java index 61415863..874d0527 100644 --- a/src/main/java/binnie/extratrees/block/slab/ItemETSlab.java +++ b/src/main/java/binnie/extratrees/block/slab/ItemETSlab.java @@ -1,13 +1,8 @@ package binnie.extratrees.block.slab; -import binnie.core.block.ItemMetadata; -import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.EnumExtraTreeLog; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class ItemETSlab extends ItemSlab { EnumExtraTreeLog[] values; diff --git a/src/main/java/binnie/extratrees/block/stairs/BlockETStairs.java b/src/main/java/binnie/extratrees/block/stairs/BlockETStairs.java index fa7b0522..7e24aa84 100644 --- a/src/main/java/binnie/extratrees/block/stairs/BlockETStairs.java +++ b/src/main/java/binnie/extratrees/block/stairs/BlockETStairs.java @@ -1,39 +1,24 @@ package binnie.extratrees.block.stairs; import binnie.Constants; -import binnie.core.models.ModelManager; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.*; import binnie.extratrees.genetics.WoodAccess; -import com.google.common.collect.ImmutableMap; import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; import forestry.api.core.Tabs; -import forestry.core.models.BlockModelEntry; -import forestry.core.models.DefaultTextureGetter; import net.minecraft.block.BlockStairs; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.ModelProcessingHelper; - import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; public abstract class BlockETStairs extends BlockStairs implements IWoodKind, IItemModelRegister, IStateMapperRegister { private final boolean fireproof; diff --git a/src/main/java/binnie/extratrees/gen/WorldGenDefault.java b/src/main/java/binnie/extratrees/gen/WorldGenDefault.java index e67845ec..578c280e 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenDefault.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenDefault.java @@ -3,7 +3,6 @@ package binnie.extratrees.gen; import binnie.extratrees.worldgen.BlockType; import binnie.extratrees.worldgen.BlockTypeLeaf; import binnie.extratrees.worldgen.BlockTypeLog; -import forestry.api.arboriculture.ITree; import forestry.api.world.ITreeGenData; public class WorldGenDefault extends WorldGenTree { diff --git a/src/main/java/binnie/extratrees/genetics/WoodProvider.java b/src/main/java/binnie/extratrees/genetics/WoodProvider.java index a4527ad2..a3e041ec 100644 --- a/src/main/java/binnie/extratrees/genetics/WoodProvider.java +++ b/src/main/java/binnie/extratrees/genetics/WoodProvider.java @@ -15,8 +15,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.FMLClientHandler; -import net.minecraftforge.fml.common.registry.GameRegistry; - import javax.annotation.Nonnull; public class WoodProvider implements IWoodProvider { diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java index ba6d31fe..d4479526 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java @@ -15,7 +15,6 @@ public enum ExtraTreeLiquid implements ILiquidType { public String name; String ident; - // IIcon icon; int colour; ExtraTreeLiquid(final String name, final String ident, final int colour) { @@ -25,24 +24,14 @@ public enum ExtraTreeLiquid implements ILiquidType { this.colour = colour; } -// @Override -// public IIcon getIcon() { -// return this.icon; -// } -// -// @Override -// public void registerIcon(final IIconRegister register) { -// this.icon = ExtraTrees.proxy.getIcon(register, "liquids/" + this.getIdentifier()); -// } - @Override public ResourceLocation getStill() { - return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/" + this.getIdentifier()); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/" + this.getIdentifier()); } @Override public ResourceLocation getFlowing() { - return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/" + this.getIdentifier()); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/liquids/" + this.getIdentifier()); } @Override diff --git a/src/main/java/binnie/genetics/item/GeneticLiquid.java b/src/main/java/binnie/genetics/item/GeneticLiquid.java index 49ad047b..29cea0f0 100644 --- a/src/main/java/binnie/genetics/item/GeneticLiquid.java +++ b/src/main/java/binnie/genetics/item/GeneticLiquid.java @@ -32,16 +32,6 @@ public enum GeneticLiquid implements IFluidType { return this.name; } -// @Override -// public IIcon getIcon() { -// return this.icon; -// } -// -// @Override -// public void registerIcon(final IIconRegister register) { -// this.icon = Genetics.proxy.getIcon(register, "liquids/" + this.ident); -// } - @Override public ResourceLocation getFlowing() { return new ResourceLocation(Genetics.instance.getModID(), "blocks/liquids/" + this.ident);