diff --git a/assets/mods/dwarventech/ModuleComputers.jar b/assets/mods/dwarventech/ModuleComputers.jar index b98009d68..2c84e0e43 100644 Binary files a/assets/mods/dwarventech/ModuleComputers.jar and b/assets/mods/dwarventech/ModuleComputers.jar differ diff --git a/assets/mods/dwarventech/sprites/desktop_computer.tga b/assets/mods/dwarventech/sprites/desktop_computer.tga new file mode 100644 index 000000000..8e9f244c8 --- /dev/null +++ b/assets/mods/dwarventech/sprites/desktop_computer.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:097de085c2d06e49731c01df3b254add26c496eec9a19a3da53b2f24e1597240 +size 1042 diff --git a/src/net/torvald/terrarum/ModMgr.kt b/src/net/torvald/terrarum/ModMgr.kt index 087ac228f..1134f4081 100644 --- a/src/net/torvald/terrarum/ModMgr.kt +++ b/src/net/torvald/terrarum/ModMgr.kt @@ -121,12 +121,6 @@ object ModMgr { if (entryPoint.isNotBlank()) { var newClass: Class<*>? = null try { - - // FIXME creating new classloader somehow messes up with the default classloader??!!? - // if CommandDict fails with NullPointerException, it means it's trying to use a wrong classloader - // bypassing only reveals further issues related to the classloader, such as loading wrong copy if ItemCodex - // that does not contain entry "basegame:0" - // for modules that has JAR defined if (jar.isNotBlank()) { val urls = arrayOf() diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra new file mode 100644 index 000000000..e87778fb1 --- /dev/null +++ b/work_files/graphics/items/basegame_items.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:faa5ab54689084e214633bda6fd637ea0751cdb0cb41d67f0d3135f09921a4ba +size 213692 diff --git a/work_files/graphics/items/items.kra b/work_files/graphics/items/basegame_items16.kra similarity index 100% rename from work_files/graphics/items/items.kra rename to work_files/graphics/items/basegame_items16.kra diff --git a/work_files/graphics/items/basegame_items24.kra b/work_files/graphics/items/basegame_items24.kra new file mode 100644 index 000000000..7b5bc6b33 --- /dev/null +++ b/work_files/graphics/items/basegame_items24.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3b12b92654bde525974f10c30ad6c315df8eb55f193ef53e5ff4751abc5e7fc +size 181569 diff --git a/work_files/graphics/items/items48.kra b/work_files/graphics/items/basegame_items48.kra similarity index 100% rename from work_files/graphics/items/items48.kra rename to work_files/graphics/items/basegame_items48.kra diff --git a/work_files/graphics/items/computers_items16.kra b/work_files/graphics/items/computers_items16.kra new file mode 100644 index 000000000..ecdd73d76 --- /dev/null +++ b/work_files/graphics/items/computers_items16.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d799a7440fd6fc595d11e41f8c5bc7afc286cdbe8fe74d9b1dcf9c2cc5b202ab +size 81537 diff --git a/work_files/graphics/items/computers_items24.kra b/work_files/graphics/items/computers_items24.kra new file mode 100644 index 000000000..9186e0e7c --- /dev/null +++ b/work_files/graphics/items/computers_items24.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:345070b66f3b5947a0d623089e1f4a3b96166b3f2274903958bb8dab8da0db4a +size 201959 diff --git a/work_files/graphics/items/items24.kra b/work_files/graphics/items/items24.kra deleted file mode 100644 index 8ce1c4847..000000000 --- a/work_files/graphics/items/items24.kra +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:911b0ae979550ee2d792e0380df04db8fe399ccbeb219856e14a6989b0f5e346 -size 152275 diff --git a/work_files/graphics/sprites/fixtures/computer_parts.psd b/work_files/graphics/sprites/fixtures/computer_parts.psd index 15109309a..d1e053b61 100644 --- a/work_files/graphics/sprites/fixtures/computer_parts.psd +++ b/work_files/graphics/sprites/fixtures/computer_parts.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14572e74ec96a0b7f5b83a3609c4ad7ecd64e283fe61188f4806c5f1f59f5820 -size 225326 +oid sha256:e480d8c61afa5867f8c719d3d03393e7aabe259cdcb36cb5c1e96c800e45b8b9 +size 235455