Merge branch 'main' of https://gitea.codersquack.nl/NeoFlock/NeoComputers

2026-04-20 19:42:22 +02:00
parent 51a5d4d4ce f9e33f9f05
commit dd5d33cb19
101 changed files with 1112 additions and 38 deletions
--- a/src/main/resources/assets/neocomputers/textures/block/capacitor_bottom.png
+++ b/src/main/resources/assets/neocomputers/textures/block/capacitor_bottom.png
--- a/src/main/resources/assets/neocomputers/textures/block/capacitor_side.png
+++ b/src/main/resources/assets/neocomputers/textures/block/capacitor_side.png
--- a/src/main/resources/assets/neocomputers/textures/block/capacitor_top.png
+++ b/src/main/resources/assets/neocomputers/textures/block/capacitor_top.png
--- a/src/main/resources/assets/neocomputers/textures/gui/slots/component_bus.png
+++ b/src/main/resources/assets/neocomputers/textures/gui/slots/component_bus.png
--- a/src/main/resources/assets/neocomputers/textures/gui/slots/container.png
+++ b/src/main/resources/assets/neocomputers/textures/gui/slots/container.png
--- a/src/main/resources/assets/neocomputers/textures/gui/slots/floppy.png
+++ b/src/main/resources/assets/neocomputers/textures/gui/slots/floppy.png
--- a/src/main/resources/assets/neocomputers/textures/gui/slots/rack_mountable.png
+++ b/src/main/resources/assets/neocomputers/textures/gui/slots/rack_mountable.png
--- a/src/main/resources/assets/neocomputers/textures/gui/slots/tablet.png
+++ b/src/main/resources/assets/neocomputers/textures/gui/slots/tablet.png
--- a/src/main/resources/assets/neocomputers/textures/gui/slots/tool.png
+++ b/src/main/resources/assets/neocomputers/textures/gui/slots/tool.png
--- a/src/main/resources/assets/neocomputers/textures/gui/slots/upgrade.png
+++ b/src/main/resources/assets/neocomputers/textures/gui/slots/upgrade.png
--- a/src/main/resources/assets/neocomputers/textures/item/cbus0.png
+++ b/src/main/resources/assets/neocomputers/textures/item/cbus0.png
--- a/src/main/resources/assets/neocomputers/textures/item/cbus1.png
+++ b/src/main/resources/assets/neocomputers/textures/item/cbus1.png
--- a/src/main/resources/assets/neocomputers/textures/item/cbus2.png
+++ b/src/main/resources/assets/neocomputers/textures/item/cbus2.png
--- a/src/main/resources/assets/neocomputers/textures/item/cbus_creative.png
+++ b/src/main/resources/assets/neocomputers/textures/item/cbus_creative.png
--- a/src/main/resources/assets/neocomputers/textures/item/cpu0.png
+++ b/src/main/resources/assets/neocomputers/textures/item/cpu0.png
--- a/src/main/resources/assets/neocomputers/textures/item/cpu1.png
+++ b/src/main/resources/assets/neocomputers/textures/item/cpu1.png
--- a/src/main/resources/assets/neocomputers/textures/item/cpu2.png
+++ b/src/main/resources/assets/neocomputers/textures/item/cpu2.png
--- a/src/main/resources/assets/neocomputers/textures/item/data0.png
+++ b/src/main/resources/assets/neocomputers/textures/item/data0.png
--- a/src/main/resources/assets/neocomputers/textures/item/data0.png.mcmeta
+++ b/src/main/resources/assets/neocomputers/textures/item/data0.png.mcmeta
@@ -0,0 +1,15 @@
+{
+  "animation": {
+    "frametime": 1,
+    "frames": [
+      { "index": 0, "time": 4 },
+      { "index": 1, "time": 4 },
+      { "index": 2, "time": 4 },
+      { "index": 3, "time": 4 },
+      { "index": 4, "time": 4 },
+      { "index": 5, "time": 4 },
+      { "index": 6, "time": 4 },
+      { "index": 7, "time": 4 }
+    ]
+  }
+}
--- a/src/main/resources/assets/neocomputers/textures/item/data1.png
+++ b/src/main/resources/assets/neocomputers/textures/item/data1.png
--- a/src/main/resources/assets/neocomputers/textures/item/data1.png.mcmeta
+++ b/src/main/resources/assets/neocomputers/textures/item/data1.png.mcmeta
@@ -0,0 +1,15 @@
+{
+  "animation": {
+    "frametime": 1,
+    "frames": [
+      { "index": 0, "time": 4 },
+      { "index": 1, "time": 4 },
+      { "index": 2, "time": 4 },
+      { "index": 3, "time": 4 },
+      { "index": 4, "time": 4 },
+      { "index": 5, "time": 4 },
+      { "index": 6, "time": 4 },
+      { "index": 7, "time": 4 }
+    ]
+  }
+}
--- a/src/main/resources/assets/neocomputers/textures/item/data2.png
+++ b/src/main/resources/assets/neocomputers/textures/item/data2.png
--- a/src/main/resources/assets/neocomputers/textures/item/data2.png.mcmeta
+++ b/src/main/resources/assets/neocomputers/textures/item/data2.png.mcmeta
@@ -0,0 +1,15 @@
+{
+  "animation": {
+    "frametime": 1,
+    "frames": [
+      { "index": 0, "time": 4 },
+      { "index": 1, "time": 4 },
+      { "index": 2, "time": 4 },
+      { "index": 3, "time": 4 },
+      { "index": 4, "time": 4 },
+      { "index": 5, "time": 4 },
+      { "index": 6, "time": 4 },
+      { "index": 7, "time": 4 }
+    ]
+  }
+}
--- a/src/main/resources/assets/neocomputers/textures/item/eeprom0.png
+++ b/src/main/resources/assets/neocomputers/textures/item/eeprom0.png
--- a/src/main/resources/assets/neocomputers/textures/item/gpu0.png
+++ b/src/main/resources/assets/neocomputers/textures/item/gpu0.png
--- a/src/main/resources/assets/neocomputers/textures/item/gpu1.png
+++ b/src/main/resources/assets/neocomputers/textures/item/gpu1.png
--- a/src/main/resources/assets/neocomputers/textures/item/gpu2.png
+++ b/src/main/resources/assets/neocomputers/textures/item/gpu2.png
--- a/src/main/resources/assets/neocomputers/textures/item/hdd0.png
+++ b/src/main/resources/assets/neocomputers/textures/item/hdd0.png
--- a/src/main/resources/assets/neocomputers/textures/item/hdd1.png
+++ b/src/main/resources/assets/neocomputers/textures/item/hdd1.png
--- a/src/main/resources/assets/neocomputers/textures/item/hdd2.png
+++ b/src/main/resources/assets/neocomputers/textures/item/hdd2.png
--- a/src/main/resources/assets/neocomputers/textures/item/inet.png
+++ b/src/main/resources/assets/neocomputers/textures/item/inet.png
--- a/src/main/resources/assets/neocomputers/textures/item/inet.png.mcmeta
+++ b/src/main/resources/assets/neocomputers/textures/item/inet.png.mcmeta
@@ -0,0 +1,17 @@
+{
+  "animation": {
+    "frametime": 1,
+    "frames": [
+      { "index": 0, "time": 2 },
+      { "index": 1, "time": 7 },
+      { "index": 0, "time": 5 },
+      { "index": 1, "time": 4 },
+      { "index": 0, "time": 7 },
+      { "index": 1, "time": 2 },
+      { "index": 0, "time": 8 },
+      { "index": 1, "time": 9 },
+      { "index": 0, "time": 6 },
+      { "index": 1, "time": 4 }
+    ]
+  }
+}
--- a/src/main/resources/assets/neocomputers/textures/item/lan.png
+++ b/src/main/resources/assets/neocomputers/textures/item/lan.png
--- a/src/main/resources/assets/neocomputers/textures/item/memory0.png
+++ b/src/main/resources/assets/neocomputers/textures/item/memory0.png
--- a/src/main/resources/assets/neocomputers/textures/item/memory1.png
+++ b/src/main/resources/assets/neocomputers/textures/item/memory1.png
--- a/src/main/resources/assets/neocomputers/textures/item/memory2.png
+++ b/src/main/resources/assets/neocomputers/textures/item/memory2.png
--- a/src/main/resources/assets/neocomputers/textures/item/memory3.png
+++ b/src/main/resources/assets/neocomputers/textures/item/memory3.png
--- a/src/main/resources/assets/neocomputers/textures/item/memory4.png
+++ b/src/main/resources/assets/neocomputers/textures/item/memory4.png
--- a/src/main/resources/assets/neocomputers/textures/item/memory5.png
+++ b/src/main/resources/assets/neocomputers/textures/item/memory5.png
--- a/src/main/resources/assets/neocomputers/textures/item/red0.png
+++ b/src/main/resources/assets/neocomputers/textures/item/red0.png
--- a/src/main/resources/assets/neocomputers/textures/item/red1.png
+++ b/src/main/resources/assets/neocomputers/textures/item/red1.png
--- a/src/main/resources/assets/neocomputers/textures/item/redio0.png
+++ b/src/main/resources/assets/neocomputers/textures/item/redio0.png
--- a/src/main/resources/assets/neocomputers/textures/item/redio1.png
+++ b/src/main/resources/assets/neocomputers/textures/item/redio1.png
--- a/src/main/resources/assets/neocomputers/textures/item/tunnel.png
+++ b/src/main/resources/assets/neocomputers/textures/item/tunnel.png
--- a/src/main/resources/assets/neocomputers/textures/item/tunnel.png.mcmeta
+++ b/src/main/resources/assets/neocomputers/textures/item/tunnel.png.mcmeta
@@ -0,0 +1,13 @@
+{
+  "animation": {
+    "frametime": 1,
+    "frames": [
+      { "index": 0, "time": 3 },
+      { "index": 1, "time": 3 },
+      { "index": 2, "time": 3 },
+      { "index": 3, "time": 3 },
+      { "index": 4, "time": 3 },
+      { "index": 5, "time": 3 }
+    ]
+  }
+}
--- a/src/main/resources/assets/neocomputers/textures/item/wlan0.png
+++ b/src/main/resources/assets/neocomputers/textures/item/wlan0.png
--- a/src/main/resources/assets/neocomputers/textures/item/wlan1.png
+++ b/src/main/resources/assets/neocomputers/textures/item/wlan1.png