Clean Up BinnieSprite

This commit is contained in:
Nedelosk committed 2017-01-25 20:57:52 +01:00
1 parent 58c36b3c92
commit cdea827464
76 files changed
+228 -257

No files matched your search

@@ -1,45 +1,30 @@
package binnie.extrabees.apiary;
import binnie.Constants;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
import binnie.core.Mods;
import binnie.core.circuits.BinnieCircuitLayout;
import binnie.core.circuits.BinnieCircuitSocketType;
import binnie.core.machines.MachineGroup;
import binnie.core.machines.inventory.ValidatorSprite;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.apiary.machine.AlvearyMachine;
import binnie.extrabees.apiary.machine.AlvearyMutator;
import binnie.extrabees.apiary.machine.AlvearyStimulator;
import forestry.api.core.Tabs;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.oredict.ShapedOreRecipe;
public class ModuleApiary implements IInitializable {
public static Block blockComponent;
public static ValidatorSprite spriteMutator;
BinnieCircuitLayout stimulatorLayout;
@SubscribeEvent
@SideOnly(Side.CLIENT)
@Mod.EventHandler
public void texture(TextureStitchEvent e) {
Minecraft.getMinecraft().getTextureMapBlocks().registerSprite(new ResourceLocation(Constants.EXTRA_BEES_MOD_ID, "items/validator/mutator.0"));
Minecraft.getMinecraft().getTextureMapBlocks().registerSprite(new ResourceLocation(Constants.EXTRA_BEES_MOD_ID, "items/validator/mutator.1"));
}
@Override
public void preInit() {
final MachineGroup machineGroup = new MachineGroup(ExtraBees.instance, "alveay", "alveary", AlvearyMachine.values());
@@ -84,5 +69,6 @@ public class ModuleApiary implements IInitializable {
@Override
public void init() {
this.stimulatorLayout = new BinnieCircuitLayout(ExtraBees.instance, "Stimulator", BinnieCircuitSocketType.STIMULATOR);
ModuleApiary.spriteMutator = new ValidatorSprite(ExtraBees.instance, "validator/mutator.0", "validator/mutator.1");
}
}
@@ -37,7 +37,7 @@ public class AlvearyFrame {
public static class SlotValidatorFrame extends SlotValidator {
public SlotValidatorFrame() {
super(SlotValidator.IconFrame);
super(SlotValidator.spriteFrame);
}
@Override
@@ -43,7 +43,7 @@ public class AlvearyHatchery {
public static class SlotValidatorLarvae extends SlotValidator {
public SlotValidatorLarvae() {
super(SlotValidator.IconBee);
super(SlotValidator.spriteBee);
}
@Override
@@ -3,11 +3,10 @@ package binnie.extrabees.apiary.machine;
import binnie.core.machines.Machine;
import binnie.core.machines.inventory.ComponentInventorySlots;
import binnie.core.machines.inventory.SlotValidator;
import binnie.core.machines.inventory.ValidatorIcon;
import binnie.craftgui.minecraft.IMachineInformation;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.apiary.ComponentBeeModifier;
import binnie.extrabees.apiary.ComponentExtraBeeGUI;
import binnie.extrabees.apiary.ModuleApiary;
import binnie.extrabees.core.ExtraBeeGUID;
import binnie.extrabees.core.ExtraBeeTexture;
import forestry.api.apiculture.IBee;
@@ -69,7 +68,7 @@ public class AlvearyMutator {
public static class SlotValidatorMutator extends SlotValidator {
public SlotValidatorMutator() {
super(new ValidatorIcon(ExtraBees.instance, "validator/mutator.0", "validator/mutator.1"));
super(ModuleApiary.spriteMutator);
}
@Override
@@ -47,7 +47,7 @@ public class AlvearyStimulator {
public static class SlotValidatorCircuit extends SlotValidator {
public SlotValidatorCircuit() {
super(SlotValidator.IconCircuit);
super(SlotValidator.spriteCircuit);
}
@Override