mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 12:19:47 +00:00
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
This commit is contained in:
commit
5171e33764
25 files changed
+278
-189
No files matched your search
@@ -1,6 +1,8 @@
|
||||
package binnie.botany;
|
||||
|
||||
import binnie.Constants;
|
||||
import binnie.botany.api.EnumAcidity;
|
||||
import binnie.botany.api.EnumSoilType;
|
||||
import binnie.botany.api.IFlower;
|
||||
import binnie.botany.api.gardening.IBlockSoil;
|
||||
import binnie.botany.ceramic.BlockCeramic;
|
||||
@@ -145,7 +147,6 @@ public class Botany extends AbstractMod {
|
||||
|
||||
@SubscribeEvent
|
||||
public void onShearFlower(final PlayerInteractEvent.RightClickBlock event) {
|
||||
|
||||
if (event.getEntityPlayer() != null && event.getEntityPlayer().getHeldItemMainhand() != null && event.getEntityPlayer().getHeldItemMainhand().getItem() == Items.SHEARS) {
|
||||
final TileEntity tile = event.getWorld().getTileEntity(event.getPos());
|
||||
if (tile instanceof TileEntityFlower) {
|
||||
@@ -184,37 +185,37 @@ public class Botany extends AbstractMod {
|
||||
}
|
||||
if (Gardening.isSoil(block)) {
|
||||
final IBlockSoil soil = (IBlockSoil) block;
|
||||
// if (Gardening.isNutrientFertiliser(event.getEntityPlayer().getHeldItemMainhand()) && soil.getType(event.getWorld(), down) != EnumSoilType.FLOWERBED) {
|
||||
// final EnumSoilType type = soil.getType(event.getWorld(), down);
|
||||
// final int next = Math.min(type.ordinal() + Gardening.getFertiliserStrength(event.getEntityPlayer().getHeldItemMainhand()), 2);
|
||||
// if (soil.fertilise(event.getWorld(), down, EnumSoilType.values()[next]) && !event.getEntityPlayer().capabilities.isCreativeMode) {
|
||||
// final ItemStack heldItem = event.getEntityPlayer().getHeldItemMainhand();
|
||||
// --heldItem.stackSize;
|
||||
// return;
|
||||
// }
|
||||
// }
|
||||
// if (Gardening.isAcidFertiliser(event.getEntityPlayer().getHeldItemMainhand()) && soil.getPH(event.getWorld(), down) != EnumAcidity.Acid) {
|
||||
// final EnumAcidity pH = soil.getPH(event.getWorld(), down);
|
||||
// final int next = Math.max(pH.ordinal() - Gardening.getFertiliserStrength(event.getEntityPlayer().getHeldItemMainhand()), 0);
|
||||
// if (soil.setPH(event.getWorld(), down, EnumAcidity.values()[next]) && !event.getEntityPlayer().capabilities.isCreativeMode) {
|
||||
// final ItemStack heldItem2 = event.getEntityPlayer().getHeldItemMainhand();
|
||||
// --heldItem2.stackSize;
|
||||
// return;
|
||||
// }
|
||||
// }
|
||||
// if (Gardening.isAlkalineFertiliser(event.getEntityPlayer().getHeldItemMainhand()) && soil.getPH(event.getWorld(), down) != EnumAcidity.Alkaline) {
|
||||
// final EnumAcidity pH = soil.getPH(event.getWorld(), down);
|
||||
// final int next = Math.min(pH.ordinal() + Gardening.getFertiliserStrength(event.getEntityPlayer().getHeldItemMainhand()), 2);
|
||||
// if (soil.setPH(event.getWorld(), down, EnumAcidity.values()[next]) && !event.getEntityPlayer().capabilities.isCreativeMode) {
|
||||
// final ItemStack heldItem3 = event.getEntityPlayer().getHeldItemMainhand();
|
||||
// --heldItem3.stackSize;
|
||||
// return;
|
||||
// }
|
||||
// }
|
||||
// if (Gardening.isWeedkiller(event.getEntityPlayer().getHeldItemMainhand()) && Gardening.addWeedKiller(event.getWorld(), down) && !event.getEntityPlayer().capabilities.isCreativeMode) {
|
||||
// final ItemStack heldItem4 = event.getEntityPlayer().getHeldItemMainhand();
|
||||
// --heldItem4.stackSize;
|
||||
// }
|
||||
if (Gardening.isNutrientFertiliser(event.getEntityPlayer().getHeldItemMainhand()) && soil.getType(event.getWorld(), down) != EnumSoilType.FLOWERBED) {
|
||||
final EnumSoilType type = soil.getType(event.getWorld(), down);
|
||||
final int next = Math.min(type.ordinal() + Gardening.getFertiliserStrength(event.getEntityPlayer().getHeldItemMainhand()), 2);
|
||||
if (soil.fertilise(event.getWorld(), down, EnumSoilType.values()[next]) && !event.getEntityPlayer().capabilities.isCreativeMode) {
|
||||
final ItemStack heldItem = event.getEntityPlayer().getHeldItemMainhand();
|
||||
--heldItem.stackSize;
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (Gardening.isAcidFertiliser(event.getEntityPlayer().getHeldItemMainhand()) && soil.getPH(event.getWorld(), down) != EnumAcidity.Acid) {
|
||||
final EnumAcidity pH = soil.getPH(event.getWorld(), down);
|
||||
final int next = Math.max(pH.ordinal() - Gardening.getFertiliserStrength(event.getEntityPlayer().getHeldItemMainhand()), 0);
|
||||
if (soil.setPH(event.getWorld(), down, EnumAcidity.values()[next]) && !event.getEntityPlayer().capabilities.isCreativeMode) {
|
||||
final ItemStack heldItem2 = event.getEntityPlayer().getHeldItemMainhand();
|
||||
--heldItem2.stackSize;
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (Gardening.isAlkalineFertiliser(event.getEntityPlayer().getHeldItemMainhand()) && soil.getPH(event.getWorld(), down) != EnumAcidity.Alkaline) {
|
||||
final EnumAcidity pH = soil.getPH(event.getWorld(), down);
|
||||
final int next = Math.min(pH.ordinal() + Gardening.getFertiliserStrength(event.getEntityPlayer().getHeldItemMainhand()), 2);
|
||||
if (soil.setPH(event.getWorld(), down, EnumAcidity.values()[next]) && !event.getEntityPlayer().capabilities.isCreativeMode) {
|
||||
final ItemStack heldItem3 = event.getEntityPlayer().getHeldItemMainhand();
|
||||
--heldItem3.stackSize;
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (Gardening.isWeedkiller(event.getEntityPlayer().getHeldItemMainhand()) && Gardening.addWeedKiller(event.getWorld(), down) && !event.getEntityPlayer().capabilities.isCreativeMode) {
|
||||
final ItemStack heldItem4 = event.getEntityPlayer().getHeldItemMainhand();
|
||||
--heldItem4.stackSize;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -260,9 +261,9 @@ public class Botany extends AbstractMod {
|
||||
final Block block = event.getBlock().getBlock();
|
||||
if (Gardening.isSoil(block)) {
|
||||
final IBlockSoil soil = (IBlockSoil) block;
|
||||
// if (soil.fertilise(event.getWorld(), event.getPos(), EnumSoilType.LOAM)) {
|
||||
// event.setResult(Event.Result.ALLOW);
|
||||
// }
|
||||
if (soil.fertilise(event.getWorld(), event.getPos(), EnumSoilType.LOAM)) {
|
||||
event.setResult(Event.Result.ALLOW);
|
||||
}
|
||||
}
|
||||
final TileEntity tile = event.getWorld().getTileEntity(event.getPos());
|
||||
if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).onBonemeal()) {
|
||||
|
||||
@@ -103,7 +103,7 @@ public class BlockCeramic extends Block implements IBlockMetadata, IColoredBlock
|
||||
@Override
|
||||
public String getBlockName(final ItemStack par1ItemStack) {
|
||||
final int meta = TileEntityMetadata.getItemDamage(par1ItemStack);
|
||||
return EnumFlowerColor.get(meta).getName() + " Ceramic Block";
|
||||
return EnumFlowerColor.get(meta).getColourName() + " Ceramic Block";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -464,9 +464,9 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
String name = this.color1.getName();
|
||||
String name = this.color1.getColourName();
|
||||
if (this.type.canDouble() && this.color2 != this.color1) {
|
||||
name = name + " & " + this.color2.getName();
|
||||
name = name + " & " + this.color2.getColourName();
|
||||
}
|
||||
return name + " " + this.type.name;
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ public class BlockStained extends Block implements IBlockMetadata, IColoredBlock
|
||||
@Override
|
||||
public String getBlockName(final ItemStack par1ItemStack) {
|
||||
final int meta = TileEntityMetadata.getItemDamage(par1ItemStack);
|
||||
return EnumFlowerColor.get(meta).getName() + " Pigmented Glass";
|
||||
return EnumFlowerColor.get(meta).getColourName() + " Pigmented Glass";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -11,7 +11,7 @@ import java.util.Map;
|
||||
|
||||
public class CeramicColor implements IDesignMaterial {
|
||||
EnumFlowerColor color;
|
||||
static Map<EnumFlowerColor, CeramicColor> map;
|
||||
private final static Map<EnumFlowerColor, CeramicColor> map = new LinkedHashMap<>();
|
||||
|
||||
CeramicColor(final EnumFlowerColor color) {
|
||||
this.color = color;
|
||||
@@ -37,7 +37,6 @@ public class CeramicColor implements IDesignMaterial {
|
||||
}
|
||||
|
||||
static {
|
||||
CeramicColor.map = new LinkedHashMap<>();
|
||||
for (final EnumFlowerColor c : EnumFlowerColor.values()) {
|
||||
CeramicColor.map.put(c, new CeramicColor(c));
|
||||
}
|
||||
|
||||
@@ -1,23 +1,32 @@
|
||||
package binnie.botany.ceramic;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import binnie.botany.Botany;
|
||||
import binnie.botany.genetics.EnumFlowerColor;
|
||||
import binnie.botany.items.BotanyItems;
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.extratrees.api.IDesignMaterial;
|
||||
import binnie.extratrees.api.IDesignSystem;
|
||||
import binnie.extratrees.api.IPattern;
|
||||
import binnie.extratrees.carpentry.DesignerManager;
|
||||
import binnie.extratrees.carpentry.EnumPattern;
|
||||
import forestry.core.render.TextureManager;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
public class CeramicDesignSystem implements IDesignSystem {
|
||||
public static CeramicDesignSystem instance = new CeramicDesignSystem();
|
||||
// Map<Integer, IIcon> primary;
|
||||
// Map<Integer, IIcon> secondary;
|
||||
Map<Integer, TextureAtlasSprite> primary;
|
||||
Map<Integer, TextureAtlasSprite> secondary;
|
||||
|
||||
CeramicDesignSystem() {
|
||||
// this.primary = new HashMap<Integer, IIcon>();
|
||||
// this.secondary = new HashMap<Integer, IIcon>();
|
||||
this.primary = new HashMap<Integer, TextureAtlasSprite>();
|
||||
this.secondary = new HashMap<Integer, TextureAtlasSprite>();
|
||||
DesignerManager.instance.registerDesignSystem(this);
|
||||
}
|
||||
|
||||
@@ -42,32 +51,32 @@ public class CeramicDesignSystem implements IDesignSystem {
|
||||
}
|
||||
|
||||
public String getTexturePath() {
|
||||
return "ceramic";
|
||||
return "blocks/ceramic";
|
||||
}
|
||||
|
||||
@Override
|
||||
public TextureAtlasSprite getPrimarySprite(IPattern pattern) {
|
||||
if (pattern instanceof EnumPattern) {
|
||||
return this.primary.get(((EnumPattern) pattern).ordinal());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TextureAtlasSprite getSecondarySprite(IPattern pattern) {
|
||||
if (pattern instanceof EnumPattern) {
|
||||
return this.secondary.get(((EnumPattern) pattern).ordinal());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerSprites() {
|
||||
for (EnumPattern pattern : EnumPattern.values()) {
|
||||
this.primary.put(pattern.ordinal(), TextureManager.registerSprite(new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0")));
|
||||
this.secondary.put(pattern.ordinal(), TextureManager.registerSprite(new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1")));
|
||||
}
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public IIcon getPrimaryIcon(final IPattern pattern) {
|
||||
// if (pattern instanceof EnumPattern) {
|
||||
// return this.primary.get(((EnumPattern) pattern).ordinal());
|
||||
// }
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public IIcon getSecondaryIcon(final IPattern pattern) {
|
||||
// if (pattern instanceof EnumPattern) {
|
||||
// return this.secondary.get(((EnumPattern) pattern).ordinal());
|
||||
// }
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void registerIcons(final IIconRegister register) {
|
||||
// for (final EnumPattern pattern : EnumPattern.values()) {
|
||||
// this.primary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, this.getMod().getModID(), this.getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"));
|
||||
// this.secondary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, this.getMod().getModID(), this.getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"));
|
||||
// }
|
||||
// }
|
||||
|
||||
public AbstractMod getMod() {
|
||||
return Botany.instance;
|
||||
|
||||
@@ -6,6 +6,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -65,9 +66,8 @@ public class CeramicTileRecipe implements IRecipe {
|
||||
return this.cached;
|
||||
}
|
||||
|
||||
//TODO IMPLEMENT
|
||||
@Override
|
||||
public ItemStack[] getRemainingItems(InventoryCrafting inv) {
|
||||
return new ItemStack[0];
|
||||
return ForgeHooks.defaultRecipeGetRemainingItems(inv);
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,7 @@ import binnie.core.BinnieCore;
|
||||
import forestry.core.blocks.IColoredBlock;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -37,6 +38,7 @@ public class BlockFlower extends BlockContainer implements /*IItemModelRegister,
|
||||
final float f = 0.2f;
|
||||
this.setTickRandomly(true);
|
||||
this.setRegistryName("flower");
|
||||
this.setSoundType(SoundType.PLANT);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -15,8 +15,12 @@ import com.mojang.authlib.GameProfile;
|
||||
import forestry.api.core.EnumHumidity;
|
||||
import forestry.api.core.EnumTemperature;
|
||||
import forestry.api.core.IErrorState;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.IPollinatable;
|
||||
import forestry.api.lepidopterology.IButterfly;
|
||||
import forestry.api.lepidopterology.IButterflyNursery;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockDoublePlant.EnumPlantType;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTUtil;
|
||||
@@ -24,12 +28,12 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.biome.Biome;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.HashSet;
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
|
||||
public class TileEntityFlower extends TileEntity //implements IPollinatable, IButterflyNursery
|
||||
{
|
||||
public class TileEntityFlower extends TileEntity /*implements IPollinatable, IButterflyNursery*/{
|
||||
IFlower flower;
|
||||
GameProfile owner;
|
||||
int section;
|
||||
@@ -92,33 +96,33 @@ public class TileEntityFlower extends TileEntity //implements IPollinatable, IBu
|
||||
this.owner = owner;
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public EnumSet<EnumPlantType> getPlantType() {
|
||||
// return EnumSet.of(EnumPlantType.Plains);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public IIndividual getPollen() {
|
||||
// return this.getFlower();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean canMateWith(final IIndividual individual) {
|
||||
// return this.isBreeding() && individual instanceof IFlower && this.getFlower() != null && this.getFlower().getMate() == null && this.getFlower().hasFlowered() && !this.getFlower().isGeneticEqual(individual);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void mateWith(final IIndividual individual) {
|
||||
// if (this.getFlower() == null || !(individual instanceof IFlower)) {
|
||||
// return;
|
||||
// }
|
||||
// final IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) individual.getGenome().getPrimary();
|
||||
// final IAlleleFlowerSpecies primary2 = this.getFlower().getGenome().getPrimary();
|
||||
// if (primary == primary2 || this.worldObj.rand.nextInt(4) == 0) {
|
||||
// this.getFlower().mate((IFlower) individual);
|
||||
// //this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
|
||||
// }
|
||||
// }
|
||||
/*@Override
|
||||
public EnumSet<EnumPlantType> getPlantType() {
|
||||
return EnumSet.of(EnumPlantType.Plains);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIndividual getPollen() {
|
||||
return this.getFlower();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canMateWith(final IIndividual individual) {
|
||||
return this.isBreeding() && individual instanceof IFlower && this.getFlower() != null && this.getFlower().getMate() == null && this.getFlower().hasFlowered() && !this.getFlower().isGeneticEqual(individual);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void mateWith(final IIndividual individual) {
|
||||
if (this.getFlower() == null || !(individual instanceof IFlower)) {
|
||||
return;
|
||||
}
|
||||
final IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) individual.getGenome().getPrimary();
|
||||
final IAlleleFlowerSpecies primary2 = this.getFlower().getGenome().getPrimary();
|
||||
if (primary == primary2 || this.worldObj.rand.nextInt(4) == 0) {
|
||||
this.getFlower().mate((IFlower) individual);
|
||||
this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
|
||||
}
|
||||
}*/
|
||||
|
||||
public IFlower getFlower() {
|
||||
if (this.getSection() <= 0) {
|
||||
|
||||
@@ -8,6 +8,7 @@ import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockBush;
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.block.properties.PropertyEnum;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
@@ -32,6 +33,7 @@ public class BlockPlant extends BlockBush implements IItemModelRegister {
|
||||
this.setRegistryName("plant");
|
||||
this.setCreativeTab(CreativeTabBotany.instance);
|
||||
this.setTickRandomly(true);
|
||||
this.setSoundType(SoundType.PLANT);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -2,6 +2,9 @@ package binnie.botany.items;
|
||||
|
||||
import binnie.botany.CreativeTabBotany;
|
||||
import binnie.botany.genetics.EnumFlowerColor;
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -10,24 +13,31 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemClay extends Item {
|
||||
public class ItemClay extends Item implements IColoredItem, IItemModelRegister {
|
||||
public ItemClay() {
|
||||
this.setUnlocalizedName("clay");
|
||||
this.setHasSubtypes(true);
|
||||
this.setCreativeTab(CreativeTabBotany.instance);
|
||||
setRegistryName("clay");
|
||||
}
|
||||
//
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public int getColorFromItemStack(final ItemStack stack, final int p_82790_2_) {
|
||||
// final int damage = stack.getItemDamage();
|
||||
// return EnumFlowerColor.get(damage).getColor(false);
|
||||
// }
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
for (EnumFlowerColor c : EnumFlowerColor.values()) {
|
||||
manager.registerItemModel(item, c.ordinal());
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public int getColorFromItemstack(ItemStack stack, int tintIndex) {
|
||||
return EnumFlowerColor.get(stack.getMetadata()).getColor(false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemStackDisplayName(final ItemStack stack) {
|
||||
return EnumFlowerColor.get(stack.getItemDamage()).getName() + " Clay";
|
||||
return EnumFlowerColor.get(stack.getItemDamage()).getColourName() + " " + super.getItemStackDisplayName(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -37,10 +47,4 @@ public class ItemClay extends Item {
|
||||
list.add(new ItemStack(this, 1, c.ordinal()));
|
||||
}
|
||||
}
|
||||
//
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public void registerIcons(final IIconRegister register) {
|
||||
// this.itemIcon = Botany.proxy.getIcon(register, "clay");
|
||||
// }
|
||||
}
|
||||
@@ -37,7 +37,7 @@ public class ItemPigment extends Item implements IItemModelRegister, IColoredIte
|
||||
|
||||
@Override
|
||||
public String getItemStackDisplayName(final ItemStack stack) {
|
||||
return EnumFlowerColor.get(stack.getItemDamage()).getName() + " Pigment";
|
||||
return EnumFlowerColor.get(stack.getItemDamage()).getColourName() + " " + super.getItemStackDisplayName(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,7 +1,17 @@
|
||||
package binnie.core.block;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
public class ItemMetadata extends ItemBlock {
|
||||
public ItemMetadata(final Block block) {
|
||||
@@ -12,45 +22,39 @@ public class ItemMetadata extends ItemBlock {
|
||||
public int getMetadata(final int par1) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) {
|
||||
if (!(block instanceof IBlockMetadata)) {
|
||||
return false;
|
||||
}
|
||||
int placedMeta = ((IBlockMetadata) block).getPlacedMeta(stack, world, pos, side);
|
||||
if (placedMeta < 0) {
|
||||
return false;
|
||||
}
|
||||
if (!world.setBlockState(pos, newState, 3)) {
|
||||
return false;
|
||||
}
|
||||
if (world.getBlockState(pos).getBlock() == block) {
|
||||
TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos);
|
||||
if (tile != null) {
|
||||
tile.setTileMetadata(placedMeta, false);
|
||||
}
|
||||
setTileEntityNBT(world, player, pos, stack);
|
||||
block.onBlockPlacedBy(world, pos, newState, player, stack);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public boolean placeBlockAt(final ItemStack stack, final EntityPlayer player, final World world, final int x, final int y, final int z, final int side, final float hitX, final float hitY, final float hitZ, final int metadata) {
|
||||
// final Block block = this.field_150939_a;
|
||||
// if (!(block instanceof IBlockMetadata)) {
|
||||
// return false;
|
||||
// }
|
||||
// final int placedMeta = ((IBlockMetadata) block).getPlacedMeta(stack, world, x, y, z, ForgeDirection.values()[side]);
|
||||
// if (placedMeta < 0) {
|
||||
// return false;
|
||||
// }
|
||||
// if (!world.setBlock(x, y, z, block, metadata, 3)) {
|
||||
// return false;
|
||||
// }
|
||||
// if (world.getBlock(x, y, z) == block) {
|
||||
// final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
|
||||
// if (tile != null) {
|
||||
// tile.setTileMetadata(placedMeta, false);
|
||||
// }
|
||||
// block.onBlockPlacedBy(world, x, y, z, player, stack);
|
||||
// block.onPostBlockPlaced(world, x, y, z, metadata);
|
||||
// }
|
||||
// return true;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public String getItemStackDisplayName(final ItemStack par1ItemStack) {
|
||||
// return ((IBlockMetadata) this.field_150939_a).getBlockName(par1ItemStack);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
|
||||
// ((IBlockMetadata) this.field_150939_a).getBlockTooltip(par1ItemStack, par3List);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public IIcon getIconFromDamage(final int par1) {
|
||||
// return this.field_150939_a.getIcon(1, par1);
|
||||
// }
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public String getItemStackDisplayName(final ItemStack par1ItemStack) {
|
||||
return ((IBlockMetadata) block).getBlockName(par1ItemStack);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
|
||||
((IBlockMetadata) block).getBlockTooltip(stack, tooltip);
|
||||
}
|
||||
}
|
||||
@@ -1,13 +1,14 @@
|
||||
package binnie.extratrees.api;
|
||||
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public interface IDesignSystem {
|
||||
// IIcon getPrimaryIcon(final IPattern p0);
|
||||
//
|
||||
// IIcon getSecondaryIcon(final IPattern p0);
|
||||
//
|
||||
// void registerIcons(final IIconRegister p0);
|
||||
TextureAtlasSprite getPrimarySprite(final IPattern pattern);
|
||||
|
||||
TextureAtlasSprite getSecondarySprite(final IPattern pattern);
|
||||
|
||||
void registerSprites();
|
||||
|
||||
IDesignMaterial getDefaultMaterial();
|
||||
|
||||
|
||||
@@ -1,24 +1,31 @@
|
||||
package binnie.extratrees.carpentry;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
import binnie.extratrees.api.CarpentryManager;
|
||||
import binnie.extratrees.api.IDesignMaterial;
|
||||
import binnie.extratrees.api.IDesignSystem;
|
||||
import binnie.extratrees.api.IPattern;
|
||||
import binnie.extratrees.block.PlankType;
|
||||
import binnie.extratrees.item.ExtraTreeItems;
|
||||
import forestry.core.render.TextureManager;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
public enum DesignSystem implements IDesignSystem {
|
||||
Wood,
|
||||
Glass;
|
||||
|
||||
// Map<Integer, IIcon> primary;
|
||||
// Map<Integer, IIcon> secondary;
|
||||
Map<Integer, TextureAtlasSprite> primary;
|
||||
Map<Integer, TextureAtlasSprite> secondary;
|
||||
|
||||
DesignSystem() {
|
||||
// this.primary = new HashMap<Integer, IIcon>();
|
||||
// this.secondary = new HashMap<Integer, IIcon>();
|
||||
this.primary = new HashMap<Integer, TextureAtlasSprite>();
|
||||
this.secondary = new HashMap<Integer, TextureAtlasSprite>();
|
||||
DesignerManager.instance.registerDesignSystem(this);
|
||||
}
|
||||
|
||||
@@ -126,29 +133,29 @@ public enum DesignSystem implements IDesignSystem {
|
||||
}
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public IIcon getPrimaryIcon(final IPattern pattern) {
|
||||
// if (pattern instanceof EnumPattern) {
|
||||
// return this.primary.get(((EnumPattern) pattern).ordinal());
|
||||
// }
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public IIcon getSecondaryIcon(final IPattern pattern) {
|
||||
// if (pattern instanceof EnumPattern) {
|
||||
// return this.secondary.get(((EnumPattern) pattern).ordinal());
|
||||
// }
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void registerIcons(final IIconRegister register) {
|
||||
// for (final EnumPattern pattern : EnumPattern.values()) {
|
||||
// this.primary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, this.getMod().getModID(), this.getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"));
|
||||
// this.secondary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, this.getMod().getModID(), this.getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"));
|
||||
// }
|
||||
// }
|
||||
@Override
|
||||
public TextureAtlasSprite getPrimarySprite(final IPattern pattern) {
|
||||
if (pattern instanceof EnumPattern) {
|
||||
return this.primary.get(((EnumPattern) pattern).ordinal());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TextureAtlasSprite getSecondarySprite(final IPattern pattern) {
|
||||
if (pattern instanceof EnumPattern) {
|
||||
return this.secondary.get(((EnumPattern) pattern).ordinal());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerSprites() {
|
||||
for (final EnumPattern pattern : EnumPattern.values()) {
|
||||
this.primary.put(pattern.ordinal(), TextureManager.registerSprite(new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0")));
|
||||
this.secondary.put(pattern.ordinal(), TextureManager.registerSprite(new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1")));
|
||||
}
|
||||
}
|
||||
|
||||
public AbstractMod getMod() {
|
||||
return ExtraTrees.instance;
|
||||
|
||||
Reference in new issue
Block a user