From 11507f7257b8e0a6f49eb21f301a11237db3b521 Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Thu, 20 Apr 2023 23:26:14 +0200 Subject: [PATCH] ported features from 1.19.2 --- gradle.properties | 4 ++-- src/main/java/me/jonasjones/nec/block/ModBlocks.java | 4 ++-- src/main/java/me/jonasjones/nec/item/ModItems.java | 7 ++++++- src/main/java/me/jonasjones/nec/util/ModRegistries.java | 2 -- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9c3c8fb..f69685f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,8 +11,8 @@ org.gradle.parallel=true # Mod Properties - mod_version = 0.1.0 - maven_group = me.jonasjones + mod_version = 0.2.0-1.18.2 + maven_group = me.jonasjones archives_base_name = not-enough-cursedness # Dependencies diff --git a/src/main/java/me/jonasjones/nec/block/ModBlocks.java b/src/main/java/me/jonasjones/nec/block/ModBlocks.java index efbc2b0..9b6cfcb 100644 --- a/src/main/java/me/jonasjones/nec/block/ModBlocks.java +++ b/src/main/java/me/jonasjones/nec/block/ModBlocks.java @@ -11,8 +11,8 @@ 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; +import static net.minecraft.core.Registry.BLOCK; +import static net.minecraft.core.Registry.ITEM; public class ModBlocks { public static final Block GREEN_BIRCH_LOG = new RotatedPillarBlock(FabricBlockSettings.of(Material.WOOD).strength(4.0f)); diff --git a/src/main/java/me/jonasjones/nec/item/ModItems.java b/src/main/java/me/jonasjones/nec/item/ModItems.java index 95c5156..549d09e 100644 --- a/src/main/java/me/jonasjones/nec/item/ModItems.java +++ b/src/main/java/me/jonasjones/nec/item/ModItems.java @@ -8,9 +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 me.jonasjones.nec.NotEnoughCursedness.MOD_ID; +import static net.minecraft.core.Registry.ITEM; public class ModItems { private static Item STEEL_ITEM; @@ -19,6 +19,7 @@ public class ModItems { 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 void register() { TieredItem DIRT_SWORD = new SwordItem(DirtToolMaterial.INSTANCE, 1, -3.0F, new Item.Properties()); @@ -44,5 +45,9 @@ public class ModItems { Item AK47 = new Item(new FabricItemSettings()); AK47_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "ak_47"), AK47); ModRegistries.register_item(AK47_ITEM); + + Item HELMET_ON_A_STICK = new Item(new FabricItemSettings()); + HELMET_ON_A_STICK_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "helmet_on_a_stick"), HELMET_ON_A_STICK); + ModRegistries.register_item(HELMET_ON_A_STICK); } } diff --git a/src/main/java/me/jonasjones/nec/util/ModRegistries.java b/src/main/java/me/jonasjones/nec/util/ModRegistries.java index 0e0f13e..02e453c 100644 --- a/src/main/java/me/jonasjones/nec/util/ModRegistries.java +++ b/src/main/java/me/jonasjones/nec/util/ModRegistries.java @@ -1,8 +1,6 @@ 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;