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

@@ -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;