Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3388 from younggam/patch-5

Browse Source 
protected->public for mod supports
This commit is contained in:
Anuken
2020-11-15 11:07:48 -05:00
committed by GitHub
parent aebd3f959f bfc2b08bcc
commit 3870c64b60
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/world/Block.java
View File

@@ -556,17 +556,17 @@ public class Block extends UnlockableContent{
return cacheLayer == CacheLayer.walls; return cacheLayer == CacheLayer.walls;
} }
protected void requirements(Category cat, ItemStack[] stacks, boolean unlocked){ public void requirements(Category cat, ItemStack[] stacks, boolean unlocked){
requirements(cat, BuildVisibility.shown, stacks); requirements(cat, BuildVisibility.shown, stacks);
this.alwaysUnlocked = unlocked; this.alwaysUnlocked = unlocked;
} }
protected void requirements(Category cat, ItemStack[] stacks){ public void requirements(Category cat, ItemStack[] stacks){
requirements(cat, BuildVisibility.shown, stacks); requirements(cat, BuildVisibility.shown, stacks);
} }
/** Sets up requirements. Use only this method to set up requirements. */ /** Sets up requirements. Use only this method to set up requirements. */
protected void requirements(Category cat, BuildVisibility visible, ItemStack[] stacks){ public void requirements(Category cat, BuildVisibility visible, ItemStack[] stacks){
this.category = cat; this.category = cat;
this.requirements = stacks; this.requirements = stacks;
this.buildVisibility = visible; this.buildVisibility = visible;

2
core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
View File

@@ -27,7 +27,7 @@ public class ItemTurret extends Turret{
} }
/** Initializes accepted ammo map. Format: [item1, bullet1, item2, bullet2...] */ /** Initializes accepted ammo map. Format: [item1, bullet1, item2, bullet2...] */
protected void ammo(Object... objects){ public void ammo(Object... objects){
ammoTypes = OrderedMap.of(objects); ammoTypes = OrderedMap.of(objects);
} }

2
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -33,7 +33,7 @@ public class Conveyor extends Block implements Autotiler{
public float speed = 0f; public float speed = 0f;
public float displayedSpeed = 0f; public float displayedSpeed = 0f;
protected Conveyor(String name){ public Conveyor(String name){
super(name); super(name);
rotate = true; rotate = true;
update = true; update = true;