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 diff --git a/build.gradle b/build.gradle index 8c37f0f..930f6e2 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,7 @@ 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 loom.layered { //it.parchment("org.parchmentmc.data:parchment-1.19.3:2022.12.18@zip") it.officialMojangMappings { diff --git a/src/main/java/me/jonasjones/nec/block/ModBlocks.java b/src/main/java/me/jonasjones/nec/block/ModBlocks.java index 766bc50..efbc2b0 100644 --- a/src/main/java/me/jonasjones/nec/block/ModBlocks.java +++ b/src/main/java/me/jonasjones/nec/block/ModBlocks.java @@ -10,8 +10,9 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.RotatedPillarBlock; import net.minecraft.world.level.material.Material; -import static net.minecraft.core.Registry.BLOCK; -import static net.minecraft.core.Registry.ITEM; +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 RotatedPillarBlock(FabricBlockSettings.of(Material.WOOD).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(BLOCK, new ResourceLocation("nec", "blaze_block"), BLAZE_BLOCK); - BLAZE_BLOCK_ITEM = Registry.register(ITEM, new ResourceLocation("nec", "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(BLOCK, new ResourceLocation("nec", "green_birch_log"), GREEN_BIRCH_LOG); - GREEN_BIRCH_LOG_ITEM = Registry.register(ITEM, new ResourceLocation("nec", "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(BLOCK, new ResourceLocation("nec", "gun_block"), GUN_BLOCK); - GUN_BLOCK_ITEM = Registry.register(ITEM, new ResourceLocation("nec", "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(BLOCK, new ResourceLocation("nec", "diamond_ore_ore"), DIAMOND_ORE_ORE); - DIAMOND_ORE_ORE_ITEM = Registry.register(ITEM, new ResourceLocation("nec", "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(BLOCK, new ResourceLocation("nec", "deepslate_diamond_ore_ore"), DEEPSLATE_DIAMOND_ORE_ORE); - DEEPSLATE_DIAMOND_ORE_ORE_ITEM = Registry.register(ITEM, new ResourceLocation("nec", "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(BLOCK, new ResourceLocation("nec", "java_block"), JAVA_BLOCK); - JAVA_BLOCK_ITEM = Registry.register(ITEM, new ResourceLocation("nec", "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(BLOCK, new ResourceLocation("nec", "pocket_block"), POCKET_BLOCK); - POCKET_BLOCK_ITEM = Registry.register(ITEM, new ResourceLocation("nec", "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 80c3565..95c5156 100644 --- a/src/main/java/me/jonasjones/nec/item/ModItems.java +++ b/src/main/java/me/jonasjones/nec/item/ModItems.java @@ -8,8 +8,9 @@ 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 net.minecraft.core.Registry.ITEM; +import static me.jonasjones.nec.NotEnoughCursedness.MOD_ID; public class ModItems { private static Item STEEL_ITEM; @@ -21,27 +22,27 @@ public class ModItems { public static void register() { TieredItem DIRT_SWORD = new SwordItem(DirtToolMaterial.INSTANCE, 1, -3.0F, new Item.Properties()); - DIRT_SWORD_ITEM = Registry.register(ITEM, new ResourceLocation("nec", "dirt_sword"), DIRT_SWORD); + 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(ITEM, new ResourceLocation("nec", "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(ITEM, new ResourceLocation("nec", "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(ITEM, new ResourceLocation("nec", "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(ITEM, new ResourceLocation("nec", "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(ITEM, new ResourceLocation("nec", "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 9976bdd..b8bd16c 100644 --- a/src/main/java/me/jonasjones/nec/item/materials/DirtToolMaterial.java +++ b/src/main/java/me/jonasjones/nec/item/materials/DirtToolMaterial.java @@ -38,4 +38,4 @@ public class DirtToolMaterial implements Tier { public Ingredient getRepairIngredient() { 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 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!"); } } diff --git a/src/main/java/me/jonasjones/nec/util/ModRegistries.java b/src/main/java/me/jonasjones/nec/util/ModRegistries.java index c8b72b6..0e0f13e 100644 --- a/src/main/java/me/jonasjones/nec/util/ModRegistries.java +++ b/src/main/java/me/jonasjones/nec/util/ModRegistries.java @@ -1,22 +1,20 @@ package me.jonasjones.nec.util; import me.jonasjones.nec.block.ModBlocks; +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.client.gui.screens.CreateBuffetWorldScreen; -import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; + +import static me.jonasjones.nec.NotEnoughCursedness.MOD_ID; public class ModRegistries { - /*static final CreativeModeTab ITEM_GROUP = new CreativeModeTab(0, "nec") { - @Override - public ItemStack makeIcon() { - return ModBlocks.GREEN_BIRCH_LOG_ITEM.getDefaultInstance(); - } - };*/ + /*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(); @@ -52,7 +50,7 @@ public class ModRegistries { } public static void register_item(Item CUSTOM_ITEM) { - //CreateBuffetWorldScreen.modifyEntriesEvent(ITEM_GROUP).register(content -> { + //ItemGroupEvents.modifyEntriesEvent(ITEM_GROUP).register(content -> { // content.add(CUSTOM_ITEM); //}); } 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 0000000..e8446d6 Binary files /dev/null and b/src/main/resources/assets/nec/textures/block/ricky_block.png differ 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