mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-12 08:48:09 +07:00
Code Issues Packages Projects Releases Wiki Activity

Various bugfixes

Browse Source
This commit is contained in:
Anuken
2019-10-25 14:48:44 -04:00
parent 742fb3dece
commit 44dc250a2b
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/io/anuke/mindustry/mod/Mods.java
View File

@ -277,6 +277,7 @@ public class Mods implements Loadable{
/** Creates all the content found in mod files. */ /** Creates all the content found in mod files. */
public void loadContent(){ public void loadContent(){
for(LoadedMod mod : loaded){ for(LoadedMod mod : loaded){
safeRun(mod, () -> { safeRun(mod, () -> {
if(mod.root.child("content").exists()){ if(mod.root.child("content").exists()){

1
core/src/io/anuke/mindustry/ui/dialogs/ModsDialog.java
View File

@ -96,6 +96,7 @@ public class ModsDialog extends FloatingDialog{
anyDisabled = true; anyDisabled = true;
table.row(); table.row();
table.addImage().growX().height(4f).pad(6f).color(Pal.gray); table.addImage().growX().height(4f).pad(6f).color(Pal.gray);
table.row();
} }
table.table(Styles.black6, t -> { table.table(Styles.black6, t -> {

4
core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
View File

@ -413,12 +413,12 @@ public class Conveyor extends Block implements Autotiler{
static long toLong(int value){ static long toLong(int value){
byte[] values = Pack.bytes(value, writeByte); byte[] values = Pack.bytes(value, writeByte);
byte itemid = values[0]; short itemid = content.item(values[0]).id;
float x = values[1] / 127f; float x = values[1] / 127f;
float y = ((int)values[2] + 128) / 255f; float y = ((int)values[2] + 128) / 255f;
short[] shorts = writeShort; short[] shorts = writeShort;
shorts[0] = (short)itemid; shorts[0] = itemid;
shorts[1] = (short)(x * Short.MAX_VALUE); shorts[1] = (short)(x * Short.MAX_VALUE);
shorts[2] = (short)((y - 1f) * Short.MAX_VALUE); shorts[2] = (short)((y - 1f) * Short.MAX_VALUE);
return Pack.longShorts(shorts); return Pack.longShorts(shorts);