From 59a45f6af27faffd694ca3d68b861b492d6706bb Mon Sep 17 00:00:00 2001 From: May P Date: Sat, 13 Dec 2025 01:41:25 +0200 Subject: [PATCH] yup its done now i hope --- CHANGELOG | 8 +++++- build.gradle | 10 +------ gradle.properties | 6 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/java/com/smithy/Celestium.java | 13 ++++++++- .../ad_astra/dimension_type/earth_orbit.json | 25 +++++++++++++++++ .../data/ad_astra/dimension_type/glacio.json | 25 +++++++++++++++++ .../ad_astra/dimension_type/glacio_orbit.json | 25 +++++++++++++++++ .../data/ad_astra/dimension_type/mars.json | 25 +++++++++++++++++ .../ad_astra/dimension_type/mars_orbit.json | 25 +++++++++++++++++ .../data/ad_astra/dimension_type/mercury.json | 25 +++++++++++++++++ .../dimension_type/mercury_orbit.json | 25 +++++++++++++++++ .../data/ad_astra/dimension_type/moon.json | 25 +++++++++++++++++ .../ad_astra/dimension_type/moon_orbit.json | 25 +++++++++++++++++ .../data/ad_astra/dimension_type/venus.json | 25 +++++++++++++++++ .../ad_astra/dimension_type/venus_orbit.json | 25 +++++++++++++++++ .../recipes/optional/glistering_tome.json | 28 ------------------- .../celestium/functions/cheatchest.mcfunction | 1 - .../celestium/functions/freecash.mcfunction | 2 +- .../data/celestium/functions/time.mcfunction | 2 +- .../minecraft/dimension_type/overworld.json | 25 +++++++++++++++++ .../dimension_type/overworld_caves.json | 25 +++++++++++++++++ .../minecraft/dimension_type/the_end.json | 26 +++++++++++++++++ .../minecraft/dimension_type/the_nether.json | 20 +++++++++++++ .../loot_tables/blocks/blackstone.json | 21 -------------- .../data/minecraft/tags/functions/load.json | 5 ---- .../data/minecraft/tags/functions/tick.json | 5 ---- .../recipes/amethyst_screwdriver.json | 27 ++++++++++++++++++ src/main/resources/fabric.mod.json | 9 ++---- 29 files changed, 427 insertions(+), 83 deletions(-) create mode 100644 src/main/resources/data/ad_astra/dimension_type/earth_orbit.json create mode 100644 src/main/resources/data/ad_astra/dimension_type/glacio.json create mode 100644 src/main/resources/data/ad_astra/dimension_type/glacio_orbit.json create mode 100644 src/main/resources/data/ad_astra/dimension_type/mars.json create mode 100644 src/main/resources/data/ad_astra/dimension_type/mars_orbit.json create mode 100644 src/main/resources/data/ad_astra/dimension_type/mercury.json create mode 100644 src/main/resources/data/ad_astra/dimension_type/mercury_orbit.json create mode 100644 src/main/resources/data/ad_astra/dimension_type/moon.json create mode 100644 src/main/resources/data/ad_astra/dimension_type/moon_orbit.json create mode 100644 src/main/resources/data/ad_astra/dimension_type/venus.json create mode 100644 src/main/resources/data/ad_astra/dimension_type/venus_orbit.json delete mode 100644 src/main/resources/data/amethyst_imbuement/recipes/optional/glistering_tome.json delete mode 100644 src/main/resources/data/celestium/functions/cheatchest.mcfunction create mode 100644 src/main/resources/data/minecraft/dimension_type/overworld.json create mode 100644 src/main/resources/data/minecraft/dimension_type/overworld_caves.json create mode 100644 src/main/resources/data/minecraft/dimension_type/the_end.json create mode 100644 src/main/resources/data/minecraft/dimension_type/the_nether.json delete mode 100644 src/main/resources/data/minecraft/loot_tables/blocks/blackstone.json delete mode 100644 src/main/resources/data/minecraft/tags/functions/load.json delete mode 100644 src/main/resources/data/minecraft/tags/functions/tick.json create mode 100644 src/main/resources/data/tardis_refined/recipes/amethyst_screwdriver.json diff --git a/CHANGELOG b/CHANGELOG index 16c98e0..75d86f2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,4 +2,10 @@ ## v0.0.1: Celestia season 1 - do later -- fixed create deco conflict with TAN \ No newline at end of file +- fixed create deco conflict with TAN + +## v0.0.2: Celestia Season 2 +- uh +- i make world tall +- i make, change recipe's +- i think thats it \ No newline at end of file diff --git a/build.gradle b/build.gradle index 85c7439..d0daf65 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.3-SNAPSHOT' + id 'fabric-loom' version '1.10.1' id 'maven-publish' } @@ -19,14 +19,6 @@ repositories { } loom { - splitEnvironmentSourceSets() - - mods { - "celestium" { - sourceSet sourceSets.main - sourceSet sourceSets.client - } - } } diff --git a/gradle.properties b/gradle.properties index ee10b58..b8df83a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,12 +6,12 @@ org.gradle.parallel=true # check these on https://fabricmc.net/develop minecraft_version=1.20.1 yarn_mappings=1.20.1+build.9 -loader_version=0.14.21 +loader_version=0.16.10 # Mod Properties -mod_version=0.0.1 +mod_version=0.0.2 maven_group=com.smithy archives_base_name=celestium # Dependencies -fabric_version=0.85.0+1.20.1 \ No newline at end of file +fabric_version=0.92.1+1.20.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 62f495d..cea7a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/com/smithy/Celestium.java b/src/main/java/com/smithy/Celestium.java index cff13d1..98c111f 100644 --- a/src/main/java/com/smithy/Celestium.java +++ b/src/main/java/com/smithy/Celestium.java @@ -1,9 +1,13 @@ package com.smithy; import net.fabricmc.api.ModInitializer; - +import net.fabricmc.fabric.api.resource.ResourceManagerHelper; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.util.Identifier; +import net.minecraft.text.Text; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import net.fabricmc.fabric.api.resource.ResourcePackActivationType; public class Celestium implements ModInitializer { // This logger is used to write text to the console and the log file. @@ -17,6 +21,13 @@ public class Celestium implements ModInitializer { // However, some things (like resources) may still be uninitialized. // Proceed with mild caution. + ResourceManagerHelper.registerBuiltinResourcePack( + new Identifier("celestium", "overrides"), + FabricLoader.getInstance().getModContainer("celestium").get(), + Text.literal("Celestium Overrides"), + ResourcePackActivationType.ALWAYS_ENABLED + ); + LOGGER.info("beer!!!!!"); } } \ No newline at end of file diff --git a/src/main/resources/data/ad_astra/dimension_type/earth_orbit.json b/src/main/resources/data/ad_astra/dimension_type/earth_orbit.json new file mode 100644 index 0000000..c5ade14 --- /dev/null +++ b/src/main/resources/data/ad_astra/dimension_type/earth_orbit.json @@ -0,0 +1,25 @@ +{ + "ambient_light": 0.0, + "bed_works": true, + "coordinate_scale": 1.0, + "effects": "ad_astra:earth_orbit", + "has_ceiling": false, + "has_raids": false, + "has_skylight": true, + "height": 512, + "infiniburn": "#minecraft:infiniburn_overworld", + "logical_height": 512, + "min_y": -64, + "monster_spawn_block_light_limit": 0, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 0 + } + }, + "natural": true, + "piglin_safe": false, + "respawn_anchor_works": false, + "ultrawarm": false +} \ No newline at end of file diff --git a/src/main/resources/data/ad_astra/dimension_type/glacio.json b/src/main/resources/data/ad_astra/dimension_type/glacio.json new file mode 100644 index 0000000..860f2b0 --- /dev/null +++ b/src/main/resources/data/ad_astra/dimension_type/glacio.json @@ -0,0 +1,25 @@ +{ + "ambient_light": 0.0, + "bed_works": true, + "coordinate_scale": 1.0, + "effects": "ad_astra:glacio", + "has_ceiling": false, + "has_raids": false, + "has_skylight": true, + "height": 2096, + "infiniburn": "#minecraft:infiniburn_overworld", + "logical_height": 2096, + "min_y": -64, + "monster_spawn_block_light_limit": 0, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 0 + } + }, + "natural": true, + "piglin_safe": false, + "respawn_anchor_works": false, + "ultrawarm": false +} \ No newline at end of file diff --git a/src/main/resources/data/ad_astra/dimension_type/glacio_orbit.json b/src/main/resources/data/ad_astra/dimension_type/glacio_orbit.json new file mode 100644 index 0000000..e248ce7 --- /dev/null +++ b/src/main/resources/data/ad_astra/dimension_type/glacio_orbit.json @@ -0,0 +1,25 @@ +{ + "ambient_light": 0.0, + "bed_works": true, + "coordinate_scale": 1.0, + "effects": "ad_astra:glacio_orbit", + "has_ceiling": false, + "has_raids": false, + "has_skylight": true, + "height": 512, + "infiniburn": "#minecraft:infiniburn_overworld", + "logical_height": 512, + "min_y": -64, + "monster_spawn_block_light_limit": 0, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 0 + } + }, + "natural": true, + "piglin_safe": false, + "respawn_anchor_works": false, + "ultrawarm": false +} \ No newline at end of file diff --git a/src/main/resources/data/ad_astra/dimension_type/mars.json b/src/main/resources/data/ad_astra/dimension_type/mars.json new file mode 100644 index 0000000..4a49640 --- /dev/null +++ b/src/main/resources/data/ad_astra/dimension_type/mars.json @@ -0,0 +1,25 @@ +{ + "ambient_light": 0.0, + "bed_works": true, + "coordinate_scale": 1.0, + "effects": "ad_astra:mars", + "has_ceiling": false, + "has_raids": false, + "has_skylight": true, + "height": 2096, + "infiniburn": "#minecraft:infiniburn_overworld", + "logical_height": 2096, + "min_y": -64, + "monster_spawn_block_light_limit": 0, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 0 + } + }, + "natural": true, + "piglin_safe": false, + "respawn_anchor_works": false, + "ultrawarm": false +} \ No newline at end of file diff --git a/src/main/resources/data/ad_astra/dimension_type/mars_orbit.json b/src/main/resources/data/ad_astra/dimension_type/mars_orbit.json new file mode 100644 index 0000000..9322686 --- /dev/null +++ b/src/main/resources/data/ad_astra/dimension_type/mars_orbit.json @@ -0,0 +1,25 @@ +{ + "ambient_light": 0.0, + "bed_works": true, + "coordinate_scale": 1.0, + "effects": "ad_astra:mars_orbit", + "has_ceiling": false, + "has_raids": false, + "has_skylight": true, + "height": 512, + "infiniburn": "#minecraft:infiniburn_overworld", + "logical_height": 512, + "min_y": -64, + "monster_spawn_block_light_limit": 0, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 0 + } + }, + "natural": true, + "piglin_safe": false, + "respawn_anchor_works": false, + "ultrawarm": false +} \ No newline at end of file diff --git a/src/main/resources/data/ad_astra/dimension_type/mercury.json b/src/main/resources/data/ad_astra/dimension_type/mercury.json new file mode 100644 index 0000000..b307a8f --- /dev/null +++ b/src/main/resources/data/ad_astra/dimension_type/mercury.json @@ -0,0 +1,25 @@ +{ + "ambient_light": 0.0, + "bed_works": true, + "coordinate_scale": 1.0, + "effects": "ad_astra:mercury", + "has_ceiling": false, + "has_raids": false, + "has_skylight": true, + "height": 2096, + "infiniburn": "#minecraft:infiniburn_overworld", + "logical_height": 2096, + "min_y": -64, + "monster_spawn_block_light_limit": 0, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 0 + } + }, + "natural": true, + "piglin_safe": true, + "respawn_anchor_works": false, + "ultrawarm": false +} \ No newline at end of file diff --git a/src/main/resources/data/ad_astra/dimension_type/mercury_orbit.json b/src/main/resources/data/ad_astra/dimension_type/mercury_orbit.json new file mode 100644 index 0000000..f6d6282 --- /dev/null +++ b/src/main/resources/data/ad_astra/dimension_type/mercury_orbit.json @@ -0,0 +1,25 @@ +{ + "ambient_light": 0.0, + "bed_works": true, + "coordinate_scale": 1.0, + "effects": "ad_astra:mercury_orbit", + "has_ceiling": false, + "has_raids": false, + "has_skylight": true, + "height": 512, + "infiniburn": "#minecraft:infiniburn_overworld", + "logical_height": 512, + "min_y": -64, + "monster_spawn_block_light_limit": 0, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 0 + } + }, + "natural": true, + "piglin_safe": false, + "respawn_anchor_works": false, + "ultrawarm": false +} \ No newline at end of file diff --git a/src/main/resources/data/ad_astra/dimension_type/moon.json b/src/main/resources/data/ad_astra/dimension_type/moon.json new file mode 100644 index 0000000..8bf60c1 --- /dev/null +++ b/src/main/resources/data/ad_astra/dimension_type/moon.json @@ -0,0 +1,25 @@ +{ + "ambient_light": 0.0, + "bed_works": true, + "coordinate_scale": 1.0, + "effects": "ad_astra:moon", + "has_ceiling": false, + "has_raids": false, + "has_skylight": true, + "height": 2096, + "infiniburn": "#minecraft:infiniburn_overworld", + "logical_height": 2096, + "min_y": -64, + "monster_spawn_block_light_limit": 0, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 0 + } + }, + "natural": true, + "piglin_safe": false, + "respawn_anchor_works": false, + "ultrawarm": false +} \ No newline at end of file diff --git a/src/main/resources/data/ad_astra/dimension_type/moon_orbit.json b/src/main/resources/data/ad_astra/dimension_type/moon_orbit.json new file mode 100644 index 0000000..0e0ed78 --- /dev/null +++ b/src/main/resources/data/ad_astra/dimension_type/moon_orbit.json @@ -0,0 +1,25 @@ +{ + "ambient_light": 0.0, + "bed_works": true, + "coordinate_scale": 1.0, + "effects": "ad_astra:moon_orbit", + "has_ceiling": false, + "has_raids": false, + "has_skylight": true, + "height": 512, + "infiniburn": "#minecraft:infiniburn_overworld", + "logical_height": 512, + "min_y": -64, + "monster_spawn_block_light_limit": 0, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 0 + } + }, + "natural": true, + "piglin_safe": false, + "respawn_anchor_works": false, + "ultrawarm": false +} \ No newline at end of file diff --git a/src/main/resources/data/ad_astra/dimension_type/venus.json b/src/main/resources/data/ad_astra/dimension_type/venus.json new file mode 100644 index 0000000..418bed5 --- /dev/null +++ b/src/main/resources/data/ad_astra/dimension_type/venus.json @@ -0,0 +1,25 @@ +{ + "ambient_light": 0.0, + "bed_works": true, + "coordinate_scale": 1.0, + "effects": "ad_astra:venus", + "has_ceiling": false, + "has_raids": false, + "has_skylight": true, + "height": 2096, + "infiniburn": "#minecraft:infiniburn_overworld", + "logical_height": 2096, + "min_y": -64, + "monster_spawn_block_light_limit": 0, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 0 + } + }, + "natural": true, + "piglin_safe": true, + "respawn_anchor_works": false, + "ultrawarm": false +} \ No newline at end of file diff --git a/src/main/resources/data/ad_astra/dimension_type/venus_orbit.json b/src/main/resources/data/ad_astra/dimension_type/venus_orbit.json new file mode 100644 index 0000000..29a7c23 --- /dev/null +++ b/src/main/resources/data/ad_astra/dimension_type/venus_orbit.json @@ -0,0 +1,25 @@ +{ + "ambient_light": 0.0, + "bed_works": true, + "coordinate_scale": 1.0, + "effects": "ad_astra:venus_orbit", + "has_ceiling": false, + "has_raids": false, + "has_skylight": true, + "height": 512, + "infiniburn": "#minecraft:infiniburn_overworld", + "logical_height": 512, + "min_y": -64, + "monster_spawn_block_light_limit": 0, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 0 + } + }, + "natural": true, + "piglin_safe": false, + "respawn_anchor_works": false, + "ultrawarm": false +} \ No newline at end of file diff --git a/src/main/resources/data/amethyst_imbuement/recipes/optional/glistering_tome.json b/src/main/resources/data/amethyst_imbuement/recipes/optional/glistering_tome.json deleted file mode 100644 index e604fc6..0000000 --- a/src/main/resources/data/amethyst_imbuement/recipes/optional/glistering_tome.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "fabric:load_conditions": [ - { - "condition": "fabric:all_mods_loaded", - "values": [ - "patchouli" - ] - }, - { - "condition": "amethyst_imbuement:enabled", - "id": "optional/glistering_tome" - } - ], - - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:book" - }, - { - "item": "minecraft:amethyst_shard" - } - ], - "result": { - "item": "amethyst_imbuement:glistering_tome" - } - } - \ No newline at end of file diff --git a/src/main/resources/data/celestium/functions/cheatchest.mcfunction b/src/main/resources/data/celestium/functions/cheatchest.mcfunction deleted file mode 100644 index 0eb686a..0000000 --- a/src/main/resources/data/celestium/functions/cheatchest.mcfunction +++ /dev/null @@ -1 +0,0 @@ -give @p minecraft:white_shulker_box{display:{Name:'{"text":"End Game"}'},BlockEntityTag:{Items:[{Slot:0b,id:"minecraft:netherite_helmet",Count:1b,tag:{Enchantments:[{lvl:1,id:"mending"},{lvl:3,id:"unbreaking"},{lvl:4,id:"protection"},{lvl:4,id:"blast_protection"},{lvl:4,id:"fire_protection"},{lvl:4,id:"projectile_protection"},{lvl:1,id:"aqua_affinity"},{lvl:3,id:"respiration"}]}},{Slot:1b,id:"minecraft:netherite_leggings",Count:1b,tag:{Enchantments:[{lvl:1,id:"mending"},{lvl:3,id:"unbreaking"},{lvl:4,id:"protection"},{lvl:4,id:"blast_protection"},{lvl:4,id:"fire_protection"},{lvl:4,id:"projectile_protection"}]}},{Slot:2b,id:"minecraft:netherite_sword",Count:1b,tag:{Enchantments:[{lvl:1,id:"mending"},{lvl:3,id:"unbreaking"},{lvl:5,id:"sharpness"},{lvl:5,id:"smite"},{lvl:5,id:"bane_of_arthropods"},{lvl:2,id:"fire_aspect"},{lvl:2,id:"knockback"},{lvl:3,id:"looting"}]}},{Slot:3b,id:"minecraft:netherite_pickaxe",Count:1b,tag:{Enchantments:[{lvl:1,id:"mending"},{lvl:3,id:"unbreaking"},{lvl:5,id:"efficiency"},{lvl:1,id:"silk_touch"}]}},{Slot:4b,id:"minecraft:trident",Count:1b,tag:{Enchantments:[{lvl:1,id:"mending"},{lvl:3,id:"unbreaking"},{lvl:5,id:"loyalty"}]}},{Slot:5b,id:"minecraft:golden_carrot",Count:64b},{Slot:6b,id:"minecraft:golden_carrot",Count:64b},{Slot:7b,id:"minecraft:golden_carrot",Count:64b},{Slot:8b,id:"minecraft:golden_carrot",Count:64b},{Slot:9b,id:"minecraft:netherite_chestplate",Count:1b,tag:{Enchantments:[{lvl:1,id:"mending"},{lvl:3,id:"unbreaking"},{lvl:4,id:"protection"},{lvl:4,id:"blast_protection"},{lvl:4,id:"fire_protection"},{lvl:4,id:"projectile_protection"}]}},{Slot:10b,id:"minecraft:netherite_boots",Count:1b,tag:{Enchantments:[{lvl:1,id:"mending"},{lvl:3,id:"unbreaking"},{lvl:4,id:"protection"},{lvl:4,id:"blast_protection"},{lvl:4,id:"fire_protection"},{lvl:4,id:"projectile_protection"},{lvl:4,id:"feather_falling"},{lvl:3,id:"depth_strider"},{lvl:3,id:"soul_speed"}]}},{Slot:11b,id:"minecraft:netherite_axe",Count:1b,tag:{Enchantments:[{lvl:1,id:"mending"},{lvl:3,id:"unbreaking"},{lvl:5,id:"sharpness"},{lvl:5,id:"smite"},{lvl:5,id:"bane_of_arthropods"},{lvl:5,id:"efficiency"}]}},{Slot:12b,id:"minecraft:netherite_pickaxe",Count:1b,tag:{Enchantments:[{lvl:1,id:"mending"},{lvl:3,id:"unbreaking"},{lvl:5,id:"efficiency"},{lvl:3,id:"fortune"}]}},{Slot:13b,id:"minecraft:water_bucket",Count:1b},{Slot:14b,id:"minecraft:firework_rocket",Count:64b,tag:{Fireworks:{Flight:3}}},{Slot:15b,id:"minecraft:firework_rocket",Count:64b,tag:{Fireworks:{Flight:3}}},{Slot:16b,id:"minecraft:firework_rocket",Count:64b,tag:{Fireworks:{Flight:3}}},{Slot:17b,id:"minecraft:firework_rocket",Count:64b,tag:{Fireworks:{Flight:3}}},{Slot:18b,id:"minecraft:elytra",Count:1b,tag:{Enchantments:[{lvl:1,id:"mending"},{lvl:3,id:"unbreaking"}]}},{Slot:19b,id:"minecraft:shield",Count:1b,tag:{Enchantments:[{lvl:1,id:"mending"},{lvl:3,id:"unbreaking"}],BlockEntityTag:{Patterns:[{Pattern:"flo",Color:4},{Pattern:"mc",Color:0}]}}},{Slot:20b,id:"minecraft:netherite_shovel",Count:1b,tag:{Enchantments:[{lvl:1,id:"mending"},{lvl:3,id:"unbreaking"},{lvl:5,id:"efficiency"}]}},{Slot:21b,id:"minecraft:netherite_axe",Count:1b,tag:{Enchantments:[{lvl:1,id:"mending"},{lvl:3,id:"unbreaking"},{lvl:5,id:"power"},{lvl:2,id:"punch"},{lvl:1,id:"infinity"},{lvl:1,id:"flame"}]}},{Slot:23b,id:"minecraft:cobblestone",Count:64b},{Slot:24b,id:"minecraft:cobblestone",Count:64b},{Slot:25b,id:"minecraft:cobblestone",Count:64b},{Slot:26b,id:"minecraft:cobblestone",Count:64b}]}} 1 \ No newline at end of file diff --git a/src/main/resources/data/celestium/functions/freecash.mcfunction b/src/main/resources/data/celestium/functions/freecash.mcfunction index de85247..824d26e 100644 --- a/src/main/resources/data/celestium/functions/freecash.mcfunction +++ b/src/main/resources/data/celestium/functions/freecash.mcfunction @@ -1,2 +1,2 @@ tellraw @a {"text":"Free cash!","bold":true,"color":"dark_green","hoverEvent":{"action":"show_text","contents":[{"text":"Thanks Obama.","italic":true,"color":"dark_purple"}]}} -give @a diamond 8 \ No newline at end of file +give @a celestianeconomy:small_nothing 9 \ No newline at end of file diff --git a/src/main/resources/data/celestium/functions/time.mcfunction b/src/main/resources/data/celestium/functions/time.mcfunction index c84b442..a4eeb2b 100644 --- a/src/main/resources/data/celestium/functions/time.mcfunction +++ b/src/main/resources/data/celestium/functions/time.mcfunction @@ -1,2 +1,2 @@ -tellraw @a {"text":"The time has come...","bold":true,"italic":true,"color":"dark_purple","hoverEvent":{"action":"show_text","contents":[{"text":"It truly has.","italic":true,"color":"dark_purple"}]}} +tellraw @a {"text":"It's Time...","bold":true,"italic":true,"color":"dark_purple","hoverEvent":{"action":"show_text","contents":[{"text":"...for... uh... ","italic":true,"color":"dark_purple"},{"text":"something™","italic":true,"color":"black"}]}} give @a clock 1 \ No newline at end of file diff --git a/src/main/resources/data/minecraft/dimension_type/overworld.json b/src/main/resources/data/minecraft/dimension_type/overworld.json new file mode 100644 index 0000000..cb88d44 --- /dev/null +++ b/src/main/resources/data/minecraft/dimension_type/overworld.json @@ -0,0 +1,25 @@ +{ + "ultrawarm": false, + "natural": true, + "piglin_safe": false, + "respawn_anchor_works": false, + "bed_works": true, + "has_raids": true, + "has_skylight": true, + "has_ceiling": false, + "coordinate_scale": 1, + "ambient_light": 0, + "logical_height": 2096, + "effects": "minecraft:overworld", + "infiniburn": "#minecraft:infiniburn_overworld", + "min_y": -64, + "height": 2096, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 7 + } + }, + "monster_spawn_block_light_limit": 0 +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/dimension_type/overworld_caves.json b/src/main/resources/data/minecraft/dimension_type/overworld_caves.json new file mode 100644 index 0000000..e282288 --- /dev/null +++ b/src/main/resources/data/minecraft/dimension_type/overworld_caves.json @@ -0,0 +1,25 @@ +{ + "ultrawarm": false, + "natural": true, + "piglin_safe": false, + "respawn_anchor_works": false, + "bed_works": true, + "has_raids": true, + "has_skylight": true, + "has_ceiling": true, + "coordinate_scale": 1, + "ambient_light": 0, + "logical_height": 2096, + "effects": "minecraft:overworld", + "infiniburn": "#minecraft:infiniburn_overworld", + "min_y": -64, + "height": 2096, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 7 + } + }, + "monster_spawn_block_light_limit": 0 +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/dimension_type/the_end.json b/src/main/resources/data/minecraft/dimension_type/the_end.json new file mode 100644 index 0000000..24b7744 --- /dev/null +++ b/src/main/resources/data/minecraft/dimension_type/the_end.json @@ -0,0 +1,26 @@ +{ + "ambient_light": 0.0, + "bed_works": false, + "coordinate_scale": 1.0, + "effects": "minecraft:the_end", + "fixed_time": 6000, + "has_ceiling": false, + "has_raids": true, + "has_skylight": false, + "height": 2032, + "infiniburn": "#minecraft:infiniburn_end", + "logical_height": 2032, + "min_y": 0, + "monster_spawn_block_light_limit": 0, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 0 + } + }, + "natural": false, + "piglin_safe": false, + "respawn_anchor_works": false, + "ultrawarm": false +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/dimension_type/the_nether.json b/src/main/resources/data/minecraft/dimension_type/the_nether.json new file mode 100644 index 0000000..6eeb73c --- /dev/null +++ b/src/main/resources/data/minecraft/dimension_type/the_nether.json @@ -0,0 +1,20 @@ +{ + "ambient_light": 0.1, + "bed_works": false, + "coordinate_scale": 8.0, + "effects": "minecraft:the_nether", + "fixed_time": 18000, + "has_ceiling": true, + "has_raids": false, + "has_skylight": false, + "height": 2032, + "infiniburn": "#minecraft:infiniburn_nether", + "logical_height": 128, + "min_y": 0, + "monster_spawn_block_light_limit": 15, + "monster_spawn_light_level": 11, + "natural": false, + "piglin_safe": true, + "respawn_anchor_works": true, + "ultrawarm": true +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/loot_tables/blocks/blackstone.json b/src/main/resources/data/minecraft/loot_tables/blocks/blackstone.json deleted file mode 100644 index edad135..0000000 --- a/src/main/resources/data/minecraft/loot_tables/blocks/blackstone.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:blackstone" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:blocks/blackstone" -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/functions/load.json b/src/main/resources/data/minecraft/tags/functions/load.json deleted file mode 100644 index a0844a9..0000000 --- a/src/main/resources/data/minecraft/tags/functions/load.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - -] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/functions/tick.json b/src/main/resources/data/minecraft/tags/functions/tick.json deleted file mode 100644 index 3994eb4..0000000 --- a/src/main/resources/data/minecraft/tags/functions/tick.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - - ] -} \ No newline at end of file diff --git a/src/main/resources/data/tardis_refined/recipes/amethyst_screwdriver.json b/src/main/resources/data/tardis_refined/recipes/amethyst_screwdriver.json new file mode 100644 index 0000000..66849c3 --- /dev/null +++ b/src/main/resources/data/tardis_refined/recipes/amethyst_screwdriver.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "A": { + "item": "minecraft:amethyst_shard" + }, + "B": { + "item": "ad_astra:glacian_button" + }, + "L": { + "item": "minecraft:lapis_lazuli" + }, + "R": { + "item": "minecraft:blaze_rod" + } + }, + "pattern": [ + " A ", + "BR ", + " L " + ], + "result": { + "item": "tardis_refined:amethyst_screwdriver" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 6faf35c..1e46675 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,11 +5,10 @@ "name": "Celestium", "description": "For things that mods can't coordinate, and reading.", "authors": [ - "Gæmer", - "CosmoOrSth" + "Gæmer" ], "contact": { - "sources": "https://github.com/BigSmithy/Celestium" + "sources": "https://git.bigsmithy.org/Smithy/Celestium" }, "license": "CC0-1.0", "icon": "assets/celestium/icon.png", @@ -17,8 +16,6 @@ "entrypoints": { "main": [ "com.smithy.Celestium" - ], - "client": [ ] }, "mixins": [ @@ -28,7 +25,7 @@ "fabricloader": ">=0.14.21", "minecraft": "~1.20.1", "java": ">=17", - "fabric-api": "*" + "fabric": ">=0.92.1+1.20.1" }, "suggests": {