This commit is contained in:
Anuken 2020-03-06 16:07:07 -05:00
parent f8b554aff8
commit 60d28fb01b
9 changed files with 2072 additions and 2459 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 769 B

After

Width:  |  Height:  |  Size: 732 B

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 682 KiB

After

Width:  |  Height:  |  Size: 693 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 128 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 KiB

After

Width:  |  Height:  |  Size: 224 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 905 KiB

After

Width:  |  Height:  |  Size: 867 KiB

View File

@ -559,7 +559,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
/** Handles tile tap events that are not platform specific. */
boolean tileTapped(@Nullable Tilec tile){
if(tile == null) return false;
if(tile == null){
frag.inv.hide();
return false;
}
boolean consumed = false, showedInventory = false;
//check if tapped block is configurable

View File

@ -485,10 +485,12 @@ public class Tile implements Position{
int offsety = -(size - 1) / 2;
for(int dx = 0; dx < size; dx++){
for(int dy = 0; dy < size; dy++){
Tile other = world.tile(entity.tileX() + dx + offsetx, entity.tileY() + dy + offsety);
Tile other = world.tile(x + dx + offsetx, y + dy + offsety);
if(other != null){
//reset entity and block *manually* - thus, preChanged() will not be called anywhere else, for multiblocks
other.entity = null;
if(other != this){ //do not remove own entity so it can be processed in changed()
other.entity = null;
}
other.block = Blocks.air;
}
}

View File

@ -110,7 +110,7 @@ public class ImagePacker{
map.each((key, val) -> content2id.put(val.split("\\|")[0], key));
Array<UnlockableContent> cont = Array.withArrays(Vars.content.blocks(), Vars.content.items(), Vars.content.liquids());
cont.removeAll(u -> u instanceof BlockPart || u instanceof BuildBlock || u == Blocks.air);
cont.removeAll(u -> u instanceof BuildBlock || u == Blocks.air);
int minid = 0xF8FF;
for(String key : map.keys()){