From cecde3f586ecce609b1f4019db5ad60bb4ebeafb Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Sun, 3 Sep 2023 18:16:47 +0200 Subject: [PATCH 1/5] fixed typo in badge url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7498229..6d726ff 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,6 @@ - + This mod is in the early stages of development and any feature request is welcome. To do that, create a new issue and mark it as a feature request. From 0e481b27ec95ac0bfae94f760d087bf4202349e3 Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Thu, 7 Sep 2023 21:21:23 +0200 Subject: [PATCH 2/5] update to 1.20.1 --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2567c5f..68469e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20 -yarn_mappings=1.20+build.1 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 loader_version=0.14.22 # Mod Properties @@ -14,4 +14,4 @@ maven_group = me.jonasjones archives_base_name = not-enough-cursedness # Dependencies -fabric_version=0.83.0+1.20 +fabric_version=0.88.1+1.20.1 From 3586c2c24151220cd950ae4ef5e5675f58675642 Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Thu, 7 Sep 2023 22:18:47 +0200 Subject: [PATCH 3/5] added items to vanilla itemgroups --- .../jonasjones/nec/NotEnoughCursedness.java | 23 +++++++++- .../java/me/jonasjones/nec/item/ModItems.java | 14 +++--- .../me/jonasjones/nec/util/ModRegistries.java | 45 +++++++++++++++++-- 3 files changed, 70 insertions(+), 12 deletions(-) diff --git a/src/main/java/me/jonasjones/nec/NotEnoughCursedness.java b/src/main/java/me/jonasjones/nec/NotEnoughCursedness.java index 2a98876..5850795 100644 --- a/src/main/java/me/jonasjones/nec/NotEnoughCursedness.java +++ b/src/main/java/me/jonasjones/nec/NotEnoughCursedness.java @@ -4,9 +4,25 @@ import me.jonasjones.nec.block.ModBlocks; import me.jonasjones.nec.item.ModItems; import me.jonasjones.nec.util.ModRegistries; import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.fabricmc.fabric.impl.itemgroup.FabricItemGroupBuilderImpl; +import net.minecraft.Util; +import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.Util.*; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.ItemStack; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin.register; + public class NotEnoughCursedness implements ModInitializer { // This logger is used to write text to the console and the log file. // It is considered best practice to use your mod id as the logger's name. @@ -14,14 +30,17 @@ public class NotEnoughCursedness implements ModInitializer { public static String MOD_ID = "nec"; public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); + @Override public void onInitialize() { - //register blocks ModBlocks.register(); ModItems.register(); ModRegistries.registerModStuffs(); - LOGGER.info("Your game is now cursed!"); + + + + } } diff --git a/src/main/java/me/jonasjones/nec/item/ModItems.java b/src/main/java/me/jonasjones/nec/item/ModItems.java index 35bb46b..c477520 100644 --- a/src/main/java/me/jonasjones/nec/item/ModItems.java +++ b/src/main/java/me/jonasjones/nec/item/ModItems.java @@ -13,13 +13,13 @@ import static net.minecraft.core.registries.BuiltInRegistries.ITEM; import static me.jonasjones.nec.NotEnoughCursedness.MOD_ID; public class ModItems { - private static Item STEEL_ITEM; - private static TieredItem DIRT_SWORD_ITEM; - private static Item NEGATIVE_FLINT_ITEM; - private static Item LETTER_ITEM; - private static Item CHAINMAIL_ITEM; - private static Item AK47_ITEM; - private static Item HELMET_ON_A_STICK_ITEM; + public static Item STEEL_ITEM; + public static TieredItem DIRT_SWORD_ITEM; + public static Item NEGATIVE_FLINT_ITEM; + public static Item LETTER_ITEM; + public static Item CHAINMAIL_ITEM; + public static Item AK47_ITEM; + public static Item HELMET_ON_A_STICK_ITEM; public static void register() { TieredItem DIRT_SWORD = new SwordItem(DirtToolMaterial.INSTANCE, 1, -3.0F, new Item.Properties()); diff --git a/src/main/java/me/jonasjones/nec/util/ModRegistries.java b/src/main/java/me/jonasjones/nec/util/ModRegistries.java index 02e453c..3b895ee 100644 --- a/src/main/java/me/jonasjones/nec/util/ModRegistries.java +++ b/src/main/java/me/jonasjones/nec/util/ModRegistries.java @@ -1,24 +1,34 @@ package me.jonasjones.nec.util; import me.jonasjones.nec.block.ModBlocks; +import me.jonasjones.nec.item.ModItems; +import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.fabricmc.fabric.api.registry.FuelRegistry; import net.fabricmc.fabric.api.registry.StrippableBlockRegistry; +import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import static me.jonasjones.nec.NotEnoughCursedness.MOD_ID; public class ModRegistries { + public static CreativeModeTab ITEM_GROUP = FabricItemGroup.builder().title(Component.translatable("itemGroup.nec.not_enough_cursedness")).icon(() -> new ItemStack(ModBlocks.GREEN_BIRCH_LOG_ITEM)).build(); + - /*static final ItemGroup ITEM_GROUP = FabricItemGroup.builder(new Identifier(MOD_ID, "not_enough_cursedness")) - .icon(() -> ModBlocks.GREEN_BIRCH_LOG_ITEM.getDefaultStack()) - .build();*/ public static void registerModStuffs() { registerFuels(); registerCommands(); registerEvents(); registerStrippables(); registerFlammableBlock(); + register_itemGroup(); } private static void registerFuels() { @@ -52,4 +62,33 @@ public class ModRegistries { // content.add(CUSTOM_ITEM); //}); } + + public static void register_itemGroup() { + + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.BUILDING_BLOCKS).register(content -> { + content.accept(new ItemStack(ModBlocks.GREEN_BIRCH_LOG_ITEM)); + content.accept(new ItemStack(ModBlocks.BLAZE_BLOCK)); + content.accept(new ItemStack(ModBlocks.GUN_BLOCK)); + content.accept(new ItemStack(ModBlocks.DIAMOND_ORE_ORE)); + content.accept(new ItemStack(ModBlocks.DEEPSLATE_DIAMOND_ORE_ORE)); + content.accept(new ItemStack(ModBlocks.JAVA_BLOCK)); + content.accept(new ItemStack(ModBlocks.POCKET_BLOCK)); + content.accept(new ItemStack(ModBlocks.FLETCHING_STAIRS_BLOCK)); + }); + + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.INGREDIENTS).register(content -> { + content.accept(new ItemStack(ModItems.STEEL_ITEM)); + content.accept(new ItemStack(ModItems.NEGATIVE_FLINT_ITEM)); + content.accept(new ItemStack(ModItems.LETTER_ITEM)); + content.accept(new ItemStack(ModItems.CHAINMAIL_ITEM)); + }); + + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COMBAT).register(content -> { + content.accept(new ItemStack(ModItems.DIRT_SWORD_ITEM)); + content.accept(new ItemStack(ModItems.AK47_ITEM)); + content.accept(new ItemStack(ModItems.HELMET_ON_A_STICK_ITEM)); + }); + + ITEM_GROUP = Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, new ResourceLocation(MOD_ID, "nec"), ITEM_GROUP); + } } From 80da85aa91f57bc1317abe9a6f83ca006b6bf178 Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:22:08 +0200 Subject: [PATCH 4/5] added most cursed translation ever --- src/main/resources/assets/nec/lang/de_de.json | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 src/main/resources/assets/nec/lang/de_de.json diff --git a/src/main/resources/assets/nec/lang/de_de.json b/src/main/resources/assets/nec/lang/de_de.json new file mode 100644 index 0000000..27b9b06 --- /dev/null +++ b/src/main/resources/assets/nec/lang/de_de.json @@ -0,0 +1,110 @@ +{ + "advancements.story.bedrock.title": "\u00A78G R U N D G E S T E I N", + "advancements.story.bedrock.description": "\u00A7a\u00A7o\u00A7lWie zum fick hast du es geschafft?", + + "advancements.nec.ak_47.description": "Bekomme eine AK47", + "advancements.nec.ak_47.title": "Glückwunsch, Du bist scheiß unnötig!", + "advancements.nec.dirt_sword.description": "Haha, verstehst du's? ... -_-", + "advancements.nec.dirt_sword.title": "Du bist jetzt dreckig", + "advancements.nec.fletching_stairs.description": "Crafte eine Bognertisch Treppe", + "advancements.nec.fletching_stairs.title": "Endlich nützlich!", + "advancements.nec.pocket_block.description": "Crafte einen Pocket Block", + "advancements.nec.pocket_block.title": "Es ist einfach Grundgestein", + "advancements.nec.java_block.description": "Crafte einen Java Block", + "advancements.nec.java_block.title": "Du idiot, das ist falsch!", + "advancements.nec.root.description": "Nicht Genug Verfluchtheit", + "advancements.nec.root.title": "Not Enough Cursedness", + + "block.nec.blaze_block": "Lohenblock", + "block.nec.cursed_dirt_stairs": "Verfluchte Erdtreppe", + "block.nec.cursed_dirt_slab": "Verfulchte Erdestufe", + "block.nec.cursed_dirt": "Verfluchte Erde", + "block.nec.deepslate_diamond_ore_ore": "Tiefenschiefer-Diamanterzerz", + "block.nec.diamond_ore_ore": "Diamanterzerz", + "block.nec.fletching_stairs": "Bognertischstufe", + "block.nec.green_birch_log": "Grüner Birkenstamm", + "block.nec.gun_block": "Schießblock", + "block.nec.java_block": "Javablock", + "block.nec.pocket_block": "Pocketblock", + "item.nec.ak_47": "AK-47", + "item.nec.chainmail": "Kettenbrief", + "item.nec.dirt_sword": "Erdschwert", + "item.nec.helmet_on_a_stick": "Helm auf einem Stock", + "item.nec.letter": "Brief", + "item.nec.negative_flint": "Negativer Feuerstein", + "item.nec.steel": "Zeug", + "itemGroup.nec.not_enough_cursedness": "Nicht Genug Verfluchtheit", + + "block.minecraft.ancient_debris": "Zimtschnecke", + "block.minecraft.calibrated_sculk_sensor": "Variabler Widerstand", + "block.minecraft.chiseled_polished_blackstone": "Gemeißelter polnischer Schwarzstein", + "block.minecraft.cracked_polished_blackstone_bricks": "Rissige polnischer Schwarzsteinziegel", + "block.minecraft.crying_obsidian": "Trauriger Obsidian", + "block.minecraft.dark_oak_trapdoor": "Schokoladentafel", + "block.minecraft.deepslate_gold_ore": "Tiefenschieferbuttererz", + "block.minecraft.glow_lichen": "Diamanterzüberlagerung", + "block.minecraft.gold_block": "Butterblock", + "block.minecraft.gold_ore": "Buttererz", + "block.minecraft.netherite_block": "Zimtbutterblock", + "block.minecraft.nether_gold_ore": "Netherbuttererz", + "block.minecraft.polished_andesite":"Polnischer Andesit", + "block.minecraft.polished_andesite_slab":"Polnische Andesitstufe", + "block.minecraft.polished_andesite_stairs":"Polnische Andesittreppe", + "block.minecraft.polished_basalt":"Polnischer Basalt", + "block.minecraft.polished_blackstone":"Polnischer Schwarzstein", + "block.minecraft.polished_blackstone_brick_slab":"Polnische Schwarzsteinziegelstufe", + "block.minecraft.polished_blackstone_brick_stairs":"Polnische Schwarzsteinziegeltreppe", + "block.minecraft.polished_blackstone_brick_wall":"Polnische Schwarzsteinziegelwand", + "block.minecraft.polished_blackstone_bricks":"Polnische Schwarzsteinziegel", + "block.minecraft.polished_blackstone_button":"Polnischer Schwarzsteinknopf", + "block.minecraft.polished_blackstone_pressure_plate":"Polnische Schwarzsteindruckplatte", + "block.minecraft.polished_blackstone_slab":"Polnische Schwarzsteinstufe", + "block.minecraft.polished_blackstone_stairs":"Polnische Schwarzsteintreppe", + "block.minecraft.polished_blackstone_wall":"Polnische Schwarzsteinwand", + "block.minecraft.polished_deepslate":"Polnischer Tiefenschiefer", + "block.minecraft.polished_deepslate_slab":"Polnische Tiefenschieferstufe", + "block.minecraft.polished_deepslate_stairs":"Polnische Tiefenschiefertreppe", + "block.minecraft.polished_deepslate_wall":"Polnische Tiefenschieferwand", + "block.minecraft.polished_diorite":"Polnischer Diorit", + "block.minecraft.polished_diorite_slab":"Polnische Dioritstufe", + "block.minecraft.polished_diorite_stairs":"Polnische Diorittreppe", + "block.minecraft.polished_granite":"Polnischer Granit", + "block.minecraft.polished_granite_slab":"Polnische Granitstufe", + "block.minecraft.polished_granite_stairs":"Polnische Granittreppe", + "block.minecraft.raw_gold_block": "Block of Rohe Butter", + "block.minecraft.sculk_sensor": "Widerstand", + "block.minecraft.stone": "Kieselstein", + "block.minecraft.stripped_mangrove_log": "Rote Beteblock", + "item.minecraft.enchanted_golden_apple": "Verzauberter Butterapfel", + "item.minecraft.gold_ingot": "Butter", + "item.minecraft.gold_nugget": "Butterklumpen", + "item.minecraft.golden_apple": "Butterapfel", + "item.minecraft.golden_axe": "Butteraxt", + "item.minecraft.golden_boots": "Butterstiefel", + "item.minecraft.golden_carrot": "Butterkarotte", + "item.minecraft.golden_chestplate": "Butterbrustplatte", + "item.minecraft.golden_helmet": "Butterhelm", + "item.minecraft.golden_hoe": "Butter Hacke", + "item.minecraft.golden_horse_armor": "Butter Rossharnisch", + "item.minecraft.golden_leggings": "Butterhose", + "item.minecraft.golden_pickaxe": "Butterspitzhacke", + "item.minecraft.golden_shovel": "Butterschaufel", + "item.minecraft.golden_sword": "Butterschwert", + "item.minecraft.gunpowder": "Schwarzsteinpulver", + "item.minecraft.netherite_axe": "Zimtbutteraxt", + "item.minecraft.netherite_boots": "Zimtbutterstiefel", + "item.minecraft.netherite_chestplate": "Zimtbutterbrustplatte", + "item.minecraft.netherite_helmet": "Zimtbutterhelm", + "item.minecraft.netherite_hoe": "Zimtbutterhacke", + "item.minecraft.netherite_ingot": "Zimtbutter", + "item.minecraft.netherite_leggings": "Zimtbutterhose", + "item.minecraft.netherite_pickaxe": "Zimtbutterspitzhacke", + "item.minecraft.netherite_scrap": "Zimtbutterabfall", + "item.minecraft.netherite_shovel": "Zimtbutterschaufel", + "item.minecraft.netherite_sword": "Zimtbutterschwert", + "item.minecraft.raw_gold": "Rohe Butter", + "subtitles.block.sculk_sensor.clicking": "Widerstand fängt an zu klicken", + "subtitles.block.sculk_sensor.clicking_stop": "Widerstand hört auf zu klicken", + "subtitles.item.armor.equip_gold": "Butterrüstung wird angelegt", + "trim_material.minecraft.gold": "Butter Schmiedevorlage" +} \ No newline at end of file From f45216b320e886a77f0f09831704bc0babc1d7f0 Mon Sep 17 00:00:00 2001 From: J-onasJones Date: Thu, 21 Sep 2023 21:20:52 +0200 Subject: [PATCH 5/5] bumped version number --- gradle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 68469e1..11bc471 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G org.gradle.parallel=true # Fabric Properties - # check these on https://fabricmc.net/develop -minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.10 +# check these on https://fabricmc.net/develop +minecraft_version=1.20.2 +yarn_mappings=1.20.2+build.1 loader_version=0.14.22 # Mod Properties @@ -14,4 +14,4 @@ maven_group = me.jonasjones archives_base_name = not-enough-cursedness # Dependencies -fabric_version=0.88.1+1.20.1 +fabric_version=0.89.0+1.20.2