diff --git a/gradle.properties b/gradle.properties index 06d9320..7ae01a0 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.4.1-downside-up +mod_version=26.4.13 maven_group=dev.tggamesyt archives_base_name=szar # Dependencies diff --git a/run/logs/2026-02-05-1.log.gz b/run/logs/2026-02-05-1.log.gz deleted file mode 100644 index e898004..0000000 Binary files a/run/logs/2026-02-05-1.log.gz and /dev/null differ diff --git a/run/logs/2026-02-05-2.log.gz b/run/logs/2026-02-05-2.log.gz deleted file mode 100644 index 34b2903..0000000 Binary files a/run/logs/2026-02-05-2.log.gz and /dev/null differ diff --git a/run/logs/2026-02-05-3.log.gz b/run/logs/2026-02-05-3.log.gz deleted file mode 100644 index f7e0053..0000000 Binary files a/run/logs/2026-02-05-3.log.gz and /dev/null differ diff --git a/run/logs/2026-02-05-4.log.gz b/run/logs/2026-02-05-4.log.gz deleted file mode 100644 index 2223c95..0000000 Binary files a/run/logs/2026-02-05-4.log.gz and /dev/null differ diff --git a/run/logs/2026-02-05-5.log.gz b/run/logs/2026-02-05-5.log.gz deleted file mode 100644 index ca12878..0000000 Binary files a/run/logs/2026-02-05-5.log.gz and /dev/null differ diff --git a/run/logs/2026-02-05-6.log.gz b/run/logs/2026-02-05-6.log.gz deleted file mode 100644 index b4b7ce3..0000000 Binary files a/run/logs/2026-02-05-6.log.gz and /dev/null differ diff --git a/run/logs/2026-02-05-7.log.gz b/run/logs/2026-02-05-7.log.gz deleted file mode 100644 index 270c71b..0000000 Binary files a/run/logs/2026-02-05-7.log.gz and /dev/null differ diff --git a/run/logs/2026-02-06-1.log.gz b/run/logs/2026-02-06-1.log.gz deleted file mode 100644 index 057744b..0000000 Binary files a/run/logs/2026-02-06-1.log.gz and /dev/null differ diff --git a/run/logs/2026-02-06-2.log.gz b/run/logs/2026-02-06-2.log.gz deleted file mode 100644 index dceb44a..0000000 Binary files a/run/logs/2026-02-06-2.log.gz and /dev/null differ diff --git a/run/logs/2026-02-07-1.log.gz b/run/logs/2026-02-07-1.log.gz deleted file mode 100644 index 531b4ce..0000000 Binary files a/run/logs/2026-02-07-1.log.gz and /dev/null differ diff --git a/run/logs/2026-02-07-2.log.gz b/run/logs/2026-02-07-2.log.gz deleted file mode 100644 index dbf2deb..0000000 Binary files a/run/logs/2026-02-07-2.log.gz and /dev/null differ diff --git a/run/logs/2026-02-07-3.log.gz b/run/logs/2026-02-07-3.log.gz deleted file mode 100644 index 3ac3524..0000000 Binary files a/run/logs/2026-02-07-3.log.gz and /dev/null differ diff --git a/run/logs/2026-02-07-4.log.gz b/run/logs/2026-02-07-4.log.gz deleted file mode 100644 index 61b5743..0000000 Binary files a/run/logs/2026-02-07-4.log.gz and /dev/null differ diff --git a/run/logs/2026-02-07-5.log.gz b/run/logs/2026-02-07-5.log.gz deleted file mode 100644 index 12c0e07..0000000 Binary files a/run/logs/2026-02-07-5.log.gz and /dev/null differ diff --git a/run/logs/2026-02-07-6.log.gz b/run/logs/2026-02-07-6.log.gz deleted file mode 100644 index 01a8023..0000000 Binary files a/run/logs/2026-02-07-6.log.gz and /dev/null differ diff --git a/run/logs/2026-02-08-1.log.gz b/run/logs/2026-02-08-1.log.gz deleted file mode 100644 index bf54217..0000000 Binary files a/run/logs/2026-02-08-1.log.gz and /dev/null differ diff --git a/run/logs/2026-02-08-2.log.gz b/run/logs/2026-02-08-2.log.gz deleted file mode 100644 index 7c59b19..0000000 Binary files a/run/logs/2026-02-08-2.log.gz and /dev/null differ diff --git a/run/logs/2026-02-08-3.log.gz b/run/logs/2026-02-08-3.log.gz deleted file mode 100644 index 9f6ef05..0000000 Binary files a/run/logs/2026-02-08-3.log.gz and /dev/null differ diff --git a/run/logs/2026-02-08-4.log.gz b/run/logs/2026-02-08-4.log.gz deleted file mode 100644 index db73c08..0000000 Binary files a/run/logs/2026-02-08-4.log.gz and /dev/null differ diff --git a/run/logs/2026-02-08-5.log.gz b/run/logs/2026-02-08-5.log.gz deleted file mode 100644 index fda804e..0000000 Binary files a/run/logs/2026-02-08-5.log.gz and /dev/null differ diff --git a/run/logs/2026-02-08-6.log.gz b/run/logs/2026-02-08-6.log.gz deleted file mode 100644 index 304c7da..0000000 Binary files a/run/logs/2026-02-08-6.log.gz and /dev/null differ diff --git a/run/logs/2026-02-09-1.log.gz b/run/logs/2026-02-09-1.log.gz deleted file mode 100644 index 48a5f42..0000000 Binary files a/run/logs/2026-02-09-1.log.gz and /dev/null differ diff --git a/run/logs/debug-1.log.gz b/run/logs/debug-1.log.gz deleted file mode 100644 index 29858e9..0000000 Binary files a/run/logs/debug-1.log.gz and /dev/null differ diff --git a/run/logs/debug-2.log.gz b/run/logs/debug-2.log.gz deleted file mode 100644 index 9a35458..0000000 Binary files a/run/logs/debug-2.log.gz and /dev/null differ diff --git a/run/logs/debug-3.log.gz b/run/logs/debug-3.log.gz deleted file mode 100644 index 2ab31b2..0000000 Binary files a/run/logs/debug-3.log.gz and /dev/null differ diff --git a/run/logs/debug-4.log.gz b/run/logs/debug-4.log.gz deleted file mode 100644 index a994a79..0000000 Binary files a/run/logs/debug-4.log.gz and /dev/null differ diff --git a/run/logs/debug-5.log.gz b/run/logs/debug-5.log.gz deleted file mode 100644 index d512134..0000000 Binary files a/run/logs/debug-5.log.gz and /dev/null differ diff --git a/run/logs/telemetry/20260205-1.json.gz b/run/logs/telemetry/20260205-1.json.gz deleted file mode 100644 index 3d5b9b8..0000000 Binary files a/run/logs/telemetry/20260205-1.json.gz and /dev/null differ diff --git a/run/logs/telemetry/20260206-1.json.gz b/run/logs/telemetry/20260206-1.json.gz deleted file mode 100644 index 4173d34..0000000 Binary files a/run/logs/telemetry/20260206-1.json.gz and /dev/null differ diff --git a/src/main/java/dev/tggamesyt/szar/ObsidianCubeStructure.java b/src/main/java/dev/tggamesyt/szar/ObsidianCubeStructure.java new file mode 100644 index 0000000..2e22851 --- /dev/null +++ b/src/main/java/dev/tggamesyt/szar/ObsidianCubeStructure.java @@ -0,0 +1,65 @@ +package dev.tggamesyt.szar; + +import com.mojang.serialization.Codec; +import net.minecraft.structure.StructurePlacementData; +import net.minecraft.util.BlockRotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; +import net.minecraft.world.Heightmap; +import net.minecraft.world.gen.structure.Structure; +import net.minecraft.world.gen.structure.StructureType; + +import java.util.Optional; + +public class ObsidianCubeStructure extends Structure { + + public static final Codec CODEC = + Structure.createCodec(ObsidianCubeStructure::new); + + public ObsidianCubeStructure(Config config) { + super(config); + } + + @Override + protected Optional getStructurePosition(Context context) { + return Structure.getStructurePosition( + context, + Heightmap.Type.WORLD_SURFACE_WG, + collector -> { + + ChunkPos chunkPos = context.chunkPos(); + int x = chunkPos.getCenterX(); + int z = chunkPos.getCenterZ(); + + int y = context.chunkGenerator().getHeightInGround( + x, z, + Heightmap.Type.WORLD_SURFACE_WG, + context.world(), + context.noiseConfig() + ); + + BlockPos pos = new BlockPos(x, y, z); + + StructurePlacementData placement = + new StructurePlacementData() + .setRotation( + BlockRotation.random(context.random()) + ); + + collector.addPiece( + new ObsidianCubeStructurePiece( + context, + pos, + BlockPos.ORIGIN, + placement + ) + ); + } + ); + } + + @Override + public StructureType getType() { + return Szar.OBSIDIAN_CUBE_TYPE; + } +} \ No newline at end of file diff --git a/src/main/java/dev/tggamesyt/szar/ObsidianCubeStructurePiece.java b/src/main/java/dev/tggamesyt/szar/ObsidianCubeStructurePiece.java new file mode 100644 index 0000000..4cbd848 --- /dev/null +++ b/src/main/java/dev/tggamesyt/szar/ObsidianCubeStructurePiece.java @@ -0,0 +1,49 @@ +package dev.tggamesyt.szar; + +import net.minecraft.nbt.NbtCompound; +import net.minecraft.structure.SimpleStructurePiece; +import net.minecraft.structure.StructureContext; +import net.minecraft.structure.StructurePlacementData; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockBox; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.random.Random; +import net.minecraft.world.ServerWorldAccess; +import net.minecraft.world.gen.structure.Structure; + +public class ObsidianCubeStructurePiece extends SimpleStructurePiece { + + private static final Identifier TEMPLATE_ID = + new Identifier(Szar.MOD_ID, "obsidian_cube"); + + /* ===== NORMAL CONSTRUCTOR ===== */ + public ObsidianCubeStructurePiece( + Structure.Context context, + BlockPos pos, + BlockPos origin, + StructurePlacementData placement + ) { + super( + Szar.OBSIDIAN_CUBE_PIECE, + 0, + context.structureTemplateManager(), + TEMPLATE_ID, + TEMPLATE_ID.toString(), + placement, + pos + ); + } + + /* ===== NBT CONSTRUCTOR ===== */ + public ObsidianCubeStructurePiece(StructureContext context, NbtCompound nbt) { + super( + Szar.OBSIDIAN_CUBE_PIECE, + nbt, + context.structureTemplateManager(), + identifier -> new StructurePlacementData() + ); + } + + @Override + protected void handleMetadata(String metadata, BlockPos pos, ServerWorldAccess world, Random random, BlockBox boundingBox) {} +} \ No newline at end of file diff --git a/src/main/java/dev/tggamesyt/szar/ServerCosmetics.java b/src/main/java/dev/tggamesyt/szar/ServerCosmetics.java index 5cec3b8..656882b 100644 --- a/src/main/java/dev/tggamesyt/szar/ServerCosmetics.java +++ b/src/main/java/dev/tggamesyt/szar/ServerCosmetics.java @@ -23,10 +23,10 @@ public class ServerCosmetics { public static final Identifier MOJANG_CAPES_SYNC = new Identifier(Szar.MOD_ID, "mojang_capes_sync"); private static final String CAPES_URL = - "https://raw.githubusercontent.com/tggamesyt/szar/main/capes.json"; + "https://gitea.tggamesyt.dev/tggamesyt/szar/raw/main/capes.json"; private static final String USERS_URL = - "https://raw.githubusercontent.com/tggamesyt/szar/main/usercosmetics.json"; + "https://gitea.tggamesyt.dev/tggamesyt/szar/raw/main/usercosmetics.json"; public static final Map CAPES = new HashMap<>(); public static final Map USERS = new HashMap<>(); @@ -112,7 +112,7 @@ public class ServerCosmetics { USERS.put(uuid, user); } - Szar.LOGGER.info("Loaded server capes & user cosmetics from GitHub"); + Szar.LOGGER.info("Loaded server capes & user cosmetics from Gitea"); } catch (Exception e) { Szar.LOGGER.error("Failed loading cosmetics", e); diff --git a/src/main/java/dev/tggamesyt/szar/Szar.java b/src/main/java/dev/tggamesyt/szar/Szar.java index 37f5a60..f4e89b1 100644 --- a/src/main/java/dev/tggamesyt/szar/Szar.java +++ b/src/main/java/dev/tggamesyt/szar/Szar.java @@ -1785,7 +1785,19 @@ public class Szar implements ModInitializer { new Identifier(MOD_ID, "island_piece"), IslandStructurePiece::new ); + public static final StructurePieceType OBSIDIAN_CUBE_PIECE = + Registry.register( + Registries.STRUCTURE_PIECE, + new Identifier(MOD_ID, "obsidian_cube_piece"), + ObsidianCubeStructurePiece::new + ); + public static final StructureType OBSIDIAN_CUBE_TYPE = + Registry.register( + Registries.STRUCTURE_TYPE, + new Identifier(MOD_ID, "obsidian_cube"), + () -> ObsidianCubeStructure.CODEC + ); public static final StructureType ISLAND_TYPE = Registry.register( Registries.STRUCTURE_TYPE, diff --git a/src/main/resources/assets/szar/textures/block/ender_obsidian.png b/src/main/resources/assets/szar/textures/block/ender_obsidian.png index 53dabf9..df74176 100644 Binary files a/src/main/resources/assets/szar/textures/block/ender_obsidian.png and b/src/main/resources/assets/szar/textures/block/ender_obsidian.png differ diff --git a/src/main/resources/assets/szar/textures/block/ender_ore.png b/src/main/resources/assets/szar/textures/block/ender_ore.png index 12c8722..34d1b9c 100644 Binary files a/src/main/resources/assets/szar/textures/block/ender_ore.png and b/src/main/resources/assets/szar/textures/block/ender_ore.png differ diff --git a/src/main/resources/assets/szar/textures/item/raw_ender.png b/src/main/resources/assets/szar/textures/item/raw_ender.png index 7664367..1e64e97 100644 Binary files a/src/main/resources/assets/szar/textures/item/raw_ender.png and b/src/main/resources/assets/szar/textures/item/raw_ender.png differ diff --git a/src/main/resources/assets/szar/textures/item/raw_ender_1.png b/src/main/resources/assets/szar/textures/item/raw_ender_1.png deleted file mode 100644 index dcbe535..0000000 Binary files a/src/main/resources/assets/szar/textures/item/raw_ender_1.png and /dev/null differ diff --git a/src/main/resources/data/szar/structures/obsidian_cube.nbt b/src/main/resources/data/szar/structures/obsidian_cube.nbt new file mode 100644 index 0000000..b7397ea Binary files /dev/null and b/src/main/resources/data/szar/structures/obsidian_cube.nbt differ diff --git a/src/main/resources/data/szar/worldgen/structure/obsidian_cube.json b/src/main/resources/data/szar/worldgen/structure/obsidian_cube.json new file mode 100644 index 0000000..9dddae3 --- /dev/null +++ b/src/main/resources/data/szar/worldgen/structure/obsidian_cube.json @@ -0,0 +1,8 @@ +{ + "type": "szar:obsidian_cube", + "biomes": "szar:chorus_forest", + "step": "surface_structures", + "terrain_adaptation": "none", + "spawn_overrides": {}, + "config": {} +} \ No newline at end of file diff --git a/src/main/resources/data/szar/worldgen/structure_set/obsidian_cube.json b/src/main/resources/data/szar/worldgen/structure_set/obsidian_cube.json new file mode 100644 index 0000000..ce20793 --- /dev/null +++ b/src/main/resources/data/szar/worldgen/structure_set/obsidian_cube.json @@ -0,0 +1,14 @@ +{ + "structures": [ + { + "structure": "szar:obsidian_cube", + "weight": 1 + } + ], + "placement": { + "type": "minecraft:random_spread", + "spacing": 20, + "separation": 10, + "salt": 398826349 + } +} \ No newline at end of file