action) {
return this.actions.remove(action);
}
-
+
public void virtualClick() {
this.actions.forEach(action -> {
action.accept(this);
@@ -152,5 +151,5 @@ public abstract class BasicButton extends Component {
public Label getLabel() {
return label;
}
-
+
}
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Button.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Button.java
index c41dedc..5d42241 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Button.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Button.java
@@ -28,11 +28,11 @@ public class Button extends BasicButton {
public Button(String name, String label, Font labelFont) {
super(name, label, labelFont);
}
-
+
public Button(String name, Label label) {
super(name, label);
}
-
+
public Button(String name, String label) {
this(name, label, new Font());
}
@@ -40,7 +40,7 @@ public class Button extends BasicButton {
@Override
protected void assembleSelf(RenderTarget target) {
// Border
-
+
Vec4 borderColor;
if (isPressed() || isHovered() || isFocused()) {
borderColor = Colors.BLUE;
@@ -48,9 +48,9 @@ public class Button extends BasicButton {
borderColor = Colors.LIGHT_GRAY;
}
target.fill(getX(), getY(), getWidth(), getHeight(), borderColor);
-
+
// Inside area
-
+
if (isPressed()) {
// Do nothing
} else {
@@ -62,20 +62,20 @@ public class Button extends BasicButton {
}
target.fill(getX() + 2, getY() + 2, getWidth() - 4, getHeight() - 4, backgroundColor);
}
-
+
// Change label font color
-
+
if (isPressed()) {
getLabel().setFont(getLabel().getFont().withColor(Colors.WHITE));
} else {
getLabel().setFont(getLabel().getFont().withColor(Colors.BLACK));
}
}
-
+
@Override
protected void postAssembleSelf(RenderTarget target) {
// Apply disable tint
-
+
if (!isEnabled()) {
target.fill(getX(), getY(), getWidth(), getHeight(), Colors.toVector(0x88FFFFFF));
}
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Checkbox.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Checkbox.java
index 5f9d0df..990ed43 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Checkbox.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Checkbox.java
@@ -27,24 +27,24 @@ import ru.windcorp.progressia.client.graphics.gui.layout.LayoutAlign;
import ru.windcorp.progressia.client.graphics.gui.layout.LayoutHorizontal;
public class Checkbox extends BasicButton {
-
+
private class Tick extends Component {
public Tick() {
super(Checkbox.this.getName() + ".Tick");
-
+
setPreferredSize(new Vec2i(Typefaces.getDefault().getLineHeight() * 3 / 2));
}
-
+
@Override
protected void assembleSelf(RenderTarget target) {
-
+
int size = getPreferredSize().x;
int x = getX();
int y = getY() + (getHeight() - size) / 2;
-
+
// Border
-
+
Vec4 borderColor;
if (Checkbox.this.isPressed() || Checkbox.this.isHovered() || Checkbox.this.isFocused()) {
borderColor = Colors.BLUE;
@@ -52,9 +52,9 @@ public class Checkbox extends BasicButton {
borderColor = Colors.LIGHT_GRAY;
}
target.fill(x, y, size, size, borderColor);
-
+
// Inside area
-
+
if (Checkbox.this.isPressed()) {
// Do nothing
} else {
@@ -66,9 +66,9 @@ public class Checkbox extends BasicButton {
}
target.fill(x + 2, y + 2, size - 4, size - 4, backgroundColor);
}
-
+
// "Tick"
-
+
if (Checkbox.this.isChecked()) {
target.fill(x + 4, y + 4, size - 8, size - 8, Colors.BLUE);
}
@@ -81,10 +81,10 @@ public class Checkbox extends BasicButton {
public Checkbox(String name, String label, Font labelFont, boolean check) {
super(name, label, labelFont);
this.checked = check;
-
+
assert getChildren().size() == 1 : "Checkbox expects that BasicButton contains exactly one child";
Component basicChild = getChild(0);
-
+
Group group = new Group(getName() + ".LabelAndTick", new LayoutHorizontal(0, 10));
removeChild(basicChild);
setLayout(new LayoutAlign(0, 0.5f, 10));
@@ -92,18 +92,18 @@ public class Checkbox extends BasicButton {
group.addChild(new Tick());
group.addChild(basicChild);
addChild(group);
-
+
addAction(b -> switchState());
}
-
+
public Checkbox(String name, String label, Font labelFont) {
this(name, label, labelFont, false);
}
-
+
public Checkbox(String name, String label, boolean check) {
this(name, label, new Font(), check);
}
-
+
public Checkbox(String name, String label) {
this(name, label, false);
}
@@ -111,14 +111,14 @@ public class Checkbox extends BasicButton {
public void switchState() {
setChecked(!isChecked());
}
-
+
/**
* @return the checked
*/
public boolean isChecked() {
return checked;
}
-
+
/**
* @param checked the checked to set
*/
@@ -129,21 +129,21 @@ public class Checkbox extends BasicButton {
@Override
protected void assembleSelf(RenderTarget target) {
// Change label font color
-
+
if (isPressed()) {
getLabel().setFont(getLabel().getFont().withColor(Colors.BLUE));
} else {
getLabel().setFont(getLabel().getFont().withColor(Colors.BLACK));
}
}
-
+
@Override
protected void postAssembleSelf(RenderTarget target) {
// Apply disable tint
-
+
if (!isEnabled()) {
target.fill(getX(), getY(), getWidth(), getHeight(), Colors.toVector(0x88FFFFFF));
}
}
-
+
}
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Component.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Component.java
index bb6f24d..ad4b5ba 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Component.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Component.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui;
import java.util.Collections;
@@ -66,7 +66,7 @@ public class Component extends Named {
private Object layoutHint = null;
private Layout layout = null;
-
+
private boolean isEnabled = true;
private boolean isFocusable = false;
@@ -303,7 +303,7 @@ public class Component extends Named {
public boolean isFocusable() {
return isFocusable;
}
-
+
/**
* Checks whether this component can become focused at this moment.
*
@@ -460,11 +460,11 @@ public class Component extends Named {
return null;
}
-
+
public boolean isEnabled() {
return isEnabled;
}
-
+
/**
* Enables or disables this component. An {@link EnableEvent} is dispatched
* if the state changes.
@@ -478,7 +478,7 @@ public class Component extends Named {
if (isFocused() && isEnabled()) {
focusNext();
}
-
+
if (isEnabled()) {
setHovered(false);
}
@@ -715,7 +715,7 @@ public class Component extends Named {
protected void assembleChildren(RenderTarget target) {
getChildren().forEach(child -> child.assemble(target));
}
-
+
/*
* Automatic Reassembly
*/
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/DynamicLabel.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/DynamicLabel.java
index bddad7b..ff62027 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/DynamicLabel.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/DynamicLabel.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui;
import glm.mat._4.Mat4;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/GUILayer.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/GUILayer.java
index 2e0981c..9a4c648 100755
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/GUILayer.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/GUILayer.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui;
import ru.windcorp.progressia.client.graphics.flat.AssembledFlatLayer;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Group.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Group.java
index d8a8b23..b6606fa 100755
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Group.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Group.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui;
public class Group extends Component {
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Label.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Label.java
index 4450f33..044b5d3 100755
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Label.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Label.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui;
import glm.mat._4.Mat4;
@@ -82,7 +82,7 @@ public class Label extends Component {
public Font getFont() {
return font;
}
-
+
public void setFont(Font font) {
this.font = font;
requestReassembly();
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Layout.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Layout.java
index 8d5d84f..4d08ed4 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Layout.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Layout.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui;
import glm.vec._2.i.Vec2i;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Panel.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Panel.java
index 90357ef..a3f9feb 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Panel.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Panel.java
@@ -30,43 +30,43 @@ public class Panel extends Group {
public Panel(String name, Layout layout, Vec4 fill, Vec4 border) {
super(name, layout);
-
+
this.fill = Objects.requireNonNull(fill, "fill");
this.border = border;
}
-
+
public Panel(String name, Layout layout) {
this(name, layout, Colors.WHITE, Colors.LIGHT_GRAY);
}
-
+
/**
* @return the fill
*/
public Vec4 getFill() {
return fill;
}
-
+
/**
* @param fill the fill to set
*/
public void setFill(Vec4 fill) {
this.fill = Objects.requireNonNull(fill, "fill");
}
-
+
/**
* @return the border
*/
public Vec4 getBorder() {
return border;
}
-
+
/**
* @param border the border to set
*/
public void setBorder(Vec4 border) {
this.border = border;
}
-
+
@Override
protected void assembleSelf(RenderTarget target) {
if (border == null) {
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/RadioButton.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/RadioButton.java
index 471efb6..1ee7f66 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/RadioButton.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/RadioButton.java
@@ -30,30 +30,30 @@ import ru.windcorp.progressia.client.graphics.gui.layout.LayoutHorizontal;
import ru.windcorp.progressia.client.graphics.input.KeyEvent;
public class RadioButton extends BasicButton {
-
+
private class Tick extends Component {
public Tick() {
super(RadioButton.this.getName() + ".Tick");
-
+
setPreferredSize(new Vec2i(Typefaces.getDefault().getLineHeight() * 3 / 2));
}
-
+
private void cross(RenderTarget target, int x, int y, int size, Vec4 color) {
target.fill(x + 4, y, size - 8, size, color);
target.fill(x + 2, y + 2, size - 4, size - 4, color);
target.fill(x, y + 4, size, size - 8, color);
}
-
+
@Override
protected void assembleSelf(RenderTarget target) {
-
+
int size = getPreferredSize().x;
int x = getX();
int y = getY() + (getHeight() - size) / 2;
-
+
// Border
-
+
Vec4 borderColor;
if (RadioButton.this.isPressed() || RadioButton.this.isHovered() || RadioButton.this.isFocused()) {
borderColor = Colors.BLUE;
@@ -61,9 +61,9 @@ public class RadioButton extends BasicButton {
borderColor = Colors.LIGHT_GRAY;
}
cross(target, x, y, size, borderColor);
-
+
// Inside area
-
+
if (RadioButton.this.isPressed()) {
// Do nothing
} else {
@@ -75,9 +75,9 @@ public class RadioButton extends BasicButton {
}
cross(target, x + 2, y + 2, size - 4, backgroundColor);
}
-
+
// "Tick"
-
+
if (RadioButton.this.isChecked()) {
cross(target, x + 4, y + 4, size - 8, Colors.BLUE);
}
@@ -86,16 +86,16 @@ public class RadioButton extends BasicButton {
}
private boolean checked;
-
+
private RadioButtonGroup group = null;
public RadioButton(String name, String label, Font labelFont, boolean check) {
super(name, label, labelFont);
this.checked = check;
-
+
assert getChildren().size() == 1 : "RadioButton expects that BasicButton contains exactly one child";
Component basicChild = getChild(0);
-
+
Group group = new Group(getName() + ".LabelAndTick", new LayoutHorizontal(0, 10));
removeChild(basicChild);
setLayout(new LayoutAlign(0, 0.5f, 10));
@@ -103,16 +103,17 @@ public class RadioButton extends BasicButton {
group.addChild(new Tick());
group.addChild(basicChild);
addChild(group);
-
+
addListener(KeyEvent.class, e -> {
- if (e.isRelease()) return false;
-
+ if (e.isRelease())
+ return false;
+
if (e.getKey() == GLFW.GLFW_KEY_LEFT || e.getKey() == GLFW.GLFW_KEY_UP) {
if (this.group != null) {
this.group.selectPrevious();
this.group.getSelected().takeFocus();
}
-
+
return true;
} else if (e.getKey() == GLFW.GLFW_KEY_RIGHT || e.getKey() == GLFW.GLFW_KEY_DOWN) {
if (this.group != null) {
@@ -121,85 +122,87 @@ public class RadioButton extends BasicButton {
}
return true;
}
-
+
return false;
});
-
+
addAction(b -> setChecked(true));
}
-
+
public RadioButton(String name, String label, Font labelFont) {
this(name, label, labelFont, false);
}
-
+
public RadioButton(String name, String label, boolean check) {
this(name, label, new Font(), check);
}
-
+
public RadioButton(String name, String label) {
this(name, label, false);
}
-
+
/**
* @param group the group to set
*/
public RadioButton setGroup(RadioButtonGroup group) {
-
+
if (this.group != null) {
group.selectNext();
removeAction(group.listener);
group.buttons.remove(this);
- group.getSelected(); // Clear reference if this was the only button in the group
+ group.getSelected(); // Clear reference if this was the only button
+ // in the group
}
-
+
this.group = group;
-
+
if (this.group != null) {
group.buttons.add(this);
addAction(group.listener);
}
-
+
setChecked(false);
-
+
return this;
}
-
+
/**
* @return the checked
*/
public boolean isChecked() {
return checked;
}
-
+
/**
* @param checked the checked to set
*/
public void setChecked(boolean checked) {
this.checked = checked;
-
+
if (group != null) {
- group.listener.accept(this); // Failsafe for manual invocations of setChecked()
+ group.listener.accept(this); // Failsafe for manual invocations of
+ // setChecked()
}
}
@Override
protected void assembleSelf(RenderTarget target) {
// Change label font color
-
+
if (isPressed()) {
getLabel().setFont(getLabel().getFont().withColor(Colors.BLUE));
} else {
getLabel().setFont(getLabel().getFont().withColor(Colors.BLACK));
}
}
-
+
@Override
protected void postAssembleSelf(RenderTarget target) {
// Apply disable tint
-
+
if (!isEnabled()) {
target.fill(getX(), getY(), getWidth(), getHeight(), Colors.toVector(0x88FFFFFF));
}
}
-
+
}
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/RadioButtonGroup.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/RadioButtonGroup.java
index 3887018..a8d94dc 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/RadioButtonGroup.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/RadioButtonGroup.java
@@ -26,92 +26,93 @@ import java.util.function.Consumer;
public class RadioButtonGroup {
- private final Collection> actions = Collections.synchronizedCollection(new ArrayList<>());
+ private final Collection> actions = Collections
+ .synchronizedCollection(new ArrayList<>());
final List buttons = Collections.synchronizedList(new ArrayList<>());
-
+
private RadioButton selected = null;
-
+
Consumer listener = b -> {
if (b instanceof RadioButton && ((RadioButton) b).isChecked() && buttons.contains(b)) {
select((RadioButton) b);
}
};
-
+
public RadioButtonGroup addAction(Consumer action) {
this.actions.add(Objects.requireNonNull(action, "action"));
return this;
}
-
+
public boolean removeAction(Consumer action) {
return this.actions.remove(action);
}
-
+
public List getButtons() {
return Collections.unmodifiableList(buttons);
}
-
+
public synchronized RadioButton getSelected() {
if (!buttons.contains(selected)) {
selected = null;
}
return selected;
}
-
+
public synchronized void select(RadioButton button) {
if (button != null && !buttons.contains(button)) {
throw new IllegalArgumentException("Button " + button + " is not in the group");
}
-
+
getSelected(); // Clear if invalid
-
+
if (selected == button) {
return; // Terminate listener-setter recursion
}
-
+
if (selected != null) {
selected.setChecked(false);
}
-
+
selected = button;
-
+
if (selected != null) {
selected.setChecked(true);
}
-
+
actions.forEach(action -> action.accept(this));
}
-
+
public void selectNext() {
selectNeighbour(+1);
}
-
+
public void selectPrevious() {
selectNeighbour(-1);
}
-
+
private synchronized void selectNeighbour(int direction) {
if (getSelected() == null) {
if (buttons.isEmpty()) {
throw new IllegalStateException("Cannot select neighbour button: group empty");
}
-
+
select(buttons.get(0));
} else {
RadioButton button;
int index = buttons.indexOf(selected);
-
+
do {
index += direction;
-
+
if (index >= buttons.size()) {
index = 0;
} else if (index < 0) {
index = buttons.size() - 1;
}
-
+
button = buttons.get(index);
} while (button != getSelected() && !button.isEnabled());
-
+
select(button);
}
}
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ButtonEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ButtonEvent.java
index 071f06e..28c0cc3 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ButtonEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ButtonEvent.java
@@ -21,26 +21,26 @@ package ru.windcorp.progressia.client.graphics.gui.event;
import ru.windcorp.progressia.client.graphics.gui.BasicButton;
public class ButtonEvent extends ComponentEvent {
-
+
public static class Press extends ButtonEvent {
public Press(BasicButton button) {
super(button, true);
}
}
-
+
public static class Release extends ButtonEvent {
public Release(BasicButton button) {
super(button, false);
}
}
-
+
private final boolean isPress;
protected ButtonEvent(BasicButton button, boolean isPress) {
super(button);
this.isPress = isPress;
}
-
+
public static ButtonEvent create(BasicButton button, boolean isPress) {
if (isPress) {
return new Press(button);
@@ -56,5 +56,5 @@ public class ButtonEvent extends ComponentEvent {
public boolean isRelease() {
return !isPress;
}
-
+
}
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildAddedEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildAddedEvent.java
index f1611fe..9bbf93a 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildAddedEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildAddedEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.event;
import ru.windcorp.progressia.client.graphics.gui.Component;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildEvent.java
index a27cf79..0d63e38 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.event;
import ru.windcorp.progressia.client.graphics.gui.Component;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildRemovedEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildRemovedEvent.java
index 897d787..ec2e46c 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildRemovedEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildRemovedEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.event;
import ru.windcorp.progressia.client.graphics.gui.Component;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ComponentEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ComponentEvent.java
index b1d1175..dbf6e1c 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ComponentEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ComponentEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.event;
import ru.windcorp.progressia.client.graphics.gui.Component;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/EnableEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/EnableEvent.java
index f56df2c..d8e5b5b 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/EnableEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/EnableEvent.java
@@ -7,5 +7,5 @@ public class EnableEvent extends ComponentEvent {
public EnableEvent(Component component) {
super(component);
}
-
+
}
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/FocusEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/FocusEvent.java
index ff859f3..fe476c2 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/FocusEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/FocusEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.event;
import ru.windcorp.progressia.client.graphics.gui.Component;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HierarchyEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HierarchyEvent.java
index d3a4984..5195c7e 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HierarchyEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HierarchyEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.event;
import ru.windcorp.progressia.client.graphics.gui.Component;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HoverEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HoverEvent.java
index b1d63ad..1e788f9 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HoverEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HoverEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.event;
import ru.windcorp.progressia.client.graphics.gui.Component;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ParentChangedEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ParentChangedEvent.java
index a7d9d40..ca5556a 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ParentChangedEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ParentChangedEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.event;
import ru.windcorp.progressia.client.graphics.gui.Component;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutAlign.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutAlign.java
index d521914..2fdf55d 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutAlign.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutAlign.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.layout;
import static java.lang.Math.max;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderHorizontal.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderHorizontal.java
index 3e271de..2be127e 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderHorizontal.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderHorizontal.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.layout;
import static java.lang.Math.max;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderVertical.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderVertical.java
index 0efcaa4..4584362 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderVertical.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderVertical.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.layout;
import static java.lang.Math.max;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutFill.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutFill.java
index c65fc4a..c0c448a 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutFill.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutFill.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.layout;
import static java.lang.Math.max;
@@ -27,7 +27,7 @@ import ru.windcorp.progressia.client.graphics.gui.Layout;
public class LayoutFill implements Layout {
private final int margin;
-
+
public LayoutFill(int margin) {
this.margin = margin;
}
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutGrid.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutGrid.java
index a164378..02a519f 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutGrid.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutGrid.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.layout;
import java.util.Arrays;
@@ -97,15 +97,15 @@ public class LayoutGrid implements Layout {
void setBounds(int column, int row, Component child, Component parent) {
if (!isSummed)
throw new IllegalStateException("Not summed yet");
-
+
int width, height;
-
+
if (column == columns.length - 1) {
width = parent.getWidth() - margin - columns[column];
} else {
width = columns[column + 1] - columns[column] - gap;
}
-
+
if (row == rows.length - 1) {
height = parent.getHeight() - margin - rows[row];
} else {
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutHorizontal.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutHorizontal.java
index 85c37fa..fc940c3 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutHorizontal.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutHorizontal.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.layout;
import static java.lang.Math.max;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutVertical.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutVertical.java
index 6e48d69..25c87ae 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutVertical.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutVertical.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.gui.layout;
import static java.lang.Math.max;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/menu/MenuLayer.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/menu/MenuLayer.java
index 4fa155c..7d6fff1 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/menu/MenuLayer.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/menu/MenuLayer.java
@@ -41,47 +41,47 @@ public class MenuLayer extends GUILayer {
private final Component content;
private final Component background;
-
+
private final Runnable closeAction = () -> {
GUI.removeLayer(this);
};
-
+
public MenuLayer(String name, Component content) {
super(name, new LayoutFill(0));
-
+
setCursorPolicy(CursorPolicy.REQUIRE);
-
+
this.background = new Panel(name + ".Background", new LayoutAlign(10), Colors.toVector(0x66000000), null);
this.content = content;
-
+
background.addChild(content);
getRoot().addChild(background);
}
-
+
public MenuLayer(String name, Layout contentLayout) {
this(name, new Panel(name + ".Content", contentLayout));
}
-
+
public MenuLayer(String name) {
this(name, new LayoutVertical(20, 10));
}
-
+
public Component getContent() {
return content;
}
-
+
public Component getBackground() {
return background;
}
-
+
protected void addTitle() {
String translationKey = "Layer" + getName() + ".Title";
MutableString titleText = new MutableStringLocalized(translationKey);
Font titleFont = new Font().deriveBold().withColor(Colors.BLACK).withAlign(0.5f);
-
+
Label label = new Label(getName() + ".Title", titleFont, titleText);
getContent().addChild(label);
-
+
Panel panel = new Panel(getName() + ".Title.Underscore", null, Colors.BLUE, null);
panel.setLayout(new LayoutFill() {
@Override
@@ -91,17 +91,17 @@ public class MenuLayer extends GUILayer {
});
getContent().addChild(panel);
}
-
+
protected Runnable getCloseAction() {
return closeAction;
}
-
+
@Override
protected void handleInput(Input input) {
-
+
if (!input.isConsumed()) {
InputEvent event = input.getEvent();
-
+
if (event instanceof KeyEvent) {
KeyEvent keyEvent = (KeyEvent) event;
if (keyEvent.isPress() && keyEvent.getKey() == GLFW.GLFW_KEY_ESCAPE) {
@@ -109,9 +109,9 @@ public class MenuLayer extends GUILayer {
}
}
}
-
+
super.handleInput(input);
input.consume();
}
-
+
}
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/input/CursorEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/CursorEvent.java
index 43dd965..8bc480b 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/input/CursorEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/CursorEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.input;
import glm.vec._2.d.Vec2d;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/input/CursorMoveEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/CursorMoveEvent.java
index c87fc62..d23af54 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/input/CursorMoveEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/CursorMoveEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.input;
import glm.vec._2.Vec2;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/input/FrameResizeEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/FrameResizeEvent.java
index 5589158..70c9870 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/input/FrameResizeEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/FrameResizeEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.input;
import glm.vec._2.i.Vec2i;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/input/InputEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/InputEvent.java
index b0c2483..dc8a187 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/input/InputEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/InputEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.input;
public abstract class InputEvent {
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/input/KeyEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/KeyEvent.java
index 291b89e..8df55be 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/input/KeyEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/KeyEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.input;
import org.lwjgl.glfw.GLFW;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/input/KeyMatcher.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/KeyMatcher.java
index 6fedcd6..6073a7b 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/input/KeyMatcher.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/KeyMatcher.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.input;
import java.util.function.Predicate;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/input/Keys.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/Keys.java
index 3904f59..aa8940c 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/input/Keys.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/Keys.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.input;
import java.lang.reflect.Field;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/input/WheelEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/WheelEvent.java
index 24938c3..80c5282 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/input/WheelEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/WheelEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.input;
public abstract class WheelEvent extends InputEvent {
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/input/WheelScrollEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/WheelScrollEvent.java
index 968ff64..0ba2d2b 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/input/WheelScrollEvent.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/WheelScrollEvent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.input;
import glm.vec._2.d.Vec2d;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/Input.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/Input.java
index 1aad6bb..46da738 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/Input.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/Input.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.input.bus;
import ru.windcorp.progressia.client.graphics.input.InputEvent;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputBus.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputBus.java
index a22a243..233540a 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputBus.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputBus.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.input.bus;
import java.util.ArrayList;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputListener.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputListener.java
index 0d68b5e..f6e3811 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputListener.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputListener.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.input.bus;
import ru.windcorp.progressia.client.graphics.input.InputEvent;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/BlockFaceVectors.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/BlockFaceVectors.java
index 3b929c0..9b3abf9 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/BlockFaceVectors.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/BlockFaceVectors.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
import static ru.windcorp.progressia.common.world.block.BlockFace.*;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/DynamicModel.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/DynamicModel.java
index 9460bd7..fb0e47d 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/DynamicModel.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/DynamicModel.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
import java.util.ArrayList;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/EmptyModel.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/EmptyModel.java
index f9cff67..f3e40a0 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/EmptyModel.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/EmptyModel.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
import glm.mat._4.Mat4;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/Face.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/Face.java
index 79da464..6b21711 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/Face.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/Face.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
import java.nio.ByteBuffer;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/FaceGroup.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/FaceGroup.java
index ee91544..9df04df 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/FaceGroup.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/FaceGroup.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
import ru.windcorp.progressia.client.graphics.texture.Texture;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/Faces.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/Faces.java
index d1e9c07..f685644 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/Faces.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/Faces.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
import java.nio.ShortBuffer;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/LambdaModel.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/LambdaModel.java
index 0ae31bf..3f0d97d 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/LambdaModel.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/LambdaModel.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
import java.util.ArrayList;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/Model.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/Model.java
index 47cd88b..5e59007 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/Model.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/Model.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
import glm.mat._4.Mat4;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/Renderable.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/Renderable.java
index 6063685..b379b75 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/Renderable.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/Renderable.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
public interface Renderable {
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/Shape.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/Shape.java
index 145b149..3a29c74 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/Shape.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/Shape.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
import java.nio.ByteBuffer;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderHelper.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderHelper.java
index 67578f6..b950d06 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderHelper.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderHelper.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
import glm.mat._4.Mat4;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderProgram.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderProgram.java
index e27bc77..d2f0e3a 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderProgram.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderProgram.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
import java.nio.ByteBuffer;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/Shapes.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/Shapes.java
index 7ddd5d6..e1b2838 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/Shapes.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/Shapes.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
import java.util.Map;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/model/StaticModel.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/StaticModel.java
index 4c489d3..32b7a8c 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/model/StaticModel.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/StaticModel.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.model;
import java.util.ArrayList;
@@ -78,7 +78,7 @@ public class StaticModel extends Model {
private Mat4[] getTransforms() {
return transforms.toArray(new Mat4[transforms.size()]);
}
-
+
public StaticModel build() {
return new StaticModel(getParts(), getTransforms());
}
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/Atlases.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/Atlases.java
index 94ed270..26a171d 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/Atlases.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/Atlases.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.texture;
import java.io.IOException;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/ComplexTexture.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/ComplexTexture.java
index a4f2881..9800508 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/ComplexTexture.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/ComplexTexture.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.texture;
import java.util.Map;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/SimpleTexture.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/SimpleTexture.java
index d772faa..f631f54 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/SimpleTexture.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/SimpleTexture.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.texture;
public class SimpleTexture extends Texture {
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/SimpleTextures.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/SimpleTextures.java
index 12db086..f98b92d 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/SimpleTextures.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/SimpleTextures.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.texture;
import java.io.IOException;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/Sprite.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/Sprite.java
index fc13896..9655295 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/Sprite.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/Sprite.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.texture;
import java.util.Objects;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/Texture.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/Texture.java
index a4d89bf..3041679 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/Texture.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/Texture.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.texture;
public abstract class Texture {
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureData.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureData.java
index 0453984..cc04c45 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureData.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureData.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.texture;
import static org.lwjgl.opengl.GL11.*;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureDataEditor.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureDataEditor.java
index 7079f59..8a7f5c3 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureDataEditor.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureDataEditor.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.texture;
import static ru.windcorp.progressia.client.graphics.texture.TextureUtil.BYTES_PER_PIXEL;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureLoader.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureLoader.java
index 18f2326..6b2ffdf 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureLoader.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureLoader.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.texture;
import java.awt.Graphics2D;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TexturePrimitive.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TexturePrimitive.java
index a1895bb..62c981b 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TexturePrimitive.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TexturePrimitive.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.texture;
import static org.lwjgl.opengl.GL11.*;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureSettings.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureSettings.java
index 3dd43a4..0b75742 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureSettings.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureSettings.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.texture;
public class TextureSettings {
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureUtil.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureUtil.java
index ea0fdee..adc5b9d 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureUtil.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureUtil.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.texture;
import java.awt.Color;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/world/Camera.java b/src/main/java/ru/windcorp/progressia/client/graphics/world/Camera.java
index 46b551c..58c84c1 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/world/Camera.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/world/Camera.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.world;
import static java.lang.Math.*;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/world/EntityAnchor.java b/src/main/java/ru/windcorp/progressia/client/graphics/world/EntityAnchor.java
index d11ea92..b927133 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/world/EntityAnchor.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/world/EntityAnchor.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.world;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/world/LayerWorld.java b/src/main/java/ru/windcorp/progressia/client/graphics/world/LayerWorld.java
index 50709ac..72c9a2b 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/world/LayerWorld.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/world/LayerWorld.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.world;
import java.util.ArrayList;
@@ -57,7 +57,7 @@ public class LayerWorld extends Layer {
super("World");
this.client = client;
this.inputBasedControls = new InputBasedControls(client);
-
+
setCursorPolicy(CursorPolicy.FORBID);
}
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/world/LocalPlayer.java b/src/main/java/ru/windcorp/progressia/client/graphics/world/LocalPlayer.java
index 620185b..7a4443a 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/world/LocalPlayer.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/world/LocalPlayer.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.world;
import ru.windcorp.progressia.client.Client;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/world/Selection.java b/src/main/java/ru/windcorp/progressia/client/graphics/world/Selection.java
index cd4ba29..3d997ee 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/world/Selection.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/world/Selection.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.world;
import glm.vec._2.Vec2;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderHelper.java b/src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderHelper.java
index de17238..b735876 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderHelper.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderHelper.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.world;
import glm.mat._4.Mat4;
diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderProgram.java b/src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderProgram.java
index 5e55297..75a6372 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderProgram.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderProgram.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.graphics.world;
import java.nio.ByteBuffer;
diff --git a/src/main/java/ru/windcorp/progressia/client/localization/LocaleListener.java b/src/main/java/ru/windcorp/progressia/client/localization/LocaleListener.java
index b7c1f54..8e06d9f 100644
--- a/src/main/java/ru/windcorp/progressia/client/localization/LocaleListener.java
+++ b/src/main/java/ru/windcorp/progressia/client/localization/LocaleListener.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.localization;
@FunctionalInterface
diff --git a/src/main/java/ru/windcorp/progressia/client/localization/Localizer.java b/src/main/java/ru/windcorp/progressia/client/localization/Localizer.java
index b61d000..70ad714 100644
--- a/src/main/java/ru/windcorp/progressia/client/localization/Localizer.java
+++ b/src/main/java/ru/windcorp/progressia/client/localization/Localizer.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.localization;
import java.lang.ref.WeakReference;
diff --git a/src/main/java/ru/windcorp/progressia/client/localization/MutableString.java b/src/main/java/ru/windcorp/progressia/client/localization/MutableString.java
index a96d804..702aafa 100644
--- a/src/main/java/ru/windcorp/progressia/client/localization/MutableString.java
+++ b/src/main/java/ru/windcorp/progressia/client/localization/MutableString.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.localization;
import java.lang.ref.WeakReference;
diff --git a/src/main/java/ru/windcorp/progressia/client/localization/MutableStringConcat.java b/src/main/java/ru/windcorp/progressia/client/localization/MutableStringConcat.java
index f31fbca..e16533e 100644
--- a/src/main/java/ru/windcorp/progressia/client/localization/MutableStringConcat.java
+++ b/src/main/java/ru/windcorp/progressia/client/localization/MutableStringConcat.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.localization;
public class MutableStringConcat extends MutableString {
diff --git a/src/main/java/ru/windcorp/progressia/client/localization/MutableStringFormatter.java b/src/main/java/ru/windcorp/progressia/client/localization/MutableStringFormatter.java
index fddba06..07fad9d 100644
--- a/src/main/java/ru/windcorp/progressia/client/localization/MutableStringFormatter.java
+++ b/src/main/java/ru/windcorp/progressia/client/localization/MutableStringFormatter.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.localization;
import java.util.IllegalFormatException;
diff --git a/src/main/java/ru/windcorp/progressia/client/localization/MutableStringFunc.java b/src/main/java/ru/windcorp/progressia/client/localization/MutableStringFunc.java
index d945618..82ae330 100644
--- a/src/main/java/ru/windcorp/progressia/client/localization/MutableStringFunc.java
+++ b/src/main/java/ru/windcorp/progressia/client/localization/MutableStringFunc.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.localization;
import java.util.function.Function;
diff --git a/src/main/java/ru/windcorp/progressia/client/localization/MutableStringLocalized.java b/src/main/java/ru/windcorp/progressia/client/localization/MutableStringLocalized.java
index 583d9e5..32a6d68 100644
--- a/src/main/java/ru/windcorp/progressia/client/localization/MutableStringLocalized.java
+++ b/src/main/java/ru/windcorp/progressia/client/localization/MutableStringLocalized.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.localization;
public class MutableStringLocalized extends MutableString {
diff --git a/src/main/java/ru/windcorp/progressia/client/localization/MutableStringParented.java b/src/main/java/ru/windcorp/progressia/client/localization/MutableStringParented.java
index d7b0fae..fd6c8fd 100644
--- a/src/main/java/ru/windcorp/progressia/client/localization/MutableStringParented.java
+++ b/src/main/java/ru/windcorp/progressia/client/localization/MutableStringParented.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.localization;
public abstract class MutableStringParented extends MutableString {
diff --git a/src/main/java/ru/windcorp/progressia/client/localization/Parser.java b/src/main/java/ru/windcorp/progressia/client/localization/Parser.java
index 7d587dc..d39e574 100644
--- a/src/main/java/ru/windcorp/progressia/client/localization/Parser.java
+++ b/src/main/java/ru/windcorp/progressia/client/localization/Parser.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.localization;
import ru.windcorp.jputil.chars.EscapeException;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/ChunkRender.java b/src/main/java/ru/windcorp/progressia/client/world/ChunkRender.java
index 21f6098..b4e4316 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/ChunkRender.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/ChunkRender.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world;
import java.util.Collections;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/ChunkRenderModel.java b/src/main/java/ru/windcorp/progressia/client/world/ChunkRenderModel.java
index 9653abe..ffd3b77 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/ChunkRenderModel.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/ChunkRenderModel.java
@@ -39,9 +39,9 @@ import ru.windcorp.progressia.common.world.ChunkData;
import ru.windcorp.progressia.common.world.block.BlockFace;
public class ChunkRenderModel implements Renderable {
-
+
private final ChunkRender chunk;
-
+
private final Collection optimizers = new ArrayList<>();
private Model model = null;
@@ -51,8 +51,9 @@ public class ChunkRenderModel implements Renderable {
@Override
public void render(ShapeRenderHelper renderer) {
- if (model == null) return;
-
+ if (model == null)
+ return;
+
renderer.pushTransform().translate(
chunk.getX() * ChunkData.BLOCKS_PER_CHUNK,
chunk.getY() * ChunkData.BLOCKS_PER_CHUNK,
@@ -63,32 +64,32 @@ public class ChunkRenderModel implements Renderable {
renderer.popTransform();
}
-
+
public void update() {
setupCROs();
-
+
StaticModel.Builder sink = StaticModel.builder();
-
+
optimizers.forEach(ChunkRenderOptimizer::startRender);
-
+
chunk.forEachBiC(blockInChunk -> {
processBlockAndTiles(blockInChunk, sink);
});
-
+
for (ChunkRenderOptimizer optimizer : optimizers) {
Renderable renderable = optimizer.endRender();
if (renderable != null) {
sink.addPart(renderable);
}
}
-
+
this.model = sink.build();
this.optimizers.clear();
}
private void setupCROs() {
Set ids = ChunkRenderOptimizerRegistry.getInstance().keySet();
-
+
for (String id : ids) {
ChunkRenderOptimizer optimizer = ChunkRenderOptimizerRegistry.getInstance().create(id);
optimizer.setup(chunk);
@@ -98,7 +99,7 @@ public class ChunkRenderModel implements Renderable {
private void processBlockAndTiles(Vec3i blockInChunk, Builder sink) {
processBlock(blockInChunk, sink);
-
+
for (BlockFace face : BlockFace.getFaces()) {
processTileStack(blockInChunk, face, sink);
}
@@ -106,18 +107,18 @@ public class ChunkRenderModel implements Renderable {
private void processBlock(Vec3i blockInChunk, Builder sink) {
BlockRender block = chunk.getBlock(blockInChunk);
-
+
if (block instanceof BlockRenderNone) {
return;
}
-
+
if (block.needsOwnRenderable()) {
sink.addPart(
- block.createRenderable(chunk.getData(), blockInChunk),
+ block.createRenderable(chunk.getData(), blockInChunk),
new Mat4().identity().translate(blockInChunk.x, blockInChunk.y, blockInChunk.z)
);
}
-
+
processBlockWithCROs(block, blockInChunk);
}
@@ -129,26 +130,26 @@ public class ChunkRenderModel implements Renderable {
private void processTileStack(Vec3i blockInChunk, BlockFace face, Builder sink) {
TileRenderStack trs = chunk.getTilesOrNull(blockInChunk, face);
-
+
if (trs == null || trs.isEmpty()) {
return;
}
-
+
trs.forEach(tile -> processTile(tile, blockInChunk, face, sink));
}
- private void processTile(TileRender tile, Vec3i blockInChunk, BlockFace face, Builder sink) {
+ private void processTile(TileRender tile, Vec3i blockInChunk, BlockFace face, Builder sink) {
if (tile instanceof TileRenderNone) {
return;
}
-
+
if (tile.needsOwnRenderable()) {
sink.addPart(
- tile.createRenderable(chunk.getData(), blockInChunk, face),
+ tile.createRenderable(chunk.getData(), blockInChunk, face),
new Mat4().identity().translate(blockInChunk.x, blockInChunk.y, blockInChunk.z)
);
}
-
+
processTileWithCROs(tile, blockInChunk, face);
}
diff --git a/src/main/java/ru/windcorp/progressia/client/world/ChunkUpdateListener.java b/src/main/java/ru/windcorp/progressia/client/world/ChunkUpdateListener.java
index c348498..ee606af 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/ChunkUpdateListener.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/ChunkUpdateListener.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world;
import glm.vec._3.i.Vec3i;
@@ -39,7 +39,7 @@ class ChunkUpdateListener implements ChunkDataListener {
public void onChunkChanged(ChunkData chunk) {
world.getChunk(chunk).markForUpdate();
}
-
+
@Override
public void onChunkLoaded(ChunkData chunk) {
Vec3i cursor = new Vec3i();
@@ -49,12 +49,12 @@ class ChunkUpdateListener implements ChunkDataListener {
world.markChunkForUpdate(cursor);
}
}
-
+
@Override
public void onChunkBlockChanged(ChunkData chunk, Vec3i blockInChunk, BlockData previous, BlockData current) {
onLocationChanged(chunk, blockInChunk);
}
-
+
@Override
public void onChunkTilesChanged(
ChunkData chunk,
@@ -68,18 +68,18 @@ class ChunkUpdateListener implements ChunkDataListener {
private void onLocationChanged(ChunkData chunk, Vec3i blockInChunk) {
Vec3i chunkPos = Vectors.grab3i().set(chunk.getX(), chunk.getY(), chunk.getZ());
-
+
checkCoordinate(blockInChunk, chunkPos, VectorUtil.Axis.X);
checkCoordinate(blockInChunk, chunkPos, VectorUtil.Axis.Y);
checkCoordinate(blockInChunk, chunkPos, VectorUtil.Axis.Z);
-
+
Vectors.release(chunkPos);
}
private void checkCoordinate(Vec3i blockInChunk, Vec3i chunkPos, VectorUtil.Axis axis) {
int block = VectorUtil.get(blockInChunk, axis);
int diff = 0;
-
+
if (block == 0) {
diff = -1;
} else if (block == ChunkData.BLOCKS_PER_CHUNK - 1) {
@@ -87,12 +87,12 @@ class ChunkUpdateListener implements ChunkDataListener {
} else {
return;
}
-
+
int previousChunkPos = VectorUtil.get(chunkPos, axis);
VectorUtil.set(chunkPos, axis, previousChunkPos + diff);
world.markChunkForUpdate(chunkPos);
-
+
VectorUtil.set(chunkPos, axis, previousChunkPos);
}
diff --git a/src/main/java/ru/windcorp/progressia/client/world/WorldRender.java b/src/main/java/ru/windcorp/progressia/client/world/WorldRender.java
index 8be08c2..a83ee32 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/WorldRender.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/WorldRender.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/block/BlockRender.java b/src/main/java/ru/windcorp/progressia/client/world/block/BlockRender.java
index d350fa8..6c3f939 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/block/BlockRender.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/block/BlockRender.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.block;
import ru.windcorp.progressia.client.graphics.model.ShapeRenderHelper;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderNone.java b/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderNone.java
index 84a2c4b..3f422f2 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderNone.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderNone.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.block;
import glm.vec._3.i.Vec3i;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderOpaqueCube.java b/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderOpaqueCube.java
index e4d8723..e753667 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderOpaqueCube.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderOpaqueCube.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.block;
import ru.windcorp.progressia.client.graphics.texture.Texture;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderRegistry.java b/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderRegistry.java
index 29bac40..5724d27 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.block;
import ru.windcorp.progressia.client.graphics.texture.Atlases;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderTexturedCube.java b/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderTexturedCube.java
index 1042a46..d410a52 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderTexturedCube.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderTexturedCube.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.block;
import static ru.windcorp.progressia.common.world.block.BlockFace.*;
@@ -68,23 +68,27 @@ public abstract class BlockRenderTexturedCube
public Texture getTexture(BlockFace blockFace) {
return textures.get(blockFace);
}
-
+
public Vec4 getColorMultiplier(BlockFace blockFace) {
return Colors.WHITE;
}
@Override
public final void getFaces(
- ChunkData chunk, Vec3i blockInChunk, BlockFace blockFace,
+ ChunkData chunk,
+ Vec3i blockInChunk,
+ BlockFace blockFace,
boolean inner,
Consumer output,
Vec3 offset
) {
output.accept(createFace(chunk, blockInChunk, blockFace, inner, offset));
}
-
+
private Face createFace(
- ChunkData chunk, Vec3i blockInChunk, BlockFace blockFace,
+ ChunkData chunk,
+ Vec3i blockInChunk,
+ BlockFace blockFace,
boolean inner,
Vec3 offset
) {
@@ -101,19 +105,25 @@ public abstract class BlockRenderTexturedCube
@Override
public Renderable createRenderable(ChunkData chunk, Vec3i blockInChunk) {
boolean opaque = isBlockOpaque();
-
+
Face[] faces = new Face[BLOCK_FACE_COUNT + (opaque ? BLOCK_FACE_COUNT : 0)];
-
+
for (int i = 0; i < BLOCK_FACE_COUNT; ++i) {
faces[i] = createFace(chunk, blockInChunk, BlockFace.getFaces().get(i), false, Vectors.ZERO_3);
}
-
+
if (!opaque) {
for (int i = 0; i < BLOCK_FACE_COUNT; ++i) {
- faces[i + BLOCK_FACE_COUNT] = createFace(chunk, blockInChunk, BlockFace.getFaces().get(i), true, Vectors.ZERO_3);
+ faces[i + BLOCK_FACE_COUNT] = createFace(
+ chunk,
+ blockInChunk,
+ BlockFace.getFaces().get(i),
+ true,
+ Vectors.ZERO_3
+ );
}
}
-
+
return new Shape(Usage.STATIC, WorldRenderProgram.getDefault(), faces);
}
diff --git a/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderTransparentCube.java b/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderTransparentCube.java
index 7f3df03..02b8b45 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderTransparentCube.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/block/BlockRenderTransparentCube.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.block;
import ru.windcorp.progressia.client.graphics.texture.Texture;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/cro/ChunkRenderOptimizerRegistry.java b/src/main/java/ru/windcorp/progressia/client/world/cro/ChunkRenderOptimizerRegistry.java
index 7e4dc87..7676b4f 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/cro/ChunkRenderOptimizerRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/cro/ChunkRenderOptimizerRegistry.java
@@ -15,15 +15,15 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.cro;
import ru.windcorp.progressia.common.util.namespaces.NamespacedFactoryRegistry;
public class ChunkRenderOptimizerRegistry extends NamespacedFactoryRegistry {
-
+
private static final ChunkRenderOptimizerRegistry INSTANCE = new ChunkRenderOptimizerRegistry();
-
+
/**
* @return the instance
*/
diff --git a/src/main/java/ru/windcorp/progressia/client/world/entity/EntityRender.java b/src/main/java/ru/windcorp/progressia/client/world/entity/EntityRender.java
index 13a2b24..8243c9d 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/entity/EntityRender.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/entity/EntityRender.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.entity;
import ru.windcorp.progressia.common.util.namespaces.Namespaced;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/entity/EntityRenderRegistry.java b/src/main/java/ru/windcorp/progressia/client/world/entity/EntityRenderRegistry.java
index 60b7bf6..1ffdda5 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/entity/EntityRenderRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/entity/EntityRenderRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.entity;
import java.io.IOException;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/entity/EntityRenderable.java b/src/main/java/ru/windcorp/progressia/client/world/entity/EntityRenderable.java
index eecaa16..361f7cd 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/entity/EntityRenderable.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/entity/EntityRenderable.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.entity;
import glm.vec._3.Vec3;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/entity/HumanoidModel.java b/src/main/java/ru/windcorp/progressia/client/world/entity/HumanoidModel.java
index 1609bfc..96704f3 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/entity/HumanoidModel.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/entity/HumanoidModel.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.entity;
import static java.lang.Math.*;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/entity/NPedModel.java b/src/main/java/ru/windcorp/progressia/client/world/entity/NPedModel.java
index ead6565..05986e5 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/entity/NPedModel.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/entity/NPedModel.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.entity;
import static java.lang.Math.atan2;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/entity/QuadripedModel.java b/src/main/java/ru/windcorp/progressia/client/world/entity/QuadripedModel.java
index 8755b08..b586744 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/entity/QuadripedModel.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/entity/QuadripedModel.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.entity;
import static java.lang.Math.*;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRender.java b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRender.java
index 4f82d86..6b6163b 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRender.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRender.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.tile;
import ru.windcorp.progressia.client.graphics.model.ShapeRenderHelper;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderGrass.java b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderGrass.java
index c73647b..762fcf4 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderGrass.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderGrass.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.tile;
import ru.windcorp.progressia.client.graphics.texture.Texture;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderNone.java b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderNone.java
index 8e2a6e4..56ea3cb 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderNone.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderNone.java
@@ -28,12 +28,12 @@ public class TileRenderNone extends TileRender {
public TileRenderNone(String id) {
super(id);
}
-
+
@Override
public Renderable createRenderable(ChunkData chunk, Vec3i blockInChunk, BlockFace face) {
return EmptyModel.getInstance();
}
-
+
@Override
public boolean needsOwnRenderable() {
return false;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderOpaqueSurface.java b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderOpaqueSurface.java
index e4990e8..bcc9df5 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderOpaqueSurface.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderOpaqueSurface.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.tile;
import ru.windcorp.progressia.client.graphics.texture.Texture;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderRegistry.java b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderRegistry.java
index b240933..499db0e 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.tile;
import ru.windcorp.progressia.client.graphics.texture.Atlases;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderStack.java b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderStack.java
index 6bb8fb0..10b0757 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderStack.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderStack.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.tile;
import ru.windcorp.progressia.client.world.ChunkRender;
diff --git a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderSurface.java b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderSurface.java
index eebcb07..417bdbe 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderSurface.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderSurface.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.tile;
import java.util.function.Consumer;
@@ -44,7 +44,7 @@ public abstract class TileRenderSurface extends TileRender implements TileOptimi
super(id);
this.texture = texture;
}
-
+
public TileRenderSurface(String id) {
this(id, null);
}
@@ -52,23 +52,27 @@ public abstract class TileRenderSurface extends TileRender implements TileOptimi
public Texture getTexture(BlockFace blockFace) {
return texture;
}
-
+
public Vec4 getColorMultiplier(BlockFace blockFace) {
return Colors.WHITE;
}
-
+
@Override
public final void getFaces(
- ChunkData chunk, Vec3i blockInChunk, BlockFace blockFace,
+ ChunkData chunk,
+ Vec3i blockInChunk,
+ BlockFace blockFace,
boolean inner,
Consumer output,
Vec3 offset
) {
output.accept(createFace(chunk, blockInChunk, blockFace, inner, offset));
}
-
+
private Face createFace(
- ChunkData chunk, Vec3i blockInChunk, BlockFace blockFace,
+ ChunkData chunk,
+ Vec3i blockInChunk,
+ BlockFace blockFace,
boolean inner,
Vec3 offset
) {
@@ -87,9 +91,9 @@ public abstract class TileRenderSurface extends TileRender implements TileOptimi
return new Shape(
Usage.STATIC,
WorldRenderProgram.getDefault(),
-
+
createFace(chunk, blockInChunk, blockFace, false, Vectors.ZERO_3),
- createFace(chunk, blockInChunk, blockFace, true, Vectors.ZERO_3)
+ createFace(chunk, blockInChunk, blockFace, true, Vectors.ZERO_3)
);
}
diff --git a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderTransparentSurface.java b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderTransparentSurface.java
index b35986e..af512a9 100644
--- a/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderTransparentSurface.java
+++ b/src/main/java/ru/windcorp/progressia/client/world/tile/TileRenderTransparentSurface.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.client.world.tile;
import ru.windcorp.progressia.client.graphics.texture.Texture;
diff --git a/src/main/java/ru/windcorp/progressia/common/Units.java b/src/main/java/ru/windcorp/progressia/common/Units.java
index 842e378..979cc2d 100644
--- a/src/main/java/ru/windcorp/progressia/common/Units.java
+++ b/src/main/java/ru/windcorp/progressia/common/Units.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common;
import java.lang.annotation.ElementType;
diff --git a/src/main/java/ru/windcorp/progressia/common/collision/AABB.java b/src/main/java/ru/windcorp/progressia/common/collision/AABB.java
index fd8ffe9..3ecb58f 100644
--- a/src/main/java/ru/windcorp/progressia/common/collision/AABB.java
+++ b/src/main/java/ru/windcorp/progressia/common/collision/AABB.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.collision;
import glm.vec._3.Vec3;
diff --git a/src/main/java/ru/windcorp/progressia/common/collision/AABBoid.java b/src/main/java/ru/windcorp/progressia/common/collision/AABBoid.java
index ab2cd80..04312f1 100644
--- a/src/main/java/ru/windcorp/progressia/common/collision/AABBoid.java
+++ b/src/main/java/ru/windcorp/progressia/common/collision/AABBoid.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.collision;
import glm.vec._3.Vec3;
diff --git a/src/main/java/ru/windcorp/progressia/common/collision/Collideable.java b/src/main/java/ru/windcorp/progressia/common/collision/Collideable.java
index 8db7805..d96a472 100644
--- a/src/main/java/ru/windcorp/progressia/common/collision/Collideable.java
+++ b/src/main/java/ru/windcorp/progressia/common/collision/Collideable.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.collision;
import glm.vec._3.Vec3;
diff --git a/src/main/java/ru/windcorp/progressia/common/collision/CollisionModel.java b/src/main/java/ru/windcorp/progressia/common/collision/CollisionModel.java
index 9ade6af..209063a 100644
--- a/src/main/java/ru/windcorp/progressia/common/collision/CollisionModel.java
+++ b/src/main/java/ru/windcorp/progressia/common/collision/CollisionModel.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.collision;
import glm.vec._3.Vec3;
diff --git a/src/main/java/ru/windcorp/progressia/common/collision/CollisionPathComputer.java b/src/main/java/ru/windcorp/progressia/common/collision/CollisionPathComputer.java
index 4826bce..2f9598b 100644
--- a/src/main/java/ru/windcorp/progressia/common/collision/CollisionPathComputer.java
+++ b/src/main/java/ru/windcorp/progressia/common/collision/CollisionPathComputer.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.collision;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/common/collision/CompoundCollisionModel.java b/src/main/java/ru/windcorp/progressia/common/collision/CompoundCollisionModel.java
index 6f5ec24..a91dfdf 100644
--- a/src/main/java/ru/windcorp/progressia/common/collision/CompoundCollisionModel.java
+++ b/src/main/java/ru/windcorp/progressia/common/collision/CompoundCollisionModel.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.collision;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/common/collision/TransformedCollisionModel.java b/src/main/java/ru/windcorp/progressia/common/collision/TransformedCollisionModel.java
index 96bfbee..9622423 100644
--- a/src/main/java/ru/windcorp/progressia/common/collision/TransformedCollisionModel.java
+++ b/src/main/java/ru/windcorp/progressia/common/collision/TransformedCollisionModel.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.collision;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/common/collision/TranslatedAABB.java b/src/main/java/ru/windcorp/progressia/common/collision/TranslatedAABB.java
index 4c33ad2..fd94cfc 100644
--- a/src/main/java/ru/windcorp/progressia/common/collision/TranslatedAABB.java
+++ b/src/main/java/ru/windcorp/progressia/common/collision/TranslatedAABB.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.collision;
import glm.vec._3.Vec3;
diff --git a/src/main/java/ru/windcorp/progressia/common/collision/Wall.java b/src/main/java/ru/windcorp/progressia/common/collision/Wall.java
index 91ca006..91e9f72 100644
--- a/src/main/java/ru/windcorp/progressia/common/collision/Wall.java
+++ b/src/main/java/ru/windcorp/progressia/common/collision/Wall.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.collision;
import glm.vec._3.Vec3;
diff --git a/src/main/java/ru/windcorp/progressia/common/collision/WorldCollisionHelper.java b/src/main/java/ru/windcorp/progressia/common/collision/WorldCollisionHelper.java
index 69d2d4a..5280994 100644
--- a/src/main/java/ru/windcorp/progressia/common/collision/WorldCollisionHelper.java
+++ b/src/main/java/ru/windcorp/progressia/common/collision/WorldCollisionHelper.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.collision;
import java.util.ArrayList;
diff --git a/src/main/java/ru/windcorp/progressia/common/collision/colliders/AABBoidCollider.java b/src/main/java/ru/windcorp/progressia/common/collision/colliders/AABBoidCollider.java
index 5fab3d8..0750e79 100644
--- a/src/main/java/ru/windcorp/progressia/common/collision/colliders/AABBoidCollider.java
+++ b/src/main/java/ru/windcorp/progressia/common/collision/colliders/AABBoidCollider.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.collision.colliders;
import glm.mat._3.Mat3;
diff --git a/src/main/java/ru/windcorp/progressia/common/collision/colliders/AnythingWithCompoundCollider.java b/src/main/java/ru/windcorp/progressia/common/collision/colliders/AnythingWithCompoundCollider.java
index 559de13..2680098 100644
--- a/src/main/java/ru/windcorp/progressia/common/collision/colliders/AnythingWithCompoundCollider.java
+++ b/src/main/java/ru/windcorp/progressia/common/collision/colliders/AnythingWithCompoundCollider.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.collision.colliders;
import ru.windcorp.progressia.common.collision.Collideable;
diff --git a/src/main/java/ru/windcorp/progressia/common/collision/colliders/Collider.java b/src/main/java/ru/windcorp/progressia/common/collision/colliders/Collider.java
index 56bc8ad..fe47a8e 100644
--- a/src/main/java/ru/windcorp/progressia/common/collision/colliders/Collider.java
+++ b/src/main/java/ru/windcorp/progressia/common/collision/colliders/Collider.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.collision.colliders;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/common/comms/CommsChannel.java b/src/main/java/ru/windcorp/progressia/common/comms/CommsChannel.java
index 288b5dd..45c6d0a 100644
--- a/src/main/java/ru/windcorp/progressia/common/comms/CommsChannel.java
+++ b/src/main/java/ru/windcorp/progressia/common/comms/CommsChannel.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.comms;
import java.io.IOException;
diff --git a/src/main/java/ru/windcorp/progressia/common/comms/CommsListener.java b/src/main/java/ru/windcorp/progressia/common/comms/CommsListener.java
index 7445e93..e133cf8 100644
--- a/src/main/java/ru/windcorp/progressia/common/comms/CommsListener.java
+++ b/src/main/java/ru/windcorp/progressia/common/comms/CommsListener.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.comms;
import java.io.IOException;
diff --git a/src/main/java/ru/windcorp/progressia/common/comms/controls/ControlData.java b/src/main/java/ru/windcorp/progressia/common/comms/controls/ControlData.java
index 46e4e94..d90505b 100644
--- a/src/main/java/ru/windcorp/progressia/common/comms/controls/ControlData.java
+++ b/src/main/java/ru/windcorp/progressia/common/comms/controls/ControlData.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.comms.controls;
import ru.windcorp.progressia.common.util.namespaces.Namespaced;
diff --git a/src/main/java/ru/windcorp/progressia/common/comms/controls/ControlDataRegistry.java b/src/main/java/ru/windcorp/progressia/common/comms/controls/ControlDataRegistry.java
index cd884e8..59a8529 100644
--- a/src/main/java/ru/windcorp/progressia/common/comms/controls/ControlDataRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/common/comms/controls/ControlDataRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.comms.controls;
import ru.windcorp.progressia.common.util.namespaces.NamespacedFactoryRegistry;
diff --git a/src/main/java/ru/windcorp/progressia/common/comms/controls/PacketControl.java b/src/main/java/ru/windcorp/progressia/common/comms/controls/PacketControl.java
index d5abd39..2d352bb 100644
--- a/src/main/java/ru/windcorp/progressia/common/comms/controls/PacketControl.java
+++ b/src/main/java/ru/windcorp/progressia/common/comms/controls/PacketControl.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.comms.controls;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/comms/packets/Packet.java b/src/main/java/ru/windcorp/progressia/common/comms/packets/Packet.java
index 5421028..8669eb3 100644
--- a/src/main/java/ru/windcorp/progressia/common/comms/packets/Packet.java
+++ b/src/main/java/ru/windcorp/progressia/common/comms/packets/Packet.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.comms.packets;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/hacks/GuavaEventBusHijacker.java b/src/main/java/ru/windcorp/progressia/common/hacks/GuavaEventBusHijacker.java
index 6bc7901..ece4dc0 100644
--- a/src/main/java/ru/windcorp/progressia/common/hacks/GuavaEventBusHijacker.java
+++ b/src/main/java/ru/windcorp/progressia/common/hacks/GuavaEventBusHijacker.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.hacks;
import java.lang.reflect.Constructor;
diff --git a/src/main/java/ru/windcorp/progressia/common/resource/Resource.java b/src/main/java/ru/windcorp/progressia/common/resource/Resource.java
index 6cd4d32..41cf621 100644
--- a/src/main/java/ru/windcorp/progressia/common/resource/Resource.java
+++ b/src/main/java/ru/windcorp/progressia/common/resource/Resource.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.resource;
import java.io.IOException;
@@ -34,7 +34,7 @@ import ru.windcorp.progressia.common.util.Named;
import ru.windcorp.progressia.common.util.crash.CrashReports;
public class Resource extends Named {
-
+
private final ResourceReader resourceReader;
public Resource(String name, ResourceReader resourceReader) {
@@ -45,7 +45,7 @@ public class Resource extends Named {
public InputStream getInputStream() {
return getResourceReader().read(getName());
}
-
+
public ResourceReader getResourceReader() {
return resourceReader;
}
diff --git a/src/main/java/ru/windcorp/progressia/common/resource/ResourceManager.java b/src/main/java/ru/windcorp/progressia/common/resource/ResourceManager.java
index 33db64d..fcfc43f 100644
--- a/src/main/java/ru/windcorp/progressia/common/resource/ResourceManager.java
+++ b/src/main/java/ru/windcorp/progressia/common/resource/ResourceManager.java
@@ -15,18 +15,18 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.resource;
public class ResourceManager {
-
+
private static final ResourceReader CLASSPATH_READER = new ClasspathResourceReader();
private static final ResourceReader FILESYSTEM_READER = new FilesystemResourceReader();
public static Resource getResource(String name) {
return new Resource(name, CLASSPATH_READER);
}
-
+
public static Resource getFileResource(String name) {
return new Resource(name, FILESYSTEM_READER);
}
diff --git a/src/main/java/ru/windcorp/progressia/common/resource/ResourceReader.java b/src/main/java/ru/windcorp/progressia/common/resource/ResourceReader.java
index 1f95f2c..49c221c 100644
--- a/src/main/java/ru/windcorp/progressia/common/resource/ResourceReader.java
+++ b/src/main/java/ru/windcorp/progressia/common/resource/ResourceReader.java
@@ -20,7 +20,7 @@ package ru.windcorp.progressia.common.resource;
import java.io.InputStream;
public interface ResourceReader {
-
+
InputStream read(String name);
}
diff --git a/src/main/java/ru/windcorp/progressia/common/state/AbstractStatefulObjectLayout.java b/src/main/java/ru/windcorp/progressia/common/state/AbstractStatefulObjectLayout.java
index b2feb80..99a0340 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/AbstractStatefulObjectLayout.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/AbstractStatefulObjectLayout.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/state/HashMapStateStorage.java b/src/main/java/ru/windcorp/progressia/common/state/HashMapStateStorage.java
index 52d446f..56ee25d 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/HashMapStateStorage.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/HashMapStateStorage.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
import gnu.trove.map.TIntIntMap;
diff --git a/src/main/java/ru/windcorp/progressia/common/state/IOContext.java b/src/main/java/ru/windcorp/progressia/common/state/IOContext.java
index b18f875..75d61fc 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/IOContext.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/IOContext.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
public enum IOContext {
diff --git a/src/main/java/ru/windcorp/progressia/common/state/InspectingStatefulObjectLayout.java b/src/main/java/ru/windcorp/progressia/common/state/InspectingStatefulObjectLayout.java
index 8b0a9fe..d8ec92e 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/InspectingStatefulObjectLayout.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/InspectingStatefulObjectLayout.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
import java.util.ArrayList;
diff --git a/src/main/java/ru/windcorp/progressia/common/state/IntStateField.java b/src/main/java/ru/windcorp/progressia/common/state/IntStateField.java
index abf8573..054740e 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/IntStateField.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/IntStateField.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/state/OptimizedStateStorage.java b/src/main/java/ru/windcorp/progressia/common/state/OptimizedStateStorage.java
index 478fbac..fbedec7 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/OptimizedStateStorage.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/OptimizedStateStorage.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
public class OptimizedStateStorage extends StateStorage {
diff --git a/src/main/java/ru/windcorp/progressia/common/state/OptimizedStatefulObjectLayout.java b/src/main/java/ru/windcorp/progressia/common/state/OptimizedStatefulObjectLayout.java
index 1158ab0..0f0a173 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/OptimizedStatefulObjectLayout.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/OptimizedStatefulObjectLayout.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
import java.util.List;
diff --git a/src/main/java/ru/windcorp/progressia/common/state/PrimitiveCounters.java b/src/main/java/ru/windcorp/progressia/common/state/PrimitiveCounters.java
index d3e2dbb..243d62a 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/PrimitiveCounters.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/PrimitiveCounters.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
class PrimitiveCounters {
diff --git a/src/main/java/ru/windcorp/progressia/common/state/StateChanger.java b/src/main/java/ru/windcorp/progressia/common/state/StateChanger.java
index cc8cd5a..a93e64e 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/StateChanger.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/StateChanger.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
public interface StateChanger {
diff --git a/src/main/java/ru/windcorp/progressia/common/state/StateField.java b/src/main/java/ru/windcorp/progressia/common/state/StateField.java
index ca88c4f..ef56c0f 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/StateField.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/StateField.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/state/StateFieldBuilder.java b/src/main/java/ru/windcorp/progressia/common/state/StateFieldBuilder.java
index 97c7176..935129a 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/StateFieldBuilder.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/StateFieldBuilder.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
public interface StateFieldBuilder {
diff --git a/src/main/java/ru/windcorp/progressia/common/state/StateStorage.java b/src/main/java/ru/windcorp/progressia/common/state/StateStorage.java
index 2f999f0..647ae00 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/StateStorage.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/StateStorage.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
public abstract class StateStorage {
diff --git a/src/main/java/ru/windcorp/progressia/common/state/StatefulObject.java b/src/main/java/ru/windcorp/progressia/common/state/StatefulObject.java
index 39f5b58..5a9ee27 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/StatefulObject.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/StatefulObject.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/state/StatefulObjectLayout.java b/src/main/java/ru/windcorp/progressia/common/state/StatefulObjectLayout.java
index 4490cdf..60b95bf 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/StatefulObjectLayout.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/StatefulObjectLayout.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/state/StatefulObjectRegistry.java b/src/main/java/ru/windcorp/progressia/common/state/StatefulObjectRegistry.java
index aa082a6..7811ec4 100644
--- a/src/main/java/ru/windcorp/progressia/common/state/StatefulObjectRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/common/state/StatefulObjectRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.state;
import java.util.Collections;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/BinUtil.java b/src/main/java/ru/windcorp/progressia/common/util/BinUtil.java
index ffc8a43..042d2a1 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/BinUtil.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/BinUtil.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
public class BinUtil {
diff --git a/src/main/java/ru/windcorp/progressia/common/util/ByteBufferInputStream.java b/src/main/java/ru/windcorp/progressia/common/util/ByteBufferInputStream.java
index 6b317a7..f3380a9 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/ByteBufferInputStream.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/ByteBufferInputStream.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
import java.io.InputStream;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/ByteBufferOutputStream.java b/src/main/java/ru/windcorp/progressia/common/util/ByteBufferOutputStream.java
index 8931c75..152a17f 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/ByteBufferOutputStream.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/ByteBufferOutputStream.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
import java.io.IOException;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/CoordinatePacker.java b/src/main/java/ru/windcorp/progressia/common/util/CoordinatePacker.java
index 0ef2413..8a98dd3 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/CoordinatePacker.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/CoordinatePacker.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
import glm.vec._2.i.Vec2i;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/DataBuffer.java b/src/main/java/ru/windcorp/progressia/common/util/DataBuffer.java
index 23522c1..f018fc6 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/DataBuffer.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/DataBuffer.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/FloatMathUtil.java b/src/main/java/ru/windcorp/progressia/common/util/FloatMathUtil.java
index 43487c0..a1008de 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/FloatMathUtil.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/FloatMathUtil.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
public class FloatMathUtil {
diff --git a/src/main/java/ru/windcorp/progressia/common/util/LowOverheadCache.java b/src/main/java/ru/windcorp/progressia/common/util/LowOverheadCache.java
index c5b2952..9d668e9 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/LowOverheadCache.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/LowOverheadCache.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
import java.util.ArrayList;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/Matrices.java b/src/main/java/ru/windcorp/progressia/common/util/Matrices.java
index 8804272..6534d5b 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/Matrices.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/Matrices.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
import glm.mat._3.Mat3;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/MultiLOC.java b/src/main/java/ru/windcorp/progressia/common/util/MultiLOC.java
index 295244d..3d417ac 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/MultiLOC.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/MultiLOC.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
import java.util.HashMap;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/Named.java b/src/main/java/ru/windcorp/progressia/common/util/Named.java
index d9fc97a..8722ad4 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/Named.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/Named.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
import java.util.Objects;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/SizeLimitedList.java b/src/main/java/ru/windcorp/progressia/common/util/SizeLimitedList.java
index 2010ccb..050fd94 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/SizeLimitedList.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/SizeLimitedList.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/StashingStack.java b/src/main/java/ru/windcorp/progressia/common/util/StashingStack.java
index 394c79d..9f7f8e7 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/StashingStack.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/StashingStack.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
import java.util.Arrays;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/TaskQueue.java b/src/main/java/ru/windcorp/progressia/common/util/TaskQueue.java
index a081356..325619d 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/TaskQueue.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/TaskQueue.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/VectorUtil.java b/src/main/java/ru/windcorp/progressia/common/util/VectorUtil.java
index 00ede3e..dfb9f1e 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/VectorUtil.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/VectorUtil.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/Vectors.java b/src/main/java/ru/windcorp/progressia/common/util/Vectors.java
index 7d99ea5..fb0a20a 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/Vectors.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/Vectors.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util;
import glm.vec._2.Vec2;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/crash/Analyzer.java b/src/main/java/ru/windcorp/progressia/common/util/crash/Analyzer.java
index 3289c3d..715aa66 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/crash/Analyzer.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/crash/Analyzer.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.crash;
/**
diff --git a/src/main/java/ru/windcorp/progressia/common/util/crash/ContextProvider.java b/src/main/java/ru/windcorp/progressia/common/util/crash/ContextProvider.java
index 5b62663..92d94ac 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/crash/ContextProvider.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/crash/ContextProvider.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.crash;
import java.util.Map;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/crash/CrashReports.java b/src/main/java/ru/windcorp/progressia/common/util/crash/CrashReports.java
index ab0ec3e..8c80681 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/crash/CrashReports.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/crash/CrashReports.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.crash;
import org.apache.logging.log4j.LogManager;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/crash/ReportingEventBus.java b/src/main/java/ru/windcorp/progressia/common/util/crash/ReportingEventBus.java
index 141efa9..d7e5315 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/crash/ReportingEventBus.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/crash/ReportingEventBus.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.crash;
import com.google.common.eventbus.EventBus;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/crash/analyzers/OutOfMemoryAnalyzer.java b/src/main/java/ru/windcorp/progressia/common/util/crash/analyzers/OutOfMemoryAnalyzer.java
index c07152f..647e9b3 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/crash/analyzers/OutOfMemoryAnalyzer.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/crash/analyzers/OutOfMemoryAnalyzer.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.crash.analyzers;
import ru.windcorp.progressia.common.util.crash.Analyzer;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/ArgsContextProvider.java b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/ArgsContextProvider.java
index 6c16902..55786c5 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/ArgsContextProvider.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/ArgsContextProvider.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.crash.providers;
import ru.windcorp.progressia.ProgressiaLauncher;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/JavaVersionContextProvider.java b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/JavaVersionContextProvider.java
index b8f4358..184a916 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/JavaVersionContextProvider.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/JavaVersionContextProvider.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.crash.providers;
import ru.windcorp.progressia.common.util.crash.ContextProvider;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/LanguageContextProvider.java b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/LanguageContextProvider.java
index ca9d387..8de2668 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/LanguageContextProvider.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/LanguageContextProvider.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.crash.providers;
import ru.windcorp.progressia.client.localization.Localizer;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/OSContextProvider.java b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/OSContextProvider.java
index 7fd4610..56752fd 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/OSContextProvider.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/OSContextProvider.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.crash.providers;
import ru.windcorp.progressia.common.util.crash.ContextProvider;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/OpenALContextProvider.java b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/OpenALContextProvider.java
index ad31bba..77626b3 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/OpenALContextProvider.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/OpenALContextProvider.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.crash.providers;
import ru.windcorp.progressia.client.audio.AudioManager;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/RAMContextProvider.java b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/RAMContextProvider.java
index 9c60921..2d91e5f 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/crash/providers/RAMContextProvider.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/crash/providers/RAMContextProvider.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.crash.providers;
import ru.windcorp.progressia.common.util.crash.ContextProvider;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/dynstr/DoubleFlusher.java b/src/main/java/ru/windcorp/progressia/common/util/dynstr/DoubleFlusher.java
index 6068669..ab21b4b 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/dynstr/DoubleFlusher.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/dynstr/DoubleFlusher.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.dynstr;
import gnu.trove.list.TCharList;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/dynstr/DynamicString.java b/src/main/java/ru/windcorp/progressia/common/util/dynstr/DynamicString.java
index 8376a3d..2266943 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/dynstr/DynamicString.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/dynstr/DynamicString.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.dynstr;
import java.util.function.Supplier;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/dynstr/DynamicStrings.java b/src/main/java/ru/windcorp/progressia/common/util/dynstr/DynamicStrings.java
index 030cd9d..0b5745e 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/dynstr/DynamicStrings.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/dynstr/DynamicStrings.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.dynstr;
import java.util.ArrayList;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/dynstr/FloatFlusher.java b/src/main/java/ru/windcorp/progressia/common/util/dynstr/FloatFlusher.java
index 0b245ee..26a727e 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/dynstr/FloatFlusher.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/dynstr/FloatFlusher.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.dynstr;
import gnu.trove.list.TCharList;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/dynstr/IntFlusher.java b/src/main/java/ru/windcorp/progressia/common/util/dynstr/IntFlusher.java
index 9924f81..64f98a7 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/dynstr/IntFlusher.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/dynstr/IntFlusher.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.dynstr;
import gnu.trove.list.TCharList;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/namespaces/IllegalIdException.java b/src/main/java/ru/windcorp/progressia/common/util/namespaces/IllegalIdException.java
index d896bac..cb5da76 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/namespaces/IllegalIdException.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/namespaces/IllegalIdException.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.namespaces;
public class IllegalIdException extends RuntimeException {
diff --git a/src/main/java/ru/windcorp/progressia/common/util/namespaces/Namespaced.java b/src/main/java/ru/windcorp/progressia/common/util/namespaces/Namespaced.java
index 2d87007..557804b 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/namespaces/Namespaced.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/namespaces/Namespaced.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.namespaces;
public abstract class Namespaced {
diff --git a/src/main/java/ru/windcorp/progressia/common/util/namespaces/NamespacedFactoryRegistry.java b/src/main/java/ru/windcorp/progressia/common/util/namespaces/NamespacedFactoryRegistry.java
index 2a94593..e4a4303 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/namespaces/NamespacedFactoryRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/namespaces/NamespacedFactoryRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.namespaces;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/namespaces/NamespacedInstanceRegistry.java b/src/main/java/ru/windcorp/progressia/common/util/namespaces/NamespacedInstanceRegistry.java
index ce1f3cf..7b3f01d 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/namespaces/NamespacedInstanceRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/namespaces/NamespacedInstanceRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.namespaces;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/common/util/namespaces/NamespacedUtil.java b/src/main/java/ru/windcorp/progressia/common/util/namespaces/NamespacedUtil.java
index b969b8e..ecff557 100644
--- a/src/main/java/ru/windcorp/progressia/common/util/namespaces/NamespacedUtil.java
+++ b/src/main/java/ru/windcorp/progressia/common/util/namespaces/NamespacedUtil.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.util.namespaces;
import java.util.Objects;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/BlockRay.java b/src/main/java/ru/windcorp/progressia/common/world/BlockRay.java
index 4d5f1f9..0cfc0be 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/BlockRay.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/BlockRay.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
import glm.vec._3.Vec3;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/ChunkData.java b/src/main/java/ru/windcorp/progressia/common/world/ChunkData.java
index 252429c..b6a2c42 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/ChunkData.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/ChunkData.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
import static ru.windcorp.progressia.common.world.block.BlockFace.*;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/ChunkDataListener.java b/src/main/java/ru/windcorp/progressia/common/world/ChunkDataListener.java
index 72008c4..17abda8 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/ChunkDataListener.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/ChunkDataListener.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
import glm.vec._3.i.Vec3i;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/ChunkDataListeners.java b/src/main/java/ru/windcorp/progressia/common/world/ChunkDataListeners.java
index b39437c..fdae0ab 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/ChunkDataListeners.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/ChunkDataListeners.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/Coordinates.java b/src/main/java/ru/windcorp/progressia/common/world/Coordinates.java
index 55f2076..ea1de1a 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/Coordinates.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/Coordinates.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
import static ru.windcorp.progressia.common.world.ChunkData.BLOCKS_PER_CHUNK;
@@ -158,7 +158,7 @@ public class Coordinates {
return output;
}
-
+
public static boolean isOnChunkBorder(int blockInChunk) {
return blockInChunk == 0 || blockInChunk == BLOCKS_PER_CHUNK - 1;
}
diff --git a/src/main/java/ru/windcorp/progressia/common/world/DecodingException.java b/src/main/java/ru/windcorp/progressia/common/world/DecodingException.java
index 532d22f..410bfad 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/DecodingException.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/DecodingException.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
/**
diff --git a/src/main/java/ru/windcorp/progressia/common/world/IllegalCoordinatesException.java b/src/main/java/ru/windcorp/progressia/common/world/IllegalCoordinatesException.java
index 69240cf..5fa2d9d 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/IllegalCoordinatesException.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/IllegalCoordinatesException.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
public class IllegalCoordinatesException extends RuntimeException {
diff --git a/src/main/java/ru/windcorp/progressia/common/world/PacketAffectChunk.java b/src/main/java/ru/windcorp/progressia/common/world/PacketAffectChunk.java
index 95e6eab..fdd4ce3 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/PacketAffectChunk.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/PacketAffectChunk.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
import glm.vec._3.i.Vec3i;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/PacketAffectWorld.java b/src/main/java/ru/windcorp/progressia/common/world/PacketAffectWorld.java
index 8433b9b..1432f1c 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/PacketAffectWorld.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/PacketAffectWorld.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
import ru.windcorp.progressia.common.comms.packets.Packet;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/PacketRevokeChunk.java b/src/main/java/ru/windcorp/progressia/common/world/PacketRevokeChunk.java
index c65b045..c1ab7e3 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/PacketRevokeChunk.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/PacketRevokeChunk.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/PacketSendChunk.java b/src/main/java/ru/windcorp/progressia/common/world/PacketSendChunk.java
index ca079ff..12a78c8 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/PacketSendChunk.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/PacketSendChunk.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/PacketSetLocalPlayer.java b/src/main/java/ru/windcorp/progressia/common/world/PacketSetLocalPlayer.java
index f835614..625a4c5 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/PacketSetLocalPlayer.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/PacketSetLocalPlayer.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/PlayerData.java b/src/main/java/ru/windcorp/progressia/common/world/PlayerData.java
index 2123e3f..ecd512b 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/PlayerData.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/PlayerData.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
import ru.windcorp.progressia.common.world.entity.EntityData;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/WorldData.java b/src/main/java/ru/windcorp/progressia/common/world/WorldData.java
index 85c6188..6201df9 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/WorldData.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/WorldData.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
import java.util.ArrayList;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/WorldDataListener.java b/src/main/java/ru/windcorp/progressia/common/world/WorldDataListener.java
index 9211efd..9b81d12 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/WorldDataListener.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/WorldDataListener.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/block/BlockData.java b/src/main/java/ru/windcorp/progressia/common/world/block/BlockData.java
index e94f838..2c9d352 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/block/BlockData.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/block/BlockData.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.block;
import ru.windcorp.progressia.common.collision.AABB;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/block/BlockDataRegistry.java b/src/main/java/ru/windcorp/progressia/common/world/block/BlockDataRegistry.java
index ac1934c..68b7412 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/block/BlockDataRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/block/BlockDataRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.block;
import ru.windcorp.progressia.common.util.namespaces.NamespacedInstanceRegistry;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/block/BlockFace.java b/src/main/java/ru/windcorp/progressia/common/world/block/BlockFace.java
index 9023500..92210ea 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/block/BlockFace.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/block/BlockFace.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.block;
import com.google.common.collect.ImmutableList;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/block/BlockRelation.java b/src/main/java/ru/windcorp/progressia/common/world/block/BlockRelation.java
index 659a5fa..46ff044 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/block/BlockRelation.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/block/BlockRelation.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.block;
import static java.lang.Math.abs;
@@ -43,7 +43,7 @@ public class BlockRelation {
public Vec3i getVector() {
return vector;
}
-
+
public Vec3 getFloatVector() {
return floatVector;
}
diff --git a/src/main/java/ru/windcorp/progressia/common/world/block/PacketAffectBlock.java b/src/main/java/ru/windcorp/progressia/common/world/block/PacketAffectBlock.java
index 2c1c8a2..5a4a3ac 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/block/PacketAffectBlock.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/block/PacketAffectBlock.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.block;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/block/PacketSetBlock.java b/src/main/java/ru/windcorp/progressia/common/world/block/PacketSetBlock.java
index 55d0eb2..a29fa2e 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/block/PacketSetBlock.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/block/PacketSetBlock.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.block;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/entity/EntityData.java b/src/main/java/ru/windcorp/progressia/common/world/entity/EntityData.java
index 7b3325c..2ed2263 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/entity/EntityData.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/entity/EntityData.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.entity;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/entity/EntityDataRegistry.java b/src/main/java/ru/windcorp/progressia/common/world/entity/EntityDataRegistry.java
index 26f219d..34271ae 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/entity/EntityDataRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/entity/EntityDataRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.entity;
import ru.windcorp.progressia.common.state.StatefulObjectRegistry;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/entity/PacketAffectEntity.java b/src/main/java/ru/windcorp/progressia/common/world/entity/PacketAffectEntity.java
index f3bf792..aefd64e 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/entity/PacketAffectEntity.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/entity/PacketAffectEntity.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.entity;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/entity/PacketChangeEntity.java b/src/main/java/ru/windcorp/progressia/common/world/entity/PacketChangeEntity.java
index d09b0f3..515f1f0 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/entity/PacketChangeEntity.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/entity/PacketChangeEntity.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.entity;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/entity/PacketRevokeEntity.java b/src/main/java/ru/windcorp/progressia/common/world/entity/PacketRevokeEntity.java
index 06dfc12..98b1d88 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/entity/PacketRevokeEntity.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/entity/PacketRevokeEntity.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.entity;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/entity/PacketSendEntity.java b/src/main/java/ru/windcorp/progressia/common/world/entity/PacketSendEntity.java
index 6604d4a..93d724c 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/entity/PacketSendEntity.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/entity/PacketSendEntity.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.entity;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/generic/ChunkMap.java b/src/main/java/ru/windcorp/progressia/common/world/generic/ChunkMap.java
index 6c35781..7176386 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/generic/ChunkMap.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/generic/ChunkMap.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.generic;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/generic/ChunkSet.java b/src/main/java/ru/windcorp/progressia/common/world/generic/ChunkSet.java
index 73c2267..c6e4fd3 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/generic/ChunkSet.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/generic/ChunkSet.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.generic;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/generic/ChunkSets.java b/src/main/java/ru/windcorp/progressia/common/world/generic/ChunkSets.java
index 93413e4..aa03957 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/generic/ChunkSets.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/generic/ChunkSets.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.generic;
import java.util.Iterator;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/generic/GenericBlock.java b/src/main/java/ru/windcorp/progressia/common/world/generic/GenericBlock.java
index d669b07..1d2c252 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/generic/GenericBlock.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/generic/GenericBlock.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.generic;
public interface GenericBlock {
diff --git a/src/main/java/ru/windcorp/progressia/common/world/generic/GenericChunk.java b/src/main/java/ru/windcorp/progressia/common/world/generic/GenericChunk.java
index 656304f..511c9aa 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/generic/GenericChunk.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/generic/GenericChunk.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.generic;
import java.util.function.Consumer;
@@ -91,17 +91,20 @@ public interface GenericChunk, B exten
Vectors.release(v);
return result;
}
-
+
default boolean isSurfaceBiC(Vec3i blockInChunk) {
int hits = 0;
-
- if (Coordinates.isOnChunkBorder(blockInChunk.x)) hits++;
- if (Coordinates.isOnChunkBorder(blockInChunk.y)) hits++;
- if (Coordinates.isOnChunkBorder(blockInChunk.z)) hits++;
-
+
+ if (Coordinates.isOnChunkBorder(blockInChunk.x))
+ hits++;
+ if (Coordinates.isOnChunkBorder(blockInChunk.y))
+ hits++;
+ if (Coordinates.isOnChunkBorder(blockInChunk.z))
+ hits++;
+
return hits >= 1;
}
-
+
default boolean isSurfaceBiW(Vec3i blockInWorld) {
Vec3i v = Vectors.grab3i();
@@ -113,17 +116,20 @@ public interface GenericChunk, B exten
Vectors.release(v);
return result;
}
-
+
default boolean isEdgeBiC(Vec3i blockInChunk) {
int hits = 0;
-
- if (Coordinates.isOnChunkBorder(blockInChunk.x)) hits++;
- if (Coordinates.isOnChunkBorder(blockInChunk.y)) hits++;
- if (Coordinates.isOnChunkBorder(blockInChunk.z)) hits++;
-
+
+ if (Coordinates.isOnChunkBorder(blockInChunk.x))
+ hits++;
+ if (Coordinates.isOnChunkBorder(blockInChunk.y))
+ hits++;
+ if (Coordinates.isOnChunkBorder(blockInChunk.z))
+ hits++;
+
return hits >= 2;
}
-
+
default boolean isEdgeBiW(Vec3i blockInWorld) {
Vec3i v = Vectors.grab3i();
@@ -135,17 +141,20 @@ public interface GenericChunk, B exten
Vectors.release(v);
return result;
}
-
+
default boolean isVertexBiC(Vec3i blockInChunk) {
int hits = 0;
-
- if (Coordinates.isOnChunkBorder(blockInChunk.x)) hits++;
- if (Coordinates.isOnChunkBorder(blockInChunk.y)) hits++;
- if (Coordinates.isOnChunkBorder(blockInChunk.z)) hits++;
-
+
+ if (Coordinates.isOnChunkBorder(blockInChunk.x))
+ hits++;
+ if (Coordinates.isOnChunkBorder(blockInChunk.y))
+ hits++;
+ if (Coordinates.isOnChunkBorder(blockInChunk.z))
+ hits++;
+
return hits == 3;
}
-
+
default boolean isVertexBiW(Vec3i blockInWorld) {
Vec3i v = Vectors.grab3i();
diff --git a/src/main/java/ru/windcorp/progressia/common/world/generic/GenericEntity.java b/src/main/java/ru/windcorp/progressia/common/world/generic/GenericEntity.java
index c15bd39..ee802b9 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/generic/GenericEntity.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/generic/GenericEntity.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.generic;
import glm.vec._3.Vec3;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/generic/GenericTile.java b/src/main/java/ru/windcorp/progressia/common/world/generic/GenericTile.java
index e35aec2..73bf63b 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/generic/GenericTile.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/generic/GenericTile.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.generic;
public interface GenericTile {
diff --git a/src/main/java/ru/windcorp/progressia/common/world/generic/GenericTileStack.java b/src/main/java/ru/windcorp/progressia/common/world/generic/GenericTileStack.java
index 31a5158..11eb5e4 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/generic/GenericTileStack.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/generic/GenericTileStack.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.generic;
import java.util.AbstractList;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/generic/GenericWorld.java b/src/main/java/ru/windcorp/progressia/common/world/generic/GenericWorld.java
index 943067e..e1b71fa 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/generic/GenericWorld.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/generic/GenericWorld.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.generic;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/generic/LongBasedChunkMap.java b/src/main/java/ru/windcorp/progressia/common/world/generic/LongBasedChunkMap.java
index 2fbc912..855f0d7 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/generic/LongBasedChunkMap.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/generic/LongBasedChunkMap.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.generic;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/generic/LongBasedChunkSet.java b/src/main/java/ru/windcorp/progressia/common/world/generic/LongBasedChunkSet.java
index cd5a755..f5112c8 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/generic/LongBasedChunkSet.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/generic/LongBasedChunkSet.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.generic;
import java.util.Iterator;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/io/ChunkCodec.java b/src/main/java/ru/windcorp/progressia/common/world/io/ChunkCodec.java
index 7c2a35c..d3bdb2b 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/io/ChunkCodec.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/io/ChunkCodec.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.io;
import java.io.DataInputStream;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/io/ChunkIO.java b/src/main/java/ru/windcorp/progressia/common/world/io/ChunkIO.java
index 025738f..1dec1b7 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/io/ChunkIO.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/io/ChunkIO.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.io;
import java.io.DataInputStream;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/tile/PacketAddTile.java b/src/main/java/ru/windcorp/progressia/common/world/tile/PacketAddTile.java
index 650b4a7..bfc47c2 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/tile/PacketAddTile.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/tile/PacketAddTile.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.tile;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/tile/PacketAffectTile.java b/src/main/java/ru/windcorp/progressia/common/world/tile/PacketAffectTile.java
index b12012c..07d9105 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/tile/PacketAffectTile.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/tile/PacketAffectTile.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.tile;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/tile/PacketRemoveTile.java b/src/main/java/ru/windcorp/progressia/common/world/tile/PacketRemoveTile.java
index 9a8ef6c..d05c0c4 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/tile/PacketRemoveTile.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/tile/PacketRemoveTile.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.tile;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/tile/TileData.java b/src/main/java/ru/windcorp/progressia/common/world/tile/TileData.java
index d314445..b8f42aa 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/tile/TileData.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/tile/TileData.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.tile;
import ru.windcorp.progressia.common.util.namespaces.Namespaced;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/tile/TileDataRegistry.java b/src/main/java/ru/windcorp/progressia/common/world/tile/TileDataRegistry.java
index 110baea..5508ded 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/tile/TileDataRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/tile/TileDataRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.tile;
import ru.windcorp.progressia.common.util.namespaces.NamespacedInstanceRegistry;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/tile/TileDataStack.java b/src/main/java/ru/windcorp/progressia/common/world/tile/TileDataStack.java
index 80f0ba4..78530a0 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/tile/TileDataStack.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/tile/TileDataStack.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.tile;
import ru.windcorp.progressia.common.world.ChunkData;
diff --git a/src/main/java/ru/windcorp/progressia/common/world/tile/TileReference.java b/src/main/java/ru/windcorp/progressia/common/world/tile/TileReference.java
index 75fde58..b8d593f 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/tile/TileReference.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/tile/TileReference.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.tile;
public interface TileReference {
diff --git a/src/main/java/ru/windcorp/progressia/common/world/tile/TileStackIsFullException.java b/src/main/java/ru/windcorp/progressia/common/world/tile/TileStackIsFullException.java
index c9f6240..8f01d7f 100644
--- a/src/main/java/ru/windcorp/progressia/common/world/tile/TileStackIsFullException.java
+++ b/src/main/java/ru/windcorp/progressia/common/world/tile/TileStackIsFullException.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.common.world.tile;
public class TileStackIsFullException extends RuntimeException {
diff --git a/src/main/java/ru/windcorp/progressia/server/ChunkLoader.java b/src/main/java/ru/windcorp/progressia/server/ChunkLoader.java
index d708fe2..f2391a2 100644
--- a/src/main/java/ru/windcorp/progressia/server/ChunkLoader.java
+++ b/src/main/java/ru/windcorp/progressia/server/ChunkLoader.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/ChunkManager.java b/src/main/java/ru/windcorp/progressia/server/ChunkManager.java
index badb061..2e1623d 100644
--- a/src/main/java/ru/windcorp/progressia/server/ChunkManager.java
+++ b/src/main/java/ru/windcorp/progressia/server/ChunkManager.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server;
import java.util.ArrayList;
@@ -79,27 +79,23 @@ public class ChunkManager {
}
}
-
+
@FunctionalInterface
- public interface ChunksLoadListener
- {
+ public interface ChunksLoadListener {
void handle(boolean starting);
}
-
+
@FunctionalInterface
- private interface ChunksLoadEventListener
- {
+ private interface ChunksLoadEventListener {
void handle();
}
-
- public interface ChunksLoadStartListener extends ChunksLoadEventListener
- {
-
+
+ public interface ChunksLoadStartListener extends ChunksLoadEventListener {
+
}
-
- public interface ChunksLoadFinishListener extends ChunksLoadEventListener
- {
-
+
+ public interface ChunksLoadFinishListener extends ChunksLoadEventListener {
+
}
private final Server server;
@@ -109,10 +105,11 @@ public class ChunkManager {
private final ChunkSet toLoad = ChunkSets.newHashSet();
private final ChunkSet toUnload = ChunkSets.newHashSet();
- private Collection listeners = Collections.synchronizedCollection( new ArrayList<>());
- private Collection startListeners = Collections.synchronizedCollection( new ArrayList<>());
- private Collection finishListeners = Collections.synchronizedCollection( new ArrayList<>());
-
+ private Collection listeners = Collections.synchronizedCollection(new ArrayList<>());
+ private Collection startListeners = Collections.synchronizedCollection(new ArrayList<>());
+ private Collection finishListeners = Collections
+ .synchronizedCollection(new ArrayList<>());
+
// TODO replace with a normal Map managed by some sort of PlayerListener,
// weak maps are weak
private final Map visions = Collections.synchronizedMap(new WeakHashMap<>());
@@ -132,26 +129,22 @@ public class ChunkManager {
}
}
- public void register(ChunksLoadListener cll)
- {
+ public void register(ChunksLoadListener cll) {
listeners.add(cll);
}
-
- public void register(ChunksLoadStartListener clsl)
- {
+
+ public void register(ChunksLoadStartListener clsl) {
startListeners.add(clsl);
}
-
- public void register(ChunksLoadFinishListener clfl)
- {
+
+ public void register(ChunksLoadFinishListener clfl) {
finishListeners.add(clfl);
}
-
- public void unregisterAll()
- {
+
+ public void unregisterAll() {
listeners.clear();
}
-
+
private void gatherRequests() {
requested.clear();
@@ -177,14 +170,13 @@ public class ChunkManager {
}
private void processQueues() {
-
- if (toUnload.size()!=0 || toLoad.size()!=0)
- {
- LogManager.getLogger().info(String.valueOf(toUnload.size())+" "+String.valueOf( toLoad.size()));
+
+ if (toUnload.size() != 0 || toLoad.size() != 0) {
+ LogManager.getLogger().info(String.valueOf(toUnload.size()) + " " + String.valueOf(toLoad.size()));
}
listeners.forEach(l -> l.handle(false));
startListeners.forEach(sl -> sl.handle());
-
+
toUnload.forEach(this::unloadChunk);
toUnload.clear();
toLoad.forEach(this::loadChunk);
@@ -195,7 +187,7 @@ public class ChunkManager {
});
listeners.forEach(l -> l.handle(true));
finishListeners.forEach(fl -> fl.handle());
-
+
}
private PlayerVision getVision(Player player, boolean createIfMissing) {
@@ -236,22 +228,22 @@ public class ChunkManager {
TestWorldDiskIO.saveChunk(chunk, getServer());
}
-
+
public void unloadAll() // dont use probably
{
WorldData world = getServer().getWorld().getData();
-
- //Collection chunks = world.getChunks();
+
+ // Collection chunks = world.getChunks();
Collection chunkPoss = new HashSet();
-
+
world.forEachChunk(c -> {
chunkPoss.add(c.getPosition());
});
-
+
chunkPoss.forEach(v -> {
ChunkData c = world.getChunk(v);
world.removeChunk(c);
-
+
TestWorldDiskIO.saveChunk(c, getServer());
});
}
diff --git a/src/main/java/ru/windcorp/progressia/server/EntityManager.java b/src/main/java/ru/windcorp/progressia/server/EntityManager.java
index d904c83..3e2079a 100644
--- a/src/main/java/ru/windcorp/progressia/server/EntityManager.java
+++ b/src/main/java/ru/windcorp/progressia/server/EntityManager.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server;
import java.util.Collections;
diff --git a/src/main/java/ru/windcorp/progressia/server/Player.java b/src/main/java/ru/windcorp/progressia/server/Player.java
index ea373a8..9b29918 100644
--- a/src/main/java/ru/windcorp/progressia/server/Player.java
+++ b/src/main/java/ru/windcorp/progressia/server/Player.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/PlayerManager.java b/src/main/java/ru/windcorp/progressia/server/PlayerManager.java
index b1447bf..fac1119 100644
--- a/src/main/java/ru/windcorp/progressia/server/PlayerManager.java
+++ b/src/main/java/ru/windcorp/progressia/server/PlayerManager.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server;
import java.util.ArrayList;
@@ -72,9 +72,8 @@ public class PlayerManager {
return player;
}
-
- public void removePlayer(Player player)
- {
+
+ public void removePlayer(Player player) {
players.remove(player);
}
diff --git a/src/main/java/ru/windcorp/progressia/server/ServerState.java b/src/main/java/ru/windcorp/progressia/server/ServerState.java
index 774f17d..d252e0c 100644
--- a/src/main/java/ru/windcorp/progressia/server/ServerState.java
+++ b/src/main/java/ru/windcorp/progressia/server/ServerState.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server;
import ru.windcorp.progressia.common.world.WorldData;
diff --git a/src/main/java/ru/windcorp/progressia/server/ServerThread.java b/src/main/java/ru/windcorp/progressia/server/ServerThread.java
index d8d15a9..7420c2b 100644
--- a/src/main/java/ru/windcorp/progressia/server/ServerThread.java
+++ b/src/main/java/ru/windcorp/progressia/server/ServerThread.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server;
import java.util.concurrent.Executors;
@@ -29,7 +29,7 @@ import ru.windcorp.progressia.server.world.ticking.TickerCoordinator;
public class ServerThread implements Runnable {
private static final ThreadLocal SERVER_THREADS_MAP = new ThreadLocal<>();
-
+
private static boolean isShuttingDown;
public static Server getCurrentServer() {
@@ -73,8 +73,7 @@ public class ServerThread implements Runnable {
@Override
public void run() {
try {
- if (isShuttingDown)
- {
+ if (isShuttingDown) {
getTicker().stop();
executor.shutdown();
return;
@@ -87,10 +86,10 @@ public class ServerThread implements Runnable {
}
public void stop() {
-
+
isShuttingDown = true;
- //getTicker().stop();
+ // getTicker().stop();
}
public Server getServer() {
diff --git a/src/main/java/ru/windcorp/progressia/server/TickingSettings.java b/src/main/java/ru/windcorp/progressia/server/TickingSettings.java
index 743da10..8cb77d6 100644
--- a/src/main/java/ru/windcorp/progressia/server/TickingSettings.java
+++ b/src/main/java/ru/windcorp/progressia/server/TickingSettings.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server;
import ru.windcorp.progressia.common.Units;
diff --git a/src/main/java/ru/windcorp/progressia/server/comms/Client.java b/src/main/java/ru/windcorp/progressia/server/comms/Client.java
index f439e27..fdc1e98 100644
--- a/src/main/java/ru/windcorp/progressia/server/comms/Client.java
+++ b/src/main/java/ru/windcorp/progressia/server/comms/Client.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.comms;
import ru.windcorp.progressia.common.comms.CommsChannel;
diff --git a/src/main/java/ru/windcorp/progressia/server/comms/ClientChat.java b/src/main/java/ru/windcorp/progressia/server/comms/ClientChat.java
index 35b9ca2..3d46634 100644
--- a/src/main/java/ru/windcorp/progressia/server/comms/ClientChat.java
+++ b/src/main/java/ru/windcorp/progressia/server/comms/ClientChat.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.comms;
public abstract class ClientChat extends Client {
diff --git a/src/main/java/ru/windcorp/progressia/server/comms/ClientManager.java b/src/main/java/ru/windcorp/progressia/server/comms/ClientManager.java
index cb4b80b..e223443 100644
--- a/src/main/java/ru/windcorp/progressia/server/comms/ClientManager.java
+++ b/src/main/java/ru/windcorp/progressia/server/comms/ClientManager.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.comms;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/server/comms/ClientPlayer.java b/src/main/java/ru/windcorp/progressia/server/comms/ClientPlayer.java
index c455b8e..d414524 100644
--- a/src/main/java/ru/windcorp/progressia/server/comms/ClientPlayer.java
+++ b/src/main/java/ru/windcorp/progressia/server/comms/ClientPlayer.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.comms;
import glm.vec._3.i.Vec3i;
diff --git a/src/main/java/ru/windcorp/progressia/server/comms/DefaultServerCommsListener.java b/src/main/java/ru/windcorp/progressia/server/comms/DefaultServerCommsListener.java
index d570e01..a405f78 100644
--- a/src/main/java/ru/windcorp/progressia/server/comms/DefaultServerCommsListener.java
+++ b/src/main/java/ru/windcorp/progressia/server/comms/DefaultServerCommsListener.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.comms;
import java.io.IOException;
diff --git a/src/main/java/ru/windcorp/progressia/server/comms/controls/ControlLogic.java b/src/main/java/ru/windcorp/progressia/server/comms/controls/ControlLogic.java
index 31e97a2..f9bfb3b 100644
--- a/src/main/java/ru/windcorp/progressia/server/comms/controls/ControlLogic.java
+++ b/src/main/java/ru/windcorp/progressia/server/comms/controls/ControlLogic.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.comms.controls;
import ru.windcorp.progressia.common.comms.controls.PacketControl;
diff --git a/src/main/java/ru/windcorp/progressia/server/comms/controls/ControlLogicRegistry.java b/src/main/java/ru/windcorp/progressia/server/comms/controls/ControlLogicRegistry.java
index 18ece0a..92112e3 100644
--- a/src/main/java/ru/windcorp/progressia/server/comms/controls/ControlLogicRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/server/comms/controls/ControlLogicRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.comms.controls;
import ru.windcorp.progressia.common.util.namespaces.NamespacedInstanceRegistry;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/ChunkLogic.java b/src/main/java/ru/windcorp/progressia/server/world/ChunkLogic.java
index 37685d2..acea221 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/ChunkLogic.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/ChunkLogic.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world;
import java.util.ArrayList;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/ChunkTickContext.java b/src/main/java/ru/windcorp/progressia/server/world/ChunkTickContext.java
index 5eed263..c197706 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/ChunkTickContext.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/ChunkTickContext.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/TickAndUpdateUtil.java b/src/main/java/ru/windcorp/progressia/server/world/TickAndUpdateUtil.java
index 22d106e..acf9d1f 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/TickAndUpdateUtil.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/TickAndUpdateUtil.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world;
import glm.vec._3.i.Vec3i;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/TickContext.java b/src/main/java/ru/windcorp/progressia/server/world/TickContext.java
index 50dda55..0997c65 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/TickContext.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/TickContext.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world;
import java.util.Random;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/TickContextMutable.java b/src/main/java/ru/windcorp/progressia/server/world/TickContextMutable.java
index 68185d9..81f5c49 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/TickContextMutable.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/TickContextMutable.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world;
import java.util.Objects;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/UpdateTriggerer.java b/src/main/java/ru/windcorp/progressia/server/world/UpdateTriggerer.java
index 511170e..07acf55 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/UpdateTriggerer.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/UpdateTriggerer.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world;
import glm.vec._3.i.Vec3i;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/WorldLogic.java b/src/main/java/ru/windcorp/progressia/server/world/WorldLogic.java
index 93a1028..abd10e4 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/WorldLogic.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/WorldLogic.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world;
import java.util.Collection;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/block/BlockLogic.java b/src/main/java/ru/windcorp/progressia/server/world/block/BlockLogic.java
index 794259f..fcf141d 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/block/BlockLogic.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/block/BlockLogic.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.block;
import ru.windcorp.progressia.common.util.namespaces.Namespaced;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/block/BlockLogicRegistry.java b/src/main/java/ru/windcorp/progressia/server/world/block/BlockLogicRegistry.java
index df18ff7..b50b02f 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/block/BlockLogicRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/block/BlockLogicRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.block;
import ru.windcorp.progressia.common.util.namespaces.NamespacedInstanceRegistry;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/block/BlockTickContext.java b/src/main/java/ru/windcorp/progressia/server/world/block/BlockTickContext.java
index a305b9a..d10f10c 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/block/BlockTickContext.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/block/BlockTickContext.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.block;
import java.util.Objects;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/block/TickableBlock.java b/src/main/java/ru/windcorp/progressia/server/world/block/TickableBlock.java
index 56ba938..62b830f 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/block/TickableBlock.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/block/TickableBlock.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.block;
import ru.windcorp.progressia.server.world.ticking.TickingPolicy;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/block/UpdateableBlock.java b/src/main/java/ru/windcorp/progressia/server/world/block/UpdateableBlock.java
index 1497c92..d9b931f 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/block/UpdateableBlock.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/block/UpdateableBlock.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.block;
import org.apache.logging.log4j.LogManager;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/entity/EntityLogic.java b/src/main/java/ru/windcorp/progressia/server/world/entity/EntityLogic.java
index 7725612..0f33517 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/entity/EntityLogic.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/entity/EntityLogic.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.entity;
import ru.windcorp.progressia.common.util.namespaces.Namespaced;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/entity/EntityLogicRegistry.java b/src/main/java/ru/windcorp/progressia/server/world/entity/EntityLogicRegistry.java
index d8b05d4..a3ecd20 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/entity/EntityLogicRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/entity/EntityLogicRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.entity;
import ru.windcorp.progressia.common.util.namespaces.NamespacedInstanceRegistry;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/generation/AbstractWorldGenerator.java b/src/main/java/ru/windcorp/progressia/server/world/generation/AbstractWorldGenerator.java
index ffb5c06..2753a8f 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/generation/AbstractWorldGenerator.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/generation/AbstractWorldGenerator.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.generation;
import java.io.DataInputStream;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/generation/WorldGenerator.java b/src/main/java/ru/windcorp/progressia/server/world/generation/WorldGenerator.java
index afed281..41a7885 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/generation/WorldGenerator.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/generation/WorldGenerator.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.generation;
import java.io.DataInputStream;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/AddTile.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/AddTile.java
index 6e9ea47..238a42f 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/AddTile.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/AddTile.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/BlockTriggeredUpdate.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/BlockTriggeredUpdate.java
index 331a5c4..6d8d408 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/BlockTriggeredUpdate.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/BlockTriggeredUpdate.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedBlockChange.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedBlockChange.java
index b005285..62cedac 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedBlockChange.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedBlockChange.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedChange.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedChange.java
index e1eb5ca..d5db70a 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedChange.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedChange.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedChunkChange.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedChunkChange.java
index d98c001..ef4a8cf 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedChunkChange.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedChunkChange.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedEvaluation.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedEvaluation.java
index da865b4..5fe1320 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedEvaluation.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedEvaluation.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedTileChange.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedTileChange.java
index 1b6cde2..3197def 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedTileChange.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedTileChange.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.Objects;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedWorldChange.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedWorldChange.java
index 711bd5d..c01e83a 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedWorldChange.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/CachedWorldChange.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/ChangeEntity.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/ChangeEntity.java
index 08f1212..a7a7072 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/ChangeEntity.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/ChangeEntity.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/RemoveTile.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/RemoveTile.java
index 42dea30..0f811b1 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/RemoveTile.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/RemoveTile.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/SetBlock.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/SetBlock.java
index 330333b..e4cc4fb 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/SetBlock.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/SetBlock.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/StateChange.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/StateChange.java
index 93d5f08..4aa8c7c 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/StateChange.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/StateChange.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
@FunctionalInterface
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/TickChunk.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/TickChunk.java
index c0895e1..92e0ff6 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/TickChunk.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/TickChunk.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.ArrayList;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/TickEntitiesTask.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/TickEntitiesTask.java
index 1e76b23..8376c8d 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/TickEntitiesTask.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/TickEntitiesTask.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import glm.vec._3.i.Vec3i;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/TileTriggeredUpdate.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/TileTriggeredUpdate.java
index 76fc414..80b91bd 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/TileTriggeredUpdate.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/TileTriggeredUpdate.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/WorldAccessor.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/WorldAccessor.java
index 2c83ccd..2069484 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tasks/WorldAccessor.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/WorldAccessor.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tasks;
import java.util.function.Consumer;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/ticking/Change.java b/src/main/java/ru/windcorp/progressia/server/world/ticking/Change.java
index b0fc7f2..4340327 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/ticking/Change.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/ticking/Change.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.ticking;
import ru.windcorp.progressia.server.Server;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/ticking/DevilInvasionException.java b/src/main/java/ru/windcorp/progressia/server/world/ticking/DevilInvasionException.java
index 50ff69c..fd146bc 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/ticking/DevilInvasionException.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/ticking/DevilInvasionException.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.ticking;
public class DevilInvasionException extends RuntimeException {
diff --git a/src/main/java/ru/windcorp/progressia/server/world/ticking/Evaluation.java b/src/main/java/ru/windcorp/progressia/server/world/ticking/Evaluation.java
index f4f3922..a198361 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/ticking/Evaluation.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/ticking/Evaluation.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.ticking;
import ru.windcorp.progressia.server.Server;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/ticking/Ticker.java b/src/main/java/ru/windcorp/progressia/server/world/ticking/Ticker.java
index 8a102ac..d830d0e 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/ticking/Ticker.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/ticking/Ticker.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.ticking;
import java.util.ArrayList;
@@ -115,8 +115,7 @@ class Ticker {
} catch (Exception e) {
getCoordinator().crash(e, this.name);
}
-
-
+
}
private synchronized boolean sleep() {
diff --git a/src/main/java/ru/windcorp/progressia/server/world/ticking/TickerCoordinator.java b/src/main/java/ru/windcorp/progressia/server/world/ticking/TickerCoordinator.java
index 7d58d6d..57e742f 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/ticking/TickerCoordinator.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/ticking/TickerCoordinator.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.ticking;
import java.util.ArrayList;
@@ -152,7 +152,7 @@ public class TickerCoordinator {
public double getTPS() {
return 1 / tickLength;
}
-
+
public long getUptimeTicks() {
return ticks;
}
@@ -168,7 +168,7 @@ public class TickerCoordinator {
tickStart = System.currentTimeMillis();
}
-
+
private void onTickEnd() {
ticks++;
}
@@ -191,7 +191,7 @@ public class TickerCoordinator {
logger.debug("Pass complete");
passes++;
}
-
+
onTickEnd();
logger.debug("Tick complete; run {} passes", passes);
diff --git a/src/main/java/ru/windcorp/progressia/server/world/ticking/TickerTask.java b/src/main/java/ru/windcorp/progressia/server/world/ticking/TickerTask.java
index 4a075c0..fe25d8a 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/ticking/TickerTask.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/ticking/TickerTask.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.ticking;
import glm.vec._3.i.Vec3i;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/ticking/TickingPolicy.java b/src/main/java/ru/windcorp/progressia/server/world/ticking/TickingPolicy.java
index a5836fe..e391ca4 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/ticking/TickingPolicy.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/ticking/TickingPolicy.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.ticking;
import ru.windcorp.progressia.server.world.block.TickableBlock;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tile/HangingTileLogic.java b/src/main/java/ru/windcorp/progressia/server/world/tile/HangingTileLogic.java
index 745f289..fdd3a53 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tile/HangingTileLogic.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tile/HangingTileLogic.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tile;
import ru.windcorp.progressia.server.world.block.BlockLogic;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tile/TSTickContext.java b/src/main/java/ru/windcorp/progressia/server/world/tile/TSTickContext.java
index 399f7b8..7121187 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tile/TSTickContext.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tile/TSTickContext.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tile;
import java.util.Objects;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tile/TickableTile.java b/src/main/java/ru/windcorp/progressia/server/world/tile/TickableTile.java
index 4def3b0..50a4b15 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tile/TickableTile.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tile/TickableTile.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tile;
import ru.windcorp.progressia.server.world.ticking.TickingPolicy;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tile/TileLogic.java b/src/main/java/ru/windcorp/progressia/server/world/tile/TileLogic.java
index 4a97ead..c623999 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tile/TileLogic.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tile/TileLogic.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tile;
import ru.windcorp.progressia.common.util.namespaces.Namespaced;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tile/TileLogicRegistry.java b/src/main/java/ru/windcorp/progressia/server/world/tile/TileLogicRegistry.java
index d8bceaf..cc0fca6 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tile/TileLogicRegistry.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tile/TileLogicRegistry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tile;
import ru.windcorp.progressia.common.util.namespaces.NamespacedInstanceRegistry;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tile/TileLogicStack.java b/src/main/java/ru/windcorp/progressia/server/world/tile/TileLogicStack.java
index 5e91963..99d23d5 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tile/TileLogicStack.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tile/TileLogicStack.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tile;
import ru.windcorp.progressia.common.world.generic.GenericTileStack;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tile/TileTickContext.java b/src/main/java/ru/windcorp/progressia/server/world/tile/TileTickContext.java
index 45f41ec..69dc77d 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tile/TileTickContext.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tile/TileTickContext.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tile;
import ru.windcorp.progressia.common.world.tile.TileData;
diff --git a/src/main/java/ru/windcorp/progressia/server/world/tile/UpdateableTile.java b/src/main/java/ru/windcorp/progressia/server/world/tile/UpdateableTile.java
index bf114fa..0a5aca5 100644
--- a/src/main/java/ru/windcorp/progressia/server/world/tile/UpdateableTile.java
+++ b/src/main/java/ru/windcorp/progressia/server/world/tile/UpdateableTile.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.server.world.tile;
public interface UpdateableTile {
diff --git a/src/main/java/ru/windcorp/progressia/test/CollisionModelRenderer.java b/src/main/java/ru/windcorp/progressia/test/CollisionModelRenderer.java
index 4c7ca68..7328cef 100644
--- a/src/main/java/ru/windcorp/progressia/test/CollisionModelRenderer.java
+++ b/src/main/java/ru/windcorp/progressia/test/CollisionModelRenderer.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import glm.mat._4.Mat4;
diff --git a/src/main/java/ru/windcorp/progressia/test/ControlBreakBlockData.java b/src/main/java/ru/windcorp/progressia/test/ControlBreakBlockData.java
index a9df57a..d7e8a36 100644
--- a/src/main/java/ru/windcorp/progressia/test/ControlBreakBlockData.java
+++ b/src/main/java/ru/windcorp/progressia/test/ControlBreakBlockData.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import glm.vec._3.i.Vec3i;
diff --git a/src/main/java/ru/windcorp/progressia/test/ControlPlaceBlockData.java b/src/main/java/ru/windcorp/progressia/test/ControlPlaceBlockData.java
index f3e45e2..f83a0cc 100644
--- a/src/main/java/ru/windcorp/progressia/test/ControlPlaceBlockData.java
+++ b/src/main/java/ru/windcorp/progressia/test/ControlPlaceBlockData.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import glm.vec._3.i.Vec3i;
diff --git a/src/main/java/ru/windcorp/progressia/test/ControlPlaceTileData.java b/src/main/java/ru/windcorp/progressia/test/ControlPlaceTileData.java
index 5a37b6f..5835d7b 100644
--- a/src/main/java/ru/windcorp/progressia/test/ControlPlaceTileData.java
+++ b/src/main/java/ru/windcorp/progressia/test/ControlPlaceTileData.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import glm.vec._3.i.Vec3i;
diff --git a/src/main/java/ru/windcorp/progressia/test/LayerAbout.java b/src/main/java/ru/windcorp/progressia/test/LayerAbout.java
index 7b45fd4..b0b89bb 100644
--- a/src/main/java/ru/windcorp/progressia/test/LayerAbout.java
+++ b/src/main/java/ru/windcorp/progressia/test/LayerAbout.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import ru.windcorp.progressia.client.graphics.Colors;
diff --git a/src/main/java/ru/windcorp/progressia/test/LayerButtonTest.java b/src/main/java/ru/windcorp/progressia/test/LayerButtonTest.java
index 6f829da..d715cea 100644
--- a/src/main/java/ru/windcorp/progressia/test/LayerButtonTest.java
+++ b/src/main/java/ru/windcorp/progressia/test/LayerButtonTest.java
@@ -39,87 +39,88 @@ import ru.windcorp.progressia.server.Player;
import ru.windcorp.progressia.server.ServerState;
public class LayerButtonTest extends MenuLayer {
-
+
boolean alive = true;
public LayerButtonTest() {
super("ButtonTest");
-
+
addTitle();
-
+
Button blockableButton;
getContent().addChild((blockableButton = new Button("BlockableButton", "Blockable")).addAction(b -> {
System.out.println("Button Blockable!");
}));
blockableButton.setEnabled(false);
-
+
getContent().addChild(new Checkbox("EnableButton", "Enable").addAction(b -> {
blockableButton.setEnabled(((Checkbox) b).isChecked());
}));
-
+
RadioButtonGroup group = new RadioButtonGroup().addAction(g -> {
System.out.println("RBG! " + g.getSelected().getLabel().getCurrentText());
});
-
+
getContent().addChild(new RadioButton("RB1", "Moon").setGroup(group));
getContent().addChild(new RadioButton("RB2", "Type").setGroup(group));
getContent().addChild(new RadioButton("RB3", "Ice").setGroup(group));
getContent().addChild(new RadioButton("RB4", "Cream").setGroup(group));
-
+
getContent().getChild(getContent().getChildren().size() - 1).setEnabled(false);
-
+
getContent().addChild(new Label("Hint", new Font().withColor(Colors.LIGHT_GRAY), "This is a MenuLayer"));
-
+
getContent().addChild(new Button("Continue", "Continue").addAction(b -> {
getCloseAction().run();
}));
-
+
getContent().addChild(new Button("Menu", "Back To Menu").addAction(b -> {
- //System.exit(0);
- //for (Layer layer : GUI.getLayers())
- //{
- // GUI.removeLayer(layer);
- //}
+ // System.exit(0);
+ // for (Layer layer : GUI.getLayers())
+ // {
+ // GUI.removeLayer(layer);
+ // }
getCloseAction().run();
-
- //ClientState.getInstance().;
-
+
+ // ClientState.getInstance().;
+
Collection players = ServerState.getInstance().getPlayerManager().getPlayers();
players.clear();
-
+
ClientState.disconnectFromLocalServer();
-
+
MutableString t = new MutableStringLocalized("LayerText.Save");
- LayerTestText layer = new LayerTestText("Text",() -> {t.update(); return t.get();});
-
+ LayerTestText layer = new LayerTestText("Text", () -> {
+ t.update();
+ return t.get();
+ });
+
GUI.addTopLayer(layer);
-
+
ChunkManager cm = ServerState.getInstance().getChunkManager();
alive = true;
- cm.register((ChunksLoadFinishListener)() -> {
- if (alive)
- {
+ cm.register((ChunksLoadFinishListener) () -> {
+ if (alive) {
GUI.removeLayer(layer);
GUI.addTopLayer(new LayerTitle("Title"));
- //cm.unregisterAll();
+ // cm.unregisterAll();
alive = false;
-
- //ServerState.getInstance().;
+
+ // ServerState.getInstance().;
ServerState.getInstance().shutdown("Safe Exit");
ServerState.setInstance(null);
-
+
TestPlayerControls.resetInstance();
}
});
-
- //ClientState.getInstance();
+
+ // ClientState.getInstance();
ClientState.setInstance(null);
- //ServerState.getInstance().getChunkManager().unloadAll();
-
-
+ // ServerState.getInstance().getChunkManager().unloadAll();
+
}));
-
+
getContent().takeFocus();
}
diff --git a/src/main/java/ru/windcorp/progressia/test/LayerTestGUI.java b/src/main/java/ru/windcorp/progressia/test/LayerTestGUI.java
index fb69ca3..e5b95fa 100755
--- a/src/main/java/ru/windcorp/progressia/test/LayerTestGUI.java
+++ b/src/main/java/ru/windcorp/progressia/test/LayerTestGUI.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import glm.vec._3.Vec3;
diff --git a/src/main/java/ru/windcorp/progressia/test/LayerTestText.java b/src/main/java/ru/windcorp/progressia/test/LayerTestText.java
index 3cfef00..fef1b23 100644
--- a/src/main/java/ru/windcorp/progressia/test/LayerTestText.java
+++ b/src/main/java/ru/windcorp/progressia/test/LayerTestText.java
@@ -10,15 +10,15 @@ import ru.windcorp.progressia.client.graphics.gui.layout.LayoutVertical;
public class LayerTestText extends GUILayer {
public LayerTestText(String name, Supplier value) {
- super(name, new LayoutVertical(20,10));
-
- //MutableString title = new MutableStringLocalized("Layer"+name+".Title");
+ super(name, new LayoutVertical(20, 10));
+
+ // MutableString title = new
+ // MutableStringLocalized("Layer"+name+".Title");
Font titleFont = new Font().deriveBold().withColor(Colors.BLACK).withAlign(0.5f);
- getRoot().addChild(new Label(name+".Text", titleFont, value));
+ getRoot().addChild(new Label(name + ".Text", titleFont, value));
}
-
- public LayerTestText(String name, String value)
- {
- this(name,() -> value);
+
+ public LayerTestText(String name, String value) {
+ this(name, () -> value);
}
}
diff --git a/src/main/java/ru/windcorp/progressia/test/LayerTestUI.java b/src/main/java/ru/windcorp/progressia/test/LayerTestUI.java
index c93a055..08d527e 100755
--- a/src/main/java/ru/windcorp/progressia/test/LayerTestUI.java
+++ b/src/main/java/ru/windcorp/progressia/test/LayerTestUI.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import org.lwjgl.glfw.GLFW;
diff --git a/src/main/java/ru/windcorp/progressia/test/LayerTitle.java b/src/main/java/ru/windcorp/progressia/test/LayerTitle.java
index c739651..d2ba139 100644
--- a/src/main/java/ru/windcorp/progressia/test/LayerTitle.java
+++ b/src/main/java/ru/windcorp/progressia/test/LayerTitle.java
@@ -14,21 +14,22 @@ import ru.windcorp.progressia.client.localization.MutableStringLocalized;
public class LayerTitle extends GUILayer {
public LayerTitle(String name) {
- super(name, new LayoutVertical(20,10));
-
- MutableString title = new MutableStringLocalized("Layer"+name+".Title");
+ super(name, new LayoutVertical(20, 10));
+
+ MutableString title = new MutableStringLocalized("Layer" + name + ".Title");
Font titleFont = new Font().deriveBold().withColor(Colors.BLACK).withAlign(0.5f);
- getRoot().addChild(new Label(name+".Title", titleFont, title));
-
+ getRoot().addChild(new Label(name + ".Title", titleFont, title));
+
Font buttonFont = titleFont;
- MutableString playText = new MutableStringLocalized("Layer"+name+".Play");
- getRoot().addChild(new Button(name+".Play", new Label(name+".Play", buttonFont, playText)).addAction(b -> {
+ MutableString playText = new MutableStringLocalized("Layer" + name + ".Play");
+ getRoot().addChild(new Button(name + ".Play", new Label(name + ".Play", buttonFont, playText)).addAction(b -> {
GUI.removeLayer(this);
-
- ProgressiaLauncher.play();}));
-
- MutableString quitText = new MutableStringLocalized("Layer"+name+".Quit");
- getRoot().addChild(new Button(name+"Quit", new Label(name+".Quit", buttonFont, quitText)).addAction(b -> {
+
+ ProgressiaLauncher.play();
+ }));
+
+ MutableString quitText = new MutableStringLocalized("Layer" + name + ".Quit");
+ getRoot().addChild(new Button(name + "Quit", new Label(name + ".Quit", buttonFont, quitText)).addAction(b -> {
System.exit(0);
}));
}
diff --git a/src/main/java/ru/windcorp/progressia/test/TestBlockLogicAir.java b/src/main/java/ru/windcorp/progressia/test/TestBlockLogicAir.java
index e378dbf..e9877e9 100644
--- a/src/main/java/ru/windcorp/progressia/test/TestBlockLogicAir.java
+++ b/src/main/java/ru/windcorp/progressia/test/TestBlockLogicAir.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import ru.windcorp.progressia.common.world.block.BlockFace;
diff --git a/src/main/java/ru/windcorp/progressia/test/TestBlockLogicGlass.java b/src/main/java/ru/windcorp/progressia/test/TestBlockLogicGlass.java
index eca9e5c..e58cc3d 100644
--- a/src/main/java/ru/windcorp/progressia/test/TestBlockLogicGlass.java
+++ b/src/main/java/ru/windcorp/progressia/test/TestBlockLogicGlass.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import ru.windcorp.progressia.common.world.block.BlockFace;
diff --git a/src/main/java/ru/windcorp/progressia/test/TestChunkCodec.java b/src/main/java/ru/windcorp/progressia/test/TestChunkCodec.java
index a4f891b..a39f53f 100644
--- a/src/main/java/ru/windcorp/progressia/test/TestChunkCodec.java
+++ b/src/main/java/ru/windcorp/progressia/test/TestChunkCodec.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import java.io.DataInput;
diff --git a/src/main/java/ru/windcorp/progressia/test/TestContent.java b/src/main/java/ru/windcorp/progressia/test/TestContent.java
index dad5496..003f5a3 100644
--- a/src/main/java/ru/windcorp/progressia/test/TestContent.java
+++ b/src/main/java/ru/windcorp/progressia/test/TestContent.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import static ru.windcorp.progressia.client.world.block.BlockRenderRegistry.getBlockTexture;
@@ -287,7 +287,7 @@ public class TestContent {
)
);
logic.register(ControlLogic.of("Test:PlaceTile", TestContent::onTilePlaceReceived));
-
+
triggers.register(
ControlTriggers.localOf(
"Test:StartNextMusic",
diff --git a/src/main/java/ru/windcorp/progressia/test/TestEntityDataStatie.java b/src/main/java/ru/windcorp/progressia/test/TestEntityDataStatie.java
index 94f5043..6bbee70 100644
--- a/src/main/java/ru/windcorp/progressia/test/TestEntityDataStatie.java
+++ b/src/main/java/ru/windcorp/progressia/test/TestEntityDataStatie.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import ru.windcorp.progressia.common.collision.AABB;
diff --git a/src/main/java/ru/windcorp/progressia/test/TestEntityLogicStatie.java b/src/main/java/ru/windcorp/progressia/test/TestEntityLogicStatie.java
index 5fa66fb..f27abfe 100644
--- a/src/main/java/ru/windcorp/progressia/test/TestEntityLogicStatie.java
+++ b/src/main/java/ru/windcorp/progressia/test/TestEntityLogicStatie.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import ru.windcorp.progressia.common.world.entity.EntityData;
diff --git a/src/main/java/ru/windcorp/progressia/test/TestEntityRenderHuman.java b/src/main/java/ru/windcorp/progressia/test/TestEntityRenderHuman.java
index 388d89c..3357f82 100644
--- a/src/main/java/ru/windcorp/progressia/test/TestEntityRenderHuman.java
+++ b/src/main/java/ru/windcorp/progressia/test/TestEntityRenderHuman.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import static java.lang.Math.toRadians;
diff --git a/src/main/java/ru/windcorp/progressia/test/TestEntityRenderJavapony.java b/src/main/java/ru/windcorp/progressia/test/TestEntityRenderJavapony.java
index aefa1c6..1e567d6 100644
--- a/src/main/java/ru/windcorp/progressia/test/TestEntityRenderJavapony.java
+++ b/src/main/java/ru/windcorp/progressia/test/TestEntityRenderJavapony.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import java.util.ArrayList;
diff --git a/src/main/java/ru/windcorp/progressia/test/TestEntityRenderStatie.java b/src/main/java/ru/windcorp/progressia/test/TestEntityRenderStatie.java
index 47990fd..12fd113 100644
--- a/src/main/java/ru/windcorp/progressia/test/TestEntityRenderStatie.java
+++ b/src/main/java/ru/windcorp/progressia/test/TestEntityRenderStatie.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import ru.windcorp.progressia.client.graphics.model.Renderable;
diff --git a/src/main/java/ru/windcorp/progressia/test/TestMusicPlayer.java b/src/main/java/ru/windcorp/progressia/test/TestMusicPlayer.java
index 1674d5b..ac221d8 100644
--- a/src/main/java/ru/windcorp/progressia/test/TestMusicPlayer.java
+++ b/src/main/java/ru/windcorp/progressia/test/TestMusicPlayer.java
@@ -38,41 +38,41 @@ import ru.windcorp.progressia.common.resource.ResourceManager;
import ru.windcorp.progressia.common.util.crash.CrashReports;
public class TestMusicPlayer implements Runnable {
-
+
private static final int MIN_SILENCE = 15 * 1000; // 15 seconds
private static final int MAX_SILENCE = 60 * 1000; // one minute
-
+
private static TestMusicPlayer instance = null;
-
+
private final List compositions = new ArrayList<>();
-
+
private final Random random = new Random();
private long nextStart;
private Sound lastStarted = null;
-
+
public TestMusicPlayer() {
this.nextStart = System.currentTimeMillis();
-
+
instance = this;
}
-
+
public static void start() {
Thread thread = new Thread(new TestMusicPlayer(), "Music Thread");
thread.setDaemon(true);
thread.start();
}
-
+
@Override
public void run() {
loadCompositions();
-
+
if (compositions.isEmpty()) {
LogManager.getLogger().warn("No music found");
return;
}
-
+
while (true) {
-
+
try {
synchronized (this) {
while (true) {
@@ -88,39 +88,39 @@ public class TestMusicPlayer implements Runnable {
LogManager.getLogger().warn("Received interrupt in music thread, terminating thread...");
return;
}
-
+
startNextComposition();
-
+
}
}
private void loadCompositions() {
try {
-
+
Path directory = Paths.get("music");
-
+
if (!Files.isDirectory(directory)) {
Files.createDirectories(directory);
}
-
+
Iterator it = Files.walk(directory).filter(Files::isRegularFile).iterator();
int i = 0;
-
+
while (it.hasNext()) {
String file = it.next().toString();
if (!file.endsWith(".ogg") && !file.endsWith(".oga")) {
LogManager.getLogger().warn("Skipping " + file + ": not .ogg nor .oga");
}
-
+
String id = "Progressia:Music" + (i++);
-
+
AudioManager.loadSound(ResourceManager.getFileResource(file.toString()), id, AudioFormat.STEREO);
SoundType composition = AudioRegistry.getInstance().get(id);
compositions.add(composition);
-
+
LogManager.getLogger().info("Loaded " + file);
}
-
+
} catch (IOException e) {
throw CrashReports.report(e, "Could not load music");
}
@@ -129,20 +129,21 @@ public class TestMusicPlayer implements Runnable {
private synchronized void startNextComposition() {
int index = random.nextInt(compositions.size());
SoundType composition = compositions.get(index);
-
+
long now = System.currentTimeMillis();
long durationInMs = (long) (composition.getDuration() * 1000);
long silence = random.nextInt(MAX_SILENCE - MIN_SILENCE) + MIN_SILENCE;
-
+
nextStart = now + durationInMs + silence;
-
+
lastStarted = new Music(composition);
lastStarted.play(false);
}
-
+
public static void startNextNow() {
- if (instance == null) return;
-
+ if (instance == null)
+ return;
+
synchronized (instance) {
instance.nextStart = System.currentTimeMillis();
instance.notifyAll();
diff --git a/src/main/java/ru/windcorp/progressia/test/TestPlayerControls.java b/src/main/java/ru/windcorp/progressia/test/TestPlayerControls.java
index 960a97e..f2d557e 100644
--- a/src/main/java/ru/windcorp/progressia/test/TestPlayerControls.java
+++ b/src/main/java/ru/windcorp/progressia/test/TestPlayerControls.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import glm.Glm;
@@ -90,9 +90,8 @@ public class TestPlayerControls {
private LayerTestGUI debugLayer = null;
private Runnable updateCallback = null;
-
- public static void resetInstance()
- {
+
+ public static void resetInstance() {
INSTANCE = new TestPlayerControls();
}
@@ -188,7 +187,7 @@ public class TestPlayerControls {
case GLFW.GLFW_KEY_ESCAPE:
if (!event.isPress())
return false;
-
+
handleEscape();
break;
diff --git a/src/main/java/ru/windcorp/progressia/test/TestTileLogicGrass.java b/src/main/java/ru/windcorp/progressia/test/TestTileLogicGrass.java
index 06afc77..e6514ca 100644
--- a/src/main/java/ru/windcorp/progressia/test/TestTileLogicGrass.java
+++ b/src/main/java/ru/windcorp/progressia/test/TestTileLogicGrass.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test;
import ru.windcorp.progressia.common.world.block.BlockFace;
diff --git a/src/main/java/ru/windcorp/progressia/test/TestWorldDiskIO.java b/src/main/java/ru/windcorp/progressia/test/TestWorldDiskIO.java
index cbb294b..355b7dc 100644
--- a/src/main/java/ru/windcorp/progressia/test/TestWorldDiskIO.java
+++ b/src/main/java/ru/windcorp/progressia/test/TestWorldDiskIO.java
@@ -78,25 +78,29 @@ public class TestWorldDiskIO {
return loc << 1;
}
- /*private static int intFromNat(int loc) // Possibly unused
- {
- if ((loc & 1) == 1)
- return -loc >> 1;
- return loc >> 1;
- }*/
+ /*
+ * private static int intFromNat(int loc) // Possibly unused
+ * {
+ * if ((loc & 1) == 1)
+ * return -loc >> 1;
+ * return loc >> 1;
+ * }
+ */
private static Vec3i getRegion(Vec3i chunkLoc) {
- return new Vec3i(natFromInt(chunkLoc.x/regionSize.x), natFromInt(chunkLoc.y/regionSize.y), natFromInt(chunkLoc.z/regionSize.z));
+ return new Vec3i(
+ natFromInt(chunkLoc.x / regionSize.x),
+ natFromInt(chunkLoc.y / regionSize.y),
+ natFromInt(chunkLoc.z / regionSize.z)
+ );
}
-
- private static int mod(int a, int m)
- {
- return ((a%m)+m)%m;
+
+ private static int mod(int a, int m) {
+ return ((a % m) + m) % m;
}
-
- private static Vec3i getRegionLoc(Vec3i chunkLoc)
- {
- return new Vec3i(mod(chunkLoc.x,regionSize.x),mod(chunkLoc.y,regionSize.y),mod(chunkLoc.z,regionSize.z));
+
+ private static Vec3i getRegionLoc(Vec3i chunkLoc) {
+ return new Vec3i(mod(chunkLoc.x, regionSize.x), mod(chunkLoc.y, regionSize.y), mod(chunkLoc.z, regionSize.z));
}
public static void initRegions() {
@@ -129,10 +133,9 @@ public class TestWorldDiskIO {
break;
}
}
-
- private static void expand(int sectors)
- {
-
+
+ private static void expand(int sectors) {
+
}
public static void saveChunk(ChunkData chunk, Server server) {
@@ -197,20 +200,18 @@ public class TestWorldDiskIO {
ChunkIO.save(chunk, output, IOContext.SAVE);
writeGenerationHint(chunk, output, server);
}
- }
- else if (currentFormat == 65536)
- {
+ } else if (currentFormat == 65536) {
LOG.debug(
"Saving {} {} {}",
chunk.getPosition().x,
chunk.getPosition().y,
chunk.getPosition().z
);
-
+
Files.createDirectories(SAVE_DIR);
-
+
Vec3i saveCoords = getRegion(chunk.getPosition());
-
+
Path path = SAVE_DIR.resolve(
String.format(
"%d_%d_%d" + extension,
@@ -219,49 +220,53 @@ public class TestWorldDiskIO {
saveCoords.z
)
);
-
- /*if (!dosave)
- {
- return;
- }
- dosave = false;*/
-
+
+ /*
+ * if (!dosave)
+ * {
+ * return;
+ * }
+ * dosave = false;
+ */
+
try (
RandomAccessFile output = new RandomAccessFile(path.toFile(), "rw")
) {
- //LOG.debug(output.read());
- if (output.read()<0)
- {
+ // LOG.debug(output.read());
+ if (output.read() < 0) {
LOG.info("Making header");
- output.writeChars("\0".repeat((offsetBytes+1)*chunksPerRegion));
+ output.writeChars("\0".repeat((offsetBytes + 1) * chunksPerRegion));
}
-
+
Vec3i pos = getRegionLoc(chunk.getPosition());
- int shortOffset = (offsetBytes+1)*(pos.z+regionSize.z*(pos.y + regionSize.y*pos.x));
- int fullOffset = (offsetBytes+1)*(chunksPerRegion);
+ int shortOffset = (offsetBytes + 1) * (pos.z + regionSize.z * (pos.y + regionSize.y * pos.x));
+ int fullOffset = (offsetBytes + 1) * (chunksPerRegion);
output.seek(shortOffset);
int offset = output.readInt();
- int sectorLength = offset&255;
+ int sectorLength = offset & 255;
offset = offset >> 8;
- if (sectorLength == 0)
- {
+ if (sectorLength == 0) {
int outputLen = (int) output.length();
- offset = (int) (outputLen-fullOffset)/sectorSize+1;
+ offset = (int) (outputLen - fullOffset) / sectorSize + 1;
output.seek(shortOffset);
- output.writeInt(offset<<8);
+ output.writeInt(offset << 8);
output.seek(outputLen);
- /*while (output.length()>24);
- LOG.debug(bfClone>>24);
+
+ for (int i = 0; i < 4; i++) {
+ bw.write(bfClone >> 24);
+ LOG.debug(bfClone >> 24);
bfClone = bfClone << 8;
}
- /*bw.write(
- new char[] {
- (char) bestFormat / (256 * 256 * 256),
- (char) (bestFormat % 256) / (256 * 256),
- (char) (bestFormat % (256 * 256)) / (256),
- (char) (bestFormat % (256 * 256 * 256)) }
- );*/
+ /*
+ * bw.write(
+ * new char[] {
+ * (char) bestFormat / (256 * 256 * 256),
+ * (char) (bestFormat % 256) / (256 * 256),
+ * (char) (bestFormat % (256 * 256)) / (256),
+ * (char) (bestFormat % (256 * 256 * 256)) }
+ * );
+ */
bw.close();
} catch (IOException e) {
@@ -470,7 +478,7 @@ public class TestWorldDiskIO {
saveCoords.z
)
);
-
+
if (!Files.exists(path)) {
LOG.debug(
"Not found {} {} {}",
@@ -520,33 +528,34 @@ public class TestWorldDiskIO {
return chunk;
}
}
-
- private static ChunkData loadRegion(Path path, Vec3i chunkPos, WorldData world, Server server) throws IOException, DecodingException
- {
+
+ private static ChunkData loadRegion(Path path, Vec3i chunkPos, WorldData world, Server server)
+ throws IOException,
+ DecodingException {
try (
BufferedInputStream input = new BufferedInputStream(Files.newInputStream(path))
) {
- LOG.info(path.toString());
+ // LOG.info(path.toString());
Vec3i pos = getRegionLoc(chunkPos);
- int shortOffset = (offsetBytes+1)*(pos.z+regionSize.z*(pos.y + regionSize.y*pos.x));
- int fullOffset = (offsetBytes+1)*(chunksPerRegion);
+ int shortOffset = (offsetBytes + 1) * (pos.z + regionSize.z * (pos.y + regionSize.y * pos.x));
+ int fullOffset = (offsetBytes + 1) * (chunksPerRegion);
input.skipNBytes(shortOffset);
int offset = 0;
- for (int i=0;i.
*/
-
+
package ru.windcorp.progressia.test.gen;
import kdotjpg.opensimplex2.areagen.OpenSimplex2S;
diff --git a/src/main/java/ru/windcorp/progressia/test/gen/TestWorldGenerator.java b/src/main/java/ru/windcorp/progressia/test/gen/TestWorldGenerator.java
index 1b35ffc..22eedc9 100644
--- a/src/main/java/ru/windcorp/progressia/test/gen/TestWorldGenerator.java
+++ b/src/main/java/ru/windcorp/progressia/test/gen/TestWorldGenerator.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package ru.windcorp.progressia.test.gen;
import java.io.DataInputStream;