apparently the problem was on the other places

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-github: [curioustorvald]
-custom: ["https://paypal.me/curioustorvald"]

.github/workflows/codeql.yml

@@ -1,99 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL Advanced"
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-  schedule:
-    - cron: '41 4 * * 0'
-
-jobs:
-  analyze:
-    name: Analyze (${{ matrix.language }})
-    # Runner size impacts CodeQL analysis time. To learn more, please see:
-    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-    #   - https://gh.io/supported-runners-and-hardware-resources
-    #   - https://gh.io/using-larger-runners (GitHub.com only)
-    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-    permissions:
-      # required for all workflows
-      security-events: write
-
-      # required to fetch internal or private CodeQL packs
-      packages: read
-
-      # only required for workflows in private repositories
-      actions: read
-      contents: read
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - language: java-kotlin
-          build-mode: none
-        # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
-        # Use `c-cpp` to analyze code written in C, C++ or both
-        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
-        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
-        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
-        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
-        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
-        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    # Add any setup steps before running the `github/codeql-action/init` action.
-    # This includes steps like installing compilers or runtimes (`actions/setup-node`
-    # or others). This is typically only required for manual builds.
-    # - name: Setup runtime (example)
-    #   uses: actions/setup-example@v1
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
-      with:
-        languages: ${{ matrix.language }}
-        build-mode: ${{ matrix.build-mode }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-    # If the analyze step fails for one of the languages you are analyzing with
-    # "We were unable to automatically build your code", modify the matrix above
-    # to set the build mode to "manual" for that language. Then modify this step
-    # to build your code.
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-    - name: Run manual build steps
-      if: matrix.build-mode == 'manual'
-      shell: bash
-      run: |
-        echo 'If you are using a "manual" build mode for one or more of the' \
-          'languages you are analyzing, replace this with the commands to build' \
-          'your code, for example:'
-        echo '  make bootstrap'
-        echo '  make release'
-        exit 1
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
-      with:
-        category: "/language:${{matrix.language}}"

.idea/artifacts/TerrarumBuild.xml

@@ -27,6 +27,7 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-math3-3.6.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/JTransforms-3.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/JLargeArrays-1.5.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/aircompressor-0.25.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-1.12.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.12.1.jar" path-in-jar="/" />
@@ -86,7 +87,6 @@
       <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/2.0.0/kotlin-stdlib-2.0.0.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/2.0.0/kotlin-stdlib-jdk7-2.0.0.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/GetBatteryStatus.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/aircompressor-2.0.2.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>

.idea/codeStyles/Project.xml

@@ -1,6 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="RIGHT_MARGIN" value="999" />
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>

.idea/libraries/io_airlift_aircompressor.xml

@@ -1,14 +1,14 @@
 <component name="libraryTable">
   <library name="io.airlift.aircompressor" type="repository">
-    <properties maven-id="io.airlift:aircompressor:2.0.2" />
+    <properties maven-id="io.airlift:aircompressor:0.25" />
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/aircompressor-2.0.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/aircompressor-0.25.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/lib/aircompressor-2.0.2-javadoc.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/aircompressor-0.25-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/aircompressor-2.0.2-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/aircompressor-0.25-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.idea/runConfigurations/Terrarum__no_prebuild__release_mode_assets_.xml

@@ -1,16 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Terrarum (no prebuild, release-mode assets)" type="JarApplication">
-    <option name="JAR_PATH" value="$PROJECT_DIR$/out/TerrarumBuild.jar" />
-    <option name="VM_PARAMETERS" value="-ea -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd" />
-    <option name="PROGRAM_PARAMETERS" value="--assets buildapp/out/assets.tevd" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH" value="17" />
-    <module name="TerrarumBuild" />
-    <method v="2">
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="TerrarumBuild" />
-      </option>
-      <option name="RunConfigurationTask" enabled="false" run_configuration_name="QuickDirtyLint" run_configuration_type="Application" />
-    </method>
-  </configuration>
-</component>

.idea/vcs.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/Terrarum.wiki" vcs="Git" />
   </component>
 </project>

CLAUDE.md

@@ -1,176 +0,0 @@
-# Terrarum
-
-A modular 2D side-scrolling tilemap platformer engine and game, built on LibGDX with Kotlin/Java. GPL-3.0.
-
-## Build & Run
-
-- **IDE**: IntelliJ IDEA (project files: `Terrarum_renewed.iml`, `TerrarumBuild.iml`)
-- **JDK**: 21
-- **Language**: Kotlin + Java mixed; Kotlin is primary, `App.java` and `FrameBufferManager.java` are Java
-- **Dependencies**: All libraries are in `lib/` (fat-jar approach, no Maven/Gradle). Includes LibGDX, GraalVM JS (modified), dyn4j (Vector2 only), custom bitmap font lib
-- **Entry point**: `net.torvald.terrarum.Principii.main()` (Java) which launches `App` (the LibGDX `ApplicationListener`)
-- **Distribution**: `buildapp/` scripts produce per-platform bundles with jlink'd runtimes
-- **Assets**: `assets/` for development, `assets_release/` for distribution. Custom `.tevd` archive format for release assets (`AssetCache.kt`)
-
-## Project Structure
-
-```
-src/net/torvald/terrarum/
-  App.java                  -- Main application class (LibGDX ApplicationListener). GL thread, render loop, splash screen
-  CommonResourcePool.kt     -- Thread-safe GL resource loading with dispatch queues
-  ModMgr.kt                 -- Module manager. Scans/loads game modules, provides getGdxFile/getJavaClass
-  IngameInstance.kt          -- Base class for game screens (show/hide/render/resize lifecycle)
-  Terrarum.kt               -- Game-level singleton (ingame instance management, extension functions)
-  GameUpdateGovernor.kt      -- Update/render tick governors (ConsistentUpdateRate, Anarchy)
-  MusicService.kt            -- Music playback management
-
-  modulebasegame/
-    EntryPoint.kt            -- Basegame module entry point (registers items, fixtures, blocks, weather)
-    TitleScreen.kt           -- Title screen (demo world rendering, async loading)
-    TerrarumIngame.kt        -- Main gameplay screen
-    IngameRenderer.kt        -- World rendering pipeline (FBO composition, lightmap, blur, shadows)
-    BuildingMaker.kt         -- Building editor screen
-
-  worlddrawer/
-    WorldCamera.kt           -- Camera position tracking (follows player, interpolated movement)
-    LightmapRenderer.kt      -- Per-tile RGB+UV light calculation and rasterisation
-    BlocksDrawer.kt          -- Tile rendering
-    FeaturesDrawer.kt        -- Wire/feature overlay rendering
-
-  gamecontroller/
-    IME.kt                   -- Input Method Engine (GraalVM JS keyboard layouts, loaded on daemon thread)
-
-  weather/
-    WeatherMixer.kt          -- Weather state machine, skybox rendering
-    SkyboxModelHosek.kt      -- Physically-based sky model
-```
-
-## Architecture: Threading & GL Dispatch
-
-All OpenGL calls (Texture, ShaderProgram, FrameBuffer creation) **must** happen on the GL thread. The codebase uses a dispatch mechanism to safely create GL resources from background threads.
-
-### CommonResourcePool (the dispatch hub)
-
-```
-Background Thread                          GL Thread (App.render)
-     |                                          |
-     |-- addToLoadingList("name", { Texture() })|
-     |-- loadAll()                              |
-     |     |                                    |
-     |     +-- if on GL thread: run directly    |
-     |     +-- if not: enqueue to               |
-     |         glDispatchQueue + latch.await()  |
-     |                                     CommonResourcePool.update()
-     |                                          |-- poll glDispatchQueue
-     |                                          |   run loadfun, latch.countDown()
-     |                                          |-- poll glRunnableQueue
-     |                                          |   run block, latch.countDown()
-     |                                          |-- poll slowLoadingQueue (one per tick)
-     |                                          |
-     +-- latch released, continues <------------+
-```
-
-Key methods:
-- `loadAll()` -- batch load; blocks background thread until GL thread processes
-- `loadAllSlowly()` -- timesliced; one resource per tick via `update()`
-- `runOnGLThread { }` -- run arbitrary block on GL thread, blocking caller
-- `update()` -- called every tick from `App.render()`, processes all queues
-- `getOrPut(name, loadfun, killfun)` -- thread-safe get-or-create with GL dispatch
-
-### App.java Boot Sequence
-
-```
-create()
-  -> postInit()          [GL thread, synchronous]
-       |-- load shaders, fonts, audio device, IME
-       |-- CommonResourcePool.setGLThread(currentThread)
-       |-- spawn Terrarum-PostInitLoader thread:
-       |     ModMgr.invoke()           // module entry points (dispatched to GL via runOnGLThread)
-       |     CommonResourcePool.loadAllSlowly()  // timesliced resource loading
-       |     loadingThreadDone = true
-       +-- return (non-blocking)
-
-render() loop [GL thread]
-  while currentScreen == null:
-       |-- drawSplash()
-       |-- CommonResourcePool.update()   // process GL dispatch queues
-       |-- when loadingThreadDone && loaded:
-       |     postLoadInit()              // tile atlas, audio mixer, Terrarum.initialise()
-       |     setScreen(titleScreen)      // transitions to title screen
-```
-
-### TitleScreen Async Loading
-
-`TitleScreen.show()` returns immediately after starting a background thread. The splash screen continues displaying until all loading completes.
-
-```
-show()
-  |-- quick GL setup (viewport, input processor, FBO, savegame list)
-  |-- spawn Terrarum-TitleScreenLoader thread:
-  |     load demo world, compute camera nodes, bogoflops, audio reset
-  |     backgroundLoadDone = true
-  +-- return
-
-renderImpl() [GL thread, every frame]
-  if !loadDone:
-       |-- App.drawSplash()
-       |-- processGLLoadStep()  // state machine, one step per frame:
-       |     0: wait for backgroundLoadDone
-       |     1: SkyboxModelHosek.loadlut()
-       |     2: IngameRenderer.setRenderedWorld + WeatherMixer init
-       |     3: load halfgrad texture
-       |     4: UIFakeGradOverlay
-       |     5: UIFakeBlurOverlay
-       |     6: UIRemoCon
-       |     7: MusicService.enterScene, gameUpdateGovernor.reset(), loadDone=true
-  else:
-       normal title screen rendering (world + UI via IngameRenderer)
-```
-
-### IME Loading
-
-`IME.kt` object `init {}` spawns a `Terrarum-IMELoader` daemon thread for GraalVM JS context binding and key layout/IME file scanning. Icon texture loading remains synchronous (requires GL thread).
-
-### ModMgr Class Initialisation
-
-`ModMgr.kt` object `init {}` only does metadata loading and class instantiation (fast). The heavy `invoke()` method runs entry points wrapped in `CommonResourcePool.runOnGLThread { }` to avoid GL calls on the wrong thread. This separation prevents `<clinit>` lock deadlocks where a background thread holding the class init lock blocks on a GL dispatch latch while the GL thread tries to access the same class.
-
-## Architecture: Rendering Pipeline
-
-### IngameRenderer
-
-Singleton object. Lazily initialised on first `invoke()` call via `invokeInit()`.
-
-Render path (per frame):
-1. `LightmapRenderer.recalculate()` -- every 3 frames, computes per-tile RGBA light values
-2. `prepLightmapRGBA()` -- Kawase blur on lightmap into `lightmapFbo`
-3. `BlocksDrawer.renderData()` -- prepare tile draw data
-4. `drawToRGB()` -- render world tiles + actors into `fboRGB` (with shadow FBOs)
-5. `drawToA()` -- render alpha/glow channel
-6. Composite: sky -> world -> light multiply -> emissive blend -> vibrancy -> UI
-7. Output to `App.renderFBO`, then `TerrarumPostProcessor.draw()` applies final effects
-
-**Critical ordering in `resize()`**: `BlocksDrawer.resize()` and `LightmapRenderer.resize()` must be called **before** `lightmapFbo` creation, because `lightmapFbo` dimensions derive from `LightmapRenderer.lightBuffer` size.
-
-### WorldCamera
-
-Follows an `ActorWithBody` (player or camera actor). Position interpolated per frame. `WorldCamera.x/y` = top-left corner of visible area. `gdxCamX/Y` = centre of visible area. `moveCameraToWorldCoord()` positions the IngameRenderer camera for world-space drawing; `setCameraPosition(0,0)` positions it for screen-space drawing.
-
-### FBO Extension Functions
-
-- `FrameBuffer.inAction(camera, batch) { }` -- bind FBO, set camera to FBO dimensions (Y-down), run block, restore camera to screen dimensions
-- `FrameBuffer.inActionF(camera, batch) { }` -- same but Y-up (for flipped FBO content)
-
-Both save/restore `camera.position` and call `setToOrtho` with `App.scr.wf/hf` on exit.
-
-## Key Conventions
-
-- **GL thread safety**: Any code creating `Texture`, `TextureRegion`, `TextureRegionPack`, `ShaderProgram`, `FrameBuffer`, or `Pixmap` must run on the GL thread. Use `CommonResourcePool.runOnGLThread { }` when on a background thread.
-- **Kotlin `object` singletons**: First access triggers `<clinit>`. Keep `init {}` blocks fast (no blocking, no GL dispatch). Defer heavy work to explicit `invoke()` methods.
-- **`ConcurrentHashMap` cannot store null values**. Use `HashMap` for maps that need nullable values (e.g. `poolKillFun`).
-- **`@Volatile`** for cross-thread boolean flags (`loadDone`, `backgroundLoadDone`, etc.)
-- **`lateinit var` guards**: Use `::prop.isInitialized` checks in `resize()` and `dispose()` for properties set during async loading steps.
-- **`ConsistentUpdateRate`**: Accumulates delta time; may call `updateFunction` multiple times before `renderFunction`. Call `.reset()` before transitioning to active rendering to avoid catch-up storms.
-- **Textures**: Use TGA format. Images with semitransparency must be TGA; opaque images may be PNG.
-- **Coordinate system**: Y-down (camera `setToOrtho(true, ...)`). `setCameraPosition(0, 0)` places origin at screen top-left, which is not LibGDX nor OpenGL works natively, hence the existence of `FlippingSpriteBatch`. If the user reports renders are flipped vertically, try draw()/drawFlipped() accordingly.
-- **ROUNDWORLD**: World wraps horizontally. `WorldCamera.x` uses `fmod worldWidth`. Lightmap and tile drawing account for wrapping.

ModuleComputers/src/net/torvald/terrarum/modulecomputers/EntryPoint.kt

@@ -1,7 +1,5 @@
 package net.torvald.terrarum.modulecomputers
 
-import net.torvald.terrarum.CommonResourcePool
-import net.torvald.terrarum.ItemSheet
 import net.torvald.terrarum.ModMgr
 import net.torvald.terrarum.ModuleEntryPoint
 
@@ -13,17 +11,7 @@ class EntryPoint : ModuleEntryPoint() {
     private val moduleName = "dwarventech"
 
     override fun invoke() {
-
-        // load common resources to the AssetsManager
-        CommonResourcePool.addToLoadingList("$moduleName.items") {
-            ItemSheet(ModMgr.getGdxFile(moduleName, "items/items.tga"))
-        }
-        CommonResourcePool.loadAll()
-
-
         ModMgr.GameItemLoader.invoke(moduleName)
-        ModMgr.GameBlockLoader.invoke(moduleName)
-        ModMgr.GameWatchdogLoader.register(moduleName, NetFrameWatchdog())
         println("[${moduleName[0].toUpperCase()}${moduleName.substring(1)}] Dirtboard(tm) go drrrrr")
     }
 

ModuleComputers/src/net/torvald/terrarum/modulecomputers/NetFrameWatchdog.kt

@@ -1,17 +0,0 @@
-package net.torvald.terrarum.modulecomputers
-
-import net.torvald.terrarum.App
-import net.torvald.terrarum.gameworld.GameWorld
-import net.torvald.terrarum.modulebasegame.TerrarumWorldWatchdog
-import net.torvald.terrarum.modulebasegame.gameworld.NetRunner
-
-/**
- * Created by minjaesong on 2025-03-02.
- */
-class NetFrameWatchdog : TerrarumWorldWatchdog(App.TICK_SPEED * 60) {
-    override fun invoke(world: GameWorld) {
-        (world.extraFields["tokenring"] as? NetRunner)?.let {
-            it.purgeDeadFrames()
-        }
-    }
-}

ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureComputerConsole.kt

@@ -1,135 +0,0 @@
-package net.torvald.terrarum.modulecomputers.gameactors
-
-import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
-import net.torvald.terrarum.langpack.Lang
-import net.torvald.terrarum.modulebasegame.gameactors.BlockBox
-import net.torvald.terrarum.modulebasegame.gameactors.Electric
-import net.torvald.terrarum.modulebasegame.gameitems.FixtureItemBase
-import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
-
-/**
- * Created by minjaesong on 2025-03-30.
- */
-class FixtureComputerConsole : Electric {
-
-    @Transient override val spawnNeedsStableFloor = true
-    @Transient override val spawnNeedsWall = false
-
-    constructor() : super(
-        BlockBox(BlockBox.ALLOW_MOVE_DOWN, 2, 2),
-        nameFun = { Lang["ITEM_COMPUTER_CONSOLE"] }
-    )
-
-    init {
-        val itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_operator_terminal.tga")
-        makeNewSprite(TextureRegionPack(itemImage.texture, 2*TILE_SIZE, 2*TILE_SIZE)).let {
-            it.setRowsAndFrames(1,1)
-        }
-
-        setWireSinkAt(0, 1, "io_bus")
-        setWireSinkAt(1, 1, "power_low")
-    }
-}
-
-/**
- * Created by minjaesong on 2025-03-30.
- */
-class FixtureComputerProcessor : Electric {
-
-    @Transient override val spawnNeedsStableFloor = true
-    @Transient override val spawnNeedsWall = false
-
-    constructor() : super(
-        BlockBox(BlockBox.ALLOW_MOVE_DOWN, 2, 3),
-        nameFun = { Lang["ITEM_COMPUTER_PROCESSOR"] }
-    )
-
-    init {
-        val itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_cpu.tga")
-        makeNewSprite(TextureRegionPack(itemImage.texture, 2*TILE_SIZE, 3*TILE_SIZE)).let {
-            it.setRowsAndFrames(1,1)
-        }
-
-        setWireSinkAt(0, 0, "memory_bus")
-        setWireSinkAt(0, 1, "serial")
-        setWireSinkAt(1, 1, "serial")
-        setWireSinkAt(0, 2, "io_bus")
-        setWireSinkAt(1, 2, "power_low")
-    }
-}
-
-/**
- * Created by minjaesong on 2025-04-01.
- */
-class FixtureNetworkInterface : Electric {
-
-    @Transient override val spawnNeedsStableFloor = true
-    @Transient override val spawnNeedsWall = false
-
-    constructor() : super(
-        BlockBox(BlockBox.ALLOW_MOVE_DOWN, 2, 3),
-        nameFun = { Lang["ITEM_NETWORK_INTERFACE"] }
-    )
-
-    init {
-        val itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_network_interface.tga")
-        makeNewSprite(TextureRegionPack(itemImage.texture, 2*TILE_SIZE, 3*TILE_SIZE)).let {
-            it.setRowsAndFrames(1,1)
-        }
-
-        setWireSinkAt(0, 0, "token_ring")
-        setWireSinkAt(1, 0, "token_ring")
-        setWireSinkAt(0, 2, "serial")
-        setWireSinkAt(1, 2, "power_low")
-    }
-}
-
-/**
- * Created by minjaesong on 2025-04-01.
- */
-class FixtureNetworkBridge : Electric {
-
-    @Transient override val spawnNeedsStableFloor = true
-    @Transient override val spawnNeedsWall = false
-
-    constructor() : super(
-        BlockBox(BlockBox.ALLOW_MOVE_DOWN, 2, 3),
-        nameFun = { Lang["ITEM_NETWORK_BRIDGE"] }
-    )
-
-    init {
-        val itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_network_bridge.tga")
-        makeNewSprite(TextureRegionPack(itemImage.texture, 2*TILE_SIZE, 3*TILE_SIZE)).let {
-            it.setRowsAndFrames(1,1)
-        }
-
-        setWireSinkAt(0, 0, "token_ring")
-        setWireSinkAt(1, 0, "token_ring")
-        setWireSinkAt(0, 1, "token_ring")
-        setWireSinkAt(1, 1, "token_ring")
-        setWireSinkAt(1, 2, "power_low")
-    }
-}
-
-/**
- * Created by minjaesong on 2025-04-01.
- */
-class FixtureMemoryCabinet : Electric {
-
-    @Transient override val spawnNeedsStableFloor = true
-    @Transient override val spawnNeedsWall = false
-
-    constructor() : super(
-        BlockBox(BlockBox.ALLOW_MOVE_DOWN, 2, 3),
-        nameFun = { Lang["ITEM_MEMORY_CABINET"] }
-    )
-
-    init {
-        val itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_memory_stack_1.tga")
-        makeNewSprite(TextureRegionPack(itemImage.texture, 1*TILE_SIZE, 3*TILE_SIZE)).let {
-            it.setRowsAndFrames(1,1)
-        }
-
-        setWireSinkAt(0, 0, "memory_bus")
-    }
-}

ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureRingBusCore.kt

@@ -1,289 +0,0 @@
-package net.torvald.terrarum.modulecomputers.gameactors
-
-import com.badlogic.gdx.utils.Queue
-import net.torvald.random.HQRNG
-import net.torvald.terrarum.INGAME
-import net.torvald.terrarum.Point2i
-import net.torvald.terrarum.modulebasegame.gameactors.BlockBox
-import net.torvald.terrarum.modulebasegame.gameactors.Electric
-import net.torvald.terrarum.modulebasegame.gameworld.NetFrame
-import net.torvald.terrarum.modulebasegame.gameworld.NetRunner
-import net.torvald.terrarum.ui.UICanvas
-import org.dyn4j.geometry.Vector2
-import kotlin.math.sign
-
-/**
- * Created by minjaesong on 2025-03-01.
- */
-open class FixtureRingBusCore : Electric {
-
-    @Transient private val rng = HQRNG()
-
-    val mac = rng.nextInt()
-
-    companion object {
-        const val INITIAL_LISTENING_TIMEOUT = 300
-        const val SIGNAL_TOO_WEAK_THRESHOLD = 1.0 / 16.0
-    }
-
-    private constructor() : super()
-
-    private var portEmit = Point2i(0, 0)
-    private var portSink = Point2i(1, 0)
-    
-    constructor(portEmit: Point2i, portSink: Point2i, blockBox: BlockBox, nameFun: () -> String) : super(
-        blockBox0 = blockBox,
-        nameFun = nameFun,
-    ) {
-        this.portEmit = portEmit
-        this.portSink = portSink
-    }
-
-    private fun setEmitterAndSink() {
-        clearStatus()
-        setWireEmitterAt(portEmit.x, portEmit.y, "10base2")
-        setWireSinkAt(portSink.x, portSink.y, "10base2")
-    }
-
-    init {
-        setEmitterAndSink()
-
-        if (!INGAME.world.extraFields.containsKey("tokenring")) {
-            INGAME.world.extraFields["tokenring"] = NetRunner()
-        }
-    }
-
-    override fun reload() {
-        super.reload()
-        setEmitterAndSink()
-        if (!INGAME.world.extraFields.containsKey("tokenring")) {
-            INGAME.world.extraFields["tokenring"] = NetRunner()
-        }
-    }
-
-    internal val msgQueue = Queue<Pair<Int, ByteArray>>()
-    internal val msgLog = Queue<Pair<Int, NetFrame>>()
-
-    private var statusAbort = false
-    private var activeMonitorStatus = 0 // 0: unknown, 1: known and not me, 2: known and it's me
-
-    private var lastAccessTime = -1L
-
-    open protected val ringBusFirmware = RingBusFirmware(0)
-
-    private enum class RingBusState {
-        NORMAL,
-        ABORT, // will "eat away" any receiving frames unless the frame is a ballot frame
-        ELECTING,
-        IVE_GOT_ELECTED
-    }
-
-    private var currentState = RingBusState.NORMAL
-
-    override fun updateSignal() {
-        val time_t = INGAME.world.worldTime.TIME_T
-        if (lastAccessTime == -1L) lastAccessTime = time_t
-
-        // monitor the input port
-        val inn = getWireStateAt(1, 0, "10base2")
-
-        // if a signal is there
-        if (inn.x >= SIGNAL_TOO_WEAK_THRESHOLD) {
-            lastAccessTime = time_t
-            val frameNumber = (inn.y + (0.5 * inn.y.sign)).toInt()
-
-            if (frameNumber != 0) { // frame number must be non-zero
-                processFrameBasedOnState(frameNumber)
-            } else {
-                setWireEmissionAt(portEmit.x, portEmit.y, Vector2())
-            }
-        } else {
-            handleNoSignal(time_t)
-        }
-    }
-
-    private fun processFrameBasedOnState(frameNumber: Int) {
-        try {
-            val frame = getFrameByNumber(frameNumber)
-
-            when (currentState) {
-                RingBusState.NORMAL -> handleNormalState(frame, frameNumber)
-                RingBusState.ABORT -> handleAbortState(frame, frameNumber)
-                RingBusState.ELECTING -> handleElectingState(frame, frameNumber)
-                RingBusState.IVE_GOT_ELECTED -> handleIveGotElectedState(frame, frameNumber)
-            }
-        } catch (e: NullPointerException) {
-            handleFrameLoss()
-        }
-    }
-
-    private fun handleNormalState(frame: NetFrame, frameNumber: Int) {
-        if (msgQueue.notEmpty() || frame.shouldIintercept(mac)) {
-            val newFrame = doSomethingWithFrame(frame) ?: frameNumber
-            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, newFrame.toDouble()))
-
-            if (newFrame != frameNumber) {
-                frame.discardFrame()
-            }
-        } else {
-            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, frameNumber.toDouble()))
-        }
-    }
-
-    private fun handleAbortState(frame: NetFrame, frameNumber: Int) {
-        if (frame.getFrameType() == "token") {
-            currentState = RingBusState.NORMAL
-            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, frameNumber.toDouble()))
-        } else if (frame.getFrameType() == "abort") {
-            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, frameNumber.toDouble()))
-        } else {
-            setWireEmissionAt(portEmit.x, portEmit.y, Vector2())
-        }
-    }
-
-    private fun handleElectingState(frame: NetFrame, frameNumber: Int) {
-        if (frame.getFrameType() == "ballot") {
-            if (frame.getBallot() < mac) {
-                frame.setBallot(mac)
-            }
-
-            if (frame.getSender() == mac && frame.getBallot() == mac) {
-                currentState = RingBusState.IVE_GOT_ELECTED
-                // elected Active Monitor sends out the first token
-                val newFrame = emitNewFrame(NetFrame.makeToken(mac))
-                setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, newFrame.toDouble()))
-            } else {
-                setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, frameNumber.toDouble()))
-            }
-        } else {
-            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, frameNumber.toDouble()))
-        }
-    }
-
-    private fun handleIveGotElectedState(frame: NetFrame, frameNumber: Int) {
-        if (frame.getFrameType() == "abort") {
-            // immediately return to normal state
-            val newFrame = emitNewFrame(NetFrame.makeToken(mac))
-            currentState = RingBusState.NORMAL
-            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, newFrame.toDouble()))
-        } else {
-            // make sure to skip a turn after the election, even if the NIC has something to send out
-            currentState = RingBusState.NORMAL
-            setWireEmissionAt(portEmit.x, portEmit.y, Vector2())
-        }
-    }
-
-    private fun handleFrameLoss() {
-        emitNewFrame(NetFrame.makeAbort(mac))
-        currentState = RingBusState.ABORT
-    }
-
-    private fun handleNoSignal(time_t: Long) {
-        setWireEmissionAt(portEmit.x, portEmit.y, Vector2())
-
-        if (time_t - lastAccessTime > INITIAL_LISTENING_TIMEOUT) {
-            currentState = RingBusState.ELECTING
-            emitNewFrame(NetFrame.makeBallot(mac))
-            lastAccessTime = time_t
-        }
-    }
-
-    protected fun doSomethingWithFrame(incomingFrame: NetFrame): Int? {
-        return when (incomingFrame.getFrameType()) {
-            "token" -> doSomethingWithToken(incomingFrame)
-            "data" -> doSomethingWithData(incomingFrame)
-            "ack" -> doSomethingWithAck(incomingFrame)
-            "ballot" -> doSomethingWithBallot(incomingFrame)
-            "abort" -> 0
-            else -> null /* returns the frame untouched */
-        }
-    }
-
-    private fun getFrameByNumber(number: Int) = (INGAME.world.extraFields["tokenring"] as NetRunner)[number]
-
-    private fun emitNewFrame(frame: NetFrame): Int {
-        return (INGAME.world.extraFields["tokenring"] as NetRunner).addFrame(frame).also {
-            setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, it.toDouble()))
-        }
-    }
-
-    protected fun doSomethingWithToken(incomingFrame: NetFrame): Int? {
-        if (msgQueue.isEmpty) return null
-
-        val (recipient, msgByte) = msgQueue.removeFirst()
-
-        return emitNewFrame(NetFrame.makeData(mac, recipient, msgByte))
-    }
-
-    protected fun doSomethingWithData(incomingFrame: NetFrame): Int? {
-        val rec = incomingFrame.getDataRecipient()
-        // if the message is for me, put incoming message into queue, then send out ack
-        if (rec == mac) {
-            msgLog.addLast(rec to incomingFrame)
-
-            val datagramme = incomingFrame.getDataContents()
-
-            val (ret, nextMsg) = if (datagramme == null) (-1 to null) else ringBusFirmware.workWithDataFrame(mac, datagramme)
-
-            // make ack
-            return emitNewFrame(NetFrame.makeAck(mac, incomingFrame.getSender(), ret))
-        }
-        else return null
-    }
-
-    protected fun doSomethingWithAck(incomingFrame: NetFrame): Int? {
-        if (msgQueue.isEmpty) return null
-
-        val topMsg = msgQueue.first()
-
-        // if the ACK is sent to me...
-        if (incomingFrame.getDataRecipient() == mac && incomingFrame.getSender() == topMsg.first) {
-
-            // ack or nak?
-            val successful = (incomingFrame.getAckStatus() == 0)
-
-            // if successful, remove the message from the queue, then send out empty token
-            // if failed, keep the message, then send out empty token anyway
-            if (successful) {
-                msgQueue.removeFirst()
-            }
-
-            // make an empty token
-            return emitNewFrame(NetFrame.makeToken(mac))
-        }
-        else return null
-    }
-
-    protected fun doSomethingWithBallot(incomingFrame: NetFrame): Int? {
-        val ballotStatus = incomingFrame.getFrameNumber()
-
-        // frame is in election phase
-        if (ballotStatus == 0) {
-            // if i'm also in the election phase, participate
-            if (activeMonitorStatus == 0) {
-                if (incomingFrame.getBallot() < mac) {
-                    incomingFrame.setBallot(mac)
-                }
-
-                // check if the election must be finished
-                if (incomingFrame.getSender() == mac && incomingFrame.getBallot() == mac) {
-                    activeMonitorStatus = 2
-
-                    // send out first empty token
-                    return emitNewFrame(NetFrame.makeToken(mac))
-                }
-            }
-            // if i'm in the winner announcement phase, kill the frame
-            else {
-                incomingFrame.discardFrame()
-                return 0
-            }
-        }
-        // frame is in winner announcement phase
-        else if (ballotStatus == 1) {
-            activeMonitorStatus = 1
-        }
-
-        return null
-    }
-}

ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureRingBusExerciser.kt

@@ -1,62 +0,0 @@
-package net.torvald.terrarum.modulecomputers.gameactors
-
-import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.terrarum.App
-import net.torvald.terrarum.Point2i
-import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
-import net.torvald.terrarum.langpack.Lang
-import net.torvald.terrarum.modulebasegame.gameactors.BlockBox
-import net.torvald.terrarum.modulebasegame.gameworld.NetFrame.Companion.toMAC
-import net.torvald.terrarum.modulecomputers.ui.UIRingBusAnalyser
-import net.torvald.terrarum.modulecomputers.ui.UIRingBusExerciser
-
-/**
- * Created by minjaesong on 2025-03-03.
- */
-class FixtureRingBusExerciser : FixtureRingBusCore {
-
-    constructor() : super(
-        portEmit = Point2i(0, 0),
-        portSink = Point2i(1, 0),
-        blockBox = BlockBox(BlockBox.NO_COLLISION, 2, 2),
-        nameFun = { Lang["ITEM_DEBUG_RING_BUS_EXERCISER"] }
-    ) {
-        this.mainUI = UIRingBusExerciser(this)
-    }
-
-    override fun drawBody(frameDelta: Float, batch: SpriteBatch) {
-        super.drawBody(frameDelta, batch)
-
-        // draw its own MAC address
-        drawUsingDrawFunInGoodPosition(frameDelta) { x, y ->
-            App.fontSmallNumbers.draw(batch, super.mac.toMAC(), x, y + 2*TILE_SIZE - 12)
-        }
-    }
-}
-
-
-
-/**
- * Created by minjaesong on 2025-03-03.
- */
-class FixtureRingBusAnalyser : FixtureRingBusCore {
-
-    constructor() : super(
-        portEmit = Point2i(0, 0),
-        portSink = Point2i(1, 0),
-        blockBox = BlockBox(BlockBox.NO_COLLISION, 2, 1),
-        nameFun = { Lang["ITEM_DEBUG_RING_BUS_ANALYSER"] },
-    ) {
-        this.mainUI = UIRingBusAnalyser(this)
-    }
-
-    override fun drawBody(frameDelta: Float, batch: SpriteBatch) {
-        super.drawBody(frameDelta, batch)
-
-        // draw its own MAC address
-        drawUsingDrawFunInGoodPosition(frameDelta) { x, y ->
-            App.fontSmallNumbers.draw(batch, super.mac.toMAC(), x, y + 1*TILE_SIZE - 12)
-        }
-    }
-}
-

ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/RingBusFirmware.kt

@@ -1,60 +0,0 @@
-package net.torvald.terrarum.modulecomputers.gameactors
-
-import net.torvald.terrarum.serialise.*
-
-
-open class RingBusFirmware(val devtype: Int) {
-
-    fun workWithDataFrame(hostMAC: Int, datagramme: ByteArray): Pair<Int, ByteArray?> {
-        if (datagramme.size < 12) return -1 to null
-
-        val protocol = datagramme[0].toUint()
-        val mode = datagramme[1].toUint()
-        val arg1 = datagramme.toBigInt16(2)
-        val recipient = datagramme.toBigInt32(4)
-        val sender = datagramme.toBigInt32(8)
-        val body = datagramme.sliceArray(12 until datagramme.size)
-
-        return invoke(hostMAC, protocol, mode, arg1, recipient, sender, body, datagramme)
-    }
-
-    open fun invoke(hostMAC: Int, protocol: Int, mode: Int, arg1: Int, recipient: Int, sender: Int, body: ByteArray, datagramme: ByteArray): Pair<Int, ByteArray?> {
-        return when (protocol) {
-            1 -> 0 to echo(recipient, sender, body)
-            2 -> 0 to blockTransfer(arg1, recipient, sender, body)
-            4 -> 0 to deviceDiscovery(hostMAC, datagramme)
-            else -> -1 to null
-        }
-    }
-
-    open fun echo(recipient: Int, sender: Int, body: ByteArray): ByteArray {
-        return ByteArray(8 + body.size).makeEmptyPacket(1, 1, 0, recipient, sender).also {
-            it.writeBigInt48(System.currentTimeMillis(), 12)
-            System.arraycopy(body, 6, this, 6, body.size - 6)
-        }
-    }
-
-    open fun blockTransfer(sequence: Int, recipient: Int, sender: Int, body: ByteArray): ByteArray {
-        return ByteArray(12).makeEmptyPacket(2, 1, sequence, recipient, sender) // always ACK
-    }
-
-    open fun deviceDiscovery(host: Int, wholeMessage: ByteArray): ByteArray {
-        return ByteArray(wholeMessage.size + 6).also {
-            System.arraycopy(wholeMessage, 0, it, 0, wholeMessage.size)
-            it[it.size - 5] = devtype.toByte()
-            it.writeBigInt32(host, it.size - 4)
-        }
-    }
-
-
-
-    private fun ByteArray.makeEmptyPacket(protocol: Int, mode: Int, arg1: Int, recipient: Int, sender: Int): ByteArray {
-        this[0] = protocol.toByte()
-        this[1] = mode.toByte()
-        this.writeBigInt16(arg1, 2)
-        this.writeBigInt32(recipient, 4)
-        this.writeBigInt32(sender, 8)
-
-        return this
-    }
-}

ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemComputerConsole.kt

@@ -1,89 +0,0 @@
-package net.torvald.terrarum.modulecomputers.gameitems
-
-import net.torvald.terrarum.gameitems.ItemID
-import net.torvald.terrarum.modulebasegame.gameitems.FixtureItemBase
-
-/**
- * Created by minjaesong on 2025-03-30.
- */
-class ItemComputerConsole(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulecomputers.gameactors.FixtureComputerConsole") {
-
-    override var dynamicID: ItemID = originalID
-    override var baseMass = 80.0
-    override val canBeDynamic = false
-    override val materialId = "STAL"
-    init {
-        itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_operator_terminal.tga")
-    }
-    override var baseToolSize: Double? = baseMass
-    override var originalName = "ITEM_COMPUTER_CONSOLE"
-
-}
-
-/**
- * Created by minjaesong on 2025-03-30.
- */
-class ItemComputerProcessor(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulecomputers.gameactors.FixtureComputerProcessor") {
-
-    override var dynamicID: ItemID = originalID
-    override var baseMass = 200.0
-    override val canBeDynamic = false
-    override val materialId = "STAL"
-    init {
-        itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_cpu.tga")
-    }
-    override var baseToolSize: Double? = baseMass
-    override var originalName = "ITEM_COMPUTER_PROCESSOR"
-
-}
-
-/**
- * Created by minjaesong on 2025-04-01.
- */
-class ItemNetworkInterface(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulecomputers.gameactors.FixtureNetworkInterface") {
-
-    override var dynamicID: ItemID = originalID
-    override var baseMass = 200.0
-    override val canBeDynamic = false
-    override val materialId = "STAL"
-    init {
-        itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_network_interface.tga")
-    }
-    override var baseToolSize: Double? = baseMass
-    override var originalName = "ITEM_NETWORK_INTERFACE"
-
-}
-
-/**
- * Created by minjaesong on 2025-04-01.
- */
-class ItemNetworkBridge(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulecomputers.gameactors.FixtureNetworkBridge") {
-
-    override var dynamicID: ItemID = originalID
-    override var baseMass = 200.0
-    override val canBeDynamic = false
-    override val materialId = "STAL"
-    init {
-        itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_network_bridge.tga")
-    }
-    override var baseToolSize: Double? = baseMass
-    override var originalName = "ITEM_NETWORK_BRIDGE"
-
-}
-
-/**
- * Created by minjaesong on 2025-04-01.
- */
-class ItemMemoryCabinet(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulecomputers.gameactors.FixtureMemoryCabinet") {
-
-    override var dynamicID: ItemID = originalID
-    override var baseMass = 80.0
-    override val canBeDynamic = false
-    override val materialId = "STAL"
-    init {
-        itemImage = FixtureItemBase.getItemImageFromSingleImage("dwarventech", "sprites/fixtures/computer_memory_stack_1.tga")
-    }
-    override var baseToolSize: Double? = baseMass
-    override var originalName = "ITEM_MEMORY_CABINET"
-
-}

ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/WirePieceNetworkBus.kt

@@ -1,79 +0,0 @@
-package net.torvald.terrarum.modulecomputers.gameitems
-
-import net.torvald.terrarum.CommonResourcePool
-import net.torvald.terrarum.WireCodex
-import net.torvald.terrarum.gameactors.ActorWithBody
-import net.torvald.terrarum.gameitems.FixtureInteractionBlocked
-import net.torvald.terrarum.gameitems.GameItem
-import net.torvald.terrarum.gameitems.ItemID
-import net.torvald.terrarum.modulebasegame.gameitems.BlockBase
-
-/**
- * Created by minjaesong on 2025-03-30.
- */
-class WirePieceNetworkBus(originalID: ItemID, private val atlasID: String, private val sheetX: Int, private val sheetY: Int)
-    : GameItem(originalID), FixtureInteractionBlocked {
-
-    override var dynamicID: ItemID = originalID
-    override var baseMass = 0.001
-    override var baseToolSize: Double? = null
-    override var inventoryCategory = Category.WIRE
-    override val canBeDynamic = false
-    override val materialId = ""
-    init {
-        itemImage = CommonResourcePool.getAsItemSheet(atlasID).get(sheetX, sheetY)
-    }
-
-    init {
-        equipPosition = GameItem.EquipPosition.HAND_GRIP
-        originalName = "ITEM_NETWORK_BUS_WIRE"
-        tags.addAll(WireCodex[originalID].tags)
-    }
-
-    override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long {
-        return BlockBase.wireStartPrimaryUse(actor,this, delta)
-    }
-
-    override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) {
-        BlockBase.wireEffectWhenEquipped(this, delta)
-    }
-
-    override fun effectOnUnequip(actor: ActorWithBody) {
-        BlockBase.wireEffectWhenUnequipped(this)
-    }
-}
-
-/**
- * Created by minjaesong on 2025-03-30.
- */
-class WirePieceIOBus(originalID: ItemID, private val atlasID: String, private val sheetX: Int, private val sheetY: Int)
-    : GameItem(originalID), FixtureInteractionBlocked {
-
-    override var dynamicID: ItemID = originalID
-    override var baseMass = 0.001
-    override var baseToolSize: Double? = null
-    override var inventoryCategory = Category.WIRE
-    override val canBeDynamic = false
-    override val materialId = ""
-    init {
-        itemImage = CommonResourcePool.getAsItemSheet(atlasID).get(sheetX, sheetY)
-    }
-
-    init {
-        equipPosition = GameItem.EquipPosition.HAND_GRIP
-        originalName = "ITEM_IO_BUS_WIRE"
-        tags.addAll(WireCodex[originalID].tags)
-    }
-
-    override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long {
-        return BlockBase.wireStartPrimaryUse(actor,this, delta)
-    }
-
-    override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) {
-        BlockBase.wireEffectWhenEquipped(this, delta)
-    }
-
-    override fun effectOnUnequip(actor: ActorWithBody) {
-        BlockBase.wireEffectWhenUnequipped(this)
-    }
-}

ModuleComputers/src/net/torvald/terrarum/modulecomputers/ui/UIRingBusAnalyser.kt

@@ -1,101 +0,0 @@
-package net.torvald.terrarum.modulecomputers.ui
-
-import com.badlogic.gdx.graphics.Color
-import com.badlogic.gdx.graphics.OrthographicCamera
-import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.terrarum.App
-import net.torvald.terrarum.ifNaN
-import net.torvald.terrarum.modulecomputers.gameactors.FixtureRingBusCore
-import net.torvald.terrarum.ui.UICanvas
-import net.torvald.terrarum.ui.UIItemVertSlider
-import net.torvald.terrarum.ui.Toolkit
-import kotlin.math.roundToInt
-
-class UIRingBusAnalyser(val host: FixtureRingBusCore) : UICanvas() {
-
-    override var width = Toolkit.drawWidth
-    override var height = App.scr.height
-
-    private val analyserPosX = 10
-    private val analyserPosY = 10
-    private val analyserWidth = width - 20
-    private val analyserHeight = height - 20
-
-    private val TEXT_LINE_HEIGHT = 24
-    private var analysisTextBuffer = ArrayList<String>()
-
-    private val analyserScroll = UIItemVertSlider(this,
-        analyserPosX - 18,
-        analyserPosY + 1,
-        0.0, 0.0, 1.0, analyserHeight - 2, analyserHeight - 2
-    )
-
-    init {
-        addUIitem(analyserScroll)
-        refreshAnalysis()
-    }
-
-    private fun refreshAnalysis() {
-        analysisTextBuffer.clear()
-
-        host.msgLog.forEach { frame ->
-            analysisTextBuffer.add(frame.toString())
-        }
-
-        // update scrollbar
-        analyserScroll.handleHeight = if (analysisTextBuffer.isEmpty())
-            analyserHeight
-        else
-            (analyserHeight.toFloat() / analysisTextBuffer.size.times(TEXT_LINE_HEIGHT))
-                .times(analyserHeight)
-                .roundToInt()
-                .coerceIn(12, analyserHeight)
-    }
-
-    private fun drawAnalysis(batch: SpriteBatch) {
-        val scroll = (analyserScroll.value * analysisTextBuffer.size.times(TEXT_LINE_HEIGHT)
-            .minus(analyserHeight - 3))
-            .ifNaN(0.0)
-            .roundToInt()
-            .coerceAtLeast(0)
-
-        analysisTextBuffer.forEachIndexed { index, s ->
-            App.fontGame.draw(batch, s,
-                analyserPosX + 6f,
-                analyserPosY + 3f + index * TEXT_LINE_HEIGHT - scroll
-            )
-        }
-    }
-
-    override fun updateImpl(delta: Float) {
-        refreshAnalysis()
-        uiItems.forEach { it.update(delta) }
-    }
-
-    override fun renderImpl(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
-        // Draw background box
-        batch.color = Color(0x7F)
-        Toolkit.fillArea(batch, analyserPosX, analyserPosY, analyserWidth, analyserHeight)
-        batch.color = Toolkit.Theme.COL_INACTIVE
-        Toolkit.drawBoxBorder(batch, analyserPosX, analyserPosY, analyserWidth, analyserHeight)
-
-        // Draw text content
-        batch.color = Color.WHITE
-        drawAnalysis(batch)
-
-        // Draw UI elements
-        uiItems.forEach { it.render(frameDelta, batch, camera) }
-    }
-
-    override fun doOpening(delta: Float) {
-        refreshAnalysis()
-    }
-
-    override fun doClosing(delta: Float) {
-        // nothing needed
-    }
-
-    override fun dispose() {
-
-    }
-}

ModuleComputers/src/net/torvald/terrarum/modulecomputers/ui/UIRingBusExerciser.kt

@@ -1,101 +0,0 @@
-package net.torvald.terrarum.modulecomputers.ui
-
-import com.badlogic.gdx.graphics.Color
-import com.badlogic.gdx.graphics.OrthographicCamera
-import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.terrarum.App
-import net.torvald.terrarum.ifNaN
-import net.torvald.terrarum.modulecomputers.gameactors.FixtureRingBusCore
-import net.torvald.terrarum.ui.UICanvas
-import net.torvald.terrarum.ui.UIItemVertSlider
-import net.torvald.terrarum.ui.Toolkit
-import kotlin.math.roundToInt
-
-class UIRingBusExerciser(val host: FixtureRingBusCore) : UICanvas() {
-
-    override var width = Toolkit.drawWidth
-    override var height = App.scr.height
-
-    private val analyserPosX = 10
-    private val analyserPosY = 10
-    private val analyserWidth = width - 20
-    private val analyserHeight = height - 20
-
-    private val TEXT_LINE_HEIGHT = 24
-    private var analysisTextBuffer = ArrayList<String>()
-
-    private val analyserScroll = UIItemVertSlider(this,
-        analyserPosX - 18,
-        analyserPosY + 1,
-        0.0, 0.0, 1.0, analyserHeight - 2, analyserHeight - 2
-    )
-
-    init {
-        addUIitem(analyserScroll)
-        refreshAnalysis()
-    }
-
-    private fun refreshAnalysis() {
-        analysisTextBuffer.clear()
-
-        host.msgLog.forEach { frame ->
-            analysisTextBuffer.add(frame.toString())
-        }
-
-        // update scrollbar
-        analyserScroll.handleHeight = if (analysisTextBuffer.isEmpty())
-            analyserHeight
-        else
-            (analyserHeight.toFloat() / analysisTextBuffer.size.times(TEXT_LINE_HEIGHT))
-                .times(analyserHeight)
-                .roundToInt()
-                .coerceIn(12, analyserHeight)
-    }
-
-    private fun drawAnalysis(batch: SpriteBatch) {
-        val scroll = (analyserScroll.value * analysisTextBuffer.size.times(TEXT_LINE_HEIGHT)
-            .minus(analyserHeight - 3))
-            .ifNaN(0.0)
-            .roundToInt()
-            .coerceAtLeast(0)
-
-        analysisTextBuffer.forEachIndexed { index, s ->
-            App.fontGame.draw(batch, s,
-                analyserPosX + 6f,
-                analyserPosY + 3f + index * TEXT_LINE_HEIGHT - scroll
-            )
-        }
-    }
-
-    override fun updateImpl(delta: Float) {
-        refreshAnalysis()
-        uiItems.forEach { it.update(delta) }
-    }
-
-    override fun renderImpl(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
-        // Draw background box
-        batch.color = Color(0x7F)
-        Toolkit.fillArea(batch, analyserPosX, analyserPosY, analyserWidth, analyserHeight)
-        batch.color = Toolkit.Theme.COL_INACTIVE
-        Toolkit.drawBoxBorder(batch, analyserPosX, analyserPosY, analyserWidth, analyserHeight)
-
-        // Draw text content
-        batch.color = Color.WHITE
-        drawAnalysis(batch)
-
-        // Draw UI elements
-        uiItems.forEach { it.render(frameDelta, batch, camera) }
-    }
-
-    override fun doOpening(delta: Float) {
-        refreshAnalysis()
-    }
-
-    override fun doClosing(delta: Float) {
-        // nothing needed
-    }
-
-    override fun dispose() {
-
-    }
-}

README.md

@@ -1,6 +1,6 @@
 ## Aperçu ##
 
-The goal of this project is to create a modular game engine that accommodates a 2D side-scrolling tilemap platformer, and a game that runs on top of it.
+This project is to create a modular game engine that accommodates a 2D side-scrolling tilemap platformer, and a game that runs on top of it.
 
 The project is divided into two parts: **Terrarum the Game Engine** and **Terrarum the actual game**.
 

assets/keylayout/fr_fr_azerty.key

@@ -1,4 +1,4 @@
-{"n":"FR Azerty","capslock":"shift","l":"iso","t":[[""],[undefined],
+{"n":"FR Azerty","capslock":"shift","t":[[""],[undefined],
 [undefined],
 ["<HOME>"],
 [undefined],
@@ -237,7 +237,7 @@
 [undefined],
 [undefined],
 [undefined],
-["<",">","≤","≥"],
+[undefined],
 [undefined],
 [undefined],
 [undefined],

assets/keylayout/zh_cn_cangjie5.ime

@@ -254,7 +254,7 @@ let states = {"keylayouts":[[""],[undefined],
 [undefined],
 [undefined]
 ],
-"dict":IMEProvider.requestDictionary("cangjie5_dict/cj5-sc.han"),
+"dict":IMEProvider.requestDictionary("cj5-sc.han"),
 "code":0, //0: not composing, 1: composing (has candidates), 2: composing (no candidates)
 "buf":"",
 "candidates":""/*comma-separated values*/}
@@ -316,4 +316,4 @@ return Object.freeze({"n":"五仓简体 Qwerty","v":"many","c":"CuriousTo\uA75Bv
 },
 "reset":()=>{ reset() },
 "composing":()=>(states.code!=0)
-})
+})

assets/keylayout/zh_tw_cangjie5.ime

@@ -254,7 +254,7 @@ let states = {"keylayouts":[[""],[undefined],
 [undefined],
 [undefined]
 ],
-"dict":IMEProvider.requestDictionary("cangjie5_dict/cj5-tc.han"),
+"dict":IMEProvider.requestDictionary("cj5-tc.han"),
 "code":0, //0: not composing, 1: composing (has candidates), 2: composing (no candidates)
 "buf":"",
 "candidates":""/*comma-separated values*/}
@@ -316,4 +316,4 @@ return Object.freeze({"n":"五倉正體 Qwerty","v":"many","c":"CuriousTo\uA75Bv
 },
 "reset":()=>{ reset() },
 "composing":()=>(states.code!=0)
-})
+})

assets/locales/en/terrarum.json

@@ -7,9 +7,7 @@
   "CONTEXT_TIME_SECOND_PLURAL": "Seconds",
   "COPYRIGHT_ALL_RIGHTS_RESERVED": "All rights reserved",
   "COPYRIGHT_GNU_GPL_3": "Distributed under GNU GPL 3",
-  "GAME_ACTION_CHANGE_COLOR" : "Change color",
   "GAME_ACTION_MOVE_VERB" : "Move",
-  "GAME_ACTION_PUT_DOWN" : "Put down",
   "GAME_ACTION_ZOOM" : "Zoom",
   "GAME_ACTION_ZOOM_OUT" : "Zoom out",
   "MENU_IO_AUTOSAVE": "Autosave",
@@ -56,7 +54,7 @@
   "MENU_OPTIONS_SPEAKER_HEADPHONE": "Headphone",
   "MENU_OPTIONS_SPEAKER_SETUP": "Speaker Setup",
   "MENU_OPTIONS_SPEAKER_STEREO": "Stereo",
-  "MENU_OPTIONS_STREAMERS_LAYOUT": "Space for Chat Overlay",
+  "MENU_OPTIONS_STREAMERS_LAYOUT": "Chat Overlay",
 
   "MENU_CREDIT_GPL_DNT" : "GPL",
   "MENU_LABEL_JVM_DNT" : "JVM",

assets/mods/basegame/books/btex.xml

@@ -52,7 +52,7 @@
         <btex/> abstracts away the meticulous styling and typesetting configurations, so you can focus on
         actually writing your texts than debugging the <latex/> macros. This does come with a downside of
         not being able to change the given style.</p>
-    <p><btex/> document is divided up to the five parts: the <a href="btexdoc">Style Declaration</a>, the
+    <p><btex/> document is divided up to five parts: the <a href="btexdoc">Style Declaration</a>, the
         <a href="cover">Cover</a>, the <a href="table of contents">Table of Contents</a>, the
         <a href="manuscript">Manuscript</a>, and the <a href="index page">Index Page</a>, of which the
         Style Declaration and the Manuscript are the mandatory parts.</p>
@@ -87,7 +87,7 @@
     </callout>
     <p>Only the <code>title</code> tag is mandatory. Cover texts will be printed using a special font that has wider
         gaps between characters. The title text will be printed in a double-size.</p>
-    <p>The cover can have a different colour with the <code>hue</code> attribute, which takes a number between 0 and 360.</p>
+    <p>The cover can have different colour with the <code>hue</code> attribute, which takes a number between 0 and 360.</p>
 
     <chapter>The Table of Contents</chapter>
 
@@ -97,7 +97,7 @@
     <callout align="left" class="code"><index id="tocpage (tag)"/>&lt;tocpage title="Custom page name if necessary"&gt;&zwsp;&lt;tableofcontents/&gt;&zwsp;&lt;/tocpage&gt;
     </callout>
 
-    <p>The optional <code>title</code> attribute allows custom names to a page.
+    <p>The optional <code>title</code> attribute allows a custom name can be given to this page.
         If unspecified, the default name is “Table of Contents”.</p>
     <p>The tag <code>&lt;tableofcontents/&gt;</code> is an internal tag used by the typesetter.</p>
 
@@ -173,8 +173,8 @@
     </callout>
 
     <p>The <code>height</code> attribute specifies the height of the image <emph>in the number of lines</emph>,
-        rather than the pixels, the width is calculated automatically; image width wider than the text width
-        will cause an error. The tag optionally takes <code>caption</code> attribute which prints a text below the image.</p>
+        rather than pixels, the width is calculated automatically; image width wider than the text width
+        will cause an error. The tag optionally takes caption attribute which prints a text below the image.</p>
 
     <p>Supported image formats: JPEG, PNG, BMP or TGA</p>
 
@@ -201,7 +201,7 @@
 
     <chapter>Conclusion</chapter>
 
-    <p>The finished book description using <btex/> can be sent to the publisher, and if there are no errors
+    <p>The finished book description using <btex/> can be sent to a publisher, and if there are no errors
         on your submission, the printed books of specified number of copies will be delivered to your
         location within a reasonable amount of business days. Happy writing!</p>
 
@@ -287,14 +287,14 @@
         In other words, <code>veun</code> and <code>vneun</code> are identical.</p>
     <p>These tags can be used in the following situation: suppose you have a <btex/> document,</p>
 
-    <callout align="left" class="code">[en] Send your &lt;v fromgame="GAME_ITEM_HOLOTAPE"/&gt; containing the manuscript to the publisher via post to have your books printed.<br/><!--
+    <callout align="left" class="code">[en] Send your &lt;v fromgame="GAME_ITEM_HOLOTAPE"/&gt; that contains the manuscript to the publisher via mail to have your books printed.<br/><!--
     -->[koKR] 원고가 담긴 &lt;veul fromgame="GAME_ITEM_HOLOTAPE"/&gt; 출판사로 우편을 통해 보내야 책이 인쇄됩니다.</callout>
 
     <p>The variables will be resolved based on the current ingame language, then the necessary
         linguistic processing is performed, which would result in a following paragraph
         (text in blue denotes the text is inserted using the tags):</p>
 
-    <callout>[en] Send your <itemname>Holotape</itemname> that contains the manuscript to the publisher via post to have your books printed.<br/><!--
+    <callout>[en] Send your <itemname>Holotape</itemname> that contains the manuscript to the publisher via mail to have your books printed.<br/><!--
     -->[koKR] 원고가 담긴 <itemname>홀로테이프를</itemname> 출판사로 우편을 통해 보내야 책이 인쇄됩니다.</callout>
 
 
@@ -309,12 +309,12 @@
         encounter the freezing every time the book is being printed, and this would be a huge minus towards
         the gameplay experience.</p>
 
-    <p>If the process exits without any error, the post system will be
-        notified and will send a post containing the finished books to the player; if the process exits
-        with errors, the post containing the details of the errors will be sent instead.</p>
+    <p>If the process exits without any error, the mailing system will be
+        notified and will send the mail containing finished books to the player; if the process exits
+        with errors, the mail containing details of the errors will be sent instead.</p>
 
     <p>For this reason, the “printing press” is not exposed to the player, they only get to interact with it
-        indirectly through the “publisher” via post.</p>
+        indirectly through the “publisher” via mail.</p>
 
 
 

assets/mods/basegame/canisters/canisters.csv

@@ -1,3 +0,0 @@
-id;itemid;tags
-1;item@basegame:59;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
-2;item@basegame:60;FLUIDSTORAGE,OPENSTORAGE

assets/mods/basegame/commands.csv

@@ -3,7 +3,6 @@ CheatWarnTest
 CodexEdictis
 ExportAtlas
 ExportCodices
-ExportFBO
 ExportMap
 ExportMap2
 ExportWorld
@@ -32,7 +31,6 @@ SetSol
 SetTurb
 SetTime
 SetTimeDelta
-SpawnMovingPlatform
 SpawnPhysTestBall
 Teleport
 ToggleNoClip

assets/mods/basegame/crafting/wires.json

@@ -32,37 +32,37 @@
   "wire@basegame:8192": { /* signal wire red */
     "workbench": "wirerollingmill",
     "ingredients": [
-      [25, 1, "item@basegame:112"] /* 1 copper */
+      [10, 1, "item@basegame:112"] /* 1 copper */
     ]
   },
   "wire@basegame:8193": { /* signal wire green */
     "workbench": "wirerollingmill",
     "ingredients": [
-      [25, 1, "item@basegame:112"] /* 1 copper */
+      [10, 1, "item@basegame:112"] /* 1 copper */
     ]  },
   "wire@basegame:8194": { /* signal wire blue */
     "workbench": "wirerollingmill",
     "ingredients": [
-      [25, 1, "item@basegame:112"] /* 1 copper */
+      [10, 1, "item@basegame:112"] /* 1 copper */
     ]
   },
   "wire@basegame:8195": { /* signal wire yellow */
     "workbench": "wirerollingmill",
     "ingredients": [
-      [25, 1, "item@basegame:112"] /* 1 copper */
+      [10, 1, "item@basegame:112"] /* 1 copper */
     ]
   },
   "wire@basegame:8196": { /* signal wire purple */
     "workbench": "wirerollingmill",
     "ingredients": [
-      [25, 1, "item@basegame:112"] /* 1 copper */
+      [10, 1, "item@basegame:112"] /* 1 copper */
     ]
   },
 
   "item@basegame:50": { /* soldering wire */
     "workbench": "wirerollingmill",
     "ingredients": [
-      [25, 1, "item@basegame:181"] /* 1 solder bar */
+      [10, 1, "item@basegame:181"] /* 1 solder bar */
     ]
   },
 

assets/mods/basegame/items/itemid.csv

@@ -58,8 +58,6 @@ id;classname;tags
 57;net.torvald.terrarum.modulebasegame.gameitems.ItemLogicSignalPushbutton;FIXTURE,SIGNAL
 58;net.torvald.terrarum.modulebasegame.gameitems.ItemLogicSignalPressurePlate;FIXTURE,SIGNAL
 
-59;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden;CONTAINER
-60;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron;CONTAINER
 
 # ingots
 112;net.torvald.terrarum.modulebasegame.gameitems.IngotCopper;INGOT
@@ -136,10 +134,9 @@ id;classname;tags
 # industrial
 2048;net.torvald.terrarum.modulebasegame.gameitems.ItemInductionMotor;FIXTURE,POWER,KINETIC
 2049;net.torvald.terrarum.modulebasegame.gameitems.ItemGearbox;FIXTURE,POWER,KINETIC
-2050;net.torvald.terrarum.modulebasegame.gameitems.ItemConveyorBelt;FIXTURE,KINETIC
 
-# data storage (pre-composed discs; 256)
-# 32768 is a reserved number for a BASEOBJECT disc (players can't produce own recordings... yet)
+# data storage (discs; 256)
+# 32768 is a reserved number for a blank disc
 32769;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc01;MUSIC,PHONO
 32770;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc02;MUSIC,PHONO
 32771;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc03;MUSIC,PHONO
@@ -150,39 +147,19 @@ id;classname;tags
 32776;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc08;MUSIC,PHONO
 32777;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc09;MUSIC,PHONO
 
-# data storage (pre-composed tapestries; 256)
-33024;net.torvald.terrarum.modulebasegame.gameitems.ItemTapestry;FIXTURE,BASEOBJECT
+# data storage (tapestries; 256)
+#33024;net.torvald.terrarum.modulebasegame.gameitems.ItemTapestry;FIXTURE,BASEOBJECT
 
-# data storage (pre-composed text signs; 256)
+# data storage (text signs; 256)
 33280;net.torvald.terrarum.modulebasegame.gameitems.ItemTextSignCopper;FIXTURE,BASEOBJECT
 
-# data storage (pre-composed typewritten leaflets; 256)
-33536;net.torvald.terrarum.modulebasegame.gameitems.ItemPlainDocument;READINGS,BASEOBJECT
 
-# data storage (pre-composed unsealed letters; 256)
-33792;net.torvald.terrarum.modulebasegame.gameitems.ItemUnsealedLetter;POST,BASEOBJECT
-
-# data storage (pre-composed sealed letters; 256)
-34048;net.torvald.terrarum.modulebasegame.gameitems.ItemSealedLetter;POST,BASEOBJECT
-
-# data storage (pre-composed delivery packets; 256)
-34304;net.torvald.terrarum.modulebasegame.gameitems.ItemPostParcel;POST,PARCEL,BASEOBJECT
-
-
-# give it 65536 or greater ID so it would not be able to be redeemed by a code
-65536;net.torvald.terrarum.modulebasegame.gameitems.ItemFileRef;BASEOBJECT
 
 # fluids on storage
-# FUTURE QUEST: autogenerate them using CANISTERS CODEX
-#   with new ItemID scheme:
-#       basegame_2<fluid@basegame:1
-#       stands for a wooden bucket (CANISTERS basegame_2) holding a block of water (fluid@basegame:1)
-#
+# preferably autogenerated
 # FLUIDSTORAGE: required tag for buckets/canisters
 # OPENSTORAGE: cannot hold gas. Canisters need LIDDEDSTORAGE/SEALEDSTORAGE
 # NOEXTREMETHERM: cannot hold cryogenic/molten fluids (can only hold fluid with therm 0 or 1)
-#
-# BELOW ARE COMPELETY IRRELEVANT AND PENDING FOR REMOVAL
 # 100000h..1000FFh : container type 0 x Fluid type 0..255
 # 100100h..1001FFh : container type 1 x Fluid type 0..255
 # 100200h..1002FFh : container type 2 x Fluid type 0..255
@@ -191,20 +168,16 @@ id;classname;tags
 # 100500h..1005FFh : container type 5 x Fluid type 0..255
 # ...
 # 10FF00h..10FFFFh : container type 255 x Fluid type 0..255
-#1048576;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden00;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM,FLUIDSTORAGEEMPTY
-#1048577;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden01;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
-##1048578;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden02;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
-#1048579;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden03;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
-#
-#1048832;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron00;FLUIDSTORAGE,OPENSTORAGE,FLUIDSTORAGEEMPTY
-#1048833;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron01;FLUIDSTORAGE,OPENSTORAGE
-#1048834;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron02;FLUIDSTORAGE,OPENSTORAGE
-#1048835;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron03;FLUIDSTORAGE,OPENSTORAGE
-#
-## reserved for debug items
-#ifdef App.IS_DEVELOPMENT_BUILD
+1048576;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden00;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM,FLUIDSTORAGEEMPTY
+1048577;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden01;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
+#1048578;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden02;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
+1048579;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden03;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
+
+1048832;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron00;FLUIDSTORAGE,OPENSTORAGE,FLUIDSTORAGEEMPTY
+1048833;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron01;FLUIDSTORAGE,OPENSTORAGE
+1048834;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron02;FLUIDSTORAGE,OPENSTORAGE
+1048835;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron03;FLUIDSTORAGE,OPENSTORAGE
+
+# reserved for debug items
 16777216;net.torvald.terrarum.modulebasegame.gameitems.ItemBottomlessWaterBucket;DEBUG,TOOL
 16777217;net.torvald.terrarum.modulebasegame.gameitems.ItemBottomlessLavaBucket;DEBUG,TOOL
-16777472;net.torvald.terrarum.modulebasegame.gameitems.ItemMysteriousATM;DEBUG
-16777473;net.torvald.terrarum.modulebasegame.gameitems.ItemDebugInventron;DEBUG
-#endif

assets/mods/basegame/locales/en/configmenu.json

@@ -1,10 +1,6 @@
 {
   "MENU_MONITOR_CALI_TITLE": "Check Monitor",
-  "MENU_OPTIONS_AUDIO_COMP": "Enhance Quiet Sounds",
-  "MENU_OPTIONS_DISABLE": "Disable",
-  "MENU_OPTIONS_LIGHT": "Light",
   "MENU_OPTIONS_SHOW_ORES_TOOLTIP_WHEN_MINING": "Show Ore Tooltip When Mining",
-  "MENU_OPTIONS_STRONG": "Strong",
   "MENU_OPTIONS_MAX_CRAFTING": "Max Number of Items for Crafting",
   "MENU_OPTIONS_UNIT_BLOCKS": "Blocks",
   "MENU_OPTIONS_UNIT_FEET": "Imperial",

assets/mods/basegame/locales/en/items.json

@@ -1,6 +1,5 @@
 {
   "ITEM_ALLOYING_FURNACE": "Alloying Furnace",
-  "ITEM_AXLE": "Axle",
   "ITEM_BRICK_SINGULAR": "Brick", /* always singular */
   "ITEM_BUCKET_IRON": "Iron Bucket %1$s",
   "ITEM_BUCKET_WOODEN": "Wooden Bucket %1$s",
@@ -18,7 +17,6 @@
   "ITEM_ELECTRIC_WORKBENCH": "Electric Workbench",
   "ITEM_ENGRAVING_WORKBENCH": "Engraving Workbench",
   "ITEM_FURNACE_AND_ANVIL": "Furnace and Anvil",
-  "ITEM_GEARBOX": "Gearbox",
   "ITEM_GEM_RUBY": "Raw Ruby",
   "ITEM_GEM_EMERALD": "Raw Emerald",
   "ITEM_GEM_SAPPHIRE": "Raw Sapphire",
@@ -32,7 +30,6 @@
   "ITEM_HATCHET_STEEL": "Steel Axe",
   "ITEM_HATCHET_STONE": "Stone Axe",
   "ITEM_HATCHET_WOODEN": "Wooden Axe",
-  "ITEM_INDUCTION_MOTOR": "Induction Motor",
   "ITEM_INGOT_BRASS": "Brass Ingot",
   "ITEM_INGOT_BRONZE": "Bronze Ingot",
   "ITEM_INGOT_COPPER": "Copper Ingot",

assets/mods/basegame/locales/koKR/configmenu.json

@@ -1,10 +1,6 @@
 {
   "MENU_MONITOR_CALI_TITLE": "모니터 확인",
-  "MENU_OPTIONS_AUDIO_COMP": "조용한 소리 증폭",
-  "MENU_OPTIONS_DISABLE": "비활성화",
-  "MENU_OPTIONS_LIGHT": "약하게",
   "MENU_OPTIONS_SHOW_ORES_TOOLTIP_WHEN_MINING": "채굴 시 광석 툴팁 보이기",
-  "MENU_OPTIONS_STRONG": "강하게",
   "MENU_OPTIONS_MAX_CRAFTING": "한번에 제작할 최대 아이템 수",
   "MENU_OPTIONS_UNIT_BLOCKS": "블록",
   "MENU_OPTIONS_UNIT_FEET": "피트",

assets/mods/basegame/metadata.properties

@@ -1,4 +1,3 @@
-## this file is auto-generated using Prebuild.kt ##
 # The name that will be displayed in-game
 propername=Terrarum
 
@@ -45,10 +44,10 @@ package=net.torvald.terrarum.modulebasegame
 entrypoint=net.torvald.terrarum.modulebasegame.EntryPoint
 
 # Release date in YYYY-MM-DD
-releasedate=2025-01-19
+releasedate=2024-03-28
 
 # The version, must follow Semver 2.0.0 scheme (https://semver.org/)
-version=0.5.2
+version=0.4.2
 
 # External JAR that the module is compiled. If your module requires yet another library, the JAR must be compiled as a "Fatjar";
 # Due to security reasons, loading an arbitrary JAR is not allowed.

assets/mods/basegame/weathers/WeatherClear.json

@@ -1,8 +1,8 @@
 {
   "identifier": "clear01",
-  "skyboxGradColourMap": "model:hosek",
-  "daylightClut": "lut:clut_daylight.tga",
-  "tags": "terrestrial,generic,clear",
+  "skyboxGradColourMap": "generic_skybox.tga",
+  "daylightClut": "clut_daylight.tga",
+  "tags": "generic,clear",
   "cloudChance": 12,
   "cloudGamma": [1.2, 2.4],
   "cloudGammaVariance": [0.111, 0.0],

assets/mods/basegame/weathers/WeatherGeneric.json

@@ -1,8 +1,8 @@
 {
   "identifier": "generic01",
-  "skyboxGradColourMap": "model:hosek",
-  "daylightClut": "lut:clut_daylight.tga",
-  "tags": "terrestrial,generic",
+  "skyboxGradColourMap": "generic_skybox.tga",
+  "daylightClut": "clut_daylight.tga",
+  "tags": "generic",
   "cloudChance": 60,
   "cloudGamma": [0.9, 2.4],
   "cloudGammaVariance": [0.111, 0.0],

assets/mods/basegame/weathers/WeatherGeneric2.json

@@ -1,8 +1,8 @@
 {
   "identifier": "generic02",
-  "skyboxGradColourMap": "model:hosek",
-  "daylightClut": "lut:clut_daylight.tga",
-  "tags": "terrestrial,generic",
+  "skyboxGradColourMap": "generic_skybox.tga",
+  "daylightClut": "clut_daylight.tga",
+  "tags": "generic2",
   "cloudChance": 150,
   "cloudGamma": [0.9, 2.4],
   "cloudGammaVariance": [0.111, 0.0],

assets/mods/basegame/weathers/WeatherOvercast.json

@@ -1,8 +1,8 @@
 {
   "identifier": "overcast01",
-  "skyboxGradColourMap": "model:hosek",
-  "daylightClut": "lut:clut_daylight.tga",
-  "tags": "terrestrial,overcast",
+  "skyboxGradColourMap": "generic_skybox.tga",
+  "daylightClut": "clut_daylight.tga",
+  "tags": "overcast",
   "cloudChance": 200,
   "cloudGamma": [1.45, 1.0],
   "cloudGammaVariance": [0.0, 0.0],

assets/mods/basegame/weathers/weatherSpace.json

@@ -1,15 +0,0 @@
-{
-  "identifier": "space",
-  "skyboxGradColourMap": "static:#020202,#060604",
-  "daylightClut": "static:#FFF7",
-  "tags": "space",
-  "cloudChance": 0,
-  "cloudGamma": [1.0, 1.0],
-  "cloudGammaVariance": [0.0, 0.0],
-  "windSpeed": 0.0,
-  "windSpeedVariance": 0.0,
-  "windSpeedDamping": 0.0,
-  "clouds": {},
-  "atmoTurbidity": 1.0,
-  "shaderVibrancy": [1.0, 1.0]
-}

assets/mods/basegame/wires/wires.csv

@@ -1,12 +1,13 @@
 id;drop;name;renderclass;accept;inputcount;inputtype;outputtype;javaclass;inventoryimg;branching;tags
-8192;8192;WIRE_RED;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,0,4;3;"SIGNALWIRE"
-8193;8193;WIRE_GREEN;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,1,4;3;"SIGNALWIRE"
-8194;8194;WIRE_BLUE;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,2,4;3;"SIGNALWIRE"
-8195;8195;WIRE_YELLOW;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,3,4;3;"SIGNALWIRE"
-8196;8196;WIRE_PURPLE;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,4,4;3;"SIGNALWIRE"
+8192;8192;WIRE_RED;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,0,4;1;"SIGNALWIRE"
+8193;8193;WIRE_GREEN;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,1,4;1;"SIGNALWIRE"
+8194;8194;WIRE_BLUE;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,2,4;1;"SIGNALWIRE"
+8195;8195;WIRE_YELLOW;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,3,4;1;"SIGNALWIRE"
+8196;8196;WIRE_PURPLE;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,4,4;1;"SIGNALWIRE"
 
 1;1;WIRE_POWER_LOW;power;power_low;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,5,4;1;"POWERWIRE_LOW"
 2;2;WIRE_POWER_HIGH;power;power_high;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,6,4;1;"POWERWIRE_HIGH"
+16;16;WIRE_ETHERNET;network;10base2;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,7,4;1;"ETHERNETWIRE"
 
 256;256;AXLE;axle;axle;1;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceAxle;basegame.items,1,5;0;"AXLE"
 
@@ -14,8 +15,7 @@ id;drop;name;renderclass;accept;inputcount;inputtype;outputtype;javaclass;invent
 # inputcount: how many sides are input (outputcount is deduced from the inputcount). N/A for wires
 # inputtype: which wiretype it accepts. N/A for wires
 # outputtype: which wiretype it emits. N/A for wires
-# branching: if this wire can have branches. 0: unable, 1: tee-only, 2: cross-only, 3: tee and cross.
-# Something like a thicknet can't have branches
+# branching: if this wire can have branches. Something like a thicknet can't have branches
 #
 # comments
 # digital_3bits must come right after three wires it bundles

assets/mods/dwarventech/blocks/blocks.csv

@@ -1,84 +0,0 @@
-"id";"drop";"spawn";"name";"shdr";"shdg";"shdb";"shduv";"str";"dsty";"mate";"solid";"wall";"grav";"dlfn";"fv";"fr";"lumr";"lumg";"lumb";"lumuv";"refl";"tags"
-
-
-## Notes ##
-#
-# Every block must have a shade value that is at least as dark as the air block's
-#
-# Lava/Water props are left for future references, do not delete them until FluidCodex is built #
-#
-# id: Block ID. ID equal to or greater than 4096 is for fluids, mainly for lighting calculation.
-# drop: Which item the DroppedItem actually adds to your inventory
-# spawn: Which item the DroppedItem should impersonate when spawned
-#
-# Drop and World can point to the item from other modules (usually 'basegame')
-# To achieve that, specify the full ID, e.g. basegame:32
-# When no module ID is specified, the current module will be assumed.
-#
-# shdr/g/b, lumr/g/b: Shade RGB/ Lum RGB.
-#    valid range: float of 0..4; 1.0 for 255
-#
-# solid: whether the tile has full collision (affects physics; flowers are not solid, glass is solid)
-# clear: [PENDING FOR REMOVAL] whether the tile has trnasparency (affects render; flowers AND glass is clear)
-#
-# vscs: viscosity, (velocity) / (1 + (n/16)), 16 halves movement speed, can be used to non-fluid tiles (sticky hazard, tarmac road in Terraria)
-#
-# str: Strength of the block against the mining action. Larger value will make the block take longer time to be mined
-#
-# dsty: density. As we are putting water an 1000, it is identical to specific gravity. [g/l]
-#
-# dlfn: dynamic luminosity function.
-#    0-static, 1-torch flicker, 2-current global light (sun, star, moon), 3-daylight at noon,
-#    4-slow breath, 5-pulsate
-#
-# mate: material, four-letter code
-#
-# fv: vertical friction (boolean)
-# fr: horizontal friction. 0: frictionless, <16: slippery, 16: regular, >16: sticky
-#
-# grav: Whether the block should fall through the empty space. N/A to not make it fall;
-#       0 to fall immediately (e.g. Sand), nonzero to indicate that number of floating blocks can be supported (e.g. Scaffolding)
-#
-#
-## Illuminators ##
-#
-# Illuminator white: Mercury Lamp; CIELAB of (94, -5.131, 10.613), which is made out of CIEXYZ of (0.947638, 1.146481, 0.482263), measured with ColorMunki Spectrometer (If you don't want green tinge, collect a daylight!)
-# Illuminator orange: Sodium Lamp; CIE xy of (0.5375, 0.4153), CIEXYZ of (352.531139, 272.379377, 30.980339), measured with ColorMunki Spectrometer
-# Defalut torch : Y 64 x 0.55183 y 0.40966 (Planckian ~1 770 K); real candlelight colour taken from Spyder5 colorimeter (for I couldn't afford i1DisplayPro/Colormunki -- at least back then!)
-# Sunstone: Artificial sunlight, change colour over time in sync with sunlight. The light is set by game's code.
-# Sunlight capacitor: daylight at noon. Set by game's code.
-#
-# BLOCK_ILLUMINATOR_CYAN is actually a SUPER_LUMINATOR, cyan colour is used as:
-#   1. It has quite a brightness on RGB colour space
-#   2. Helmholz-Kohlraush effect
-#
-#
-## Tiles ##
-#
-# 16 colour palette : games's 16-colour palette
-# Magical ice: theoretical __metallic__ ice that might form under super-high pressure (> 5 TPa). Its density is a wild guess.
-#
-#
-## Actorblocks ##
-#
-# Actorblocks are virtual/placeholder blocks that accompanies actors (usually fixtures).
-# Actorblocks are recognised by the "ACTORBLOCK" tag.
-#
-## Tags ##
-#
-# Tag(s) to the item which is used by the crafting system and the game's internals. Multiple tags are separated using commas.
-# Each tag must be all uppercase and only [0-9A-Z] chars are supported.
-#
-### Internal Tags ##
-##
-## Some tags are reserved for internal use, which are:
-## - INTERNAL: denotes that the tile is internal-use.
-## - DORENDER: this internal tile must go through the standard-issue tile drawing routine.
-## - INCONSEQUENTIAL: denotes that this tile can be overwritten without dropping it. Usually used with flower tiles.
-#
-#
-## References ##
-#
-#     * Density of various woods : http://www.engineeringtoolbox.com/wood-density-d_40.html
-#     * Density of various phases of ice : http://www1.lsbu.ac.uk/water/ice_phases.html
-#

assets/mods/dwarventech/items/itemid.csv

@@ -1,5 +1,3 @@
-id;classname;tags
-#1;net.torvald.terrarum.modulecomputers.gameitems.ItemWearableWorldRadar;
-#2;net.torvald.terrarum.modulecomputers.gameitems.ItemHomeComputer;
-256;net.torvald.terrarum.modulecomputers.gameitems.ItemComputerConsole;
-257;net.torvald.terrarum.modulecomputers.gameitems.ItemComputerProcessor;
+id;classname
+1;net.torvald.terrarum.modulecomputers.gameitems.ItemWearableWorldRadar
+2;net.torvald.terrarum.modulecomputers.gameitems.ItemHomeComputer