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] 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); + //}); } }