From cfc6362e6a65a633caaeb3b914507980522dabad Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Wed, 5 Apr 2023 05:05:17 +0200 Subject: [PATCH 1/5] added feature request request --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 64c88ed..dfe2ea8 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # not-enough-cursedness A Minecraft mode introducing every little bit of cursed items/behavior into the game + +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. \ No newline at end of file From 6fd2e6a90e182d97f92822e22ff6563b09414c6d Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Fri, 7 Apr 2023 21:24:27 +0200 Subject: [PATCH 2/5] replaced "nec" with MOD_ID --- .../me/jonasjones/nec/block/ModBlocks.java | 30 ++++++++++--------- .../java/me/jonasjones/nec/item/ModItems.java | 14 +++++---- .../me/jonasjones/nec/util/ModRegistries.java | 4 ++- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/main/java/me/jonasjones/nec/block/ModBlocks.java b/src/main/java/me/jonasjones/nec/block/ModBlocks.java index 4be0ae4..54b74d6 100644 --- a/src/main/java/me/jonasjones/nec/block/ModBlocks.java +++ b/src/main/java/me/jonasjones/nec/block/ModBlocks.java @@ -11,6 +11,8 @@ import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; +import static me.jonasjones.nec.NotEnoughCursedness.MOD_ID; + public class ModBlocks { public static final Block GREEN_BIRCH_LOG = new PillarBlock(FabricBlockSettings.of(Material.WOOD).strength(4.0f)); public static final Block BLAZE_BLOCK = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0F)); @@ -38,32 +40,32 @@ public class ModBlocks { //public static final Block STRIPPED_GREEN_BIRCH_WOOD = new PillarBlock(FabricBlockSettings.of(Material.WOOD).strength(4.0f)); public static void register() { - BLAZE_BLOCK_BLOCK = Registry.register(Registries.BLOCK, new Identifier("nec", "blaze_block"), BLAZE_BLOCK); - BLAZE_BLOCK_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "blaze_block"), new BlockItem(BLAZE_BLOCK, new FabricItemSettings())); + BLAZE_BLOCK_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "blaze_block"), BLAZE_BLOCK); + BLAZE_BLOCK_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "blaze_block"), new BlockItem(BLAZE_BLOCK, new FabricItemSettings())); ModRegistries.register_item(BLAZE_BLOCK_ITEM); - GREEEN_BIRCH_LOG_BLOCK = Registry.register(Registries.BLOCK, new Identifier("nec", "green_birch_log"), GREEN_BIRCH_LOG); - GREEN_BIRCH_LOG_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "green_birch_log"), new BlockItem(GREEN_BIRCH_LOG, new FabricItemSettings())); + GREEEN_BIRCH_LOG_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "green_birch_log"), GREEN_BIRCH_LOG); + GREEN_BIRCH_LOG_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "green_birch_log"), new BlockItem(GREEN_BIRCH_LOG, new FabricItemSettings())); ModRegistries.register_item(GREEN_BIRCH_LOG_ITEM); - GUN_BLOCK_BLOCK = Registry.register(Registries.BLOCK, new Identifier("nec", "gun_block"), GUN_BLOCK); - GUN_BLOCK_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "gun_block"), new BlockItem(GUN_BLOCK, new FabricItemSettings())); + GUN_BLOCK_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "gun_block"), GUN_BLOCK); + GUN_BLOCK_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "gun_block"), new BlockItem(GUN_BLOCK, new FabricItemSettings())); ModRegistries.register_item(GUN_BLOCK_ITEM); - DIAMOND_ORE_ORE_BLOCK = Registry.register(Registries.BLOCK, new Identifier("nec", "diamond_ore_ore"), DIAMOND_ORE_ORE); - DIAMOND_ORE_ORE_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "diamond_ore_ore"), new BlockItem(DIAMOND_ORE_ORE, new FabricItemSettings())); + DIAMOND_ORE_ORE_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "diamond_ore_ore"), DIAMOND_ORE_ORE); + DIAMOND_ORE_ORE_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "diamond_ore_ore"), new BlockItem(DIAMOND_ORE_ORE, new FabricItemSettings())); ModRegistries.register_item(DIAMOND_ORE_ORE_ITEM); - DEEPSLATE_DIAMOND_ORE_ORE_BLOCK = Registry.register(Registries.BLOCK, new Identifier("nec", "deepslate_diamond_ore_ore"), DEEPSLATE_DIAMOND_ORE_ORE); - DEEPSLATE_DIAMOND_ORE_ORE_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "deepslate_diamond_ore_ore"), new BlockItem(DEEPSLATE_DIAMOND_ORE_ORE, new FabricItemSettings())); + DEEPSLATE_DIAMOND_ORE_ORE_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "deepslate_diamond_ore_ore"), DEEPSLATE_DIAMOND_ORE_ORE); + DEEPSLATE_DIAMOND_ORE_ORE_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "deepslate_diamond_ore_ore"), new BlockItem(DEEPSLATE_DIAMOND_ORE_ORE, new FabricItemSettings())); ModRegistries.register_item(DEEPSLATE_DIAMOND_ORE_ORE_ITEM); - JAVA_BLOCK_BLOCK = Registry.register(Registries.BLOCK, new Identifier("nec", "java_block"), JAVA_BLOCK); - JAVA_BLOCK_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "java_block"), new BlockItem(JAVA_BLOCK, new FabricItemSettings())); + JAVA_BLOCK_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "java_block"), JAVA_BLOCK); + JAVA_BLOCK_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "java_block"), new BlockItem(JAVA_BLOCK, new FabricItemSettings())); ModRegistries.register_item(JAVA_BLOCK_ITEM); - POCKET_BLOCK_BLOCK = Registry.register(Registries.BLOCK, new Identifier("nec", "pocket_block"), POCKET_BLOCK); - POCKET_BLOCK_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "pocket_block"), new BlockItem(POCKET_BLOCK, new FabricItemSettings())); + POCKET_BLOCK_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "pocket_block"), POCKET_BLOCK); + POCKET_BLOCK_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "pocket_block"), new BlockItem(POCKET_BLOCK, new FabricItemSettings())); ModRegistries.register_item(POCKET_BLOCK_ITEM); } } diff --git a/src/main/java/me/jonasjones/nec/item/ModItems.java b/src/main/java/me/jonasjones/nec/item/ModItems.java index 4519d54..c2a7b8b 100644 --- a/src/main/java/me/jonasjones/nec/item/ModItems.java +++ b/src/main/java/me/jonasjones/nec/item/ModItems.java @@ -8,6 +8,8 @@ import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; +import static me.jonasjones.nec.NotEnoughCursedness.MOD_ID; + public class ModItems { private static Item STEEL_ITEM; private static ToolItem DIRT_SWORD_ITEM; @@ -18,27 +20,27 @@ public class ModItems { public static void register() { ToolItem DIRT_SWORD = new SwordItem(DirtToolMaterial.INSTANCE, 1, -3.0F, new Item.Settings()); - DIRT_SWORD_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "dirt_sword"), DIRT_SWORD); + DIRT_SWORD_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "dirt_sword"), DIRT_SWORD); ModRegistries.register_item(DIRT_SWORD_ITEM); Item STEEL = new Item(new FabricItemSettings()); - STEEL_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "steel"), STEEL); + STEEL_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "steel"), STEEL); ModRegistries.register_item(STEEL_ITEM); Item NEGATIVE_FLINT = new Item(new FabricItemSettings()); - NEGATIVE_FLINT_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "negative_flint"), NEGATIVE_FLINT); + NEGATIVE_FLINT_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "negative_flint"), NEGATIVE_FLINT); ModRegistries.register_item(NEGATIVE_FLINT_ITEM); Item LETTER = new Item(new FabricItemSettings()); - LETTER_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "letter"), LETTER); + LETTER_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "letter"), LETTER); ModRegistries.register_item(LETTER_ITEM); Item CHAINMAIL = new Item(new FabricItemSettings()); - CHAINMAIL_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "chainmail"), CHAINMAIL); + CHAINMAIL_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "chainmail"), CHAINMAIL); ModRegistries.register_item(CHAINMAIL_ITEM); Item AK47 = new Item(new FabricItemSettings()); - AK47_ITEM = Registry.register(Registries.ITEM, new Identifier("nec", "ak_47"), AK47); + AK47_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "ak_47"), AK47); ModRegistries.register_item(AK47_ITEM); } } diff --git a/src/main/java/me/jonasjones/nec/util/ModRegistries.java b/src/main/java/me/jonasjones/nec/util/ModRegistries.java index 39f42b1..3daedc3 100644 --- a/src/main/java/me/jonasjones/nec/util/ModRegistries.java +++ b/src/main/java/me/jonasjones/nec/util/ModRegistries.java @@ -11,9 +11,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.util.Identifier; +import static me.jonasjones.nec.NotEnoughCursedness.MOD_ID; + public class ModRegistries { - static final ItemGroup ITEM_GROUP = FabricItemGroup.builder(new Identifier("nec", "not_enough_cursedness")) + 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() { From 25029b165509eb49800c1a492d1ebdf087bbe73a Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Sat, 15 Apr 2023 15:39:51 +0200 Subject: [PATCH 3/5] switched to mojmap --- build.gradle | 8 +++- .../me/jonasjones/nec/block/ModBlocks.java | 45 ++++++++++--------- .../java/me/jonasjones/nec/item/ModItems.java | 26 ++++++----- .../nec/item/materials/DirtToolMaterial.java | 28 ++++++------ .../me/jonasjones/nec/mixin/ExampleMixin.java | 2 +- .../me/jonasjones/nec/util/ModRegistries.java | 15 +++---- 6 files changed, 66 insertions(+), 58 deletions(-) diff --git a/build.gradle b/build.gradle index 5af2ddd..930f6e2 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,13 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + //mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + mappings loom.layered { + //it.parchment("org.parchmentmc.data:parchment-1.19.3:2022.12.18@zip") + it.officialMojangMappings { + setNameSyntheticMembers(false) + } + } modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. diff --git a/src/main/java/me/jonasjones/nec/block/ModBlocks.java b/src/main/java/me/jonasjones/nec/block/ModBlocks.java index 54b74d6..efbc2b0 100644 --- a/src/main/java/me/jonasjones/nec/block/ModBlocks.java +++ b/src/main/java/me/jonasjones/nec/block/ModBlocks.java @@ -3,18 +3,19 @@ package me.jonasjones.nec.block; import me.jonasjones.nec.util.ModRegistries; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; -import net.minecraft.block.Material; -import net.minecraft.block.PillarBlock; -import net.minecraft.item.BlockItem; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.util.Identifier; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.RotatedPillarBlock; +import net.minecraft.world.level.material.Material; import static me.jonasjones.nec.NotEnoughCursedness.MOD_ID; +import static net.minecraft.core.registries.BuiltInRegistries.BLOCK; +import static net.minecraft.core.registries.BuiltInRegistries.ITEM; public class ModBlocks { - public static final Block GREEN_BIRCH_LOG = new PillarBlock(FabricBlockSettings.of(Material.WOOD).strength(4.0f)); + public static final Block GREEN_BIRCH_LOG = new RotatedPillarBlock(FabricBlockSettings.of(Material.WOOD).strength(4.0f)); public static final Block BLAZE_BLOCK = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0F)); public static final Block GUN_BLOCK = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0F)); public static final Block DIAMOND_ORE_ORE = new Block(FabricBlockSettings.of(Material.STONE).strength(4.0F)); @@ -40,32 +41,32 @@ public class ModBlocks { //public static final Block STRIPPED_GREEN_BIRCH_WOOD = new PillarBlock(FabricBlockSettings.of(Material.WOOD).strength(4.0f)); public static void register() { - BLAZE_BLOCK_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "blaze_block"), BLAZE_BLOCK); - BLAZE_BLOCK_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "blaze_block"), new BlockItem(BLAZE_BLOCK, new FabricItemSettings())); + BLAZE_BLOCK_BLOCK = Registry.register(BLOCK, new ResourceLocation(MOD_ID, "blaze_block"), BLAZE_BLOCK); + BLAZE_BLOCK_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "blaze_block"), new BlockItem(BLAZE_BLOCK, new FabricItemSettings())); ModRegistries.register_item(BLAZE_BLOCK_ITEM); - GREEEN_BIRCH_LOG_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "green_birch_log"), GREEN_BIRCH_LOG); - GREEN_BIRCH_LOG_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "green_birch_log"), new BlockItem(GREEN_BIRCH_LOG, new FabricItemSettings())); + GREEEN_BIRCH_LOG_BLOCK = Registry.register(BLOCK, new ResourceLocation(MOD_ID, "green_birch_log"), GREEN_BIRCH_LOG); + GREEN_BIRCH_LOG_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "green_birch_log"), new BlockItem(GREEN_BIRCH_LOG, new FabricItemSettings())); ModRegistries.register_item(GREEN_BIRCH_LOG_ITEM); - GUN_BLOCK_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "gun_block"), GUN_BLOCK); - GUN_BLOCK_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "gun_block"), new BlockItem(GUN_BLOCK, new FabricItemSettings())); + GUN_BLOCK_BLOCK = Registry.register(BLOCK, new ResourceLocation(MOD_ID, "gun_block"), GUN_BLOCK); + GUN_BLOCK_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "gun_block"), new BlockItem(GUN_BLOCK, new FabricItemSettings())); ModRegistries.register_item(GUN_BLOCK_ITEM); - DIAMOND_ORE_ORE_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "diamond_ore_ore"), DIAMOND_ORE_ORE); - DIAMOND_ORE_ORE_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "diamond_ore_ore"), new BlockItem(DIAMOND_ORE_ORE, new FabricItemSettings())); + DIAMOND_ORE_ORE_BLOCK = Registry.register(BLOCK, new ResourceLocation(MOD_ID, "diamond_ore_ore"), DIAMOND_ORE_ORE); + DIAMOND_ORE_ORE_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "diamond_ore_ore"), new BlockItem(DIAMOND_ORE_ORE, new FabricItemSettings())); ModRegistries.register_item(DIAMOND_ORE_ORE_ITEM); - DEEPSLATE_DIAMOND_ORE_ORE_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "deepslate_diamond_ore_ore"), DEEPSLATE_DIAMOND_ORE_ORE); - DEEPSLATE_DIAMOND_ORE_ORE_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "deepslate_diamond_ore_ore"), new BlockItem(DEEPSLATE_DIAMOND_ORE_ORE, new FabricItemSettings())); + DEEPSLATE_DIAMOND_ORE_ORE_BLOCK = Registry.register(BLOCK, new ResourceLocation(MOD_ID, "deepslate_diamond_ore_ore"), DEEPSLATE_DIAMOND_ORE_ORE); + DEEPSLATE_DIAMOND_ORE_ORE_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "deepslate_diamond_ore_ore"), new BlockItem(DEEPSLATE_DIAMOND_ORE_ORE, new FabricItemSettings())); ModRegistries.register_item(DEEPSLATE_DIAMOND_ORE_ORE_ITEM); - JAVA_BLOCK_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "java_block"), JAVA_BLOCK); - JAVA_BLOCK_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "java_block"), new BlockItem(JAVA_BLOCK, new FabricItemSettings())); + JAVA_BLOCK_BLOCK = Registry.register(BLOCK, new ResourceLocation(MOD_ID, "java_block"), JAVA_BLOCK); + JAVA_BLOCK_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "java_block"), new BlockItem(JAVA_BLOCK, new FabricItemSettings())); ModRegistries.register_item(JAVA_BLOCK_ITEM); - POCKET_BLOCK_BLOCK = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "pocket_block"), POCKET_BLOCK); - POCKET_BLOCK_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "pocket_block"), new BlockItem(POCKET_BLOCK, new FabricItemSettings())); + POCKET_BLOCK_BLOCK = Registry.register(BLOCK, new ResourceLocation(MOD_ID, "pocket_block"), POCKET_BLOCK); + POCKET_BLOCK_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "pocket_block"), new BlockItem(POCKET_BLOCK, new FabricItemSettings())); ModRegistries.register_item(POCKET_BLOCK_ITEM); } } diff --git a/src/main/java/me/jonasjones/nec/item/ModItems.java b/src/main/java/me/jonasjones/nec/item/ModItems.java index c2a7b8b..95c5156 100644 --- a/src/main/java/me/jonasjones/nec/item/ModItems.java +++ b/src/main/java/me/jonasjones/nec/item/ModItems.java @@ -3,44 +3,46 @@ package me.jonasjones.nec.item; import me.jonasjones.nec.item.materials.DirtToolMaterial; import me.jonasjones.nec.util.ModRegistries; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.minecraft.item.*; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.util.Identifier; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.TieredItem; +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 ToolItem DIRT_SWORD_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; public static void register() { - ToolItem DIRT_SWORD = new SwordItem(DirtToolMaterial.INSTANCE, 1, -3.0F, new Item.Settings()); - DIRT_SWORD_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "dirt_sword"), DIRT_SWORD); + TieredItem DIRT_SWORD = new SwordItem(DirtToolMaterial.INSTANCE, 1, -3.0F, new Item.Properties()); + DIRT_SWORD_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "dirt_sword"), DIRT_SWORD); ModRegistries.register_item(DIRT_SWORD_ITEM); Item STEEL = new Item(new FabricItemSettings()); - STEEL_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "steel"), STEEL); + STEEL_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "steel"), STEEL); ModRegistries.register_item(STEEL_ITEM); Item NEGATIVE_FLINT = new Item(new FabricItemSettings()); - NEGATIVE_FLINT_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "negative_flint"), NEGATIVE_FLINT); + NEGATIVE_FLINT_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "negative_flint"), NEGATIVE_FLINT); ModRegistries.register_item(NEGATIVE_FLINT_ITEM); Item LETTER = new Item(new FabricItemSettings()); - LETTER_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "letter"), LETTER); + LETTER_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "letter"), LETTER); ModRegistries.register_item(LETTER_ITEM); Item CHAINMAIL = new Item(new FabricItemSettings()); - CHAINMAIL_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "chainmail"), CHAINMAIL); + CHAINMAIL_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "chainmail"), CHAINMAIL); ModRegistries.register_item(CHAINMAIL_ITEM); Item AK47 = new Item(new FabricItemSettings()); - AK47_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "ak_47"), AK47); + AK47_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "ak_47"), AK47); ModRegistries.register_item(AK47_ITEM); } } diff --git a/src/main/java/me/jonasjones/nec/item/materials/DirtToolMaterial.java b/src/main/java/me/jonasjones/nec/item/materials/DirtToolMaterial.java index 4c51144..b8bd16c 100644 --- a/src/main/java/me/jonasjones/nec/item/materials/DirtToolMaterial.java +++ b/src/main/java/me/jonasjones/nec/item/materials/DirtToolMaterial.java @@ -1,39 +1,41 @@ package me.jonasjones.nec.item.materials; -import net.minecraft.item.Items; -import net.minecraft.item.ToolMaterial; -import net.minecraft.recipe.Ingredient; -public class DirtToolMaterial implements ToolMaterial { +import net.minecraft.world.item.Items; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.crafting.Ingredient; + +public class DirtToolMaterial implements Tier { public static final DirtToolMaterial INSTANCE = new DirtToolMaterial(); + @Override - public int getDurability() { + public int getUses() { return 5; } @Override - public float getMiningSpeedMultiplier() { - return 1.0F; + public float getSpeed() { + return 1; } @Override - public float getAttackDamage() { - return 2.0F; + public float getAttackDamageBonus() { + return 2; } @Override - public int getMiningLevel() { + public int getLevel() { return 0; } @Override - public int getEnchantability() { + public int getEnchantmentValue() { return 100; } @Override public Ingredient getRepairIngredient() { - return Ingredient.ofItems(Items.DIRT, Items.COARSE_DIRT, Items.DIRT_PATH, Items.ROOTED_DIRT); + return Ingredient.of(Items.DIRT, Items.COARSE_DIRT, Items.DIRT_PATH, Items.ROOTED_DIRT); } -} +} \ No newline at end of file diff --git a/src/main/java/me/jonasjones/nec/mixin/ExampleMixin.java b/src/main/java/me/jonasjones/nec/mixin/ExampleMixin.java index 9ad17e4..1137651 100644 --- a/src/main/java/me/jonasjones/nec/mixin/ExampleMixin.java +++ b/src/main/java/me/jonasjones/nec/mixin/ExampleMixin.java @@ -1,7 +1,7 @@ package me.jonasjones.nec.mixin; import me.jonasjones.nec.NotEnoughCursedness; -import net.minecraft.client.gui.screen.TitleScreen; +import net.minecraft.client.gui.screens.TitleScreen; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/me/jonasjones/nec/util/ModRegistries.java b/src/main/java/me/jonasjones/nec/util/ModRegistries.java index 3daedc3..0e0f13e 100644 --- a/src/main/java/me/jonasjones/nec/util/ModRegistries.java +++ b/src/main/java/me/jonasjones/nec/util/ModRegistries.java @@ -1,23 +1,20 @@ package me.jonasjones.nec.util; import me.jonasjones.nec.block.ModBlocks; -import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents; 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.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.util.Identifier; +import net.minecraft.world.item.Item; import static me.jonasjones.nec.NotEnoughCursedness.MOD_ID; public class ModRegistries { - static final ItemGroup ITEM_GROUP = FabricItemGroup.builder(new Identifier(MOD_ID, "not_enough_cursedness")) + /*static final ItemGroup ITEM_GROUP = FabricItemGroup.builder(new Identifier(MOD_ID, "not_enough_cursedness")) .icon(() -> ModBlocks.GREEN_BIRCH_LOG_ITEM.getDefaultStack()) - .build(); + .build();*/ public static void registerModStuffs() { registerFuels(); registerCommands(); @@ -53,8 +50,8 @@ public class ModRegistries { } public static void register_item(Item CUSTOM_ITEM) { - ItemGroupEvents.modifyEntriesEvent(ITEM_GROUP).register(content -> { - content.add(CUSTOM_ITEM); - }); + //ItemGroupEvents.modifyEntriesEvent(ITEM_GROUP).register(content -> { + // content.add(CUSTOM_ITEM); + //}); } } From 8006eb85a18304960ad0533373b548bd1c022d79 Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Sat, 15 Apr 2023 16:46:11 +0200 Subject: [PATCH 4/5] added advancements --- src/main/resources/assets/nec/lang/en_us.json | 7 ++++ .../assets/nec/textures/block/ricky_block.png | Bin 0 -> 3605 bytes .../resources/data/nec/advancements/ak47.json | 31 ++++++++++++++++++ .../data/nec/advancements/dirt_sword.json | 31 ++++++++++++++++++ .../resources/data/nec/advancements/nec.json | 31 ++++++++++++++++++ 5 files changed, 100 insertions(+) create mode 100644 src/main/resources/assets/nec/textures/block/ricky_block.png create mode 100644 src/main/resources/data/nec/advancements/ak47.json create mode 100644 src/main/resources/data/nec/advancements/dirt_sword.json create mode 100644 src/main/resources/data/nec/advancements/nec.json diff --git a/src/main/resources/assets/nec/lang/en_us.json b/src/main/resources/assets/nec/lang/en_us.json index 83ee859..e743a5e 100644 --- a/src/main/resources/assets/nec/lang/en_us.json +++ b/src/main/resources/assets/nec/lang/en_us.json @@ -1,4 +1,11 @@ { + "advancements.nec.ak_47.description": "Obtain an AK47", + "advancements.nec.ak_47.title": "Congrats, You're f*cking useless!", + "advancements.nec.dirt_sword.description": "Haha, get it? ... -_-", + "advancements.nec.dirt_sword.title": "You are now dirty", + "advancements.nec.root.description": "uwu", + "advancements.nec.root.title": "Not Enough Cursedness", + "block.nec.blaze_block": "Blaze Block", "block.nec.cursed_dirt_stairs": "Cursed Dirt Stairs", "block.nec.cursed_dirt_slab": "Cursed Dirt Slab", diff --git a/src/main/resources/assets/nec/textures/block/ricky_block.png b/src/main/resources/assets/nec/textures/block/ricky_block.png new file mode 100644 index 0000000000000000000000000000000000000000..e8446d69b88e56aad391ba022141411cc6ff4789 GIT binary patch literal 3605 zcmbtXc~BE~6kfy$41yG=dDO7TE27=mDe202SP0t8g9LV!vI zsz6#}g;wqq31>jZfC8Z?1S9uVgaj4{5Yi2#2~Hj9)Ru1l*x8w#x9|6k@B7~SrF?P1 zQB4J@0sw&8F(>$JB`rJuV#*5Al|tBn)wfZGwxc*El_*xVD(lBxbV)>l5=cUukplUw$C z+E>v|ZryS2ymk|n9j9_1o~|*AHX;r}mM$?hLms|hW5I8t7u&+U)-Ee;^DOXcx3YcO z$r3_)z?fCWWKz9Wx{C_|rJxCM1&RPrY={Tq^b{0sc z0t>uy%JKS>9K5c3?JDv&WR`v0Am8&mp|x>@e@MioAX#KG4f z0d@!+An>4Edax~?FGp8<>QHoGJK6gh?0^`4)Rzwz1Hz-D4noRJtkq?DjTBtU0#`$) zK}C7(cK-)0TF*I^t>@9QVpuGC3R)G!Tz`y1L7$UUeFzI8KcyN?RnI9`uD!A+2ojdwWl#a~u&3Cn9kuds>dCg7} zYc+7hMmzNS2b^6NdJBUtfnHdNAeoP2KYy?AgEbVsN*;Ok+x|qlRZPEeHU}R zqgL3RlS*5CRL!!U+bbQQtx0CPhYBZG7JX%s)dG8Jq;iYAtLu=YU(5Suz5*MiBLaiC zgsCU6qE0gp$n0`>Fw5=GJw=h86~!`EczvB#hvxPMF=08BPjw$^)WNo{zNMEutyEeA z8G6~2W%9g;HRe`o{v~V?tH3m5_Pm;@oc_EkIq(K++qbYZUN+O{@tD%DdpV8n62U-U zFQUM=fSkdNPPg)ujF;Rt)3g-LLTy7eXXuS7*qtf$7A)(mpH4{ zM3i^ zOHkzHXhE8qv=`kZ0dP9Ez5}__5pjw^k+Bskyw@O@1nb~5M<#FkhO;Qql`A~Hizg~# zM;uy_3a!P!4$K)#w<6C4aa|Ofn$4{&JtP8w>9ip%%HE@z+je2g8b5)Q>v9H}*0Slz z?${OUxd6c?t9;4lbO{ujlmi=n9~Bs=3fpL_ejpeFjf)9h)&Q9LunH*GJch{hGB6w@%gb4O i9(GsXa9F;!iM3RDUi|hEv`}`>1CBYIurIa6U;P7LJE$E1 literal 0 HcmV?d00001 diff --git a/src/main/resources/data/nec/advancements/ak47.json b/src/main/resources/data/nec/advancements/ak47.json new file mode 100644 index 0000000..cf20708 --- /dev/null +++ b/src/main/resources/data/nec/advancements/ak47.json @@ -0,0 +1,31 @@ +{ + "display": { + "icon": { + "item": "nec:ak_47" + }, + "title": { + "translate": "advancements.nec.ak_47.title" + }, + "description": { + "translate": "advancements.nec.ak_47.description" + }, + "frame": "task", + "show_toast": true, + "annouce_to_chat": true + }, + "parent": "nec:nec", + "criteria": { + "requirement": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "nec:ak_47" + ] + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/nec/advancements/dirt_sword.json b/src/main/resources/data/nec/advancements/dirt_sword.json new file mode 100644 index 0000000..f99e94c --- /dev/null +++ b/src/main/resources/data/nec/advancements/dirt_sword.json @@ -0,0 +1,31 @@ +{ + "display": { + "icon": { + "item": "nec:dirt_sword" + }, + "title": { + "translate": "advancements.nec.dirt_sword.title" + }, + "description": { + "translate": "advancements.nec.dirt_sword.description" + }, + "frame": "task", + "show_toast": true, + "annouce_to_chat": true + }, + "parent": "nec:nec", + "criteria": { + "requirement": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "nec:dirt_sword" + ] + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/nec/advancements/nec.json b/src/main/resources/data/nec/advancements/nec.json new file mode 100644 index 0000000..7b43d4d --- /dev/null +++ b/src/main/resources/data/nec/advancements/nec.json @@ -0,0 +1,31 @@ +{ + "display": { + "icon": { + "item": "minecraft:dirt" + }, + "title": { + "translate": "advancements.nec.root.title" + }, + "description": { + "translate": "advancements.nec.root.description" + }, + "frame": "task", + "show_toast": false, + "annouce_to_chat": false, + "background": "nec:textures/block/ricky_block.png" + }, + "criteria": { + "crafting_table": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:crafting_table" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + } +} \ No newline at end of file From 8b7e17556d7391b589c94d1b2eb43f9c60c8836c Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Sat, 15 Apr 2023 16:47:01 +0200 Subject: [PATCH 5/5] removed placeholder mixin logger message --- src/main/java/me/jonasjones/nec/mixin/ExampleMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/jonasjones/nec/mixin/ExampleMixin.java b/src/main/java/me/jonasjones/nec/mixin/ExampleMixin.java index 1137651..19bed5e 100644 --- a/src/main/java/me/jonasjones/nec/mixin/ExampleMixin.java +++ b/src/main/java/me/jonasjones/nec/mixin/ExampleMixin.java @@ -11,6 +11,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class ExampleMixin { @Inject(at = @At("HEAD"), method = "init()V") private void init(CallbackInfo info) { - NotEnoughCursedness.LOGGER.info("This line is printed by an example mod mixin!"); + //NotEnoughCursedness.LOGGER.info("This line is printed by an example mod mixin!"); } }