From d3d57ab0dfce00a0b1e6463626ab118dfb44cd90 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 30 Jul 2017 01:40:27 +0200 Subject: [PATCH] Clean Up --- lang | 2 +- .../api/greenhouse/IGreenhouseSettings.java | 67 ------ .../gui/widgets/WidgetClimatePanel.java | 2 +- .../items/ItemGreenhouseScreen.java | 4 +- .../models/ModelCamouflageSprayCan.java | 7 +- .../greenhouse/models/ModelCamouflaged.java | 4 +- .../greenhouse/models/ModelOverlay.java | 21 +- .../multiblock/GreenhouseSettings.java | 223 ------------------ 8 files changed, 20 insertions(+), 310 deletions(-) delete mode 100644 src/main/java/forestry/api/greenhouse/IGreenhouseSettings.java delete mode 100644 src/main/java/forestry/greenhouse/multiblock/GreenhouseSettings.java diff --git a/lang b/lang index f5300f059..d638c599b 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit f5300f059b2a0e55ecea645536acde0406152559 +Subproject commit d638c599bdd25466e2635bf1882b0549e7b57427 diff --git a/src/main/java/forestry/api/greenhouse/IGreenhouseSettings.java b/src/main/java/forestry/api/greenhouse/IGreenhouseSettings.java deleted file mode 100644 index ebc3c1f1c..000000000 --- a/src/main/java/forestry/api/greenhouse/IGreenhouseSettings.java +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright 2011-2014 SirSengir - * - * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. - ******************************************************************************/ -package forestry.api.greenhouse; - -import net.minecraft.util.math.BlockPos; - -import forestry.api.core.INbtReadable; -import forestry.api.core.INbtWritable; - -public interface IGreenhouseSettings extends INbtReadable, INbtWritable { - - /** - * @return the position on that the manager starts to test. - */ - BlockPos getStartPosOffset(); - - void setStartPosOffset(BlockPos offset); - - /** - * @return the length of the manager on the east and west side - */ - int getLengthEastWest(); - - void setLengthEastWest(int length); - - /** - * @return the length of the manager on the north and south side - */ - int getLengthNorthSouth(); - - void setLengthNorthSouth(int length); - - /** - * @return the maximal height of the manager on the y axis. - */ - int getHeight(); - - void setHeight(int height); - - /** - * @return the maximal depth of the manager on the y axis. - */ - int getDepth(); - - void setDepth(int depth); - - /** - * @return a array with the length of two. The two positions represent the edges of the greenhouse. - */ - Position2D[] getEdges(); - - Position2D getMaxEdge(); - - Position2D getMinEdge(); - - IGreenhouseSettings clamp(IGreenhouseSettings clampSettings); - - /** - * - * @param edgeId an {@link Integer} between 0 and 1 - * @param position the position of this edge - */ - void setEdge(int edgeId, Position2D position); -} diff --git a/src/main/java/forestry/greenhouse/gui/widgets/WidgetClimatePanel.java b/src/main/java/forestry/greenhouse/gui/widgets/WidgetClimatePanel.java index 0ae991217..20691d442 100644 --- a/src/main/java/forestry/greenhouse/gui/widgets/WidgetClimatePanel.java +++ b/src/main/java/forestry/greenhouse/gui/widgets/WidgetClimatePanel.java @@ -69,7 +69,7 @@ public class WidgetClimatePanel extends Widget { textField.setEnableBackgroundDrawing(false); textField.setText(Float.toString(gui.container.getTargetedState().get(type))); table = new Table(); - for(Map.Entry entry : data.getData(type).entrySet()){ + for (Map.Entry entry : data.getData(type).entrySet()) { table.addValueEntry(entry.getKey(), StringUtil.floatAsPercent(entry.getValue())); } } diff --git a/src/main/java/forestry/greenhouse/items/ItemGreenhouseScreen.java b/src/main/java/forestry/greenhouse/items/ItemGreenhouseScreen.java index 376584d0f..a9154dae2 100644 --- a/src/main/java/forestry/greenhouse/items/ItemGreenhouseScreen.java +++ b/src/main/java/forestry/greenhouse/items/ItemGreenhouseScreen.java @@ -119,7 +119,7 @@ public class ItemGreenhouseScreen extends ItemForestry implements IColoredItem { IGreenhouseComponent component = MultiblockUtil.getComponent(world, pos, IGreenhouseComponent.class); if (component != null) { IGreenhouseController controller = component.getMultiblockLogic().getController(); - if(!controller.isAssembled()){ + if (!controller.isAssembled()) { if (!world.isRemote) { player.sendStatusMessage(new TextComponentTranslation("for.message.greenhouse_screen.notassembled"), true); } @@ -137,7 +137,7 @@ public class ItemGreenhouseScreen extends ItemForestry implements IColoredItem { } return EnumActionResult.PASS; } - if(!world.isBlockLoaded(pos)){ + if (!world.isBlockLoaded(pos)) { if (!world.isRemote) { player.sendStatusMessage(new TextComponentTranslation("for.message.greenhouse_screen.away"), true); } diff --git a/src/main/java/forestry/greenhouse/models/ModelCamouflageSprayCan.java b/src/main/java/forestry/greenhouse/models/ModelCamouflageSprayCan.java index 3d23de2b8..4387fed3d 100644 --- a/src/main/java/forestry/greenhouse/models/ModelCamouflageSprayCan.java +++ b/src/main/java/forestry/greenhouse/models/ModelCamouflageSprayCan.java @@ -78,9 +78,6 @@ public class ModelCamouflageSprayCan extends BlankModel { return new SprayCanModel(model, filledModel, camouflageModel, ModelManager.getInstance().getDefaultItemState()); } - } @Override - protected ItemOverrideList createOverrides() { - return new SprayCanOverrideList(); } private class SprayCanModel extends BlankModel implements IPerspectiveAwareModel { @@ -116,8 +113,12 @@ public class ModelCamouflageSprayCan extends BlankModel { return IPerspectiveAwareModel.MapWrapper.handlePerspective(originalModel, state, cameraTransformType); } + } @Override + protected ItemOverrideList createOverrides() { + return new SprayCanOverrideList(); } + } diff --git a/src/main/java/forestry/greenhouse/models/ModelCamouflaged.java b/src/main/java/forestry/greenhouse/models/ModelCamouflaged.java index 03d898e1d..30f410758 100644 --- a/src/main/java/forestry/greenhouse/models/ModelCamouflaged.java +++ b/src/main/java/forestry/greenhouse/models/ModelCamouflaged.java @@ -87,9 +87,9 @@ public class ModelCamouflaged extends Model } }*/ IBakedModel model; - if(key.state != null){ + if (key.state != null) { model = overlayModel.getModel(key.state); - }else{ + } else { model = overlayModel.getModel(key.itemStack, Minecraft.getMinecraft().world); } baker.addBakedModelPost(key.state, model); diff --git a/src/main/java/forestry/greenhouse/models/ModelOverlay.java b/src/main/java/forestry/greenhouse/models/ModelOverlay.java index 7a1c41b02..aa137f7d6 100644 --- a/src/main/java/forestry/greenhouse/models/ModelOverlay.java +++ b/src/main/java/forestry/greenhouse/models/ModelOverlay.java @@ -32,7 +32,6 @@ import forestry.greenhouse.blocks.BlockGreenhouseSprite; import forestry.greenhouse.blocks.BlockGreenhouseType; import forestry.greenhouse.blocks.IBlockCamouflaged; -// DO NOT CACHE THIS. PLEASE. I BEG YOU. NOT IN THE CURRENT STATE. @SideOnly(Side.CLIENT) public class ModelOverlay extends ModelBlockCached { public static final int OVERLAY_COLOR_INDEX = 101; @@ -46,16 +45,6 @@ public class ModelOverlay extends ModelBloc return BlockGreenhouseSprite.getSprite(BlockGreenhouseType.PLAIN, null, null, -1); } - @Override - public IBakedModel getModel(IBlockState state) { - return super.getModel(state); - } - - @Override - public IBakedModel getModel(ItemStack stack, World world) { - return super.getModel(stack, world); - } - @Override protected Key getInventoryKey(ItemStack stack) { return new Key(null, stack.getItemDamage()); @@ -77,6 +66,16 @@ public class ModelOverlay extends ModelBloc } } + @Override + public IBakedModel getModel(IBlockState state) { + return super.getModel(state); + } + + @Override + public IBakedModel getModel(ItemStack stack, World world) { + return super.getModel(stack, world); + } + private void addOverlaySprite(B block, IModelBaker baker, IBlockState state, int meta, int layer) { if (block.hasOverlaySprite(meta, layer)) { TextureAtlasSprite[] sprite = new TextureAtlasSprite[6]; diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseSettings.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseSettings.java deleted file mode 100644 index fa86b6f06..000000000 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseSettings.java +++ /dev/null @@ -1,223 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.greenhouse.multiblock; - -import java.io.IOException; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.util.math.BlockPos; - -import forestry.api.greenhouse.IGreenhouseSettings; -import forestry.api.greenhouse.Position2D; -import forestry.core.network.IStreamable; -import forestry.core.network.PacketBufferForestry; - -public class GreenhouseSettings implements IGreenhouseSettings, IStreamable { - private BlockPos startPosOffset; - private Position2D[] edges = new Position2D[2]; - private Position2D minEdge; - private Position2D maxEdge; - private int lengthEastWest; - private int lengthNorthSouth; - private int height; - private int depth; - - public GreenhouseSettings(BlockPos startPosOffset, int height, int depth, Position2D... edges) { - this.startPosOffset = startPosOffset; - this.height = height; - this.depth = depth; - this.edges = edges; - this.maxEdge = Position2D.NULL_POSITION; - this.minEdge = Position2D.NULL_POSITION; - recalculateMinAndMaxEdges(); - } - - public GreenhouseSettings(BlockPos startPosOffset, int lengthEastWest, int lengthNorthSouth, int height, int depth) { - this.startPosOffset = startPosOffset; - this.lengthEastWest = lengthEastWest; - this.lengthNorthSouth = lengthNorthSouth; - this.height = height; - this.depth = depth; - this.edges[0] = minEdge = new Position2D(-lengthEastWest, -lengthNorthSouth); - this.edges[1] = maxEdge = new Position2D(lengthEastWest, lengthNorthSouth); - } - - public GreenhouseSettings(NBTTagCompound compound) { - for (int i = 0; i < edges.length; i++) { - edges[i] = Position2D.NULL_POSITION; - } - readFromNBT(compound); - } - - public GreenhouseSettings(PacketBufferForestry data) throws IOException { - for (int i = 0; i < edges.length; i++) { - edges[i] = Position2D.NULL_POSITION; - } - readData(data); - } - - @Override - public BlockPos getStartPosOffset() { - return startPosOffset; - } - - @Override - public void setStartPosOffset(BlockPos startPosOffset) { - this.startPosOffset = startPosOffset; - } - - @Override - public int getLengthEastWest() { - return lengthEastWest; - } - - @Override - public void setLengthEastWest(int lengthEastWest) { - this.lengthEastWest = lengthEastWest; - } - - @Override - public int getLengthNorthSouth() { - return lengthNorthSouth; - } - - @Override - public void setLengthNorthSouth(int lengthNorthSouth) { - this.lengthNorthSouth = lengthNorthSouth; - } - - @Override - public int getHeight() { - return height; - } - - @Override - public void setHeight(int height) { - this.height = height; - } - - @Override - public int getDepth() { - return depth; - } - - @Override - public void setDepth(int depth) { - this.depth = depth; - } - - @Override - public Position2D[] getEdges() { - return edges; - } - - public Position2D getMaxEdge() { - return maxEdge; - } - - public Position2D getMinEdge() { - return minEdge; - } - - @Override - public IGreenhouseSettings clamp(IGreenhouseSettings clampSettings) { - Position2D minEdge = this.minEdge.clamp(clampSettings.getMinEdge(), clampSettings.getMaxEdge()); - Position2D maxEdge = this.maxEdge.clamp(clampSettings.getMinEdge(), clampSettings.getMaxEdge()); - GreenhouseSettings settings = new GreenhouseSettings(this.startPosOffset, height, depth, minEdge, maxEdge); - settings.recalculateMinAndMaxEdges(); - return settings; - } - - @Override - public void setEdge(int edgeId, Position2D position) { - setEdge(edgeId, position, true); - } - - @Override - public void readFromNBT(NBTTagCompound nbt) { - startPosOffset = NBTUtil.getPosFromTag(nbt.getCompoundTag("Offset")); - lengthNorthSouth = nbt.getInteger("lengthNorthSouth"); - lengthEastWest = nbt.getInteger("lengthEastWest"); - depth = nbt.getInteger("depth"); - height = nbt.getInteger("height"); - int[] edges = nbt.getIntArray("edges"); - if (edges.length == 4) { - setEdge(0, new Position2D(edges[0], edges[1]), false); - setEdge(1, new Position2D(edges[2], edges[3]), false); - recalculateMinAndMaxEdges(); - } - } - - @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbt) { - nbt.setTag("Offset", NBTUtil.createPosTag(startPosOffset)); - nbt.setInteger("lengthNorthSouth", lengthNorthSouth); - nbt.setInteger("lengthEastWest", lengthEastWest); - nbt.setInteger("depth", depth); - nbt.setInteger("height", height); - nbt.setIntArray("edges", new int[]{edges[0].getX(), edges[0].getZ(), edges[1].getX(), edges[1].getZ()}); - return nbt; - } - - @Override - public void writeData(PacketBufferForestry data) { - data.writeBlockPos(startPosOffset); - data.writeInt(lengthNorthSouth); - data.writeInt(lengthEastWest); - data.writeInt(depth); - data.writeInt(height); - data.writePosition(edges[0]); - data.writePosition(edges[1]); - } - - @Override - public void readData(PacketBufferForestry data) throws IOException { - startPosOffset = data.readBlockPos(); - lengthNorthSouth = data.readInt(); - lengthEastWest = data.readInt(); - depth = data.readInt(); - height = data.readInt(); - setEdge(0, data.readPosition()); - setEdge(1, data.readPosition()); - } - - private void setEdge(int edgeId, Position2D position, boolean recalculate) { - edges[edgeId] = position; - if (recalculate) { - recalculateMinAndMaxEdges(); - } - } - - private void recalculateMinAndMaxEdges() { - int minX = Integer.MAX_VALUE; - int minZ = Integer.MAX_VALUE; - int maxX = Integer.MIN_VALUE; - int maxZ = Integer.MIN_VALUE; - - for (Position2D position : edges) { - if (position.getX() < minX) { - minX = position.getX(); - } - if (position.getX() > maxX) { - maxX = position.getX(); - } - if (position.getZ() < minZ) { - minZ = position.getZ(); - } - if (position.getZ() > maxZ) { - maxZ = position.getZ(); - } - } - minEdge = new Position2D(minX, minZ); - maxEdge = new Position2D(maxX, maxZ); - } -}