diff --git a/src/main/java/forestry/api/core/EnumTemperature.java b/src/main/java/forestry/api/core/EnumTemperature.java index d772986c9..1606368a4 100644 --- a/src/main/java/forestry/api/core/EnumTemperature.java +++ b/src/main/java/forestry/api/core/EnumTemperature.java @@ -5,7 +5,6 @@ ******************************************************************************/ package forestry.api.core; -import forestry.core.utils.ClimateUtil; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -22,6 +21,8 @@ public enum EnumTemperature { NONE("None", "habitats/ocean"), ICY("Icy", "habitats/snow"), COLD("Cold", "habitats/taiga"), NORMAL("Normal", "habitats/plains"), WARM("Warm", "habitats/jungle"), HOT("Hot", "habitats/desert"), HELLISH("Hellish", "habitats/nether"); + public static EnumTemperature[] VALUES = values(); + public final String name; public final String iconIndex; @@ -35,7 +36,7 @@ public enum EnumTemperature { } @SideOnly(Side.CLIENT) - public TextureAtlasSprite getIcon() { + public TextureAtlasSprite getSprite() { return ForestryAPI.textureManager.getDefault(iconIndex); } @@ -72,7 +73,7 @@ public enum EnumTemperature { if (BiomeHelper.isBiomeHellish(biome)) { return HELLISH; } - float temperature = ClimateUtil.getTemperature(world, pos); + float temperature = ForestryAPI.climateManager.getInfo(world, pos).getTemperature(); return getFromValue(temperature); } } diff --git a/src/main/java/forestry/core/gui/ledgers/ClimateLedger.java b/src/main/java/forestry/core/gui/ledgers/ClimateLedger.java index 143df14bb..9b8e59ca3 100644 --- a/src/main/java/forestry/core/gui/ledgers/ClimateLedger.java +++ b/src/main/java/forestry/core/gui/ledgers/ClimateLedger.java @@ -38,7 +38,7 @@ public class ClimateLedger extends Ledger { drawBackground(x, y); // Draw icon - drawSprite(temperature.getIcon(), x + 3, y + 4); + drawSprite(temperature.getSprite(), x + 3, y + 4); if (!isFullyOpened()) { return; diff --git a/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java b/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java index fa6198487..b6eae987b 100644 --- a/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java +++ b/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java @@ -69,21 +69,23 @@ public class GuiGreenhouse extends GuiForestryTitled buttons = new ArrayList<>(); + + public WidgetClimatePillar(WidgetManager manager, int xPos, int yPos) { + super(manager, xPos, yPos); + this.width = 23; + this.height = 90; + for(int i = 1;i < 6;i++){ + EnumTemperature temp = EnumTemperature.VALUES[i]; + float value; + switch (temp) { + case ICY: + value = 0.0F; + break; + case COLD: + value = 0.2F; + break; + case WARM: + value = 0.9F; + break; + case HOT: + value = 1.2F; + break; + default: + value = 0.5F; + break; + } + buttons.add(new ClimateButton(this, temp, value, xPos + 5, yPos + 5 + (i - 1) * 16)); + } + } + + @Override + public void draw(int startX, int startY) { + Proxies.render.bindTexture(manager.gui.textureFile); + manager.gui.drawTexturedModalRect(startX + xPos, startY + yPos, 216, 25, width, height); + for(ClimateButton button : buttons){ + button.draw(startX, startY); + } + } + + @Override + public ToolTip getToolTip(int mouseX, int mouseY) { + for(ClimateButton button : buttons){ + if(button.isMouseOver(mouseX, mouseY)){ + return button.getToolTip(); + } + } + return null; + } + + @Override + public boolean handleMouseRelease(int mouseX, int mouseY, int eventType) { + mouseX-=manager.gui.getGuiLeft(); + mouseY-=manager.gui.getGuiTop(); + if(isMouseOver(mouseX, mouseY)){ + return true; + } + return false; + } + + @Override + public void handleMouseClick(int mouseX, int mouseY, int mouseButton) { + mouseX-=manager.gui.getGuiLeft(); + mouseY-=manager.gui.getGuiTop(); + for(ClimateButton button : buttons){ + if(button.isMouseOver(mouseX, mouseY)){ + ((GuiGreenhouse)manager.gui).setClimate(button.value); + } + } + } + + private static class ClimateButton{ + final WidgetClimatePillar parent; + final EnumTemperature temperature; + final float value; + final int xPos, yPos; + + public ClimateButton(WidgetClimatePillar parent, EnumTemperature temperature, float value, int xPos, int yPos) { + this.parent = parent; + this.temperature = temperature; + this.value = value; + this.xPos = xPos; + this.yPos = yPos; + } + + public void draw(int startX, int startY) { + parent.drawSprite(temperature.getSprite(), startX + xPos, startY + yPos); + } + + public ToolTip getToolTip() { + return toolTip; + } + + public boolean isMouseOver(int mouseX, int mouseY) { + return mouseX >= xPos && mouseX <= xPos + 16 && mouseY >= yPos && mouseY <= yPos + 16; + } + + protected final ToolTip toolTip = new ToolTip(250) { + @Override + @SideOnly(Side.CLIENT) + public void refresh() { + toolTip.clear(); + toolTip.add("T: " + AlleleManager.climateHelper.toDisplay(temperature)); + toolTip.add("V: " + value); + } + }; + } + + protected void drawSprite(TextureAtlasSprite sprite, int x, int y) { + GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0F); + Proxies.render.bindTexture(TextureManager.getInstance().getGuiTextureMap()); + manager.gui.drawTexturedModalRect(x, y, sprite, 16, 16); + } +} diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java index 4e20c0cd4..0e253dc7f 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java @@ -275,6 +275,14 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im return false; } if (sendClientUpdate && world.isRemote) { + for (IMultiblockComponent comp : connectedParts) { + if (comp instanceof ICamouflagedTile) { + ICamouflagedTile camBlock = (ICamouflagedTile) comp; + if (camBlock.getCamouflageType().equals(type)) { + world.markBlockRangeForRenderUpdate(camBlock.getCoordinates(), camBlock.getCoordinates()); + } + } + } Proxies.net.sendToServer(new PacketCamouflageSelectServer(this, type, CamouflageSelectionType.MULTIBLOCK)); } MinecraftForge.EVENT_BUS.post(new CamouflageChangeEvent(this, null, this, type)); diff --git a/src/main/resources/assets/forestry/models/block/greenhouse.window_closed.json b/src/main/resources/assets/forestry/models/block/greenhouse.window_closed.json index d82cffc92..47e9b1c8a 100644 --- a/src/main/resources/assets/forestry/models/block/greenhouse.window_closed.json +++ b/src/main/resources/assets/forestry/models/block/greenhouse.window_closed.json @@ -1,7 +1,7 @@ { "textures": { "texture": "blocks/glass_green", - "particle": "#blocks/glass_green" + "particle": "blocks/glass_green" }, "elements": [ { diff --git a/src/main/resources/assets/forestry/models/block/greenhouse.window_open.json b/src/main/resources/assets/forestry/models/block/greenhouse.window_open.json index 15a3b3d1d..f5813dad8 100644 --- a/src/main/resources/assets/forestry/models/block/greenhouse.window_open.json +++ b/src/main/resources/assets/forestry/models/block/greenhouse.window_open.json @@ -1,7 +1,7 @@ { "textures": { "texture": "blocks/glass_green", - "particle": "#blocks/glass_green", + "particle": "blocks/glass_green", "log_oak": "blocks/log_oak" }, "elements": [ diff --git a/src/main/resources/assets/forestry/models/block/greenhouse.window_up_closed.json b/src/main/resources/assets/forestry/models/block/greenhouse.window_up_closed.json index a551e53e5..e1511c5dd 100644 --- a/src/main/resources/assets/forestry/models/block/greenhouse.window_up_closed.json +++ b/src/main/resources/assets/forestry/models/block/greenhouse.window_up_closed.json @@ -1,7 +1,7 @@ { "textures": { "texture": "blocks/glass_green", - "particle": "#blocks/glass_green" + "particle": "blocks/glass_green" }, "elements": [ { diff --git a/src/main/resources/assets/forestry/models/block/greenhouse.window_up_open.json b/src/main/resources/assets/forestry/models/block/greenhouse.window_up_open.json index 4225b579f..a7617fb86 100644 --- a/src/main/resources/assets/forestry/models/block/greenhouse.window_up_open.json +++ b/src/main/resources/assets/forestry/models/block/greenhouse.window_up_open.json @@ -1,7 +1,7 @@ { "textures": { "texture": "blocks/glass_green", - "particle": "#blocks/glass_green", + "particle": "blocks/glass_green", "log_oak": "blocks/log_oak" }, "elements": [ diff --git a/src/main/resources/assets/forestry/textures/gui/greenhouse.png b/src/main/resources/assets/forestry/textures/gui/greenhouse.png index b926a517c..348e3f00b 100644 Binary files a/src/main/resources/assets/forestry/textures/gui/greenhouse.png and b/src/main/resources/assets/forestry/textures/gui/greenhouse.png differ