Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
TheThanathor committed Nov 5, 2024
2 parents ddaad56 + fd5c3ec commit 129222d
Show file tree
Hide file tree
Showing 1,655 changed files with 22,516 additions and 17,380 deletions.
15 changes: 15 additions & 0 deletions .github/ISSUE_TEMPLATE/feat_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
name: Feature Request
about: Request a feature / change to a data pack
title: ''
labels: feature-update
assignees: ''

---

**Describe the feature**
Give a headline summary of the feature.
- What is the motivation
- What data pack does it affect
- Does credit need to be given?
- Can you link to a discussion on Discord about it?
29 changes: 21 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ on:
env:
VERSION: '1.21'
COMMIT_MSG: ${{ github.event.head_commit.message }}
TEST_FABRIC_SERVER: https://meta.fabricmc.net/v2/versions/loader/1.21/0.15.11/1.0.1/server/jar
TEST_FABRIC_API: https://cdn.modrinth.com/data/P7dR8mSH/versions/HXzEJYgV/fabric-api-0.100.1%2B1.21.jar
TEST_PACKTEST: https://cdn.modrinth.com/data/XsKUhp45/versions/sQSunYHv/packtest-1.8-beta3-mc1.21.jar

jobs:
build:
Expand Down Expand Up @@ -100,6 +97,22 @@ jobs:
branch: release

test:
strategy:
fail-fast: false
matrix:
include:
# https://fabricmc.net/use/server/
# https://modrinth.com/mod/fabric-api/versions
# https://modrinth.com/mod/packtest/versions
- version: '1.21.1'
fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.1/0.16.5/1.0.1/server/jar
fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/WTaAx4ah/fabric-api-0.105.0%2B1.21.1.jar
packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/x9txtivi/packtest-1.8-mc1.21.1.jar
- version: '1.21.2'
fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.2/0.16.7/1.0.1/server/jar
fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/UEjZZNue/fabric-api-0.106.1%2B1.21.2.jar
packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/wjOUK14F/packtest-1.9-mc1.21.2.jar
name: 'test-${{ matrix.version }}'
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -128,6 +141,7 @@ jobs:
- name: Build all modules for tests
run: poetry run beet -p beet-test.yaml -l ${{ env.LOG_LEVEL }} build
env:
VERSION: ${{ matrix.version }}
LOG_LEVEL: ${{ runner.debug == 1 && 'DEBUG' || 'INFO'}}

- name: Setup Java
Expand All @@ -138,15 +152,14 @@ jobs:

- name: Download server files
run: |
curl -o server.jar $TEST_FABRIC_SERVER
curl -o server.jar ${{ matrix.fabric_server_url }}
mkdir mods
curl -o mods/fabric-api.jar $TEST_FABRIC_API
curl -o mods/packtest.jar $TEST_PACKTEST
curl -o mods/fabric-api.jar ${{ matrix.fabric_api_url }}
curl -o mods/packtest.jar ${{ matrix.packtest_url }}
- name: Copy packs to world
run: |
mkdir -p world/datapacks
rm out/gm4_guidebook.zip
rm out/gm4_zauber_cauldrons.zip
rm out/gm4_zauber_liquids.zip
cp out/gm4_*.zip world/datapacks
Expand All @@ -160,5 +173,5 @@ jobs:
if: ${{ failure() && steps.run-tests.conclusion == 'failure' }}
uses: actions/upload-artifact@v4
with:
name: 'Test world for ${{ github.sha }}'
name: 'Test world in ${{ matrix.version }} for ${{ github.sha }}'
path: ${{ github.workspace }}/world/
2 changes: 1 addition & 1 deletion base/beet.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 1.6.0
version: 1.7.0
id: gm4

data_pack:
Expand Down
19 changes: 19 additions & 0 deletions base/data/gm4/loot_table/air.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:stick",
"functions": [
{
"function": "minecraft:set_count",
"count": 0
}
]
}
]
}
]
}
3 changes: 3 additions & 0 deletions base/data/gm4/loot_table/empty.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"pools": []
}
6 changes: 6 additions & 0 deletions base/data/gm4/tags/entity_type/boats.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"values": [
{ "id": "minecraft:boat", "required": false },
{ "id": "#minecraft:boat", "required": false }
]
}
6 changes: 6 additions & 0 deletions base/data/gm4/tags/entity_type/boss.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"values": [
"minecraft:ender_dragon",
"minecraft:wither"
]
}
15 changes: 15 additions & 0 deletions base/data/gm4/tags/entity_type/chest_boats.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"values": [
{ "id": "minecraft:chest_boat", "required": false },
{ "id": "minecraft:oak_chest_boat", "required": false },
{ "id": "minecraft:spruce_chest_boat", "required": false },
{ "id": "minecraft:birch_chest_boat", "required": false },
{ "id": "minecraft:jungle_chest_boat", "required": false },
{ "id": "minecraft:acacia_chest_boat", "required": false },
{ "id": "minecraft:cherry_chest_boat", "required": false },
{ "id": "minecraft:dark_oak_chest_boat", "required": false },
{ "id": "minecraft:mangrove_chest_boat", "required": false },
{ "id": "minecraft:bamboo_chest_raft", "required": false },
{ "id": "minecraft:pale_oak_chest_boat", "required": false }
]
}
34 changes: 34 additions & 0 deletions base/data/gm4/tags/entity_type/hostile.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"values": [
"#gm4:boss",
"minecraft:blaze",
"minecraft:bogged",
"minecraft:breeze",
"minecraft:creeper",
"minecraft:elder_guardian",
"minecraft:endermite",
"minecraft:evoker",
"minecraft:ghast",
"minecraft:guardian",
"minecraft:hoglin",
"minecraft:husk",
"minecraft:magma_cube",
"minecraft:phantom",
"minecraft:piglin_brute",
"minecraft:pillager",
"minecraft:ravager",
"minecraft:shulker",
"minecraft:silverfish",
"minecraft:skeleton",
"minecraft:slime",
"minecraft:stray",
"minecraft:vex",
"minecraft:vindicator",
"minecraft:warden",
"minecraft:witch",
"minecraft:wither_skeleton",
"minecraft:zoglin",
"minecraft:zombie",
"minecraft:zombie_villager"
]
}
6 changes: 6 additions & 0 deletions base/data/gm4/tags/entity_type/neutral.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"values": [
"#gm4:neutral_hostile",
"#gm4:neutral_passive"
]
}
10 changes: 10 additions & 0 deletions base/data/gm4/tags/entity_type/neutral_hostile.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"values": [
"minecraft:cave_spider",
"minecraft:drowned",
"minecraft:enderman",
"minecraft:piglin",
"minecraft:spider",
"minecraft:zombified_piglin"
]
}
14 changes: 14 additions & 0 deletions base/data/gm4/tags/entity_type/neutral_passive.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"values": [
"minecraft:bee",
"minecraft:dolphin",
"minecraft:fox",
"minecraft:goat",
"minecraft:iron_golem",
"minecraft:llama",
"minecraft:panda",
"minecraft:polar_bear",
"minecraft:trader_llama",
"minecraft:wolf"
]
}
50 changes: 50 additions & 0 deletions base/data/gm4/tags/entity_type/non_living.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"values": [
"minecraft:area_effect_cloud",
"minecraft:arrow",
"minecraft:block_display",
"#gm4:boats",
"minecraft:breeze_wind_charge",
"#gm4:chest_boats",
"minecraft:chest_minecart",
"minecraft:command_block_minecart",
"minecraft:dragon_fireball",
"minecraft:egg",
"minecraft:end_crystal",
"minecraft:ender_pearl",
"minecraft:evoker_fangs",
"minecraft:experience_bottle",
"minecraft:experience_orb",
"minecraft:eye_of_ender",
"minecraft:falling_block",
"minecraft:fireball",
"minecraft:firework_rocket",
"minecraft:fishing_bobber",
"minecraft:furnace_minecart",
"minecraft:glow_item_frame",
"minecraft:hopper_minecart",
"minecraft:interaction",
"minecraft:item",
"minecraft:item_display",
"minecraft:item_frame",
"minecraft:leash_knot",
"minecraft:lightning_bolt",
"minecraft:llama_spit",
"minecraft:marker",
"minecraft:minecart",
"minecraft:ominous_item_spawner",
"minecraft:painting",
"minecraft:potion",
"minecraft:shulker_bullet",
"minecraft:small_fireball",
"minecraft:snowball",
"minecraft:spawner_minecart",
"minecraft:spectral_arrow",
"minecraft:text_display",
"minecraft:tnt",
"minecraft:tnt_minecart",
"minecraft:trident",
"minecraft:wind_charge",
"minecraft:wither_skull"
]
}
36 changes: 36 additions & 0 deletions base/data/gm4/tags/entity_type/passive.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"values": [
"minecraft:allay",
"minecraft:armadillo",
"minecraft:axolotl",
"minecraft:bat",
"minecraft:camel",
"minecraft:cat",
"minecraft:chicken",
"minecraft:cod",
"minecraft:cow",
"minecraft:donkey",
"minecraft:frog",
"minecraft:glow_squid",
"minecraft:horse",
"minecraft:mooshroom",
"minecraft:mule",
"minecraft:ocelot",
"minecraft:parrot",
"minecraft:pig",
"minecraft:pufferfish",
"minecraft:rabbit",
"minecraft:salmon",
"minecraft:sheep",
"minecraft:skeleton_horse",
"minecraft:sniffer",
"minecraft:snow_golem",
"minecraft:squid",
"minecraft:strider",
"minecraft:tadpole",
"minecraft:tropical_fish",
"minecraft:turtle",
"minecraft:villager",
"minecraft:wandering_trader"
]
}
3 changes: 3 additions & 0 deletions base/data/minecraft/loot_table/empty.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"pools": []
}
55 changes: 55 additions & 0 deletions base/mod.mcdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
dispatch minecraft:storage[gm4:log] to struct Gm4Log {
versions?: [LogVersion],
traverse_versions?: [LogVersion],
log?: struct {
require_id?: string
},
outdated_list?: [LogEntry],
queue?: [LogEntry],
temp?: #[text_component] string,
}

struct LogVersion {
id: string,
module: string,
version: string,
from?: string,
}

struct LogEntry {
type: ("text" | "install" | "outdated" | "missing" | "version_conflict"),
...gm4:log_entry[[type]],
}

dispatch gm4:log_entry[text] to struct {
/// The text component message to display.
message: #[text_component] string,
}

dispatch gm4:log_entry[install] to struct {
/// The name of the module that was just installed.
module: string,
}

dispatch gm4:log_entry[outdated] to struct {
module: string,
download: #[url] string,
render: #[text_component] string,
}

dispatch gm4:log_entry[missing] to struct MissingLog {
/// The name of the module.
module: string,
/// The ID of the module.
id: string,
/// The name of the dependency.
require: string,
/// The ID of the dependency.
require_id: string,
}

dispatch gm4:log_entry[version_conflict] to struct {
...MissingLog,
/// The required version of the dependency.
require_ver: string,
}
1 change: 1 addition & 0 deletions beet-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ pipeline:
- gm4.plugins.output
- gm4.plugins.player_heads
- gm4.plugins.resource_pack
- gm4.plugins.attribute_rewrite
- beet.contrib.model_merging
- beet.contrib.optifine
- beet.contrib.babelbox
Expand Down
1 change: 1 addition & 0 deletions beet-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ pipeline:
- gm4.plugins.manifest.update_patch
- gm4.plugins.player_heads
- gm4.plugins.resource_pack
- gm4.plugins.attribute_rewrite
- beet.contrib.model_merging
- beet.contrib.optifine
- beet.contrib.babelbox
Expand Down
1 change: 1 addition & 0 deletions beet-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ pipeline:
- gm4.plugins.output.test
- gm4.plugins.player_heads
- gm4.plugins.resource_pack
- gm4.plugins.attribute_rewrite
- gm4_guidebook.generate_guidebooks.load_page_data
- gm4_guidebook.generate_guidebooks.load_custom_recipes
- gm4.plugins.test.load_tests
Expand Down
Loading

0 comments on commit 129222d

Please sign in to comment.