Clean Up and fluid texture fix

This commit is contained in:
Nedelosk committed 2017-01-14 23:56:44 +01:00
1 parent 41e847b944
commit c7635db7e8
22 files changed
+19 -118

No files matched your search

@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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() {
@@ -45,7 +45,6 @@ public enum Alcohol implements IFluidType, ICocktailLiquid {
List<String> 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());
@@ -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
@@ -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
@@ -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
@@ -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;
@@ -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
@@ -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 {
@@ -1,6 +1,5 @@
package binnie.extratrees.block;
import binnie.craftgui.resource.Texture;
import binnie.extratrees.api.IDesignMaterial;
public interface IPlankType extends IDesignMaterial {
@@ -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<EnumExtraTreeLog> getVariant();
@Override
public EnumExtraTreeLog getWoodType(int meta) {
return EnumExtraTreeLog.values()[offset * VARIANTS_PER_BLOCK + (meta & VARIANTS_META_MASK)];
}
@@ -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)];
}
@@ -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)];
}
@@ -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<V extends BlockETSlab> extends ItemSlab {
EnumExtraTreeLog[] values;
@@ -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;
@@ -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 {
@@ -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 {
@@ -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
@@ -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);