diff --git a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java deleted file mode 100644 index 084966fd..00000000 --- a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java +++ /dev/null @@ -1,55 +0,0 @@ -package binnie.extrabees.gui.database; - -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.WidgetAttribute; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.geometry.IArea; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import forestry.api.apiculture.IAlleleBeeSpecies; -import net.minecraft.world.biome.BiomeGenBase; - -import java.util.ArrayList; -import java.util.List; - -public class ControlBiomes extends Control implements ITooltip { - protected List tolerated; - - public ControlBiomes(IWidget parent, int x, int y, int width, int height) { - super(parent, x, y, width * 16, height * 16); - tolerated = new ArrayList<>(); - addAttribute(WidgetAttribute.MOUSE_OVER); - } - - @Override - public void getTooltip(Tooltip tooltip) { - if (tolerated.isEmpty()) { - return; - } - - int x = (int) (getRelativeMousePosition().x() / 16.0f); - int y = (int) (getRelativeMousePosition().y() / 16.0f); - int i = x + y * 8; - if (i < tolerated.size()) { - tooltip.add(BiomeGenBase.getBiome(tolerated.get(i)).biomeName); - } - } - - @Override - public void onRenderForeground() { - for (int i = 0; i < tolerated.size(); ++i) { - int x = i % 8 * 16; - int y = i / 8 * 16; - if (BiomeGenBase.getBiome(i) != null) { - CraftGUI.Render.colour(BiomeGenBase.getBiome(i).color); - } - CraftGUI.Render.texture(CraftGUITexture.Button, new IArea(x, y, 16.0f, 16.0f)); - } - } - - public void setSpecies(IAlleleBeeSpecies species) { - tolerated.clear(); - } -} diff --git a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java index d7e8512f..bca350be 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java @@ -11,6 +11,7 @@ import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeRoot; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; @@ -22,7 +23,8 @@ import java.util.List; public class ControlClimateBar extends Control implements ITooltip { protected boolean isHumidity; protected List tolerated; - protected Color[] tempColours = new Color[]{ + + private static final Color[] TEMP_COLORS = new Color[]{ new Color(0x00fffb), new Color(0x78bbff), new Color(0x4fff30), @@ -30,7 +32,7 @@ public class ControlClimateBar extends Control implements ITooltip { new Color(0xffa200), new Color(0xff0000) }; - protected Color[] humidColours = new Color[]{ + private static final Color[] HUMID_COLORS = new Color[]{ new Color(0xffe7a3), new Color(0x1aff00), new Color(0x307cff) @@ -76,9 +78,9 @@ public class ControlClimateBar extends Control implements ITooltip { if (tolerated.contains(i)) { Color color; if (isHumidity) { - color = humidColours[i]; + color = HUMID_COLORS[i]; } else { - color = tempColours[i]; + color = TEMP_COLORS[i]; } CraftGUI.Render.solid(new IArea(x + 1, 1.0f, w, getSize().y() - 2.0f), color.getRGB()); } @@ -94,7 +96,8 @@ public class ControlClimateBar extends Control implements ITooltip { int main; EnumTolerance tolerance; - IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(species.getUID())); + IBeeRoot beeRoot = Binnie.Genetics.getBeeRoot(); + IBeeGenome genome = beeRoot.templateAsGenome(beeRoot.getTemplate(species.getUID())); if (!isHumidity) { main = species.getTemperature().ordinal() - 1; tolerance = genome.getToleranceTemp(); @@ -107,55 +110,68 @@ public class ControlClimateBar extends Control implements ITooltip { switch (tolerance) { case BOTH_5: case UP_5: - tolerated.add(main + 5); + addTolerance(main, 5); break; case BOTH_4: case UP_4: - tolerated.add(main + 4); + addTolerance(main, 4); break; case BOTH_3: case UP_3: - tolerated.add(main + 3); + addTolerance(main, 3); break; case BOTH_2: case UP_2: - tolerated.add(main + 2); + addTolerance(main, 2); break; case BOTH_1: case UP_1: - tolerated.add(main + 1); + addTolerance(main, 1); break; } switch (tolerance) { case BOTH_5: case DOWN_5: - tolerated.add(main - 5); + addTolerance(main, -5); break; case BOTH_4: case DOWN_4: - tolerated.add(main - 4); + addTolerance(main, -4); break; case BOTH_3: case DOWN_3: - tolerated.add(main - 3); + addTolerance(main, -3); break; case BOTH_2: case DOWN_2: - tolerated.add(main - 2); + addTolerance(main, -2); break; case BOTH_1: case DOWN_1: - tolerated.add(main - 1); + addTolerance(main, -1); break; } } + + private void addTolerance(int main, int offset) { + offset += main; + if (main > offset) { + for (int i = offset; i < main; i++) { + tolerated.add(i); + } + } else { + for (int i = offset; i < main; i--) { + tolerated.add(i); + } + } + } } diff --git a/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java b/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java index 08c10a30..9593ef7d 100644 --- a/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java +++ b/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java @@ -11,21 +11,17 @@ import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesClimate extends PageSpecies { protected ControlClimateBar tempBar; protected ControlClimateBar humidBar; - protected ControlBiomes biomes; public PageSpeciesClimate(IWidget parent, DatabaseTab tab) { super(parent, tab); new ControlTextCentered(this, 8.0f, I18N.localise("extrabees.gui.database.tab.species.climate")); tempBar = new ControlClimateBar(this, 8, 24, 128, 12); humidBar = new ControlClimateBar(this, 8, 42, 128, 12, true); - new ControlTextCentered(this, 70.0f, I18N.localise("extrabees.gui.database.tab.species.biomes")); - biomes = new ControlBiomes(this, 8, 90, 8, 4); } @Override public void onValueChanged(IAlleleSpecies species) { tempBar.setSpecies((IAlleleBeeSpecies) species); humidBar.setSpecies((IAlleleBeeSpecies) species); - biomes.setSpecies((IAlleleBeeSpecies) species); } }