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 -1
View File
@@ -168,7 +168,7 @@ public final class BinnieCore extends AbstractMod {
// if (event.map.getTextureType() == 0) {
// Binnie.Liquid.reloadIcons(event.map);
// }
Binnie.RESOURCE.registerIcons();
Binnie.RESOURCE.registerSprites();
}
@SubscribeEvent
@@ -22,8 +22,8 @@ import java.util.TreeSet;
class BeeBreedingSystem extends BreedingSystem {
public BeeBreedingSystem() {
this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee");
this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/discoveredBee");
this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/undiscoveredBee");
this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/discoveredBee");
}
@Override
@@ -2,7 +2,7 @@ package binnie.core.genetics;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.resource.BinnieIcon;
import binnie.core.resource.BinnieSprite;
import binnie.extrabees.genetics.ExtraBeeMutation;
import com.mojang.authlib.GameProfile;
import forestry.api.core.ForestryEvent;
@@ -35,8 +35,8 @@ import java.util.Set;
import java.util.TreeSet;
public abstract class BreedingSystem implements IItemStackRepresentitive {
protected BinnieIcon iconUndiscovered;
protected BinnieIcon iconDiscovered;
protected BinnieSprite iconUndiscovered;
protected BinnieSprite iconDiscovered;
private List<IClassification> allBranches;
List<IAlleleSpecies> allActiveSpecies;
private List<IAlleleSpecies> allSpecies;
@@ -20,8 +20,8 @@ import java.util.TreeSet;
class MothBreedingSystem extends BreedingSystem {
public MothBreedingSystem() {
this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/undiscoveredMoth");
this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/discoveredMoth");
this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/undiscoveredMoth");
this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/discoveredMoth");
}
@Override
@@ -53,8 +53,8 @@ public class TreeBreedingSystem extends BreedingSystem {
this.discoveredFruits = new UniqueItemStackSet();
this.discoveredWoods = new UniqueItemStackSet();
this.discoveredPlanks = new UniqueItemStackSet();
this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/undiscoveredTree");
this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/discoveredTree");
this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/undiscoveredTree");
this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/discoveredTree");
}
@Override
@@ -36,14 +36,14 @@ public class MachineComponent implements INbtReadable, INbtWritable {
}
public Class[] getComponentInterfaces() {
return Binnie.MCHINE.getComponentInterfaces(this.getClass());
return Binnie.MACHINE.getComponentInterfaces(this.getClass());
}
public void onInventoryUpdate() {
}
public final MachinePayload getPayload() {
return new MachinePayload(Binnie.MCHINE.getNetworkID(this.getClass()));
return new MachinePayload(Binnie.MACHINE.getNetworkID(this.getClass()));
}
public void recieveData(final MachinePayload payload) {
@@ -43,7 +43,7 @@ public class MachineGroup {
}
}
}
Binnie.MCHINE.registerMachineGroup(this);
Binnie.MACHINE.registerMachineGroup(this);
this.block = new BlockMachine(this, blockName);
mod.getProxy().registerBlock(this.block);
Item i = mod.getProxy().registerItem(new ItemMachine(this.block));
@@ -3,7 +3,7 @@ package binnie.core.machines;
import binnie.core.BinnieCore;
import binnie.core.ManagerBase;
import binnie.core.machines.inventory.SlotValidator;
import binnie.core.machines.inventory.ValidatorIcon;
import binnie.core.machines.inventory.ValidatorSprite;
import forestry.api.core.INbtReadable;
import forestry.api.core.INbtWritable;
@@ -70,11 +70,10 @@ public class ManagerMachine extends ManagerBase {
@Override
public void init() {
//TODO renderupdate
SlotValidator.IconBee = new ValidatorIcon(BinnieCore.instance, "validator/bee.0", "validator/bee.1");
SlotValidator.IconFrame = new ValidatorIcon(BinnieCore.instance, "validator/frame.0", "validator/frame.1");
SlotValidator.IconCircuit = new ValidatorIcon(BinnieCore.instance, "validator/circuit.0", "validator/circuit.1");
SlotValidator.IconBlock = new ValidatorIcon(BinnieCore.instance, "validator/block.0", "validator/block.1");
SlotValidator.spriteBee = new ValidatorSprite(BinnieCore.instance, "validator/bee.0", "validator/bee.1");
SlotValidator.spriteFrame = new ValidatorSprite(BinnieCore.instance, "validator/frame.0", "validator/frame.1");
SlotValidator.spriteCircuit = new ValidatorSprite(BinnieCore.instance, "validator/circuit.0", "validator/circuit.1");
SlotValidator.spriteBlock = new ValidatorSprite(BinnieCore.instance, "validator/block.0", "validator/block.1");
}
@Override
@@ -36,7 +36,7 @@ public class TileEntityMachine extends TileEntityMachineBase implements INetwork
super.readFromNBT(nbtTagCompound);
final String name = nbtTagCompound.getString("name");
final String group = nbtTagCompound.getString("group");
final MachinePackage pack = Binnie.MCHINE.getPackage(group, name);
final MachinePackage pack = Binnie.MACHINE.getPackage(group, name);
if (pack == null) {
this.invalidate();
return;
@@ -1,6 +1,5 @@
package binnie.core.machines.inventory;
import binnie.core.BinnieCore;
import forestry.api.genetics.AlleleManager;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.ItemStack;
@@ -8,27 +7,27 @@ import net.minecraft.item.ItemStack;
import javax.annotation.Nullable;
public abstract class SlotValidator extends Validator<ItemStack> {
public static ValidatorIcon IconBee;
public static ValidatorIcon IconFrame;
public static ValidatorIcon IconCircuit;
public static ValidatorIcon IconBlock;
public static ValidatorSprite spriteBee;
public static ValidatorSprite spriteFrame;
public static ValidatorSprite spriteCircuit;
public static ValidatorSprite spriteBlock;
@Nullable
private ValidatorIcon icon;
private ValidatorSprite sprite;
public SlotValidator(@Nullable final ValidatorIcon icon) {
this.icon = icon;
public SlotValidator(@Nullable final ValidatorSprite icon) {
this.sprite = icon;
}
@Nullable
public TextureAtlasSprite getIcon(final boolean input) {
return (this.icon == null) ? null : BinnieCore.proxy.getTextureAtlasSprite(this.icon.getIcon(input).getResourceLocation());
return (this.sprite == null) ? null : this.sprite.getSprite(input).getSprite();
}
public static class Item extends SlotValidator {
private ItemStack target;
public Item(final ItemStack target, final ValidatorIcon icon) {
public Item(final ItemStack target, final ValidatorSprite icon) {
super(icon);
this.target = target;
}
@@ -1,24 +0,0 @@
package binnie.core.machines.inventory;
import binnie.Binnie;
import binnie.core.AbstractMod;
import binnie.core.resource.BinnieIcon;
import java.util.ArrayList;
import java.util.List;
public class ValidatorIcon {
private List<BinnieIcon> iconsInput;
private List<BinnieIcon> iconsOutput;
public ValidatorIcon(final AbstractMod mod, final String pathInput, final String pathOutput) {
this.iconsInput = new ArrayList<>();
this.iconsOutput = new ArrayList<>();
this.iconsInput.add(Binnie.RESOURCE.getItemIcon(mod, pathInput));
this.iconsOutput.add(Binnie.RESOURCE.getItemIcon(mod, pathOutput));
}
public BinnieIcon getIcon(final boolean input) {
return input ? this.iconsInput.get(0) : this.iconsOutput.get(0);
}
}
@@ -0,0 +1,24 @@
package binnie.core.machines.inventory;
import binnie.Binnie;
import binnie.core.AbstractMod;
import binnie.core.resource.BinnieSprite;
import java.util.ArrayList;
import java.util.List;
public class ValidatorSprite {
private List<BinnieSprite> spritesInput;
private List<BinnieSprite> spritesOutput;
public ValidatorSprite(final AbstractMod mod, final String pathInput, final String pathOutput) {
this.spritesInput = new ArrayList<>();
this.spritesOutput = new ArrayList<>();
this.spritesInput.add(Binnie.RESOURCE.getItemSprite(mod, pathInput));
this.spritesOutput.add(Binnie.RESOURCE.getItemSprite(mod, pathOutput));
}
public BinnieSprite getSprite(final boolean input) {
return input ? this.spritesInput.get(0) : this.spritesOutput.get(0);
}
}
@@ -137,7 +137,7 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy {
this.sendToAll(packet);
}
public void registerIcon(ResourceLocation location) {
public void registerSprite(ResourceLocation location) {
}
@@ -63,7 +63,7 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy
}
@Override
public void registerIcon(ResourceLocation location) {
public void registerSprite(ResourceLocation location) {
Minecraft.getMinecraft().getTextureMapBlocks().registerSprite(location);
}
@@ -1,37 +0,0 @@
package binnie.core.resource;
import binnie.Binnie;
import binnie.core.AbstractMod;
public class BinnieIcon extends BinnieResource {
// private int textureSheet;
// private IIcon icon;
public BinnieIcon(final AbstractMod mod, final ResourceType type, final String path) {
super(mod, type, path);
// this.textureSheet = 0;
// this.icon = null;
//this.textureSheet = ((type != ResourceType.Block) ? 1 : 0);
Binnie.RESOURCE.registerIcon(this);
}
// public IIcon getIcon() {
// return this.icon;
// }
//
// @SideOnly(Side.CLIENT)
// public IIcon getIcon(final IIconRegister register) {
// this.registerIcon(register);
// return this.icon;
// }
//
// @SideOnly(Side.CLIENT)
// public void registerIcon(final IIconRegister register) {
// this.icon = BinnieCore.proxy.getIcon(register, this.mod, this.path);
// }
// public int getTextureSheet() {
// return this.textureSheet;
// }
}
@@ -0,0 +1,29 @@
package binnie.core.resource;
import binnie.Binnie;
import binnie.core.AbstractMod;
import forestry.core.render.TextureManager;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BinnieSprite extends BinnieResource {
private TextureAtlasSprite sprite;
public BinnieSprite(final AbstractMod mod, final ResourceType type, final String path) {
super(mod, type, path);
this.sprite = null;
Binnie.RESOURCE.registerSprite(this);
}
@SideOnly(Side.CLIENT)
public TextureAtlasSprite getSprite() {
return this.sprite;
}
@SideOnly(Side.CLIENT)
public void registerSprites() {
sprite = TextureManager.registerSprite(getResourceLocation());
}
}
@@ -2,15 +2,17 @@ package binnie.core.resource;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.ArrayList;
import java.util.List;
public class ManagerResource {
private List<BinnieIcon> icons;
private List<BinnieSprite> sprites;
public ManagerResource() {
this.icons = new ArrayList<>();
this.sprites = new ArrayList<>();
}
public BinnieResource getPNG(final AbstractMod mod, final ResourceType type, final String path) {
@@ -21,32 +23,25 @@ public class ManagerResource {
return new BinnieResource(mod, type, path);
}
public void registerIcon(final BinnieIcon binnieIcon) {
this.icons.add(binnieIcon);
public void registerSprite(final BinnieSprite binnieIcon) {
this.sprites.add(binnieIcon);
}
public BinnieIcon getItemIcon(final AbstractMod mod, final String iconFile) {
return new BinnieIcon(mod, ResourceType.Item, iconFile);
public BinnieSprite getItemSprite(final AbstractMod mod, final String iconFile) {
return new BinnieSprite(mod, ResourceType.Item, iconFile);
}
public BinnieIcon getBlockIcon(final AbstractMod mod, final String iconFile) {
return new BinnieIcon(mod, ResourceType.Block, iconFile);
public BinnieSprite getBlockSprite(final AbstractMod mod, final String iconFile) {
return new BinnieSprite(mod, ResourceType.Block, iconFile);
}
public void registerIcons() {
for (final BinnieIcon icon : this.icons) {
BinnieCore.proxy.registerIcon(icon.getResourceLocation());
@SideOnly(Side.CLIENT)
public void registerSprites() {
for (BinnieSprite sprite : this.sprites) {
sprite.registerSprites();
}
BinnieCore.proxy.reloadSprites();
}
// @SideOnly(Side.CLIENT)
// public void registerIcons(final IIconRegister register, final int type) {
// for (final BinnieIcon icon : this.icons) {
// if (icon.getTextureSheet() == type) {
// icon.registerIcon(register);
// }
// }
// }
}