From 63487a13863f7b9ee90e5a25a1a1f2bbbbd9395f Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 4 Dec 2021 13:10:33 +0900 Subject: [PATCH] computer stuff drawings separated from the basegame's --- assets/mods/dwarventech/ModuleComputers.jar | Bin 435942 -> 435942 bytes .../dwarventech/sprites/desktop_computer.tga | 3 +++ src/net/torvald/terrarum/ModMgr.kt | 6 ------ work_files/graphics/items/basegame_items.kra | 3 +++ .../items/{items.kra => basegame_items16.kra} | 0 .../graphics/items/basegame_items24.kra | 3 +++ .../{items48.kra => basegame_items48.kra} | 0 .../graphics/items/computers_items16.kra | 3 +++ .../graphics/items/computers_items24.kra | 3 +++ work_files/graphics/items/items24.kra | 3 --- .../sprites/fixtures/computer_parts.psd | 4 ++-- 11 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 assets/mods/dwarventech/sprites/desktop_computer.tga create mode 100644 work_files/graphics/items/basegame_items.kra rename work_files/graphics/items/{items.kra => basegame_items16.kra} (100%) create mode 100644 work_files/graphics/items/basegame_items24.kra rename work_files/graphics/items/{items48.kra => basegame_items48.kra} (100%) create mode 100644 work_files/graphics/items/computers_items16.kra create mode 100644 work_files/graphics/items/computers_items24.kra delete mode 100644 work_files/graphics/items/items24.kra diff --git a/assets/mods/dwarventech/ModuleComputers.jar b/assets/mods/dwarventech/ModuleComputers.jar index b98009d6867cccba683f7ae285e4723db6f50335..2c84e0e43c8cde7db29101aae7478a957021f450 100644 GIT binary patch delta 6597 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 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