From 643d6bda41e46a17f711324971427008a2c5caaa Mon Sep 17 00:00:00 2001 From: ChaosDogG Date: Wed, 14 Aug 2024 12:49:48 -0700 Subject: [PATCH 1/3] Catalogue Support --- fabric/src/main/resources/fabric.mod.json | 7 +++++++ forge/src/main/resources/META-INF/mods.toml | 1 + 2 files changed, 8 insertions(+) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 4773c4135..3822bf355 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -28,5 +28,12 @@ }, "suggests": { "wthit": ">=8.2.0" + }, + "custom": { + "catalogue": { + "icon": { + "image": "generations.png" + } + } } } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 75a588053..ae4d93b9b 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -10,6 +10,7 @@ displayName="Generations-Core" authors="Joseph T. McQuigg (JT122406), Waterpicker, Stampede" credits="Generations Development Team" logoFile="generations.png" +catalogueImageIcon="generations.png" description=''' Core mod for Generations. Required for all other Generations mods. Contains Blocks, Items, Entities, and other things that are used by all other Generations mods. From 4c1590b4c338d1be775d1ee95c490f2e97843716 Mon Sep 17 00:00:00 2001 From: ChaosDogG Date: Wed, 14 Aug 2024 20:43:28 -0700 Subject: [PATCH 2/3] You nerds forgor the Psychic type existed :P --- .../resources/data/generations_core/species_features/type.json | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/resources/data/generations_core/species_features/type.json b/common/src/main/resources/data/generations_core/species_features/type.json index 23fd9e2dc..dd96256ce 100644 --- a/common/src/main/resources/data/generations_core/species_features/type.json +++ b/common/src/main/resources/data/generations_core/species_features/type.json @@ -17,6 +17,7 @@ "ground", "ice", "poison", + "psychic", "rock", "steel", "water" From 264ded36bd8aebf872fc928ab97516990318043c Mon Sep 17 00:00:00 2001 From: ChaosDogG Date: Wed, 4 Sep 2024 15:43:45 -0700 Subject: [PATCH 3/3] Added the Ruby and Sapphire items and blocks to the proper Forge tags so other mods can use them --- .../generated/resources/data/forge/tags/items/gems.json | 7 +++++++ .../resources/data/forge/tags/items/gems/ruby.json | 6 ++++++ .../resources/data/forge/tags/items/gems/sapphire.json | 6 ++++++ .../resources/data/forge/tags/items/storage_blocks.json | 7 +++++++ .../data/forge/tags/items/storage_blocks/ruby.json | 6 ++++++ .../data/forge/tags/items/storage_blocks/sapphire.json | 6 ++++++ 6 files changed, 38 insertions(+) create mode 100644 common/src/main/generated/resources/data/forge/tags/items/gems.json create mode 100644 common/src/main/generated/resources/data/forge/tags/items/gems/ruby.json create mode 100644 common/src/main/generated/resources/data/forge/tags/items/gems/sapphire.json create mode 100644 common/src/main/generated/resources/data/forge/tags/items/storage_blocks.json create mode 100644 common/src/main/generated/resources/data/forge/tags/items/storage_blocks/ruby.json create mode 100644 common/src/main/generated/resources/data/forge/tags/items/storage_blocks/sapphire.json diff --git a/common/src/main/generated/resources/data/forge/tags/items/gems.json b/common/src/main/generated/resources/data/forge/tags/items/gems.json new file mode 100644 index 000000000..e49df1a60 --- /dev/null +++ b/common/src/main/generated/resources/data/forge/tags/items/gems.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#forge:gems/ruby", + "#forge:gems/sapphire" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/forge/tags/items/gems/ruby.json b/common/src/main/generated/resources/data/forge/tags/items/gems/ruby.json new file mode 100644 index 000000000..9027c36c1 --- /dev/null +++ b/common/src/main/generated/resources/data/forge/tags/items/gems/ruby.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "generations_core:ruby" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/forge/tags/items/gems/sapphire.json b/common/src/main/generated/resources/data/forge/tags/items/gems/sapphire.json new file mode 100644 index 000000000..8e511ce26 --- /dev/null +++ b/common/src/main/generated/resources/data/forge/tags/items/gems/sapphire.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "generations_core:sapphire" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/forge/tags/items/storage_blocks.json b/common/src/main/generated/resources/data/forge/tags/items/storage_blocks.json new file mode 100644 index 000000000..f00298732 --- /dev/null +++ b/common/src/main/generated/resources/data/forge/tags/items/storage_blocks.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#forge:storage_blocks/ruby", + "#forge:storage_blocks/sapphire" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/forge/tags/items/storage_blocks/ruby.json b/common/src/main/generated/resources/data/forge/tags/items/storage_blocks/ruby.json new file mode 100644 index 000000000..e874ba6a8 --- /dev/null +++ b/common/src/main/generated/resources/data/forge/tags/items/storage_blocks/ruby.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "generations_core:ruby_block" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/forge/tags/items/storage_blocks/sapphire.json b/common/src/main/generated/resources/data/forge/tags/items/storage_blocks/sapphire.json new file mode 100644 index 000000000..8b9fc4f4f --- /dev/null +++ b/common/src/main/generated/resources/data/forge/tags/items/storage_blocks/sapphire.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "generations_core:sapphire_block" + ] +} \ No newline at end of file