From 2c45413a6be5d310f2d3e95141f3b8e0dcab2d96 Mon Sep 17 00:00:00 2001 From: Elec332 Date: Fri, 12 May 2017 20:49:12 +0200 Subject: [PATCH] Fixes and more ExtraBees unhooking stuff --- .../binnie/botany/core/BotanyTexture.java | 4 ++-- .../botany/genetics/FlowerBreedingSystem.java | 15 ++++--------- .../core/genetics/BeeBreedingSystem.java | 21 +++++------------- .../binnie/core/resource/BinnieSprite.java | 11 +++++++--- .../binnie/core/resource/ManagerResource.java | 22 +++++++++++++++++++ .../java/binnie/extratrees/ExtraTrees.java | 5 +---- 6 files changed, 42 insertions(+), 36 deletions(-) diff --git a/src/main/java/binnie/botany/core/BotanyTexture.java b/src/main/java/binnie/botany/core/BotanyTexture.java index 33010e0c..b5463cbe 100644 --- a/src/main/java/binnie/botany/core/BotanyTexture.java +++ b/src/main/java/binnie/botany/core/BotanyTexture.java @@ -1,10 +1,10 @@ package binnie.botany.core; import binnie.Binnie; +import binnie.botany.Botany; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; -import binnie.extrabees.ExtraBees; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -28,7 +28,7 @@ public enum BotanyTexture implements IBinnieTexture { @SideOnly(Side.CLIENT) public BinnieResource getTexture() { if (resource == null) { - resource = Binnie.RESOURCE.getPNG(ExtraBees.instance, this.type, this.texture); + resource = Binnie.RESOURCE.getPNG(Botany.instance, this.type, this.texture); } return resource; } diff --git a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index 505f307a..40a7d3bd 100644 --- a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -9,24 +9,17 @@ import binnie.core.BinnieCore; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.ForestryAllele; import binnie.core.genetics.Tolerance; -import binnie.extrabees.ExtraBees; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; +import forestry.api.genetics.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import java.util.TreeSet; public class FlowerBreedingSystem extends BreedingSystem { + public FlowerBreedingSystem() { - this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/undiscovered_bee"); - this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/discovered_bee"); + this.iconUndiscovered = Binnie.RESOURCE.getUndiscoveredBeeSprite(); + this.iconDiscovered = Binnie.RESOURCE.getDiscoveredBeeSprite(); } @Override diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index f8c40e02..9a47e8cc 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -2,20 +2,8 @@ package binnie.core.genetics; import binnie.Binnie; import binnie.core.BinnieCore; -import binnie.extrabees.ExtraBees; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IApiaristTracker; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeMutation; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; +import forestry.api.apiculture.*; +import forestry.api.genetics.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,9 +11,10 @@ import javax.annotation.Nullable; import java.util.TreeSet; class BeeBreedingSystem extends BreedingSystem { + public BeeBreedingSystem() { - this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/undiscovered_bee"); - this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/discovered_bee"); + this.iconUndiscovered = Binnie.RESOURCE.getUndiscoveredBeeSprite(); + this.iconDiscovered = Binnie.RESOURCE.getDiscoveredBeeSprite(); } @Override diff --git a/src/main/java/binnie/core/resource/BinnieSprite.java b/src/main/java/binnie/core/resource/BinnieSprite.java index c70ed7ed..53f345af 100644 --- a/src/main/java/binnie/core/resource/BinnieSprite.java +++ b/src/main/java/binnie/core/resource/BinnieSprite.java @@ -13,15 +13,20 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; public class BinnieSprite extends BinnieResource { - @Nullable - private TextureAtlasSprite sprite; public BinnieSprite(final AbstractMod mod, final ResourceType type, final String path) { - super(mod, type, path); + this(mod.getModID(), type, path); + } + + public BinnieSprite(final String modid, final ResourceType type, final String path){ + super(modid, type, path); this.sprite = null; Binnie.RESOURCE.registerSprite(this); } + @Nullable + private TextureAtlasSprite sprite; + @SideOnly(Side.CLIENT) public TextureAtlasSprite getSprite() { Preconditions.checkState(this.sprite != null, "Tried to get sprite before it is registered."); diff --git a/src/main/java/binnie/core/resource/ManagerResource.java b/src/main/java/binnie/core/resource/ManagerResource.java index d8cba42b..9e8c9558 100644 --- a/src/main/java/binnie/core/resource/ManagerResource.java +++ b/src/main/java/binnie/core/resource/ManagerResource.java @@ -23,6 +23,14 @@ public class ManagerResource { return new BinnieResource(mod, type, path); } + public BinnieResource getPNG(final String mod, final ResourceType type, final String path) { + return this.getFile(mod, type, path + ".png"); + } + + public BinnieResource getFile(final String mod, final ResourceType type, final String path) { + return new BinnieResource(mod, type, path); + } + public void registerSprite(final BinnieSprite binnieIcon) { this.sprites.add(binnieIcon); } @@ -31,10 +39,24 @@ public class ManagerResource { return new BinnieSprite(mod, ResourceType.Item, iconFile); } + public BinnieSprite getItemSprite(final String mod, final String iconFile) { + return new BinnieSprite(mod, ResourceType.Item, iconFile); + } + public BinnieSprite getBlockSprite(final AbstractMod mod, final String iconFile) { return new BinnieSprite(mod, ResourceType.Block, iconFile); } + //Todo: move asset to binnie core assets + public BinnieSprite getUndiscoveredBeeSprite(){ + return getItemSprite("extrabees", "icon/undiscovered_bee"); + } + + //Todo: move asset to binnie core assets + public BinnieSprite getDiscoveredBeeSprite(){ + return getItemSprite("extrabees", "icon/discovered_bee"); + } + @SideOnly(Side.CLIENT) public void registerSprites() { for (BinnieSprite sprite : this.sprites) { diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index a50f63a2..ae0a02c6 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -7,7 +7,6 @@ import binnie.core.gui.IBinnieGUID; import binnie.core.models.DoublePassBakedModel; import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; -import binnie.extrabees.ExtraBees; import binnie.extratrees.alcohol.ModuleAlcohol; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.ModuleBlocks; @@ -25,7 +24,6 @@ import binnie.extratrees.kitchen.ModuleKitchen; import binnie.extratrees.machines.ModuleMachine; import binnie.extratrees.proxy.Proxy; import com.google.common.base.Preconditions; - import forestry.api.arboriculture.ITreeRoot; import forestry.api.genetics.AlleleSpeciesRegisterEvent; import forestry.api.lepidopterology.IButterflyRoot; @@ -46,7 +44,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; - import java.util.Arrays; import java.util.List; import java.util.Map; @@ -190,7 +187,7 @@ public class ExtraTrees extends AbstractMod { public static class PacketHandler extends BinniePacketHandler { public PacketHandler() { - super(ExtraBees.instance); + super(ExtraTrees.instance); } }