diff --git a/gradle.properties b/gradle.properties index 44044e7..c5b7f7f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.20.1 yarn_mappings=1.20.1+build.10 loader_version=0.18.3 # Mod Properties -mod_version=26.2.11 +mod_version=26.2.12 maven_group=dev.tggamesyt archives_base_name=szar # Dependencies diff --git a/run/saves/New World/DIM-1/data/raids.dat b/run/saves/New World/DIM-1/data/raids.dat deleted file mode 100644 index 77af614..0000000 Binary files a/run/saves/New World/DIM-1/data/raids.dat and /dev/null differ diff --git a/run/saves/New World/DIM1/data/raids_end.dat b/run/saves/New World/DIM1/data/raids_end.dat deleted file mode 100644 index 77af614..0000000 Binary files a/run/saves/New World/DIM1/data/raids_end.dat and /dev/null differ diff --git a/run/saves/New World/advancements/20bbb23e-2f22-46ba-b201-c6bd435b445b.json b/run/saves/New World/advancements/20bbb23e-2f22-46ba-b201-c6bd435b445b.json deleted file mode 100644 index 37c87c0..0000000 --- a/run/saves/New World/advancements/20bbb23e-2f22-46ba-b201-c6bd435b445b.json +++ /dev/null @@ -1,521 +0,0 @@ -{ - "minecraft:recipes/decorations/crafting_table": { - "criteria": { - "unlock_right_away": "2026-02-05 17:01:21 +0100" - }, - "done": true - }, - "minecraft:adventure/adventuring_time": { - "criteria": { - "minecraft:birch_forest": "2026-02-05 17:04:33 +0100", - "minecraft:beach": "2026-02-05 17:05:10 +0100", - "minecraft:river": "2026-02-05 17:05:52 +0100", - "minecraft:cold_ocean": "2026-02-05 17:04:44 +0100", - "minecraft:forest": "2026-02-05 17:04:32 +0100", - "minecraft:desert": "2026-02-05 17:05:29 +0100", - "minecraft:jungle": "2026-02-05 17:05:54 +0100", - "minecraft:flower_forest": "2026-02-05 17:01:23 +0100", - "minecraft:plains": "2026-02-05 17:01:32 +0100" - }, - "done": false - }, - "minecraft:adventure/root": { - "criteria": { - "killed_something": "2026-02-05 17:02:43 +0100" - }, - "done": true - }, - "szar:two_towers_explosion": { - "criteria": { - "boom": "2026-02-05 17:02:44 +0100" - }, - "done": true - }, - "minecraft:recipes/food/cooked_beef_from_smoking": { - "criteria": { - "has_beef": "2026-02-06 15:41:21 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/chest": { - "criteria": { - "has_lots_of_items": "2026-02-06 15:41:21 +0100" - }, - "done": true - }, - "minecraft:recipes/food/cooked_beef": { - "criteria": { - "has_beef": "2026-02-06 15:41:21 +0100" - }, - "done": true - }, - "minecraft:recipes/food/cooked_beef_from_campfire_cooking": { - "criteria": { - "has_beef": "2026-02-06 15:41:21 +0100" - }, - "done": true - }, - "minecraft:husbandry/root": { - "criteria": { - "consumed_item": "2026-02-07 19:50:35 +0100" - }, - "done": true - }, - "minecraft:recipes/food/cake": { - "criteria": { - "has_egg": "2026-02-07 19:51:11 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/glow_item_frame": { - "criteria": { - "has_glow_ink_sac": "2026-02-07 19:56:17 +0100" - }, - "done": true - }, - "minecraft:recipes/combat/diamond_leggings": { - "criteria": { - "has_diamond": "2026-02-08 13:23:09 +0100" - }, - "done": true - }, - "minecraft:recipes/combat/diamond_sword": { - "criteria": { - "has_diamond": "2026-02-08 13:23:09 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/jukebox": { - "criteria": { - "has_diamond": "2026-02-08 13:23:09 +0100" - }, - "done": true - }, - "minecraft:recipes/combat/diamond_chestplate": { - "criteria": { - "has_diamond": "2026-02-08 13:23:09 +0100" - }, - "done": true - }, - "minecraft:recipes/combat/diamond_helmet": { - "criteria": { - "has_diamond": "2026-02-08 13:23:09 +0100" - }, - "done": true - }, - "minecraft:recipes/tools/diamond_pickaxe": { - "criteria": { - "has_diamond": "2026-02-08 13:23:09 +0100" - }, - "done": true - }, - "minecraft:recipes/building_blocks/diamond_block": { - "criteria": { - "has_diamond": "2026-02-08 13:23:09 +0100" - }, - "done": true - }, - "minecraft:recipes/tools/diamond_hoe": { - "criteria": { - "has_diamond": "2026-02-08 13:23:09 +0100" - }, - "done": true - }, - "minecraft:recipes/tools/diamond_shovel": { - "criteria": { - "has_diamond": "2026-02-08 13:23:09 +0100" - }, - "done": true - }, - "minecraft:story/mine_diamond": { - "criteria": { - "diamond": "2026-02-08 13:23:09 +0100" - }, - "done": true - }, - "minecraft:recipes/tools/diamond_axe": { - "criteria": { - "has_diamond": "2026-02-08 13:23:09 +0100" - }, - "done": true - }, - "minecraft:recipes/combat/diamond_boots": { - "criteria": { - "has_diamond": "2026-02-08 13:23:09 +0100" - }, - "done": true - }, - "minecraft:recipes/misc/book": { - "criteria": { - "has_paper": "2026-02-08 13:53:49 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/cartography_table": { - "criteria": { - "has_paper": "2026-02-08 13:53:49 +0100" - }, - "done": true - }, - "minecraft:recipes/food/cooked_porkchop": { - "criteria": { - "has_porkchop": "2026-02-08 14:18:03 +0100" - }, - "done": true - }, - "minecraft:recipes/food/cooked_porkchop_from_campfire_cooking": { - "criteria": { - "has_porkchop": "2026-02-08 14:18:03 +0100" - }, - "done": true - }, - "minecraft:recipes/food/cooked_porkchop_from_smoking": { - "criteria": { - "has_porkchop": "2026-02-08 14:18:03 +0100" - }, - "done": true - }, - "minecraft:story/root": { - "criteria": { - "crafting_table": "2026-02-08 14:20:29 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/lantern": { - "criteria": { - "has_iron_nugget": "2026-02-08 14:20:34 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/chain": { - "criteria": { - "has_iron_nugget": "2026-02-08 14:20:34 +0100" - }, - "done": true - }, - "minecraft:recipes/misc/iron_ingot_from_nuggets": { - "criteria": { - "has_iron_nugget": "2026-02-08 14:20:34 +0100" - }, - "done": true - }, - "minecraft:recipes/misc/firework_rocket_simple": { - "criteria": { - "has_gunpowder": "2026-02-08 14:20:38 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/tnt": { - "criteria": { - "has_gunpowder": "2026-02-08 14:20:38 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/redstone_torch": { - "criteria": { - "has_redstone": "2026-02-08 14:20:45 +0100" - }, - "done": true - }, - "minecraft:recipes/tools/clock": { - "criteria": { - "has_redstone": "2026-02-08 14:20:45 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/dropper": { - "criteria": { - "has_redstone": "2026-02-08 14:20:45 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/redstone_block": { - "criteria": { - "has_redstone": "2026-02-08 14:20:45 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/note_block": { - "criteria": { - "has_redstone": "2026-02-08 14:20:45 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/target": { - "criteria": { - "has_redstone": "2026-02-08 14:20:45 +0100" - }, - "done": true - }, - "minecraft:recipes/tools/compass": { - "criteria": { - "has_redstone": "2026-02-08 14:20:45 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/piston": { - "criteria": { - "has_redstone": "2026-02-08 14:20:45 +0100" - }, - "done": true - }, - "minecraft:recipes/misc/iron_ingot_from_iron_block": { - "criteria": { - "has_iron_block": "2026-02-08 14:20:50 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/anvil": { - "criteria": { - "has_iron_block": "2026-02-08 14:20:50 +0100" - }, - "done": true - }, - "minecraft:recipes/building_blocks/oak_slab": { - "criteria": { - "has_planks": "2026-02-08 14:20:56 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/oak_sign": { - "criteria": { - "has_planks": "2026-02-08 14:20:56 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/oak_trapdoor": { - "criteria": { - "has_planks": "2026-02-08 14:20:56 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/oak_fence_gate": { - "criteria": { - "has_planks": "2026-02-08 14:20:56 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/oak_pressure_plate": { - "criteria": { - "has_planks": "2026-02-08 14:20:56 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/oak_door": { - "criteria": { - "has_planks": "2026-02-08 14:20:56 +0100" - }, - "done": true - }, - "minecraft:recipes/misc/stick": { - "criteria": { - "has_planks": "2026-02-08 14:20:56 +0100" - }, - "done": true - }, - "minecraft:recipes/building_blocks/oak_stairs": { - "criteria": { - "has_planks": "2026-02-08 14:20:56 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/oak_fence": { - "criteria": { - "has_planks": "2026-02-08 14:20:56 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/barrel": { - "criteria": { - "has_planks": "2026-02-08 14:20:56 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/oak_button": { - "criteria": { - "has_planks": "2026-02-08 14:20:56 +0100" - }, - "done": true - }, - "minecraft:recipes/combat/leather_helmet": { - "criteria": { - "has_leather": "2026-02-08 14:21:19 +0100" - }, - "done": true - }, - "minecraft:recipes/combat/leather_leggings": { - "criteria": { - "has_leather": "2026-02-08 14:21:19 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/item_frame": { - "criteria": { - "has_leather": "2026-02-08 14:21:19 +0100" - }, - "done": true - }, - "minecraft:recipes/combat/leather_chestplate": { - "criteria": { - "has_leather": "2026-02-08 14:21:19 +0100" - }, - "done": true - }, - "minecraft:recipes/combat/leather_boots": { - "criteria": { - "has_leather": "2026-02-08 14:21:19 +0100" - }, - "done": true - }, - "minecraft:recipes/misc/leather_horse_armor": { - "criteria": { - "has_leather": "2026-02-08 14:21:19 +0100" - }, - "done": true - }, - "minecraft:recipes/food/cooked_mutton_from_smoking": { - "criteria": { - "has_mutton": "2026-02-08 14:26:03 +0100" - }, - "done": true - }, - "minecraft:recipes/food/cooked_mutton": { - "criteria": { - "has_mutton": "2026-02-08 14:26:03 +0100" - }, - "done": true - }, - "minecraft:recipes/food/cooked_mutton_from_campfire_cooking": { - "criteria": { - "has_mutton": "2026-02-08 14:26:03 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/painting": { - "criteria": { - "has_wool": "2026-02-08 14:26:05 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/pink_bed": { - "criteria": { - "has_pink_wool": "2026-02-08 14:26:05 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/pink_carpet": { - "criteria": { - "has_pink_wool": "2026-02-08 14:26:05 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/pink_banner": { - "criteria": { - "has_pink_wool": "2026-02-08 14:26:05 +0100" - }, - "done": true - }, - "minecraft:recipes/misc/charcoal": { - "criteria": { - "has_log": "2026-02-09 14:04:19 +0100" - }, - "done": true - }, - "minecraft:recipes/building_blocks/oak_planks": { - "criteria": { - "has_logs": "2026-02-09 14:04:19 +0100" - }, - "done": true - }, - "minecraft:recipes/building_blocks/oak_wood": { - "criteria": { - "has_log": "2026-02-09 14:04:19 +0100" - }, - "done": true - }, - "minecraft:recipes/transportation/mangrove_boat": { - "criteria": { - "in_water": "2026-02-09 14:04:35 +0100" - }, - "done": true - }, - "minecraft:recipes/transportation/acacia_boat": { - "criteria": { - "in_water": "2026-02-09 14:04:35 +0100" - }, - "done": true - }, - "minecraft:recipes/transportation/cherry_boat": { - "criteria": { - "in_water": "2026-02-09 14:04:35 +0100" - }, - "done": true - }, - "minecraft:recipes/transportation/bamboo_raft": { - "criteria": { - "in_water": "2026-02-09 14:04:35 +0100" - }, - "done": true - }, - "minecraft:recipes/transportation/spruce_boat": { - "criteria": { - "in_water": "2026-02-09 14:04:35 +0100" - }, - "done": true - }, - "minecraft:recipes/transportation/birch_boat": { - "criteria": { - "in_water": "2026-02-09 14:04:35 +0100" - }, - "done": true - }, - "minecraft:recipes/transportation/oak_boat": { - "criteria": { - "in_water": "2026-02-09 14:04:35 +0100" - }, - "done": true - }, - "minecraft:recipes/transportation/jungle_boat": { - "criteria": { - "in_water": "2026-02-09 14:04:35 +0100" - }, - "done": true - }, - "minecraft:recipes/transportation/dark_oak_boat": { - "criteria": { - "in_water": "2026-02-09 14:04:35 +0100" - }, - "done": true - }, - "minecraft:recipes/misc/white_dye": { - "criteria": { - "has_bone_meal": "2026-02-09 14:09:53 +0100" - }, - "done": true - }, - "minecraft:recipes/building_blocks/bone_block": { - "criteria": { - "has_bone_meal": "2026-02-09 14:09:53 +0100" - }, - "done": true - }, - "minecraft:recipes/transportation/detector_rail": { - "criteria": { - "has_rail": "2026-02-09 14:15:11 +0100" - }, - "done": true - }, - "minecraft:recipes/transportation/activator_rail": { - "criteria": { - "has_rail": "2026-02-09 14:15:11 +0100" - }, - "done": true - }, - "minecraft:recipes/transportation/powered_rail": { - "criteria": { - "has_rail": "2026-02-09 14:15:11 +0100" - }, - "done": true - }, - "DataVersion": 3465 -} \ No newline at end of file diff --git a/run/saves/New World/data/fabricRegistry.dat b/run/saves/New World/data/fabricRegistry.dat deleted file mode 100644 index 10a601a..0000000 Binary files a/run/saves/New World/data/fabricRegistry.dat and /dev/null differ diff --git a/run/saves/New World/data/fabricRegistry.dat.1 b/run/saves/New World/data/fabricRegistry.dat.1 deleted file mode 100644 index 10a601a..0000000 Binary files a/run/saves/New World/data/fabricRegistry.dat.1 and /dev/null differ diff --git a/run/saves/New World/data/fabricRegistry.dat.2 b/run/saves/New World/data/fabricRegistry.dat.2 deleted file mode 100644 index 10a601a..0000000 Binary files a/run/saves/New World/data/fabricRegistry.dat.2 and /dev/null differ diff --git a/run/saves/New World/data/idcounts.dat b/run/saves/New World/data/idcounts.dat deleted file mode 100644 index 7a341b6..0000000 Binary files a/run/saves/New World/data/idcounts.dat and /dev/null differ diff --git a/run/saves/New World/data/map_0.dat b/run/saves/New World/data/map_0.dat deleted file mode 100644 index e7770b0..0000000 Binary files a/run/saves/New World/data/map_0.dat and /dev/null differ diff --git a/run/saves/New World/data/map_1.dat b/run/saves/New World/data/map_1.dat deleted file mode 100644 index e7770b0..0000000 Binary files a/run/saves/New World/data/map_1.dat and /dev/null differ diff --git a/run/saves/New World/data/map_2.dat b/run/saves/New World/data/map_2.dat deleted file mode 100644 index e7770b0..0000000 Binary files a/run/saves/New World/data/map_2.dat and /dev/null differ diff --git a/run/saves/New World/data/map_3.dat b/run/saves/New World/data/map_3.dat deleted file mode 100644 index e7770b0..0000000 Binary files a/run/saves/New World/data/map_3.dat and /dev/null differ diff --git a/run/saves/New World/data/raids.dat b/run/saves/New World/data/raids.dat deleted file mode 100644 index 77af614..0000000 Binary files a/run/saves/New World/data/raids.dat and /dev/null differ diff --git a/run/saves/New World/data/random_sequences.dat b/run/saves/New World/data/random_sequences.dat deleted file mode 100644 index 4f70df3..0000000 Binary files a/run/saves/New World/data/random_sequences.dat and /dev/null differ diff --git a/run/saves/New World/entities/r.-1.-1.mca b/run/saves/New World/entities/r.-1.-1.mca deleted file mode 100644 index 017b97f..0000000 Binary files a/run/saves/New World/entities/r.-1.-1.mca and /dev/null differ diff --git a/run/saves/New World/entities/r.-1.-2.mca b/run/saves/New World/entities/r.-1.-2.mca deleted file mode 100644 index 7a46ea8..0000000 Binary files a/run/saves/New World/entities/r.-1.-2.mca and /dev/null differ diff --git a/run/saves/New World/entities/r.-1.0.mca b/run/saves/New World/entities/r.-1.0.mca deleted file mode 100644 index a2b869e..0000000 Binary files a/run/saves/New World/entities/r.-1.0.mca and /dev/null differ diff --git a/run/saves/New World/entities/r.-2.-1.mca b/run/saves/New World/entities/r.-2.-1.mca deleted file mode 100644 index 2341f31..0000000 Binary files a/run/saves/New World/entities/r.-2.-1.mca and /dev/null differ diff --git a/run/saves/New World/entities/r.-2.-2.mca b/run/saves/New World/entities/r.-2.-2.mca deleted file mode 100644 index 1623fc1..0000000 Binary files a/run/saves/New World/entities/r.-2.-2.mca and /dev/null differ diff --git a/run/saves/New World/entities/r.-2.0.mca b/run/saves/New World/entities/r.-2.0.mca deleted file mode 100644 index 6662bd0..0000000 Binary files a/run/saves/New World/entities/r.-2.0.mca and /dev/null differ diff --git a/run/saves/New World/entities/r.-4.4.mca b/run/saves/New World/entities/r.-4.4.mca deleted file mode 100644 index e3967ce..0000000 Binary files a/run/saves/New World/entities/r.-4.4.mca and /dev/null differ diff --git a/run/saves/New World/entities/r.-4.5.mca b/run/saves/New World/entities/r.-4.5.mca deleted file mode 100644 index eed9d56..0000000 Binary files a/run/saves/New World/entities/r.-4.5.mca and /dev/null differ diff --git a/run/saves/New World/entities/r.-5.4.mca b/run/saves/New World/entities/r.-5.4.mca deleted file mode 100644 index eaef696..0000000 Binary files a/run/saves/New World/entities/r.-5.4.mca and /dev/null differ diff --git a/run/saves/New World/entities/r.-5.5.mca b/run/saves/New World/entities/r.-5.5.mca deleted file mode 100644 index 08f58c3..0000000 Binary files a/run/saves/New World/entities/r.-5.5.mca and /dev/null differ diff --git a/run/saves/New World/entities/r.0.-1.mca b/run/saves/New World/entities/r.0.-1.mca deleted file mode 100644 index ce305ef..0000000 Binary files a/run/saves/New World/entities/r.0.-1.mca and /dev/null differ diff --git a/run/saves/New World/entities/r.0.0.mca b/run/saves/New World/entities/r.0.0.mca deleted file mode 100644 index 5b69837..0000000 Binary files a/run/saves/New World/entities/r.0.0.mca and /dev/null differ diff --git a/run/saves/New World/entities/r.1.-1.mca b/run/saves/New World/entities/r.1.-1.mca deleted file mode 100644 index a4b626d..0000000 Binary files a/run/saves/New World/entities/r.1.-1.mca and /dev/null differ diff --git a/run/saves/New World/entities/r.1.0.mca b/run/saves/New World/entities/r.1.0.mca deleted file mode 100644 index 2e10159..0000000 Binary files a/run/saves/New World/entities/r.1.0.mca and /dev/null differ diff --git a/run/saves/New World/icon.png b/run/saves/New World/icon.png deleted file mode 100644 index 9e50586..0000000 Binary files a/run/saves/New World/icon.png and /dev/null differ diff --git a/run/saves/New World/level.dat b/run/saves/New World/level.dat deleted file mode 100644 index 2263d09..0000000 Binary files a/run/saves/New World/level.dat and /dev/null differ diff --git a/run/saves/New World/level.dat_old b/run/saves/New World/level.dat_old deleted file mode 100644 index 7abf2c1..0000000 Binary files a/run/saves/New World/level.dat_old and /dev/null differ diff --git a/run/saves/New World/playerdata/20bbb23e-2f22-46ba-b201-c6bd435b445b.dat b/run/saves/New World/playerdata/20bbb23e-2f22-46ba-b201-c6bd435b445b.dat deleted file mode 100644 index 58f229f..0000000 Binary files a/run/saves/New World/playerdata/20bbb23e-2f22-46ba-b201-c6bd435b445b.dat and /dev/null differ diff --git a/run/saves/New World/playerdata/20bbb23e-2f22-46ba-b201-c6bd435b445b.dat_old b/run/saves/New World/playerdata/20bbb23e-2f22-46ba-b201-c6bd435b445b.dat_old deleted file mode 100644 index c16fb76..0000000 Binary files a/run/saves/New World/playerdata/20bbb23e-2f22-46ba-b201-c6bd435b445b.dat_old and /dev/null differ diff --git a/run/saves/New World/poi/r.-1.-1.mca b/run/saves/New World/poi/r.-1.-1.mca deleted file mode 100644 index 0b7e203..0000000 Binary files a/run/saves/New World/poi/r.-1.-1.mca and /dev/null differ diff --git a/run/saves/New World/poi/r.-1.-2.mca b/run/saves/New World/poi/r.-1.-2.mca deleted file mode 100644 index b253823..0000000 Binary files a/run/saves/New World/poi/r.-1.-2.mca and /dev/null differ diff --git a/run/saves/New World/poi/r.-1.0.mca b/run/saves/New World/poi/r.-1.0.mca deleted file mode 100644 index c383436..0000000 Binary files a/run/saves/New World/poi/r.-1.0.mca and /dev/null differ diff --git a/run/saves/New World/poi/r.-2.-1.mca b/run/saves/New World/poi/r.-2.-1.mca deleted file mode 100644 index d8382b3..0000000 Binary files a/run/saves/New World/poi/r.-2.-1.mca and /dev/null differ diff --git a/run/saves/New World/poi/r.-2.-2.mca b/run/saves/New World/poi/r.-2.-2.mca deleted file mode 100644 index e69de29..0000000 diff --git a/run/saves/New World/poi/r.-2.0.mca b/run/saves/New World/poi/r.-2.0.mca deleted file mode 100644 index e69de29..0000000 diff --git a/run/saves/New World/poi/r.-4.4.mca b/run/saves/New World/poi/r.-4.4.mca deleted file mode 100644 index 3608597..0000000 Binary files a/run/saves/New World/poi/r.-4.4.mca and /dev/null differ diff --git a/run/saves/New World/poi/r.-4.5.mca b/run/saves/New World/poi/r.-4.5.mca deleted file mode 100644 index 4cc5865..0000000 Binary files a/run/saves/New World/poi/r.-4.5.mca and /dev/null differ diff --git a/run/saves/New World/poi/r.-5.4.mca b/run/saves/New World/poi/r.-5.4.mca deleted file mode 100644 index a9e52b1..0000000 Binary files a/run/saves/New World/poi/r.-5.4.mca and /dev/null differ diff --git a/run/saves/New World/poi/r.-5.5.mca b/run/saves/New World/poi/r.-5.5.mca deleted file mode 100644 index e69de29..0000000 diff --git a/run/saves/New World/poi/r.0.-1.mca b/run/saves/New World/poi/r.0.-1.mca deleted file mode 100644 index 3a516e9..0000000 Binary files a/run/saves/New World/poi/r.0.-1.mca and /dev/null differ diff --git a/run/saves/New World/poi/r.0.-2.mca b/run/saves/New World/poi/r.0.-2.mca deleted file mode 100644 index e69de29..0000000 diff --git a/run/saves/New World/poi/r.0.0.mca b/run/saves/New World/poi/r.0.0.mca deleted file mode 100644 index 3614878..0000000 Binary files a/run/saves/New World/poi/r.0.0.mca and /dev/null differ diff --git a/run/saves/New World/poi/r.1.-1.mca b/run/saves/New World/poi/r.1.-1.mca deleted file mode 100644 index e69de29..0000000 diff --git a/run/saves/New World/poi/r.1.-2.mca b/run/saves/New World/poi/r.1.-2.mca deleted file mode 100644 index e69de29..0000000 diff --git a/run/saves/New World/poi/r.1.0.mca b/run/saves/New World/poi/r.1.0.mca deleted file mode 100644 index e69de29..0000000 diff --git a/run/saves/New World/region/r.-1.-1.mca b/run/saves/New World/region/r.-1.-1.mca deleted file mode 100644 index f8612cd..0000000 Binary files a/run/saves/New World/region/r.-1.-1.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-1.-2.mca b/run/saves/New World/region/r.-1.-2.mca deleted file mode 100644 index 455af07..0000000 Binary files a/run/saves/New World/region/r.-1.-2.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-1.0.mca b/run/saves/New World/region/r.-1.0.mca deleted file mode 100644 index 310716d..0000000 Binary files a/run/saves/New World/region/r.-1.0.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-1.1.mca b/run/saves/New World/region/r.-1.1.mca deleted file mode 100644 index e69de29..0000000 diff --git a/run/saves/New World/region/r.-2.-1.mca b/run/saves/New World/region/r.-2.-1.mca deleted file mode 100644 index f9729bd..0000000 Binary files a/run/saves/New World/region/r.-2.-1.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-2.-2.mca b/run/saves/New World/region/r.-2.-2.mca deleted file mode 100644 index 5ddd7ad..0000000 Binary files a/run/saves/New World/region/r.-2.-2.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-2.0.mca b/run/saves/New World/region/r.-2.0.mca deleted file mode 100644 index 16b330f..0000000 Binary files a/run/saves/New World/region/r.-2.0.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-3.3.mca b/run/saves/New World/region/r.-3.3.mca deleted file mode 100644 index 89b5302..0000000 Binary files a/run/saves/New World/region/r.-3.3.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-3.4.mca b/run/saves/New World/region/r.-3.4.mca deleted file mode 100644 index 5518957..0000000 Binary files a/run/saves/New World/region/r.-3.4.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-3.5.mca b/run/saves/New World/region/r.-3.5.mca deleted file mode 100644 index 8312884..0000000 Binary files a/run/saves/New World/region/r.-3.5.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-4.3.mca b/run/saves/New World/region/r.-4.3.mca deleted file mode 100644 index b7d9c7b..0000000 Binary files a/run/saves/New World/region/r.-4.3.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-4.4.mca b/run/saves/New World/region/r.-4.4.mca deleted file mode 100644 index e28d802..0000000 Binary files a/run/saves/New World/region/r.-4.4.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-4.5.mca b/run/saves/New World/region/r.-4.5.mca deleted file mode 100644 index 9577b53..0000000 Binary files a/run/saves/New World/region/r.-4.5.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-5.3.mca b/run/saves/New World/region/r.-5.3.mca deleted file mode 100644 index e794556..0000000 Binary files a/run/saves/New World/region/r.-5.3.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-5.4.mca b/run/saves/New World/region/r.-5.4.mca deleted file mode 100644 index 47c6dd6..0000000 Binary files a/run/saves/New World/region/r.-5.4.mca and /dev/null differ diff --git a/run/saves/New World/region/r.-5.5.mca b/run/saves/New World/region/r.-5.5.mca deleted file mode 100644 index c31b57b..0000000 Binary files a/run/saves/New World/region/r.-5.5.mca and /dev/null differ diff --git a/run/saves/New World/region/r.0.-1.mca b/run/saves/New World/region/r.0.-1.mca deleted file mode 100644 index 89f013b..0000000 Binary files a/run/saves/New World/region/r.0.-1.mca and /dev/null differ diff --git a/run/saves/New World/region/r.0.-2.mca b/run/saves/New World/region/r.0.-2.mca deleted file mode 100644 index 39e6dae..0000000 Binary files a/run/saves/New World/region/r.0.-2.mca and /dev/null differ diff --git a/run/saves/New World/region/r.0.0.mca b/run/saves/New World/region/r.0.0.mca deleted file mode 100644 index a66ea48..0000000 Binary files a/run/saves/New World/region/r.0.0.mca and /dev/null differ diff --git a/run/saves/New World/region/r.0.1.mca b/run/saves/New World/region/r.0.1.mca deleted file mode 100644 index e69de29..0000000 diff --git a/run/saves/New World/region/r.1.-1.mca b/run/saves/New World/region/r.1.-1.mca deleted file mode 100644 index 870fcfe..0000000 Binary files a/run/saves/New World/region/r.1.-1.mca and /dev/null differ diff --git a/run/saves/New World/region/r.1.-2.mca b/run/saves/New World/region/r.1.-2.mca deleted file mode 100644 index d4dedca..0000000 Binary files a/run/saves/New World/region/r.1.-2.mca and /dev/null differ diff --git a/run/saves/New World/region/r.1.0.mca b/run/saves/New World/region/r.1.0.mca deleted file mode 100644 index 5407caa..0000000 Binary files a/run/saves/New World/region/r.1.0.mca and /dev/null differ diff --git a/run/saves/New World/region/r.1.1.mca b/run/saves/New World/region/r.1.1.mca deleted file mode 100644 index eca8933..0000000 Binary files a/run/saves/New World/region/r.1.1.mca and /dev/null differ diff --git a/run/saves/New World/region/r.2.-1.mca b/run/saves/New World/region/r.2.-1.mca deleted file mode 100644 index 048f80c..0000000 Binary files a/run/saves/New World/region/r.2.-1.mca and /dev/null differ diff --git a/run/saves/New World/region/r.2.-2.mca b/run/saves/New World/region/r.2.-2.mca deleted file mode 100644 index e69de29..0000000 diff --git a/run/saves/New World/region/r.2.0.mca b/run/saves/New World/region/r.2.0.mca deleted file mode 100644 index 8b8ee28..0000000 Binary files a/run/saves/New World/region/r.2.0.mca and /dev/null differ diff --git a/run/saves/New World/region/r.2.1.mca b/run/saves/New World/region/r.2.1.mca deleted file mode 100644 index e69de29..0000000 diff --git a/run/saves/New World/session.lock b/run/saves/New World/session.lock deleted file mode 100644 index 0d7e5f8..0000000 --- a/run/saves/New World/session.lock +++ /dev/null @@ -1 +0,0 @@ -☃ \ No newline at end of file diff --git a/run/saves/New World/stats/20bbb23e-2f22-46ba-b201-c6bd435b445b.json b/run/saves/New World/stats/20bbb23e-2f22-46ba-b201-c6bd435b445b.json deleted file mode 100644 index badcd60..0000000 --- a/run/saves/New World/stats/20bbb23e-2f22-46ba-b201-c6bd435b445b.json +++ /dev/null @@ -1 +0,0 @@ -{"stats":{"minecraft:killed":{"minecraft:wolf":1,"minecraft:pig":8,"szar:nazi":56,"minecraft:salmon":8,"szar:nyan_cat":30,"minecraft:cod":19,"minecraft:squid":4,"szar:epstein":13,"minecraft:sheep":25,"szar:hitler":10,"minecraft:bee":12,"minecraft:chicken":6,"szar:islam_terrorist":1,"minecraft:turtle":2,"minecraft:villager":4,"minecraft:cow":15},"minecraft:used":{"minecraft:flint_and_steel":2,"szar:nigger_spawn_egg":2,"minecraft:dispenser":1,"minecraft:oak_planks":117,"szar:cannabis":2,"szar:nazi_spawn_egg":2,"szar:terrorist_spawn_egg":3,"szar:niggerite_sword":19,"szar:chemical_workbench":2,"szar:pop_tart":97,"szar:police_spawn_egg":2,"szar:cigany":2,"minecraft:dirt":9,"szar:epstein_spawn_egg":13,"minecraft:rail":6,"minecraft:crafting_table":1,"minecraft:birch_sign":13,"szar:fasz":2,"szar:nyan_cat_spawn_egg":33,"szar:hitler_spawn_egg":3,"minecraft:oak_log":72,"szar:gypsy_spawn_egg":2,"minecraft:villager_spawn_egg":4,"minecraft:command_block":13,"minecraft:grass_block":62,"minecraft:barrier":57,"minecraft:oak_button":12,"minecraft:stone_button":1,"szar:niggerite_block":1,"minecraft:hopper_minecart":7,"minecraft:item_frame":40,"minecraft:written_book":2,"minecraft:wolf_spawn_egg":1,"minecraft:repeating_command_block":1,"minecraft:bone_meal":1,"minecraft:jukebox":7},"minecraft:picked_up":{"minecraft:barrier":1,"minecraft:glow_ink_sac":4,"szar:terrorist_spawn_egg":3,"minecraft:pink_wool":1,"szar:nigger_spawn_egg":1,"szar:hitler_spawn_egg":3,"szar:weed":1,"minecraft:dirt":151,"minecraft:cooked_mutton":2,"minecraft:item_frame":3,"szar:chemical_workbench":1,"minecraft:wheat_seeds":9,"szar:epstein_files":16,"minecraft:beef":4,"szar:niggerite_block":1,"minecraft:written_book":27,"szar:bullet":781,"szar:police_key":4,"minecraft:egg":19,"szar:niggerite_hoe":1,"szar:niggerite_axe":1,"szar:niggerite_shovel":1,"szar:police_spawn_egg":1,"szar:pop_tart":1213,"szar:niggerite_leggings":1,"minecraft:porkchop":2,"szar:niggerite_ingot":2,"szar:ak47":11,"szar:cannabis":1,"szar:nyan_cat_spawn_egg":65,"szar:niggerite_pickaxe":1,"minecraft:diamond":1,"szar:epstein_spawn_egg":1,"szar:niggerite_chestplate":1,"szar:niggerite_helmet":1,"szar:niggerite_sword":1,"szar:niggerite_boots":1,"szar:weed_joint":1,"minecraft:oak_button":2,"minecraft:mutton":2,"szar:police_handcuff":1},"minecraft:dropped":{"szar:cannabis":1,"szar:niggerite_helmet":1,"szar:niggerite_leggings":1,"szar:niggerite_axe":1,"szar:epstein_files":3,"minecraft:wheat_seeds":2,"szar:pop_tart":1166,"szar:niggerite_sword":1,"szar:niggerite_pickaxe":1,"szar:niggerite_hoe":1,"szar:chemical_workbench":1,"minecraft:barrier":1,"minecraft:oak_planks":1,"minecraft:item_frame":1,"szar:niggerite_block":1,"szar:niggerite_chestplate":1,"szar:police_key":1,"szar:niggerite_boots":1,"szar:weed_joint":1,"szar:weed":1,"szar:police_handcuff":1,"szar:niggerite_shovel":1},"minecraft:custom":{"minecraft:mob_kills":216,"minecraft:play_record":80,"minecraft:interact_with_crafting_table":2,"minecraft:leave_game":11,"minecraft:time_since_death":115215,"minecraft:climb_one_cm":2,"minecraft:time_since_rest":115253,"minecraft:sprint_one_cm":59105,"minecraft:damage_taken":1670,"minecraft:walk_one_cm":169479,"minecraft:drop":44,"minecraft:damage_dealt":2102,"minecraft:talked_to_villager":8,"minecraft:fly_one_cm":1112756,"minecraft:crouch_one_cm":10562,"minecraft:play_time":128975,"minecraft:deaths":5,"minecraft:sneak_time":4560,"minecraft:jump":560,"minecraft:walk_on_water_one_cm":83,"minecraft:total_world_time":174769,"minecraft:fall_one_cm":12366,"minecraft:inspect_dispenser":3},"minecraft:mined":{"minecraft:grass":1},"minecraft:killed_by":{"szar:islam_terrorist":1,"szar:nazi":3}},"DataVersion":3465} \ No newline at end of file diff --git a/run/saves/szar/advancements/20bbb23e-2f22-46ba-b201-c6bd435b445b.json b/run/saves/szar/advancements/20bbb23e-2f22-46ba-b201-c6bd435b445b.json deleted file mode 100644 index 614c753..0000000 --- a/run/saves/szar/advancements/20bbb23e-2f22-46ba-b201-c6bd435b445b.json +++ /dev/null @@ -1,177 +0,0 @@ -{ - "minecraft:recipes/decorations/blast_furnace": { - "criteria": { - "has_smooth_stone": "2026-02-05 16:54:34 +0100" - }, - "done": true - }, - "minecraft:recipes/building_blocks/oak_slab": { - "criteria": { - "has_planks": "2026-02-05 16:54:37 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/oak_sign": { - "criteria": { - "has_planks": "2026-02-05 16:54:37 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/oak_trapdoor": { - "criteria": { - "has_planks": "2026-02-05 16:54:37 +0100" - }, - "done": true - }, - "minecraft:recipes/misc/book": { - "criteria": { - "has_paper": "2026-02-05 16:42:10 +0100" - }, - "done": true - }, - "minecraft:recipes/misc/white_dye": { - "criteria": { - "has_bone_meal": "2026-02-05 16:54:17 +0100" - }, - "done": true - }, - "minecraft:recipes/misc/sugar_from_sugar_cane": { - "criteria": { - "has_sugar_cane": "2026-02-05 16:55:06 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/oak_fence_gate": { - "criteria": { - "has_planks": "2026-02-05 16:54:37 +0100" - }, - "done": true - }, - "szar:nwordpass": { - "criteria": { - "used_item": "2026-02-05 16:59:48 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/oak_pressure_plate": { - "criteria": { - "has_planks": "2026-02-05 16:54:37 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/oak_door": { - "criteria": { - "has_planks": "2026-02-05 16:54:37 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/crafting_table": { - "criteria": { - "unlock_right_away": "2026-02-05 16:42:10 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/chest": { - "criteria": { - "has_lots_of_items": "2026-02-05 16:42:10 +0100" - }, - "done": true - }, - "minecraft:recipes/misc/stick": { - "criteria": { - "has_planks": "2026-02-05 16:54:37 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/dispenser": { - "criteria": { - "has_bow": "2026-02-05 16:42:10 +0100" - }, - "done": true - }, - "minecraft:recipes/building_blocks/emerald_block": { - "criteria": { - "has_emerald": "2026-02-05 16:55:04 +0100" - }, - "done": true - }, - "minecraft:recipes/building_blocks/oak_stairs": { - "criteria": { - "has_planks": "2026-02-05 16:54:37 +0100" - }, - "done": true - }, - "minecraft:adventure/root": { - "criteria": { - "killed_something": "2026-02-05 16:52:41 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/oak_fence": { - "criteria": { - "has_planks": "2026-02-05 16:54:37 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/cartography_table": { - "criteria": { - "has_paper": "2026-02-05 16:42:10 +0100" - }, - "done": true - }, - "minecraft:adventure/adventuring_time": { - "criteria": { - "minecraft:plains": "2026-02-05 16:42:11 +0100" - }, - "done": false - }, - "minecraft:recipes/decorations/barrel": { - "criteria": { - "has_planks": "2026-02-05 16:54:37 +0100" - }, - "done": true - }, - "minecraft:recipes/building_blocks/smooth_stone_slab": { - "criteria": { - "has_smooth_stone": "2026-02-05 16:54:34 +0100" - }, - "done": true - }, - "minecraft:husbandry/root": { - "criteria": { - "consumed_item": "2026-02-05 16:58:27 +0100" - }, - "done": true - }, - "minecraft:adventure/trade": { - "criteria": { - "traded": "2026-02-05 16:55:10 +0100" - }, - "done": true - }, - "minecraft:recipes/building_blocks/smooth_stone_slab_from_smooth_stone_stonecutting": { - "criteria": { - "has_smooth_stone": "2026-02-05 16:54:34 +0100" - }, - "done": true - }, - "minecraft:recipes/misc/paper": { - "criteria": { - "has_reeds": "2026-02-05 16:55:06 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/oak_button": { - "criteria": { - "has_planks": "2026-02-05 16:54:37 +0100" - }, - "done": true - }, - "minecraft:recipes/building_blocks/bone_block": { - "criteria": { - "has_bone_meal": "2026-02-05 16:54:17 +0100" - }, - "done": true - }, - "DataVersion": 3465 -} \ No newline at end of file diff --git a/run/saves/szar/advancements/29c791a6-b421-3f40-ad2b-613924f9b1c3.json b/run/saves/szar/advancements/29c791a6-b421-3f40-ad2b-613924f9b1c3.json deleted file mode 100644 index 6da1136..0000000 --- a/run/saves/szar/advancements/29c791a6-b421-3f40-ad2b-613924f9b1c3.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "minecraft:recipes/misc/book": { - "criteria": { - "has_paper": "2026-02-05 16:21:34 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/crafting_table": { - "criteria": { - "unlock_right_away": "2026-02-05 16:21:34 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/chest": { - "criteria": { - "has_lots_of_items": "2026-02-05 16:21:34 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/dispenser": { - "criteria": { - "has_bow": "2026-02-05 16:21:34 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/cartography_table": { - "criteria": { - "has_paper": "2026-02-05 16:21:34 +0100" - }, - "done": true - }, - "minecraft:adventure/adventuring_time": { - "criteria": { - "minecraft:plains": "2026-02-05 16:21:35 +0100" - }, - "done": false - }, - "DataVersion": 3465 -} \ No newline at end of file diff --git a/run/saves/szar/advancements/75998694-2bae-3280-972d-d76ffee01fa1.json b/run/saves/szar/advancements/75998694-2bae-3280-972d-d76ffee01fa1.json deleted file mode 100644 index fa56482..0000000 --- a/run/saves/szar/advancements/75998694-2bae-3280-972d-d76ffee01fa1.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "minecraft:recipes/misc/book": { - "criteria": { - "has_paper": "2026-02-05 15:40:52 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/crafting_table": { - "criteria": { - "unlock_right_away": "2026-02-05 15:40:52 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/chest": { - "criteria": { - "has_lots_of_items": "2026-02-05 15:40:52 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/dispenser": { - "criteria": { - "has_bow": "2026-02-05 15:40:52 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/cartography_table": { - "criteria": { - "has_paper": "2026-02-05 15:40:52 +0100" - }, - "done": true - }, - "minecraft:adventure/adventuring_time": { - "criteria": { - "minecraft:plains": "2026-02-05 15:41:25 +0100" - }, - "done": false - }, - "DataVersion": 3465 -} \ No newline at end of file diff --git a/run/saves/szar/advancements/c91a898e-0266-33ea-a80c-5a1fbebd3113.json b/run/saves/szar/advancements/c91a898e-0266-33ea-a80c-5a1fbebd3113.json deleted file mode 100644 index d67b7fc..0000000 --- a/run/saves/szar/advancements/c91a898e-0266-33ea-a80c-5a1fbebd3113.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "minecraft:recipes/misc/book": { - "criteria": { - "has_paper": "2026-02-05 16:06:30 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/crafting_table": { - "criteria": { - "unlock_right_away": "2026-02-05 16:06:30 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/chest": { - "criteria": { - "has_lots_of_items": "2026-02-05 16:06:30 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/dispenser": { - "criteria": { - "has_bow": "2026-02-05 16:06:30 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/cartography_table": { - "criteria": { - "has_paper": "2026-02-05 16:06:30 +0100" - }, - "done": true - }, - "minecraft:adventure/adventuring_time": { - "criteria": { - "minecraft:plains": "2026-02-05 16:08:22 +0100" - }, - "done": false - }, - "DataVersion": 3465 -} \ No newline at end of file diff --git a/run/saves/szar/advancements/fe4bc08c-19e6-3b63-ba18-653e7a90e84a.json b/run/saves/szar/advancements/fe4bc08c-19e6-3b63-ba18-653e7a90e84a.json deleted file mode 100644 index dc67076..0000000 --- a/run/saves/szar/advancements/fe4bc08c-19e6-3b63-ba18-653e7a90e84a.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "minecraft:recipes/misc/book": { - "criteria": { - "has_paper": "2026-02-05 16:33:17 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/crafting_table": { - "criteria": { - "unlock_right_away": "2026-02-05 16:33:17 +0100" - }, - "done": true - }, - "minecraft:recipes/decorations/chest": { - "criteria": { - "has_lots_of_items": "2026-02-05 16:33:17 +0100" - }, - "done": true - }, - "minecraft:recipes/redstone/dispenser": { - "criteria": { - "has_bow": "2026-02-05 16:33:17 +0100" - }, - "done": true - }, - "minecraft:adventure/root": { - "criteria": { - "killed_something": "2026-02-05 16:33:28 +0100" - }, - "done": true - }, - "minecraft:adventure/kill_all_mobs": { - "criteria": { - "minecraft:zombie": "2026-02-05 16:33:38 +0100" - }, - "done": false - }, - "minecraft:recipes/decorations/cartography_table": { - "criteria": { - "has_paper": "2026-02-05 16:33:17 +0100" - }, - "done": true - }, - "minecraft:adventure/kill_a_mob": { - "criteria": { - "minecraft:zombie": "2026-02-05 16:33:38 +0100" - }, - "done": true - }, - "minecraft:adventure/adventuring_time": { - "criteria": { - "minecraft:plains": "2026-02-05 16:33:18 +0100" - }, - "done": false - }, - "DataVersion": 3465 -} \ No newline at end of file diff --git a/run/saves/szar/data/random_sequences.dat b/run/saves/szar/data/random_sequences.dat deleted file mode 100644 index 6846884..0000000 Binary files a/run/saves/szar/data/random_sequences.dat and /dev/null differ diff --git a/run/saves/szar/playerdata/20bbb23e-2f22-46ba-b201-c6bd435b445b.dat b/run/saves/szar/playerdata/20bbb23e-2f22-46ba-b201-c6bd435b445b.dat deleted file mode 100644 index 6b30ea5..0000000 Binary files a/run/saves/szar/playerdata/20bbb23e-2f22-46ba-b201-c6bd435b445b.dat and /dev/null differ diff --git a/run/saves/szar/playerdata/20bbb23e-2f22-46ba-b201-c6bd435b445b.dat_old b/run/saves/szar/playerdata/20bbb23e-2f22-46ba-b201-c6bd435b445b.dat_old deleted file mode 100644 index b93657f..0000000 Binary files a/run/saves/szar/playerdata/20bbb23e-2f22-46ba-b201-c6bd435b445b.dat_old and /dev/null differ diff --git a/run/saves/szar/playerdata/29c791a6-b421-3f40-ad2b-613924f9b1c3.dat b/run/saves/szar/playerdata/29c791a6-b421-3f40-ad2b-613924f9b1c3.dat deleted file mode 100644 index b0bd855..0000000 Binary files a/run/saves/szar/playerdata/29c791a6-b421-3f40-ad2b-613924f9b1c3.dat and /dev/null differ diff --git a/run/saves/szar/playerdata/29c791a6-b421-3f40-ad2b-613924f9b1c3.dat_old b/run/saves/szar/playerdata/29c791a6-b421-3f40-ad2b-613924f9b1c3.dat_old deleted file mode 100644 index 79156da..0000000 Binary files a/run/saves/szar/playerdata/29c791a6-b421-3f40-ad2b-613924f9b1c3.dat_old and /dev/null differ diff --git a/run/saves/szar/playerdata/75998694-2bae-3280-972d-d76ffee01fa1.dat b/run/saves/szar/playerdata/75998694-2bae-3280-972d-d76ffee01fa1.dat deleted file mode 100644 index 58bff57..0000000 Binary files a/run/saves/szar/playerdata/75998694-2bae-3280-972d-d76ffee01fa1.dat and /dev/null differ diff --git a/run/saves/szar/playerdata/75998694-2bae-3280-972d-d76ffee01fa1.dat_old b/run/saves/szar/playerdata/75998694-2bae-3280-972d-d76ffee01fa1.dat_old deleted file mode 100644 index fa2b2f8..0000000 Binary files a/run/saves/szar/playerdata/75998694-2bae-3280-972d-d76ffee01fa1.dat_old and /dev/null differ diff --git a/run/saves/szar/playerdata/c91a898e-0266-33ea-a80c-5a1fbebd3113.dat b/run/saves/szar/playerdata/c91a898e-0266-33ea-a80c-5a1fbebd3113.dat deleted file mode 100644 index f449990..0000000 Binary files a/run/saves/szar/playerdata/c91a898e-0266-33ea-a80c-5a1fbebd3113.dat and /dev/null differ diff --git a/run/saves/szar/playerdata/c91a898e-0266-33ea-a80c-5a1fbebd3113.dat_old b/run/saves/szar/playerdata/c91a898e-0266-33ea-a80c-5a1fbebd3113.dat_old deleted file mode 100644 index 47aded9..0000000 Binary files a/run/saves/szar/playerdata/c91a898e-0266-33ea-a80c-5a1fbebd3113.dat_old and /dev/null differ diff --git a/run/saves/szar/playerdata/fe4bc08c-19e6-3b63-ba18-653e7a90e84a.dat b/run/saves/szar/playerdata/fe4bc08c-19e6-3b63-ba18-653e7a90e84a.dat deleted file mode 100644 index eb931a8..0000000 Binary files a/run/saves/szar/playerdata/fe4bc08c-19e6-3b63-ba18-653e7a90e84a.dat and /dev/null differ diff --git a/run/saves/szar/playerdata/fe4bc08c-19e6-3b63-ba18-653e7a90e84a.dat_old b/run/saves/szar/playerdata/fe4bc08c-19e6-3b63-ba18-653e7a90e84a.dat_old deleted file mode 100644 index b4ae26e..0000000 Binary files a/run/saves/szar/playerdata/fe4bc08c-19e6-3b63-ba18-653e7a90e84a.dat_old and /dev/null differ diff --git a/run/saves/szar/stats/20bbb23e-2f22-46ba-b201-c6bd435b445b.json b/run/saves/szar/stats/20bbb23e-2f22-46ba-b201-c6bd435b445b.json deleted file mode 100644 index 7e716c5..0000000 --- a/run/saves/szar/stats/20bbb23e-2f22-46ba-b201-c6bd435b445b.json +++ /dev/null @@ -1 +0,0 @@ -{"stats":{"minecraft:mined":{"szar:tall_cannabis":1},"minecraft:killed":{"szar:nigger":1,"szar:police":1,"szar:nazi":2},"minecraft:picked_up":{"szar:niggerite_ingot":1,"szar:niggerite_sword":1,"szar:cannabis":2},"minecraft:used":{"szar:gypsy_spawn_egg":1,"szar:police_spawn_egg":4,"szar:cigany":1,"szar:nigger_spawn_egg":16,"szar:weed_joint":23,"szar:nazi_spawn_egg":2,"minecraft:milk_bucket":1,"szar:cannabis":9,"szar:fasz":1,"szar:terrorist_spawn_egg":1,"szar:niggerite_sword":2,"szar:chemical_workbench":1,"minecraft:bone_meal":7,"szar:hitler_spawn_egg":2},"minecraft:custom":{"minecraft:time_since_rest":10348,"minecraft:crouch_one_cm":166,"minecraft:walk_one_cm":31330,"minecraft:play_time":10348,"minecraft:sprint_one_cm":8985,"minecraft:damage_taken":165,"minecraft:sneak_time":61,"minecraft:mob_kills":4,"minecraft:jump":62,"minecraft:leave_game":1,"minecraft:damage_dealt":211,"minecraft:time_since_death":10348,"minecraft:fall_one_cm":1045,"minecraft:traded_with_villager":42,"minecraft:total_world_time":22401,"minecraft:talked_to_villager":5,"minecraft:interact_with_crafting_table":3,"minecraft:fly_one_cm":26142},"minecraft:crafted":{"szar:chemical_workbench":1,"minecraft:emerald":10,"minecraft:paper":72,"szar:weed_joint":2,"szar:weed":7,"szar:cannabis":12,"minecraft:air":0}},"DataVersion":3465} \ No newline at end of file diff --git a/run/saves/szar/stats/29c791a6-b421-3f40-ad2b-613924f9b1c3.json b/run/saves/szar/stats/29c791a6-b421-3f40-ad2b-613924f9b1c3.json deleted file mode 100644 index ce548a1..0000000 --- a/run/saves/szar/stats/29c791a6-b421-3f40-ad2b-613924f9b1c3.json +++ /dev/null @@ -1 +0,0 @@ -{"stats":{"minecraft:custom":{"minecraft:jump":3,"minecraft:time_since_rest":2039,"minecraft:play_time":2039,"minecraft:time_since_death":2039,"minecraft:walk_one_cm":2751,"minecraft:sneak_time":87,"minecraft:total_world_time":2100,"minecraft:fly_one_cm":4312}},"DataVersion":3465} \ No newline at end of file diff --git a/run/saves/szar/stats/75998694-2bae-3280-972d-d76ffee01fa1.json b/run/saves/szar/stats/75998694-2bae-3280-972d-d76ffee01fa1.json deleted file mode 100644 index 3a2f019..0000000 --- a/run/saves/szar/stats/75998694-2bae-3280-972d-d76ffee01fa1.json +++ /dev/null @@ -1 +0,0 @@ -{"stats":{"minecraft:custom":{"minecraft:jump":17,"minecraft:time_since_rest":1114,"minecraft:leave_game":1,"minecraft:sprint_one_cm":1293,"minecraft:play_time":1114,"minecraft:time_since_death":1114,"minecraft:walk_one_cm":1172,"minecraft:total_world_time":20990,"minecraft:fall_one_cm":209,"minecraft:fly_one_cm":1903},"minecraft:used":{"minecraft:bow":1}},"DataVersion":3465} \ No newline at end of file diff --git a/run/saves/szar/stats/c91a898e-0266-33ea-a80c-5a1fbebd3113.json b/run/saves/szar/stats/c91a898e-0266-33ea-a80c-5a1fbebd3113.json deleted file mode 100644 index 003de12..0000000 --- a/run/saves/szar/stats/c91a898e-0266-33ea-a80c-5a1fbebd3113.json +++ /dev/null @@ -1 +0,0 @@ -{"stats":{"minecraft:custom":{"minecraft:jump":31,"minecraft:time_since_rest":1324,"minecraft:leave_game":1,"minecraft:sprint_one_cm":1326,"minecraft:play_time":1324,"minecraft:time_since_death":1324,"minecraft:walk_one_cm":1499,"minecraft:sneak_time":8,"minecraft:total_world_time":4961,"minecraft:fall_one_cm":1254,"minecraft:fly_one_cm":3205}},"DataVersion":3465} \ No newline at end of file diff --git a/run/saves/szar/stats/fe4bc08c-19e6-3b63-ba18-653e7a90e84a.json b/run/saves/szar/stats/fe4bc08c-19e6-3b63-ba18-653e7a90e84a.json deleted file mode 100644 index 348816b..0000000 --- a/run/saves/szar/stats/fe4bc08c-19e6-3b63-ba18-653e7a90e84a.json +++ /dev/null @@ -1 +0,0 @@ -{"stats":{"minecraft:picked_up":{"minecraft:sculk_catalyst":1},"minecraft:custom":{"minecraft:jump":11,"minecraft:time_since_rest":3181,"minecraft:leave_game":1,"minecraft:crouch_one_cm":398,"minecraft:damage_taken":10,"minecraft:sprint_one_cm":2566,"minecraft:play_time":3181,"minecraft:time_since_death":3181,"minecraft:walk_one_cm":9579,"minecraft:sneak_time":86,"minecraft:total_world_time":3300,"minecraft:mob_kills":8,"minecraft:drop":1,"minecraft:fall_one_cm":335,"minecraft:fly_one_cm":1557},"minecraft:killed":{"szar:nigger":4,"minecraft:iron_golem":1,"minecraft:warden":2,"minecraft:zombie":1},"minecraft:dropped":{"minecraft:sculk_catalyst":1},"minecraft:used":{"minecraft:grass_block":4}},"DataVersion":3465} \ No newline at end of file diff --git a/src/main/java/dev/tggamesyt/szar/AtomEntity.java b/src/main/java/dev/tggamesyt/szar/AtomEntity.java index 0da45cb..add2244 100644 --- a/src/main/java/dev/tggamesyt/szar/AtomEntity.java +++ b/src/main/java/dev/tggamesyt/szar/AtomEntity.java @@ -11,6 +11,8 @@ import net.minecraft.world.World; public class AtomEntity extends Entity { private static final int NUKE_RADIUS = 100; + private boolean armed = false; + private boolean wasFallingFast = false; public AtomEntity(EntityType type, World world) { super(type, world); } @@ -26,14 +28,31 @@ public class AtomEntity extends Entity { this.setVelocity(this.getVelocity().add(0, -0.08, 0)); } + // Track if it was falling fast enough to count as impact + if (this.getVelocity().y < -0.5) { + wasFallingFast = true; + } + this.move(MovementType.SELF, this.getVelocity()); - if (!getWorld().isClient && this.isOnGround()) { - explode(); - this.discard(); + if (!getWorld().isClient) { + + // 🔥 If on fire, arm it + if (this.isOnFire()) { + armed = true; + } + + // 💥 Explode only if: + // 1. It was falling fast OR + // 2. It is armed + if (this.isOnGround() && (wasFallingFast || armed)) { + explode(); + this.discard(); + } } } + private void explode() { ServerWorld world = (ServerWorld) this.getWorld(); diff --git a/src/main/java/dev/tggamesyt/szar/AtomItem.java b/src/main/java/dev/tggamesyt/szar/AtomItem.java new file mode 100644 index 0000000..9931505 --- /dev/null +++ b/src/main/java/dev/tggamesyt/szar/AtomItem.java @@ -0,0 +1,45 @@ +package dev.tggamesyt.szar; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.entity.EntityType; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; + +public class AtomItem extends Item { + + public AtomItem(Settings settings) { + super(settings); + } + + @Override + public ActionResult useOnBlock(ItemUsageContext context) { + World world = context.getWorld(); + if (world.isClient()) return ActionResult.SUCCESS; + + ServerWorld serverWorld = (ServerWorld) world; + BlockPos pos = context.getBlockPos(); // The block the player clicked + Vec3d spawnPos = Vec3d.ofCenter(pos).add(0, 1, 0); // Spawn 1 block above clicked block + + // Create entity + AtomEntity atom = new AtomEntity(Szar.AtomEntityType, serverWorld); + atom.setPosition(spawnPos.x, spawnPos.y, spawnPos.z); + + // Spawn it + serverWorld.spawnEntity(atom); + + // Damage the item or set cooldown if desired + ItemStack stack = context.getStack(); + stack.damage(1, context.getPlayer(), p -> p.sendToolBreakStatus(context.getHand())); + + return ActionResult.CONSUME; + } +} diff --git a/src/main/java/dev/tggamesyt/szar/AtomSummonerItem.java b/src/main/java/dev/tggamesyt/szar/AtomSummonerItem.java index a2655e7..3c4a5ac 100644 --- a/src/main/java/dev/tggamesyt/szar/AtomSummonerItem.java +++ b/src/main/java/dev/tggamesyt/szar/AtomSummonerItem.java @@ -3,6 +3,7 @@ package dev.tggamesyt.szar; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; @@ -50,13 +51,29 @@ public class AtomSummonerItem extends Item { } BlockPos hitPos = hit.getBlockPos(); - Vec3d spawnPos = Vec3d.ofCenter(hitPos).add(0, 100, 0); + +// Get highest solid block at that X/Z + int topY = serverWorld.getTopY( + net.minecraft.world.Heightmap.Type.WORLD_SURFACE, + hitPos.getX(), + hitPos.getZ() + ); + + BlockPos topPos = new BlockPos(hitPos.getX(), topY, hitPos.getZ()); + + Vec3d spawnPos = Vec3d.ofCenter(topPos).add(0, 100, 0); AtomEntity atom = new AtomEntity(Szar.AtomEntityType, serverWorld); atom.setPosition(spawnPos.x, spawnPos.y, spawnPos.z); + // 🔴 Set armed via NBT + atom.readCustomDataFromNbt(new NbtCompound() {{ + putBoolean("Armed", true); + }}); + serverWorld.spawnEntity(atom); + // Cooldown + durability player.getItemCooldownManager().set(this, COOLDOWN_TICKS); stack.damage(1, player, p -> p.sendToolBreakStatus(hand)); diff --git a/src/main/java/dev/tggamesyt/szar/Szar.java b/src/main/java/dev/tggamesyt/szar/Szar.java index 9e79e67..d7c0501 100644 --- a/src/main/java/dev/tggamesyt/szar/Szar.java +++ b/src/main/java/dev/tggamesyt/szar/Szar.java @@ -93,8 +93,7 @@ public class Szar implements ModInitializer { public static final Block URANIUM_BLOCK = new Block( FabricBlockSettings.create() - .strength(7.0f, 1200.0f) // very hard, bedrock-tier vibe - .requiresTool() + .strength(20.0f, 1200.0f).requiresTool() ); // ConfiguredFeature Key public static final RegistryKey> URANIUM_ORE_KEY = @@ -258,6 +257,10 @@ public class Szar implements ModInitializer { entries.add(Szar.EPSTEIN_SPAWNEGG); entries.add(Szar.ATOM_DETONATOR); entries.add(Szar.URANIUM_ORE); + entries.add(Szar.URANIUM); + entries.add(Szar.URANIUM_ROD); + entries.add(Szar.ATOM_CORE); + entries.add(Szar.ATOM); }) .build() ); @@ -636,6 +639,21 @@ public class Szar implements ModInitializer { new Item.Settings() ) ); + public static final Item URANIUM = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "uranium"), + new Item(new Item.Settings()) + ); + public static final Item URANIUM_ROD = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "uranium_rod"), + new Item(new Item.Settings()) + ); + public static final Item ATOM_CORE = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "nuke_core"), + new Item(new Item.Settings()) + ); public static final Item KEY_ITEM = Registry.register( Registries.ITEM, new Identifier(MOD_ID, "police_key"), @@ -818,6 +836,13 @@ public class Szar implements ModInitializer { new Item.Settings() ) ); + public static final Item ATOM = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "atom"), + new AtomItem( + new Item.Settings() + ) + ); public static final Item NAZI_SPAWNEGG = Registry.register( Registries.ITEM, new Identifier(MOD_ID, "nazi_spawn_egg"), @@ -951,7 +976,7 @@ public class Szar implements ModInitializer { static { ANIMATION_TIMINGS_SECONDS.put(PlaneAnimation.START_ENGINE, 2.2917f); // 2.2917s * 20 ticks - ANIMATION_TIMINGS_SECONDS.put(PlaneAnimation.STOP_ENGINE, 20f); // 2.0s * 20 ticks + ANIMATION_TIMINGS_SECONDS.put(PlaneAnimation.STOP_ENGINE, 2f); // 2.0s * 20 ticks ANIMATION_TIMINGS_SECONDS.put(PlaneAnimation.FLYING, -1f); // looping ANIMATION_TIMINGS_SECONDS.put(PlaneAnimation.LANDING, 2f); // 2.0s * 20 ticks ANIMATION_TIMINGS_SECONDS.put(PlaneAnimation.LAND_STARTED, -1f); // looping diff --git a/src/main/resources/assets/szar/lang/en_us.json b/src/main/resources/assets/szar/lang/en_us.json index acd1dfe..5c0d4e1 100644 --- a/src/main/resources/assets/szar/lang/en_us.json +++ b/src/main/resources/assets/szar/lang/en_us.json @@ -57,5 +57,9 @@ "item.szar.detonator": "Detonator", "entity.szar.atom": "Atom", - "block.szar.uranium_ore": "Uranium Ore" + "block.szar.uranium_ore": "Uranium Ore", + "item.szar.uranium": "Uranium", + "item.szar.uranium_rod": "Uranium Rod", + "item.szar.nuke_core": "Nuke Core", + "item.szar.atom": "Nuke" } diff --git a/src/main/resources/assets/szar/models/item/atom.json b/src/main/resources/assets/szar/models/item/atom.json new file mode 100644 index 0000000..7cd6595 --- /dev/null +++ b/src/main/resources/assets/szar/models/item/atom.json @@ -0,0 +1,179 @@ +{ + "format_version": "1.21.11", + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "0": "szar:item/nuke" + }, + "elements": [ + { + "from": [6, 17, 6], + "to": [10, 19, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, + "faces": { + "north": {"uv": [9, 4.75, 10, 5.25], "texture": "#0"}, + "east": {"uv": [8, 4.75, 9, 5.25], "texture": "#0"}, + "south": {"uv": [11, 4.75, 12, 5.25], "texture": "#0"}, + "west": {"uv": [10, 4.75, 11, 5.25], "texture": "#0"}, + "up": {"uv": [10, 4.75, 9, 3.75], "texture": "#0"}, + "down": {"uv": [11, 3.75, 10, 4.75], "texture": "#0"} + } + }, + { + "from": [5, 15, 5], + "to": [11, 17, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, + "faces": { + "north": {"uv": [1.5, 9, 3, 9.5], "texture": "#0"}, + "east": {"uv": [0, 9, 1.5, 9.5], "texture": "#0"}, + "south": {"uv": [4.5, 9, 6, 9.5], "texture": "#0"}, + "west": {"uv": [3, 9, 4.5, 9.5], "texture": "#0"}, + "up": {"uv": [3, 9, 1.5, 7.5], "texture": "#0"}, + "down": {"uv": [4.5, 7.5, 3, 9], "texture": "#0"} + } + }, + { + "from": [4, 9, 4], + "to": [12, 16, 12], + "rotation": {"x": 0, "y": 0, "z": -180, "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [2, 5.75, 4, 7.5], "texture": "#0"}, + "east": {"uv": [0, 5.75, 2, 7.5], "texture": "#0"}, + "south": {"uv": [6, 5.75, 8, 7.5], "texture": "#0"}, + "west": {"uv": [4, 5.75, 6, 7.5], "texture": "#0"}, + "up": {"uv": [4, 5.75, 2, 3.75], "texture": "#0"}, + "down": {"uv": [6, 3.75, 4, 5.75], "texture": "#0"} + } + }, + { + "from": [7, 19, 7], + "to": [9, 20, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 19, 8]}, + "faces": { + "north": {"uv": [9.5, 10.75, 10, 11], "texture": "#0"}, + "east": {"uv": [9, 10.75, 9.5, 11], "texture": "#0"}, + "south": {"uv": [10.5, 10.75, 11, 11], "texture": "#0"}, + "west": {"uv": [10, 10.75, 10.5, 11], "texture": "#0"}, + "up": {"uv": [10, 10.75, 9.5, 10.25], "texture": "#0"}, + "down": {"uv": [10.5, 10.25, 10, 10.75], "texture": "#0"} + } + }, + { + "from": [5, 7, 5], + "to": [11, 9, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, + "faces": { + "north": {"uv": [7.5, 9, 9, 9.5], "texture": "#0"}, + "east": {"uv": [6, 9, 7.5, 9.5], "texture": "#0"}, + "south": {"uv": [10.5, 9, 12, 9.5], "texture": "#0"}, + "west": {"uv": [9, 9, 10.5, 9.5], "texture": "#0"}, + "up": {"uv": [9, 9, 7.5, 7.5], "texture": "#0"}, + "down": {"uv": [10.5, 7.5, 9, 9], "texture": "#0"} + } + }, + { + "from": [6, 5, 6], + "to": [10, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, + "faces": { + "north": {"uv": [9, 6.25, 10, 6.75], "texture": "#0"}, + "east": {"uv": [8, 6.25, 9, 6.75], "texture": "#0"}, + "south": {"uv": [11, 6.25, 12, 6.75], "texture": "#0"}, + "west": {"uv": [10, 6.25, 11, 6.75], "texture": "#0"}, + "up": {"uv": [10, 6.25, 9, 5.25], "texture": "#0"}, + "down": {"uv": [11, 5.25, 10, 6.25], "texture": "#0"} + } + }, + { + "from": [7, 4, 7], + "to": [9, 5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, + "faces": { + "north": {"uv": [11, 7.25, 11.5, 7.5], "texture": "#0"}, + "east": {"uv": [10.5, 7.25, 11, 7.5], "texture": "#0"}, + "south": {"uv": [12, 7.25, 12.5, 7.5], "texture": "#0"}, + "west": {"uv": [11.5, 7.25, 12, 7.5], "texture": "#0"}, + "up": {"uv": [11.5, 7.25, 11, 6.75], "texture": "#0"}, + "down": {"uv": [12, 6.75, 11.5, 7.25], "texture": "#0"} + } + }, + { + "from": [5, 3, 5], + "to": [6, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 3, 6]}, + "faces": { + "north": {"uv": [0.25, 11, 0.5, 12], "texture": "#0"}, + "east": {"uv": [0, 11, 0.25, 12], "texture": "#0"}, + "south": {"uv": [0.75, 11, 1, 12], "texture": "#0"}, + "west": {"uv": [0.5, 11, 0.75, 12], "texture": "#0"}, + "up": {"uv": [0.5, 11, 0.25, 10.75], "texture": "#0"}, + "down": {"uv": [0.75, 10.75, 0.5, 11], "texture": "#0"} + } + }, + { + "from": [10, 3, 10], + "to": [11, 7, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 3, 11]}, + "faces": { + "north": {"uv": [2.25, 11, 2.5, 12], "texture": "#0"}, + "east": {"uv": [2, 11, 2.25, 12], "texture": "#0"}, + "south": {"uv": [2.75, 11, 3, 12], "texture": "#0"}, + "west": {"uv": [2.5, 11, 2.75, 12], "texture": "#0"}, + "up": {"uv": [2.5, 11, 2.25, 10.75], "texture": "#0"}, + "down": {"uv": [2.75, 10.75, 2.5, 11], "texture": "#0"} + } + }, + { + "from": [10, 3, 5], + "to": [11, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 3, 6]}, + "faces": { + "north": {"uv": [1.25, 11, 1.5, 12], "texture": "#0"}, + "east": {"uv": [1, 11, 1.25, 12], "texture": "#0"}, + "south": {"uv": [1.75, 11, 2, 12], "texture": "#0"}, + "west": {"uv": [1.5, 11, 1.75, 12], "texture": "#0"}, + "up": {"uv": [1.5, 11, 1.25, 10.75], "texture": "#0"}, + "down": {"uv": [1.75, 10.75, 1.5, 11], "texture": "#0"} + } + }, + { + "from": [5, 3, 10], + "to": [6, 7, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 3, 11]}, + "faces": { + "north": {"uv": [3.25, 11, 3.5, 12], "texture": "#0"}, + "east": {"uv": [3, 11, 3.25, 12], "texture": "#0"}, + "south": {"uv": [3.75, 11, 4, 12], "texture": "#0"}, + "west": {"uv": [3.5, 11, 3.75, 12], "texture": "#0"}, + "up": {"uv": [3.5, 11, 3.25, 10.75], "texture": "#0"}, + "down": {"uv": [3.75, 10.75, 3.5, 11], "texture": "#0"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, + "faces": { + "north": {"uv": [3, 3, 6, 3.75], "texture": "#0"}, + "east": {"uv": [0, 3, 3, 3.75], "texture": "#0"}, + "south": {"uv": [9, 3, 12, 3.75], "texture": "#0"}, + "west": {"uv": [6, 3, 9, 3.75], "texture": "#0"}, + "up": {"uv": [6, 3, 3, 0], "texture": "#0"}, + "down": {"uv": [9, 0, 6, 3], "texture": "#0"} + } + }, + { + "from": [6, 3, 6], + "to": [10, 4, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [1, 10.5, 2, 10.75], "texture": "#0"}, + "east": {"uv": [0, 10.5, 1, 10.75], "texture": "#0"}, + "south": {"uv": [3, 10.5, 4, 10.75], "texture": "#0"}, + "west": {"uv": [2, 10.5, 3, 10.75], "texture": "#0"}, + "up": {"uv": [2, 10.5, 1, 9.5], "texture": "#0"}, + "down": {"uv": [3, 9.5, 2, 10.5], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/szar/models/item/nuke_core.json b/src/main/resources/assets/szar/models/item/nuke_core.json new file mode 100644 index 0000000..72f75a7 --- /dev/null +++ b/src/main/resources/assets/szar/models/item/nuke_core.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "szar:item/nuke_core" + } +} diff --git a/src/main/resources/assets/szar/models/item/uranium.json b/src/main/resources/assets/szar/models/item/uranium.json new file mode 100644 index 0000000..5ab9778 --- /dev/null +++ b/src/main/resources/assets/szar/models/item/uranium.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "szar:item/uranium" + } +} diff --git a/src/main/resources/assets/szar/models/item/uranium_rod.json b/src/main/resources/assets/szar/models/item/uranium_rod.json new file mode 100644 index 0000000..42e606b --- /dev/null +++ b/src/main/resources/assets/szar/models/item/uranium_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "szar:item/uranium_rod" + } +} diff --git a/src/main/resources/assets/szar/textures/item/nuke.png b/src/main/resources/assets/szar/textures/item/nuke.png new file mode 100644 index 0000000..691a399 Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/nuke.png differ diff --git a/src/main/resources/assets/szar/textures/item/nuke_core.png b/src/main/resources/assets/szar/textures/item/nuke_core.png new file mode 100644 index 0000000..8fa4f8b Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/nuke_core.png differ diff --git a/src/main/resources/assets/szar/textures/item/uranium.png b/src/main/resources/assets/szar/textures/item/uranium.png new file mode 100644 index 0000000..a3ac653 Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/uranium.png differ diff --git a/src/main/resources/assets/szar/textures/item/uranium_rod.png b/src/main/resources/assets/szar/textures/item/uranium_rod.png new file mode 100644 index 0000000..cbd9e73 Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/uranium_rod.png differ diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_netherite_tool.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/needs_netherite_tool.json rename to src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json diff --git a/src/main/resources/data/szar/loot_tables/blocks/uranium_ore.json b/src/main/resources/data/szar/loot_tables/blocks/uranium_ore.json index 2c2e6a3..56dadab 100644 --- a/src/main/resources/data/szar/loot_tables/blocks/uranium_ore.json +++ b/src/main/resources/data/szar/loot_tables/blocks/uranium_ore.json @@ -5,20 +5,48 @@ "rolls": 1, "entries": [ { - "type": "minecraft:item", - "name": "szar:uranium_ore" - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:netherite_pickaxe" - ] - } + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "szar:uranium_ore", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ], + "items": [ + "minecraft:diamond_pickaxe", + "minecraft:netherite_pickaxe" + ] + } + } + ] + }, + { + "type": "minecraft:item", + "name": "szar:uranium", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:netherite_pickaxe" + ] + } + } + ] + } + ] } ] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/szar/recipes/atom.json b/src/main/resources/data/szar/recipes/atom.json new file mode 100644 index 0000000..f2f8e46 --- /dev/null +++ b/src/main/resources/data/szar/recipes/atom.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "III", + "NNN", + "III" + ], + "key": { + "I": { + "item": "minecraft:iron_block" + }, + "N": { + "item": "szar:nuke_core" + } + }, + "result": { + "item": "szar:atom", + "count": 1 + } +} diff --git a/src/main/resources/data/szar/recipes/detonator.json b/src/main/resources/data/szar/recipes/detonator.json new file mode 100644 index 0000000..28f712c --- /dev/null +++ b/src/main/resources/data/szar/recipes/detonator.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "RRR", + "AAI", + "III" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "A": { + "item": "szar:atom" + }, + "I": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "item": "szar:detonator", + "count": 1 + } +} diff --git a/src/main/resources/data/szar/recipes/nuke_core.json b/src/main/resources/data/szar/recipes/nuke_core.json new file mode 100644 index 0000000..9a9f1f8 --- /dev/null +++ b/src/main/resources/data/szar/recipes/nuke_core.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "TUT", + "UTU", + "TUT" + ], + "key": { + "U": { + "item": "szar:uranium_rod" + }, + "T": { + "item": "minecraft:tnt" + } + }, + "result": { + "item": "szar:nuke_core", + "count": 1 + } +} diff --git a/src/main/resources/data/szar/recipes/uranium.json b/src/main/resources/data/szar/recipes/uranium.json new file mode 100644 index 0000000..670680d --- /dev/null +++ b/src/main/resources/data/szar/recipes/uranium.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "szar:uranium_ore" + }, + "result": "szar:uranium", + "experience": 2.67, + "cookingtime": 200 +} diff --git a/src/main/resources/data/szar/recipes/uranium_rod.json b/src/main/resources/data/szar/recipes/uranium_rod.json new file mode 100644 index 0000000..1058668 --- /dev/null +++ b/src/main/resources/data/szar/recipes/uranium_rod.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " U", + " U ", + "U " + ], + "key": { + "U": { + "item": "szar:uranium" + } + }, + "result": { + "item": "szar:uranium_rod", + "count": 1 + } +} diff --git a/src/main/resources/data/szar/recipes/uranium_rod_1.json b/src/main/resources/data/szar/recipes/uranium_rod_1.json new file mode 100644 index 0000000..10798ef --- /dev/null +++ b/src/main/resources/data/szar/recipes/uranium_rod_1.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "U", + "U", + "U" + ], + "key": { + "U": { + "item": "szar:uranium" + } + }, + "result": { + "item": "szar:uranium_rod", + "count": 1 + } +} diff --git a/src/main/resources/data/szar/recipes/uranium_rod_2.json b/src/main/resources/data/szar/recipes/uranium_rod_2.json new file mode 100644 index 0000000..05f1dd7 --- /dev/null +++ b/src/main/resources/data/szar/recipes/uranium_rod_2.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "U ", + " U ", + " U" + ], + "key": { + "U": { + "item": "szar:uranium" + } + }, + "result": { + "item": "szar:uranium_rod", + "count": 1 + } +}