From d37886b2cdafe052f2558b317d3de1def9b8a547 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 14 Feb 2020 09:51:09 -0500 Subject: [PATCH 1/3] Fixed #1585 --- core/src/mindustry/world/blocks/ItemSelection.java | 3 ++- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/ItemSelection.java b/core/src/mindustry/world/blocks/ItemSelection.java index 2f654d081b..cf4f5a0580 100644 --- a/core/src/mindustry/world/blocks/ItemSelection.java +++ b/core/src/mindustry/world/blocks/ItemSelection.java @@ -51,6 +51,7 @@ public class ItemSelection{ scrollPos = pane.getScrollY(); }); - table.add(pane).maxHeight(40 * 5); + pane.setOverscroll(false, false); + table.add(pane).maxHeight(Scl.scl(40 * 5)); } } diff --git a/gradle.properties b/gradle.properties index 2da06eb8c3..7f41c54766 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=dccfeeeffbf4e66b815306306b55472dcd123f61 +archash=899ab293f6f7bab4deadec06fac7a666028edf15 From 1fe0a7d81e3138c8dc7e4a073ba0fcfde64b5fc3 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 15 Feb 2020 12:41:57 -0500 Subject: [PATCH 2/3] Fixed mock audio package --- .../main/java/mindustry/annotations/impl/AssetsProcess.java | 4 ++-- core/src/mindustry/mod/ContentParser.java | 2 +- core/src/mindustry/mod/ModLoadingSound.java | 2 +- gradle.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java index 10e258959c..2f2234027c 100644 --- a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java +++ b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java @@ -122,11 +122,11 @@ public class AssetsProcess extends BaseProcessor{ dispose.addStatement("arc.Core.assets.unload(" + filename + ")"); dispose.addStatement(name + " = null"); - type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build()); + type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build()); }); if(classname.equals("Sounds")){ - type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build()); + type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build()); } type.addMethod(loadBegin.build()); diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index aa6048d833..65b68b3423 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -3,7 +3,7 @@ package mindustry.mod; import arc.*; import arc.assets.*; import arc.audio.*; -import arc.audio.mock.*; +import arc.mock.*; import arc.struct.Array; import arc.struct.*; import arc.files.*; diff --git a/core/src/mindustry/mod/ModLoadingSound.java b/core/src/mindustry/mod/ModLoadingSound.java index 558b29ce28..7bae2f5a6b 100644 --- a/core/src/mindustry/mod/ModLoadingSound.java +++ b/core/src/mindustry/mod/ModLoadingSound.java @@ -1,8 +1,8 @@ package mindustry.mod; import arc.audio.*; -import arc.audio.mock.*; import arc.math.geom.*; +import arc.mock.*; import arc.util.ArcAnnotate.*; public class ModLoadingSound implements Sound{ diff --git a/gradle.properties b/gradle.properties index 7f41c54766..88c2ae197f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=899ab293f6f7bab4deadec06fac7a666028edf15 +archash=f1178ca09b4d0b29e23f6443e73f8daf4a4b7329 From b96d5c417f4f9811b14351053dd66467b42ef36b Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 17 Feb 2020 09:27:51 -0500 Subject: [PATCH 3/3] Fixed #1601 --- .../blocks/distribution/OverflowGate.java | 9 ++++++++- .../mindustry/world/modules/ItemModule.java | 18 +++++++++++++----- gradle.properties | 2 +- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/mindustry/world/blocks/distribution/OverflowGate.java index 407aad78a9..e73bb140a8 100644 --- a/core/src/mindustry/world/blocks/distribution/OverflowGate.java +++ b/core/src/mindustry/world/blocks/distribution/OverflowGate.java @@ -9,6 +9,8 @@ import mindustry.world.meta.BlockGroup; import java.io.*; +import static mindustry.Vars.world; + public class OverflowGate extends Block{ public float speed = 1f; public boolean invert = false; @@ -125,19 +127,24 @@ public class OverflowGate extends Block{ @Override public byte version(){ - return 2; + return 3; } @Override public void write(DataOutput stream) throws IOException{ super.write(stream); + stream.writeInt(lastInput == null ? Pos.invalid : lastInput.pos()); } @Override public void read(DataInput stream, byte revision) throws IOException{ super.read(stream, revision); + if(revision == 1){ new DirectionalItemBuffer(25, 50f).read(stream); + }else if(revision == 3){ + lastInput = world.tile(stream.readInt()); + lastItem = items.first(); } } } diff --git a/core/src/mindustry/world/modules/ItemModule.java b/core/src/mindustry/world/modules/ItemModule.java index cd30730d2d..b08a419d0b 100644 --- a/core/src/mindustry/world/modules/ItemModule.java +++ b/core/src/mindustry/world/modules/ItemModule.java @@ -1,10 +1,9 @@ package mindustry.world.modules; -import mindustry.type.Item; -import mindustry.type.ItemStack; +import mindustry.type.*; import java.io.*; -import java.util.Arrays; +import java.util.*; import static mindustry.Vars.content; @@ -69,15 +68,24 @@ public class ItemModule extends BlockModule{ return total; } + public Item first(){ + for(int i = 0; i < items.length; i++){ + if(items[i] > 0){ + return content.item(i); + } + } + return null; + } + public Item take(){ for(int i = 0; i < items.length; i++){ int index = (i + takeRotation); - if(index >= items.length) index -= items.length; //conditional instead of mod + if(index >= items.length) index -= items.length; if(items[index] > 0){ items[index] --; total --; takeRotation = index + 1; - return content.item(index % items.length); + return content.item(index); } } return null; diff --git a/gradle.properties b/gradle.properties index 88c2ae197f..60187da317 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=f1178ca09b4d0b29e23f6443e73f8daf4a4b7329 +archash=0b2f044e5955ff700650eebecfb3dfcb629d7a8b