Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-09-20 21:08:42 +03:00
Code Issues Projects Releases Wiki Activity

Added Call#setItem

Browse Source
This commit is contained in:
Anuken 2020-11-26 16:49:01 -05:00
parent 20637fa358
commit 6b3919e8f7
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/comp/BuildingComp.java
View File

@ -435,7 +435,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
} }
/** Handle a stack input. */ /** Handle a stack input. */
public void handleStack(Item item, int amount, Teamc source){ public void handleStack(Item item, int amount, @Nullable Teamc source){
noSleep(); noSleep();
items.add(item, amount); items.add(item, amount);
} }

12
core/src/mindustry/input/InputHandler.java
View File

@ -96,9 +96,17 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
} }
@Remote(called = Loc.server, unreliable = true) @Remote(called = Loc.server, unreliable = true)
public static void transferItemTo(Unit unit, Item item, int amount, float x, float y, Building build){ public static void setItem(Building build, Item item, int amount){
if(build == null || build.items == null) return; if(build == null || build.items == null) return;
unit.stack.amount = Math.max(unit.stack.amount - amount, 0); build.items.set(item, amount);
}
@Remote(called = Loc.server, unreliable = true)
public static void transferItemTo(@Nullable Unit unit, Item item, int amount, float x, float y, Building build){
if(build == null || build.items == null) return;
if(unit != null) unit.stack.amount = Math.max(unit.stack.amount - amount, 0);
for(int i = 0; i < Mathf.clamp(amount / 3, 1, 8); i++){ for(int i = 0; i < Mathf.clamp(amount / 3, 1, 8); i++){
Time.run(i * 3, () -> createItemTransfer(item, amount, x, y, build, () -> {})); Time.run(i * 3, () -> createItemTransfer(item, amount, x, y, build, () -> {}));
} }

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash= archash=7a2a357f6cfdc3725ce581093a0ced91f4474222