mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 12:42:53 +00:00
Clean Up BinnieSprite
This commit is contained in:
1 parent
58c36b3c92
commit
cdea827464
76 files changed
+228
-257
No files matched your search
@@ -4,7 +4,7 @@ import binnie.Binnie;
|
||||
import binnie.core.IInitializable;
|
||||
import binnie.core.liquid.IFluidType;
|
||||
import binnie.core.liquid.ItemFluidContainer;
|
||||
import binnie.core.resource.BinnieIcon;
|
||||
import binnie.core.resource.BinnieSprite;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
import binnie.extratrees.alcohol.drink.DrinkLiquid;
|
||||
import binnie.extratrees.alcohol.drink.DrinkManager;
|
||||
@@ -32,11 +32,11 @@ public class ModuleAlcohol implements IInitializable {
|
||||
public ItemDrink drink;
|
||||
public Block blockDrink;
|
||||
public int drinkRendererID;
|
||||
public BinnieIcon liquid;
|
||||
public BinnieSprite liquid;
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
this.liquid = Binnie.RESOURCE.getBlockIcon(ExtraTrees.instance, "liquids/liquid");
|
||||
this.liquid = Binnie.RESOURCE.getBlockSprite(ExtraTrees.instance, "liquids/liquid");
|
||||
//ModuleAlcohol.drinkRendererID = BinnieCore.proxy.getUniqueRenderID();
|
||||
this.drink = new ItemDrink();
|
||||
ExtraTrees.proxy.registerItem(drink);
|
||||
|
||||
@@ -2,15 +2,15 @@ package binnie.extratrees.core;
|
||||
|
||||
import binnie.core.gui.IBinnieGUID;
|
||||
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 binnie.extratrees.machines.craftgui.WindowArboristDatabase;
|
||||
import binnie.extratrees.machines.craftgui.WindowBrewery;
|
||||
import binnie.extratrees.machines.craftgui.WindowDistillery;
|
||||
import binnie.extratrees.machines.craftgui.WindowLepidopteristDatabase;
|
||||
import binnie.extratrees.machines.craftgui.WindowLumbermill;
|
||||
import binnie.extratrees.machines.craftgui.WindowPress;
|
||||
import binnie.extratrees.machines.craftgui.WindowSetSquare;
|
||||
import binnie.extratrees.machines.craftgui.WindowWoodworker;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package binnie.extratrees.integration.jei.distillery.brewery;
|
||||
|
||||
import binnie.craftgui.core.CraftGUI;
|
||||
import binnie.craftgui.core.geometry.IPoint;
|
||||
import binnie.extratrees.item.craftgui.ControlDistilleryProgress;
|
||||
import binnie.extratrees.machines.craftgui.ControlDistilleryProgress;
|
||||
import mezz.jei.api.ingredients.IIngredients;
|
||||
import mezz.jei.api.recipe.BlankRecipeWrapper;
|
||||
import net.minecraft.client.Minecraft;
|
||||
|
||||
@@ -4,6 +4,7 @@ import binnie.core.BinnieCore;
|
||||
import binnie.core.IInitializable;
|
||||
import binnie.core.Mods;
|
||||
import binnie.core.machines.MachineGroup;
|
||||
import binnie.core.machines.inventory.ValidatorSprite;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
import binnie.extratrees.item.ExtraTreeItems;
|
||||
import forestry.api.core.Tabs;
|
||||
@@ -15,6 +16,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
|
||||
public class ModuleMachine implements IInitializable {
|
||||
public static ValidatorSprite spritePolish;
|
||||
|
||||
public Block blockMachine;
|
||||
|
||||
@@ -30,6 +32,7 @@ public class ModuleMachine implements IInitializable {
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
ModuleMachine.spritePolish = new ValidatorSprite(ExtraTrees.instance, "validator/polish.0", "validator/polish.1");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
package binnie.extratrees.machines;
|
||||
|
||||
import binnie.core.machines.inventory.SlotValidator;
|
||||
import binnie.core.machines.inventory.ValidatorIcon;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
import binnie.extratrees.api.IDesignMaterial;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -11,7 +9,7 @@ public class Validators {
|
||||
DesignerType type;
|
||||
|
||||
public SlotValidatorBeeswax(final DesignerType type) {
|
||||
super(new ValidatorIcon(ExtraTrees.instance, "validator/polish.0", "validator/polish.1"));
|
||||
super(ModuleMachine.spritePolish);
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
@@ -30,7 +28,7 @@ public class Validators {
|
||||
DesignerType type;
|
||||
|
||||
public SlotValidatorPlanks(final DesignerType type) {
|
||||
super(SlotValidator.IconBlock);
|
||||
super(SlotValidator.spriteBlock);
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
|
||||
|
||||
public class SlotValidatorBreweryGrain extends SlotValidator {
|
||||
public SlotValidatorBreweryGrain() {
|
||||
super(SlotValidator.IconBlock);
|
||||
super(SlotValidator.spriteBlock);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
|
||||
|
||||
public class SlotValidatorBreweryIngredient extends SlotValidator {
|
||||
public SlotValidatorBreweryIngredient() {
|
||||
super(SlotValidator.IconBlock);
|
||||
super(SlotValidator.spriteBlock);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
|
||||
|
||||
public class SlotValidatorBreweryYeast extends SlotValidator {
|
||||
public SlotValidatorBreweryYeast() {
|
||||
super(SlotValidator.IconBlock);
|
||||
super(SlotValidator.spriteBlock);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.craftgui.controls.core.Control;
|
||||
import binnie.craftgui.core.IWidget;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.core.machines.Machine;
|
||||
import binnie.core.util.ItemStackSet;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.core.machines.Machine;
|
||||
import binnie.craftgui.core.CraftGUI;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.craftgui.core.Attribute;
|
||||
import binnie.craftgui.core.CraftGUI;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.craftgui.core.CraftGUI;
|
||||
import binnie.craftgui.core.IWidget;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.core.machines.Machine;
|
||||
import binnie.core.machines.TileEntityMachine;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.craftgui.core.IWidget;
|
||||
import binnie.craftgui.minecraft.Dialog;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.core.genetics.TreeBreedingSystem;
|
||||
import binnie.craftgui.controls.ControlText;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.craftgui.controls.ControlText;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.core.genetics.TreeBreedingSystem;
|
||||
import binnie.craftgui.controls.ControlText;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.craftgui.controls.ControlTextCentered;
|
||||
import binnie.craftgui.core.IWidget;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.core.genetics.TreeBreedingSystem;
|
||||
import binnie.craftgui.controls.ControlText;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.AbstractMod;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.machines.Machine;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.machines.Machine;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.AbstractMod;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.machines.Machine;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.machines.Machine;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.craftgui.minecraft.Window;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.extratrees.item.craftgui;
|
||||
package binnie.extratrees.machines.craftgui;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.BinnieCore;
|
||||
@@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
|
||||
|
||||
public class SlotValidatorSqueezable extends SlotValidator {
|
||||
public SlotValidatorSqueezable() {
|
||||
super(SlotValidator.IconBlock);
|
||||
super(SlotValidator.spriteBlock);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -8,7 +8,7 @@ public class SlotValidatorLog extends SlotValidator {
|
||||
private static final int logWoodId = OreDictionary.getOreID("logWood");
|
||||
|
||||
public SlotValidatorLog() {
|
||||
super(SlotValidator.IconBlock);
|
||||
super(SlotValidator.spriteBlock);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user