Move some craftguis

This commit is contained in:
Nedelosk committed 2017-01-25 15:01:41 +01:00
1 parent fff40b966d
commit 49d80c847e
57 files changed
+114 -99

No files matched your search

@@ -15,9 +15,14 @@ import net.minecraft.item.EnumAction;
import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.SoundCategory;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import scala.concurrent.OnCompleteRunnable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -149,24 +154,24 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister,
public void registerModel(Item item, IModelManager manager) {
manager.registerItemModel(item, 0);
}
// @Override
// public ItemStack onItemRightClick(final ItemStack stack, final World world, final EntityPlayer player) {
// if (this.isDrinkable(stack)) {
// player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
// }
// return stack;
// }
// @Override
// public int func_150905_g(final ItemStack p_150905_1_) {
// return 0;
// }
//
// @Override
// public float func_150906_h(final ItemStack p_150906_1_) {
// return 0.0f;
// }
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World worldIn, EntityPlayer player, EnumHand hand) {
if (player.canEat(false) && this.isDrinkable(stack)) {
player.setActiveHand(hand);
return new ActionResult(EnumActionResult.SUCCESS, stack);
}
return new ActionResult(EnumActionResult.PASS, stack);
}
public float getSaturationModifier(ItemStack stack){
return 0.0F;
}
@Override
public int getHealAmount(ItemStack stack) {
return 0;
}
private boolean isDrinkable(final ItemStack stack) {
final FluidStack fluid = this.getLiquid(stack);
@@ -26,7 +26,6 @@ import binnie.craftgui.events.EventHandler;
import binnie.craftgui.events.EventMouse;
import binnie.craftgui.events.EventTextEdit;
import binnie.craftgui.events.EventValueChanged;
import binnie.craftgui.genetics.machine.WindowMachine;
import binnie.craftgui.minecraft.Dialog;
import binnie.craftgui.minecraft.EnumColor;
import binnie.craftgui.minecraft.IWindowAffectsShiftClick;
@@ -41,6 +40,7 @@ import binnie.craftgui.minecraft.control.ControlTabIcon;
import binnie.craftgui.resource.Texture;
import binnie.craftgui.resource.minecraft.CraftGUITexture;
import binnie.craftgui.window.Panel;
import binnie.genetics.machine.craftgui.WindowMachine;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@@ -2,8 +2,8 @@ package binnie.core.machines.storage;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import binnie.craftgui.genetics.machine.WindowMachine;
import binnie.craftgui.minecraft.Window;
import binnie.genetics.machine.craftgui.WindowMachine;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraftforge.fml.relauncher.Side;
@@ -8,6 +8,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
@@ -38,10 +39,15 @@ public class BlockStainedDesign extends BlockDesign {
return false;
}
@Override
public boolean canRenderInLayer(BlockRenderLayer layer) {
return layer == BlockRenderLayer.TRANSLUCENT;
}
@SideOnly(Side.CLIENT)
@Override
public int getRenderPasses() {
return 1;
return 2;
}
@Override
@@ -1,16 +1,16 @@
package binnie.extratrees.core;
import binnie.core.gui.IBinnieGUID;
import binnie.craftgui.extratrees.dictionary.WindowArboristDatabase;
import binnie.craftgui.extratrees.dictionary.WindowBrewery;
import binnie.craftgui.extratrees.dictionary.WindowDistillery;
import binnie.craftgui.extratrees.dictionary.WindowLepidopteristDatabase;
import binnie.craftgui.extratrees.dictionary.WindowLumbermill;
import binnie.craftgui.extratrees.dictionary.WindowPress;
import binnie.craftgui.extratrees.dictionary.WindowSetSquare;
import binnie.craftgui.extratrees.dictionary.WindowWoodworker;
import binnie.craftgui.extratrees.kitchen.WindowBottleRack;
import binnie.craftgui.minecraft.Window;
import binnie.extratrees.item.craftgui.WindowArboristDatabase;
import binnie.extratrees.item.craftgui.WindowBrewery;
import binnie.extratrees.item.craftgui.WindowDistillery;
import binnie.extratrees.item.craftgui.WindowLepidopteristDatabase;
import binnie.extratrees.item.craftgui.WindowLumbermill;
import binnie.extratrees.item.craftgui.WindowPress;
import binnie.extratrees.item.craftgui.WindowSetSquare;
import binnie.extratrees.item.craftgui.WindowWoodworker;
import binnie.extratrees.kitchen.craftgui.WindowBottleRack;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.tileentity.TileEntity;
@@ -2,7 +2,7 @@ package binnie.extratrees.integration.jei.distillery.brewery;
import binnie.craftgui.core.CraftGUI;
import binnie.craftgui.core.geometry.IPoint;
import binnie.craftgui.extratrees.dictionary.ControlDistilleryProgress;
import binnie.extratrees.item.craftgui.ControlDistilleryProgress;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.BlankRecipeWrapper;
import net.minecraft.client.Minecraft;
@@ -1,19 +1,17 @@
package binnie.extratrees.item;
import binnie.extratrees.api.IToolHammer;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemHammer extends Item implements IToolHammer {
boolean isDurableHammer;
// @Override
// @SideOnly(Side.CLIENT)
// public void registerIcons(final IIconRegister register) {
// this.itemIcon = ExtraTrees.proxy.getIcon(register, this.isDurableHammer ? "durableHammer" : "carpentryHammer");
// }
public class ItemHammer extends Item implements IToolHammer, IItemModelRegister {
private boolean isDurableHammer;
public ItemHammer(final boolean durable) {
this.isDurableHammer = false;
@@ -24,6 +22,12 @@ public class ItemHammer extends Item implements IToolHammer {
this.setMaxDamage(durable ? 1562 : 251);
setRegistryName(durable ? "durableHammer" : "hammer");
}
@Override
@SideOnly(Side.CLIENT)
public void registerModel(Item item, IModelManager manager) {
manager.registerItemModel(item, 0, isDurableHammer ? "durableHammer" : "carpentryHammer");
}
@Override
public String getItemStackDisplayName(final ItemStack i) {
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.craftgui.controls.core.Control;
import binnie.craftgui.core.IWidget;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.core.machines.Machine;
import binnie.core.util.ItemStackSet;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.core.machines.Machine;
import binnie.craftgui.core.CraftGUI;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.craftgui.core.Attribute;
import binnie.craftgui.core.CraftGUI;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.craftgui.core.CraftGUI;
import binnie.craftgui.core.IWidget;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.core.machines.Machine;
import binnie.core.machines.TileEntityMachine;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.Binnie;
import binnie.core.BinnieCore;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.craftgui.core.IWidget;
import binnie.craftgui.minecraft.Dialog;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.core.genetics.TreeBreedingSystem;
import binnie.craftgui.controls.ControlText;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.core.BinnieCore;
import binnie.craftgui.controls.ControlText;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.core.genetics.TreeBreedingSystem;
import binnie.craftgui.controls.ControlText;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.craftgui.controls.ControlTextCentered;
import binnie.craftgui.core.IWidget;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.Binnie;
import binnie.core.BinnieCore;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.core.genetics.TreeBreedingSystem;
import binnie.craftgui.controls.ControlText;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.Binnie;
import binnie.core.AbstractMod;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.core.AbstractMod;
import binnie.core.machines.Machine;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.core.AbstractMod;
import binnie.core.machines.Machine;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.Binnie;
import binnie.core.AbstractMod;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.core.AbstractMod;
import binnie.core.machines.Machine;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.core.AbstractMod;
import binnie.core.machines.Machine;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.core.AbstractMod;
import binnie.craftgui.minecraft.Window;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.dictionary;
package binnie.extratrees.item.craftgui;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.kitchen;
package binnie.extratrees.kitchen.craftgui;
import binnie.craftgui.core.Attribute;
import binnie.craftgui.core.IWidget;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.kitchen;
package binnie.extratrees.kitchen.craftgui;
import binnie.craftgui.controls.button.ControlButton;
import binnie.craftgui.core.IWidget;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.kitchen;
package binnie.extratrees.kitchen.craftgui;
import binnie.craftgui.controls.core.Control;
import binnie.craftgui.core.Attribute;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.kitchen;
package binnie.extratrees.kitchen.craftgui;
import binnie.craftgui.controls.core.Control;
import binnie.craftgui.core.Attribute;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.kitchen;
package binnie.extratrees.kitchen.craftgui;
import binnie.craftgui.controls.core.IControlValue;
import binnie.craftgui.core.IWidget;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.kitchen;
package binnie.extratrees.kitchen.craftgui;
import binnie.craftgui.core.IWidget;
import binnie.craftgui.core.geometry.IArea;
@@ -1,4 +1,4 @@
package binnie.craftgui.extratrees.kitchen;
package binnie.extratrees.kitchen.craftgui;
import binnie.core.AbstractMod;
import binnie.core.machines.Machine;
@@ -1,19 +1,19 @@
package binnie.genetics.core;
import binnie.core.gui.IBinnieGUID;
import binnie.craftgui.genetics.machine.WindowAcclimatiser;
import binnie.craftgui.genetics.machine.WindowAnalyser;
import binnie.craftgui.genetics.machine.WindowGeneBank;
import binnie.craftgui.genetics.machine.WindowGeneBankNEI;
import binnie.craftgui.genetics.machine.WindowGenepool;
import binnie.craftgui.genetics.machine.WindowIncubator;
import binnie.craftgui.genetics.machine.WindowInoculator;
import binnie.craftgui.genetics.machine.WindowIsolator;
import binnie.craftgui.genetics.machine.WindowPolymeriser;
import binnie.craftgui.genetics.machine.WindowSequencer;
import binnie.craftgui.genetics.machine.WindowSplicer;
import binnie.craftgui.minecraft.Window;
import binnie.genetics.gui.WindowAnalyst;
import binnie.genetics.machine.craftgui.WindowAcclimatiser;
import binnie.genetics.machine.craftgui.WindowAnalyser;
import binnie.genetics.machine.craftgui.WindowGeneBank;
import binnie.genetics.machine.craftgui.WindowGeneBankNEI;
import binnie.genetics.machine.craftgui.WindowGenepool;
import binnie.genetics.machine.craftgui.WindowIncubator;
import binnie.genetics.machine.craftgui.WindowInoculator;
import binnie.genetics.machine.craftgui.WindowIsolator;
import binnie.genetics.machine.craftgui.WindowPolymeriser;
import binnie.genetics.machine.craftgui.WindowSequencer;
import binnie.genetics.machine.craftgui.WindowSplicer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.tileentity.TileEntity;
@@ -10,8 +10,8 @@ import binnie.craftgui.core.Tooltip;
import binnie.craftgui.core.geometry.CraftGUIUtil;
import binnie.craftgui.core.geometry.IArea;
import binnie.craftgui.core.geometry.IPoint;
import binnie.craftgui.extratrees.kitchen.ControlFluidDisplay;
import binnie.craftgui.minecraft.control.ControlItemDisplay;
import binnie.extratrees.kitchen.craftgui.ControlFluidDisplay;
import binnie.genetics.Genetics;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.IBee;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.Binnie;
import binnie.core.BinnieCore;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.Binnie;
import binnie.core.genetics.BreedingSystem;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.craftgui.core.IWidget;
import binnie.craftgui.core.geometry.IArea;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.core.machines.Machine;
import binnie.craftgui.controls.ControlText;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.craftgui.core.IWidget;
import binnie.craftgui.core.geometry.IArea;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.Position;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.Position;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.Binnie;
import binnie.core.AbstractMod;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.core.AbstractMod;
import binnie.craftgui.minecraft.Window;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.Position;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.core.AbstractMod;
import binnie.craftgui.minecraft.Window;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.Position;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.CraftGUIUtil;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.Position;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.craftgui.minecraft.Window;
import net.minecraft.entity.player.EntityPlayer;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.Position;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.core.AbstractMod;
import binnie.craftgui.controls.ControlText;
@@ -1,4 +1,4 @@
package binnie.craftgui.genetics.machine;
package binnie.genetics.machine.craftgui;
import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.CraftGUIUtil;