Merge branch 'main' of ssh://gitea.marijndoeve.nl:222/Harmitcraft/Season-4

Reviewed-on: #1

.gitea/workflows/release-tag.yml

@@ -12,6 +12,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          github-server-url: https://gitea.marijndoeve.nl
+          repository: ${{ github.repository }}
+          ref: ${{ github.ref }}
+
 
       - name: Set up Docker BuildX
         uses: docker/setup-buildx-action@v2

README.md

@@ -1,2 +1,80 @@
 # Season-4
+test
+## Mods
+### VanillaTweaks
+#### Data packs
+- Survival
+  - durability ping: Warns players when durability of item is almost gone.
+  - multiplayer sleep: Only one player needed to skip the night
+  - coordinates hud: Simple HUD with player coordinates and direction
+  - track raw statistics: Tracks player statistics
+  - track statistics: Tracks player statistics
+  - nether portal coords: Simple script to calculate nether coordinates
+  - afk display: Changes player name color to gray when player is afk
+  - fast leaf decay: Speeds up leaf decay
+  - armor statues: Customizable armor statues
+- Items
+  - redstone rotation wrench: Item to rotate restone components
+  - player head drops: Players drop their heads when killed by other players
+- Mobs
+  - anti enderman grief: Endermen don't destroy your buildings
+  - double shulker shells: Shulkers drop both top and bottom half of their body
+  - bat membranes: Disables phantoms from spawning, bats drop membranes
+  - silence mobs: Silence a mob by giving it a nametag with "silence"
+  - more mob heads: Mobs occasionally drop their heads when killed.
+- Utilities
+  - kill empty boats: Admin command to despawn empty boats.
+  - spawning spheres: Show sphere in which mobs can spawn.
+- Hermitcraft
+  - wandering trades: Wandering trader sells miniblocks
 
+#### Crafting packs
+
+- straight to shapeless: Shulkers, paper, bread can be crafted in hand.
+- universal dyeing: Dye wool of any color using dyes
+- dropper to dispenser: Craft dispenser using the bow recipe
+
+#### Resource packs
+
+- Aesthetic
+  - MossCarpetOverhang
+  - AccurateSpyglass
+  - UniqueDyes
+  - EndlessEndRods
+  - HDShieldBanners
+  - StemToLog
+- Terrain
+  - TwinklingStars
+  - ClearerWater
+- Variation
+  - VariatedBricks
+  - VariatedBookshelves
+- Peace-and-quiet
+  - QuieterPistons
+  - QuieterMinecarts
+  - QuieterThunder
+  - QuieterRain
+- Utility
+  - MusicDiscRedstonePreview
+  - NoteblockBanners
+  - ArabicNumerals
+  - VisualComposterStages
+  - VisualCauldronStages
+  - VisualHoney
+  - BrewingGuide
+  - DirectionalDispensersDroppers
+  - BetterObservers
+  - CleanRedstoneDust
+  - GroovyLevers
+  - DirectionalHoppers
+  - StickyPistonSides
+  - ClearBannerPatterns
+  - HungerPreview
+  - DifferentStems
+- Unobtrusive
+  - TransparentSpyglassOverlay
+  - AlternateEnchantGlint
+  - UnobtrusiveSnow
+  - UnobtrusiveRain
+- Hud
+  - PingColorIndicator

compose.yaml

@@ -9,12 +9,14 @@ services:
       - "127.0.0.1:25564:25564"
     networks:
       - internal
+    depends_on:
+      - omb4
     environment:
       TZ: Europe/Amsterdam
       API_BINDING: ":25564"
       MAPPING: |
-        mc.marijndoeve.nl=omb4:25565
+        omb4.marijndoeve.nl=omb4:25565
-        omb.marijndoeve.nl=omb4:25565
+        harmitcraft.nl=omb4:25565
         10.0.0.21=omb4:25565
 
   omb4:
@@ -24,12 +26,14 @@ services:
     tty: true
     stdin_open: true
     depends_on:
-      - router
+      - db
     ports:
       - "24454:24454/udp" # Voice mod
     volumes:
-      - ./data:/data
+      - /srv/omb4/data:/data
       - dynmap-data:/data/dynmap/web
+    networks:
+      - internal
     environment:
       EULA: "TRUE"
       VERSION: 1.20.4
@@ -38,12 +42,15 @@ services:
       INIT_MEMORY: 1G
       MEMORY: 6G
 
+      SEED: "-1412583731547517931"
+      MOTD: "Harmitcraft Season 4!"
+
       ENABLE_AUTOPAUSE: true
 
       MAX_TICK_TIME: -1
 
       REMOVE_OLD_DATAPACKS: true
-      VANILLATWEAKS_SHARECODE: ""
+      VANILLATWEAKS_SHARECODE: "4T4SXc,4SfBGs,ABZj2f"
 
       MODRINTH_PROJECTS: |
         fabric-api
@@ -54,6 +61,7 @@ services:
         audioplayer:alpha
         dynmap:beta
         no-trial-chambers
+        shulker+:4WoxRZtH
       MODRINTH_DOWNLOAD_DEPENDENCIES: required
 
   web:
@@ -69,12 +77,18 @@ services:
       - internal
     labels:
       - traefik.enable=true
-      - traefik.http.routers.ombweb.rule=Host(`mc.marijndoeve.nl`, `omb.marijndoeve.nl`)
+      # omb4
+      - traefik.http.routers.ombweb.rule=Host(`omb4.marijndoeve.nl`)
       - traefik.http.routers.ombweb.entrypoints=websecure
       - traefik.http.routers.ombweb.tls.certresolver=marijndoeve
+      # harmitcraft
+      - traefik.http.routers.harmitcraftweb.rule=Host(`harmitcraft.nl`)
+      - traefik.http.routers.harmitcraftweb.entrypoints=websecure
+      - traefik.http.routers.harmitcraftweb.tls.certresolver=marijndoeve
+
   db:
     image: postgres:16
-    container_name: mc-db4
+    container_name: mc-db
     environment:
       TZ: Europe/Amsterdam
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
@@ -90,16 +104,16 @@ services:
     command: export-for-prometheus
     restart: unless-stopped
     environment:
-      GATHER_INTERVAL: 10s
+      EXPORT_SERVERS: mc-omb4
-      GATHER_SERVERS: omb4
     depends_on:
       - omb4
     networks:
       - internal
+      - web
 
 networks:
   internal:
-    internal: true
+    external: false
   web:
     external: true