OiOiOiAEyeEye

This commit is contained in:
2026-03-07 14:28:02 +01:00
parent a7aa7d36f9
commit 76803eb460
20 changed files with 196 additions and 106 deletions

View File

@@ -1,3 +1,3 @@
// 1.20.1 2026-02-22T17:34:09.3606501 szar/World Gen
// 1.20.1 2026-03-07T14:06:37.8445606 szar/World Gen
1d26b5da3b0a2ea6b23d456d1f0b82455a788ca1 data\szar\worldgen\configured_feature\uranium_ore.json
32864170bdb41310f9ee5d06f5720dfdb3badb6d data\szar\worldgen\placed_feature\uranium_ore_placed.json

View File

@@ -1,2 +1,2 @@
// 1.20.1 2026-02-22T17:34:09.3606501 szar/Tags for minecraft:point_of_interest_type
// 1.20.1 2026-03-07T14:06:37.8455587 szar/Tags for minecraft:point_of_interest_type
eba137b51c50a7143a3668876f41adaa1447b1d1 data\minecraft\tags\point_of_interest_type\acquirable_job_site.json

View File

@@ -1,2 +1,2 @@
// 1.20.1 2026-02-22T17:34:09.3596499 szar/Tags for minecraft:item
15754f2ee2c60320aae8a09679ed422fea29a705 data\minecraft\tags\items\music_discs.json
// 1.20.1 2026-03-07T14:06:37.8432546 szar/Tags for minecraft:item
935692b1c49ef3164e01f8a993f3ce8002919afe data\minecraft\tags\items\music_discs.json

View File

@@ -3,6 +3,7 @@
"values": [
"szar:pop_tart",
"szar:baiter",
"szar:efn"
"szar:efn",
"szar:hello"
]
}

View File

@@ -2,16 +2,8 @@ package dev.tggamesyt.szar;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
import net.minecraft.data.DataOutput;
import net.minecraft.data.server.tag.TagProvider;
import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.registry.tag.ItemTags;
import net.minecraft.registry.tag.PointOfInterestTypeTags;
import net.minecraft.util.Identifier;
import net.minecraft.world.poi.PointOfInterestType;
import java.util.concurrent.CompletableFuture;
@@ -24,7 +16,8 @@ public class ModItemTagProvider extends FabricTagProvider.ItemTagProvider {
@Override
protected void configure(RegistryWrapper.WrapperLookup lookup) {
getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(Szar.POPTART);
getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(Szar.BAITER_DISK);
getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(Szar.BAITER_DISC);
getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(Szar.EFN_DISK);
getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(Szar.HELLO_DISC);
}
}

View File

@@ -1,7 +1,6 @@
package dev.tggamesyt.szar;
import com.google.common.collect.ImmutableSet;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
@@ -75,13 +74,11 @@ import net.minecraft.world.gen.structure.StructureType;
import net.minecraft.world.poi.PointOfInterestType;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.UnknownNullability;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.regex.Pattern;
import static com.mojang.brigadier.builder.LiteralArgumentBuilder.literal;
import static dev.tggamesyt.szar.ServerCosmetics.USERS;
import static dev.tggamesyt.szar.ServerCosmetics.sync;
@@ -317,12 +314,13 @@ public class Szar implements ModInitializer {
entries.add(Szar.NYAN_SPAWNEGG);
entries.add(Szar.EPSTEIN_FILES);
entries.add(Szar.EPSTEIN_SPAWNEGG);
entries.add(Szar.BAITER_DISK);
entries.add(Szar.BAITER_DISC);
entries.add(Szar.MERL_SPAWNEGG);
entries.add(Szar.EFN_DISK);
entries.add(Szar.SLOT_MACHINE);
entries.add(Szar.ROULETTE);
entries.add(Szar.FIRTANA);
entries.add(Szar.HELLO_DISC);
// nsfw
entries.add(Szar.FASZITEM);
entries.add(Szar.CNDM);
@@ -1226,11 +1224,19 @@ public class Szar implements ModInitializer {
);
public static final SoundEvent BAITER =
SoundEvent.of(new Identifier(MOD_ID, "baiter"));
public static final Item BAITER_DISK = Registry.register(
public static final Item BAITER_DISC = Registry.register(
Registries.ITEM,
new Identifier(MOD_ID, "baiter"),
new MusicDiscItem(12, BAITER, new Item.Settings().maxCount(1).rarity(Rarity.RARE), 172)
);
public static final SoundEvent HELLO =
SoundEvent.of(new Identifier(MOD_ID, "firtana"));
public static final Item HELLO_DISC = Registry.register(
Registries.ITEM,
new Identifier(MOD_ID, "hello"),
new MusicDiscItem(10, HELLO, new Item.Settings().maxCount(1).rarity(Rarity.RARE), 239)
);
public static final SoundEvent EFN =
SoundEvent.of(new Identifier(MOD_ID, "efn"));
public static final Item EFN_DISK = Registry.register(

View File

@@ -83,5 +83,7 @@
"block.szar.slot_machine": "Slot Machine",
"block.szar.casino": "Casino Title",
"block.szar.roulette": "Roulette",
"item.szar.firtana": "Firtana"
"item.szar.firtana": "Firtana",
"item.szar.hello": "Music Disc",
"item.szar.hello.desc": "Alex Savage - OMFG - Hello (Dark Remix)"
}

View File

@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "szar:item/hello"
}
}

View File

@@ -107,6 +107,14 @@
}
]
},
"firtana_og": {
"sounds": [
{
"name": "szar:firtana_og",
"stream": true
}
]
},
"firtana": {
"sounds": [
{

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

View File

@@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:diamond"
},
{
"item": "minecraft:dried_kelp"
},
{
"item": "minecraft:stick"
}
],
"result": {
"item": "szar:firtana"
}
}

View File

@@ -0,0 +1,14 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"tag": "minecraft:music_discs"
},
{
"item": "szar:firtana"
}
],
"result": {
"item": "szar:hello"
}
}