preenchanted items

DaFuqs · DaFuqs · commit a572f8d26774 · 2025-01-19T13:14:48.000+01:00
diff --git a/src/main/java/de/dafuqs/spectrum/api/item/Preenchanted.java b/src/main/java/de/dafuqs/spectrum/api/item/Preenchanted.java
@@ -1,30 +1,30 @@
 package de.dafuqs.spectrum.api.item;
 
-import de.dafuqs.spectrum.SpectrumCommon;
-import net.minecraft.component.DataComponentTypes;
-import net.minecraft.component.type.ItemEnchantmentsComponent;
-import net.minecraft.enchantment.Enchantment;
+import de.dafuqs.spectrum.*;
+import net.minecraft.component.*;
+import net.minecraft.component.type.*;
+import net.minecraft.enchantment.*;
 import net.minecraft.item.*;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.registry.*;
 import org.jetbrains.annotations.*;
 
-public interface Preenchanted {
-
-	void addDefaultEnchantments(RegistryWrapper.Impl<Enchantment> impl, ItemEnchantmentsComponent.Builder builder);
+import java.util.*;
 
-	default ItemEnchantmentsComponent getDefaultEnchantments() {
-		var builder = new ItemEnchantmentsComponent.Builder(ItemEnchantmentsComponent.DEFAULT);
-		SpectrumCommon.getRegistryLookup()
-				.flatMap(r -> r.getOptionalWrapper(RegistryKeys.ENCHANTMENT))
-				.ifPresent(impl -> addDefaultEnchantments(impl, builder));
+public interface Preenchanted {
+	
+	Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments();
+	
+	default ItemEnchantmentsComponent buildDefaultEnchantments(RegistryWrapper.WrapperLookup lookup) {
+		ItemEnchantmentsComponent.Builder builder = new ItemEnchantmentsComponent.Builder(ItemEnchantmentsComponent.DEFAULT);
+		for (Map.Entry<RegistryKey<Enchantment>, Integer> entry : getDefaultEnchantments().entrySet()) {
+			builder.set(lookup.getWrapperOrThrow(RegistryKeys.ENCHANTMENT).getOrThrow(entry.getKey()), entry.getValue());
+		}
 		return builder.build();
 	}
 
 	default @NotNull ItemStack getDefaultEnchantedStack(Item item) {
-		var stack = new ItemStack(item);
-		SpectrumCommon.getRegistryLookup().ifPresent(
-				r -> stack.set(DataComponentTypes.ENCHANTMENTS, getDefaultEnchantments()));
+		ItemStack stack = item.getDefaultStack();
+		SpectrumCommon.getRegistryLookup().ifPresent(r -> stack.set(DataComponentTypes.ENCHANTMENTS, buildDefaultEnchantments()));
 		return stack;
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/items/food/StatusEffectDrinkItem.java b/src/main/java/de/dafuqs/spectrum/items/food/StatusEffectDrinkItem.java
@@ -1,19 +1,16 @@
 package de.dafuqs.spectrum.items.food;
 
-import de.dafuqs.spectrum.items.trinkets.*;
 import net.minecraft.advancement.criterion.*;
+import net.minecraft.component.*;
+import net.minecraft.component.type.*;
 import net.minecraft.entity.*;
-import net.minecraft.entity.effect.*;
 import net.minecraft.entity.player.*;
 import net.minecraft.item.*;
-import net.minecraft.potion.*;
 import net.minecraft.server.network.*;
 import net.minecraft.stat.*;
 import net.minecraft.world.*;
 import net.minecraft.world.event.*;
 
-import java.util.*;
-
 public class StatusEffectDrinkItem extends DrinkItem {
 	
 	public StatusEffectDrinkItem(Settings settings) {
@@ -28,14 +25,14 @@ public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) {
 		}
 		
 		if (!world.isClient) {
-			List<StatusEffectInstance> list = PotionUtil.getPotionEffects(stack);
-			for (StatusEffectInstance statusEffectInstance : list) {
-				if (statusEffectInstance.getEffectType().isInstant()) {
-					statusEffectInstance.getEffectType().applyInstantEffect(playerEntity, playerEntity, user, statusEffectInstance.getAmplifier(), 1.0D);
+			PotionContentsComponent potionContentsComponent = stack.getOrDefault(DataComponentTypes.POTION_CONTENTS, PotionContentsComponent.DEFAULT);
+			potionContentsComponent.forEachEffect((effect) -> {
+				if ((effect.getEffectType().value()).isInstant()) {
+					(effect.getEffectType().value()).applyInstantEffect(playerEntity, playerEntity, user, effect.getAmplifier(), 1.0);
 				} else {
-					user.addStatusEffect(new StatusEffectInstance(statusEffectInstance));
+					user.addStatusEffect(effect);
 				}
-			}
+			});
 		}
 		
 		if (playerEntity != null) {
diff --git a/src/main/java/de/dafuqs/spectrum/items/magic_items/PaintbrushItem.java b/src/main/java/de/dafuqs/spectrum/items/magic_items/PaintbrushItem.java
@@ -130,7 +130,7 @@ private boolean tryColorBlock(ItemUsageContext context) {
 		BlockPos pos = context.getBlockPos();
 		BlockState state = world.getBlockState(pos);
 		if (state.getBlock() instanceof ColorableBlock colorableBlock) {
-			if (!colorableBlock.isColor(state, dyeColor)) {
+			if (!colorableBlock.isColor(world, pos, dyeColor)) {
 				if (payBlockColorCost(context.getPlayer(), inkColor.get()) && colorableBlock.color(world, pos, dyeColor)) {
 					context.getWorld().playSound(null, context.getBlockPos(), SpectrumSoundEvents.PAINTBRUSH_PAINT, SoundCategory.BLOCKS, 1.0F, 1.0F);
 				} else {
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/BedrockBowItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/BedrockBowItem.java
@@ -4,6 +4,7 @@
 import de.dafuqs.spectrum.api.item.*;
 import net.minecraft.enchantment.*;
 import net.minecraft.item.*;
+import net.minecraft.registry.*;
 
 import java.util.*;
 
@@ -19,7 +20,7 @@ public boolean isDamageable() {
 	}
 	
 	@Override
-	public Map<Enchantment, Integer> getDefaultEnchantments() {
+	public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {
 		return Map.of(Enchantments.POWER, 6);
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/BedrockCrossbowItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/BedrockCrossbowItem.java
@@ -4,6 +4,7 @@
 import de.dafuqs.spectrum.api.item.*;
 import net.minecraft.enchantment.*;
 import net.minecraft.item.*;
+import net.minecraft.registry.*;
 
 import java.util.*;
 
@@ -19,7 +20,7 @@ public boolean isDamageable() {
 	}
 	
 	@Override
-	public Map<Enchantment, Integer> getDefaultEnchantments() {
+	public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {
 		return Map.of(Enchantments.QUICK_CHARGE, 4);
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/BedrockFishingRodItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/BedrockFishingRodItem.java
@@ -3,16 +3,15 @@
 import de.dafuqs.spectrum.api.item.*;
 import de.dafuqs.spectrum.entity.entity.*;
 import de.dafuqs.spectrum.registries.*;
-import net.minecraft.client.item.*;
 import net.minecraft.enchantment.*;
 import net.minecraft.entity.player.*;
 import net.minecraft.fluid.*;
 import net.minecraft.item.*;
-import net.minecraft.item.tooltip.TooltipType;
+import net.minecraft.item.tooltip.*;
+import net.minecraft.registry.*;
 import net.minecraft.text.*;
 import net.minecraft.util.*;
 import net.minecraft.world.*;
-import org.jetbrains.annotations.*;
 
 import java.util.*;
 
@@ -28,7 +27,7 @@ public boolean isDamageable() {
 	}
 	
 	@Override
-	public Map<Enchantment, Integer> getDefaultEnchantments() {
+	public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {
 		return Map.of(Enchantments.LUCK_OF_THE_SEA, 4);
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/BedrockShearsItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/BedrockShearsItem.java
@@ -3,6 +3,7 @@
 import de.dafuqs.spectrum.api.item.*;
 import net.minecraft.enchantment.*;
 import net.minecraft.item.*;
+import net.minecraft.registry.*;
 
 import java.util.*;
 
@@ -19,7 +20,7 @@ public boolean isDamageable() {
 	}
 	
 	@Override
-	public Map<Enchantment, Integer> getDefaultEnchantments() {
+	public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {
 		return Map.of(Enchantments.EFFICIENCY, 6);
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/DraconicTwinswordItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/DraconicTwinswordItem.java
@@ -13,6 +13,7 @@
 import net.minecraft.entity.projectile.*;
 import net.minecraft.item.*;
 import net.minecraft.item.tooltip.*;
+import net.minecraft.registry.*;
 import net.minecraft.server.network.*;
 import net.minecraft.sound.*;
 import net.minecraft.text.*;
@@ -200,8 +201,8 @@ public static ItemStack findThrownStack(PlayerEntity player, UUID id) {
 	}
 	
 	@Override
-	public Map<Enchantment, Integer> getDefaultEnchantments() {
-		return Map.of(Enchantments.SWEEPING, 5);
+	public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {
+		return Map.of(Enchantments.SWEEPING_EDGE, 5);
 	}
 	
 	@Override
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/DragonTalonItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/DragonTalonItem.java
@@ -16,6 +16,7 @@
 import net.minecraft.item.*;
 import net.minecraft.item.tooltip.*;
 import net.minecraft.nbt.*;
+import net.minecraft.registry.*;
 import net.minecraft.server.network.*;
 import net.minecraft.server.world.*;
 import net.minecraft.sound.*;
@@ -213,7 +214,7 @@ public boolean acceptsEnchantment(Enchantment enchantment) {
 	}
 	
 	@Override
-	public Map<Enchantment, Integer> getDefaultEnchantments() {
+	public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {
 		return Map.of();
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/GreatswordItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/GreatswordItem.java
@@ -7,6 +7,7 @@
 import net.minecraft.entity.*;
 import net.minecraft.entity.attribute.*;
 import net.minecraft.item.*;
+import net.minecraft.registry.*;
 
 import java.util.*;
 
@@ -43,7 +44,7 @@ public Multimap<EntityAttribute, EntityAttributeModifier> getAttributeModifiers(
 	}
 
 	@Override
-	public Map<Enchantment, Integer> getDefaultEnchantments() {
+	public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {
 		return Map.of(Enchantments.SWEEPING, 4);
 	}
 
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/LagoonRodItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/LagoonRodItem.java
@@ -7,7 +7,8 @@
 import net.minecraft.entity.player.*;
 import net.minecraft.fluid.*;
 import net.minecraft.item.*;
-import net.minecraft.item.tooltip.TooltipType;
+import net.minecraft.item.tooltip.*;
+import net.minecraft.registry.*;
 import net.minecraft.text.*;
 import net.minecraft.util.*;
 import net.minecraft.world.*;
@@ -21,7 +22,7 @@ public LagoonRodItem(Settings settings) {
 	}
 	
 	@Override
-	public Map<Enchantment, Integer> getDefaultEnchantments() {
+	public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {
 		return Map.of(Enchantments.LURE, 3);
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/MalachiteBidentItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/MalachiteBidentItem.java
@@ -16,6 +16,7 @@
 import net.minecraft.entity.projectile.*;
 import net.minecraft.item.*;
 import net.minecraft.item.tooltip.*;
+import net.minecraft.registry.*;
 import net.minecraft.screen.slot.*;
 import net.minecraft.server.world.*;
 import net.minecraft.sound.*;
@@ -50,7 +51,7 @@ public Multimap<EntityAttribute, EntityAttributeModifier> getAttributeModifiers(
 	}
 	
 	@Override
-	public Map<Enchantment, Integer> getDefaultEnchantments() {
+	public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {
 		return Map.of(Enchantments.IMPALING, 6);
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/MalachiteCrossbowItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/MalachiteCrossbowItem.java
@@ -25,7 +25,7 @@ public MalachiteCrossbowItem(Settings settings) {
     }
 	
 	@Override
-	public Map<Enchantment, Integer> getDefaultEnchantments() {
+	public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {
 		return Map.of(Enchantments.PIERCING, 5);
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/items/tools/PreenchantedMultiToolItem.java b/src/main/java/de/dafuqs/spectrum/items/tools/PreenchantedMultiToolItem.java
@@ -5,9 +5,8 @@
 import net.minecraft.block.entity.*;
 import net.minecraft.enchantment.*;
 import net.minecraft.item.*;
-import net.minecraft.item.tooltip.TooltipType;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.entry.*;
+import net.minecraft.item.tooltip.*;
+import net.minecraft.registry.*;
 import net.minecraft.text.*;
 
 import java.util.*;
@@ -19,7 +18,7 @@ public PreenchantedMultiToolItem(ToolMaterial material, int attackDamage, float
 	}
 	
 	@Override
-	public Map<Enchantment, Integer> getDefaultEnchantments() {
+	public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {
 		return Map.of(Enchantments.EFFICIENCY, 1);
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java
@@ -292,7 +292,7 @@ public void addDefaultEnchantments(RegistryWrapper.Impl<Enchantment> impl, ItemE
 	public static final Item ONYX_ROCK_CANDY = new RockCandyItem(IS.of().food(SpectrumFoodComponents.ONYX_ROCK_CANDY), RockCandy.RockCandyVariant.ONYX);
 	public static final Item MOONSTONE_ROCK_CANDY = new RockCandyItem(IS.of().food(SpectrumFoodComponents.MOONSTONE_ROCK_CANDY), RockCandy.RockCandyVariant.MOONSTONE);
 	
-	public static final Item BLOODBOIL_SYRUP = new StatusEffectDrinkItem(IS.of().food(SpectrumFoodComponents.BLOODBOIL_SYRUP).recipeRemainder(Items.GLASS_BOTTLE));
+	public static final Item BLOODBOIL_SYRUP = new DrinkItem(IS.of().food(SpectrumFoodComponents.BLOODBOIL_SYRUP).recipeRemainder(Items.GLASS_BOTTLE));
 	public static final Item MILKY_RESIN = new Item(IS.of(Rarity.UNCOMMON));
 	
 	// Food & drinks

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import de.dafuqs.spectrum.api.item.*;`
`5`	`5`	`import net.minecraft.enchantment.*;`
`6`	`6`	`import net.minecraft.item.*;`
	`7`	`+import net.minecraft.registry.*;`
`7`	`8`
`8`	`9`	`import java.util.*;`
`9`	`10`
`@@ -19,7 +20,7 @@ public boolean isDamageable() {`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`@Override`
`22`		`- public Map<Enchantment, Integer> getDefaultEnchantments() {`
	`23`	`+ public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {`
`23`	`24`	`return Map.of(Enchantments.POWER, 6);`
`24`	`25`	`}`
`25`	`26`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import de.dafuqs.spectrum.api.item.*;`
`4`	`4`	`import net.minecraft.enchantment.*;`
`5`	`5`	`import net.minecraft.item.*;`
	`6`	`+import net.minecraft.registry.*;`
`6`	`7`
`7`	`8`	`import java.util.*;`
`8`	`9`
`@@ -19,7 +20,7 @@ public boolean isDamageable() {`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`@Override`
`22`		`- public Map<Enchantment, Integer> getDefaultEnchantments() {`
	`23`	`+ public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {`
`23`	`24`	`return Map.of(Enchantments.EFFICIENCY, 6);`
`24`	`25`	`}`
`25`	`26`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`import net.minecraft.item.*;`
`17`	`17`	`import net.minecraft.item.tooltip.*;`
`18`	`18`	`import net.minecraft.nbt.*;`
	`19`	`+import net.minecraft.registry.*;`
`19`	`20`	`import net.minecraft.server.network.*;`
`20`	`21`	`import net.minecraft.server.world.*;`
`21`	`22`	`import net.minecraft.sound.*;`
`@@ -213,7 +214,7 @@ public boolean acceptsEnchantment(Enchantment enchantment) {`
`213`	`214`	`}`
`214`	`215`
`215`	`216`	`@Override`
`216`		`- public Map<Enchantment, Integer> getDefaultEnchantments() {`
	`217`	`+ public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {`
`217`	`218`	`return Map.of();`
`218`	`219`	`}`
`219`	`220`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import net.minecraft.entity.*;`
`8`	`8`	`import net.minecraft.entity.attribute.*;`
`9`	`9`	`import net.minecraft.item.*;`
	`10`	`+import net.minecraft.registry.*;`
`10`	`11`
`11`	`12`	`import java.util.*;`
`12`	`13`
`@@ -43,7 +44,7 @@ public Multimap<EntityAttribute, EntityAttributeModifier> getAttributeModifiers(`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`@Override`
`46`		`- public Map<Enchantment, Integer> getDefaultEnchantments() {`
	`47`	`+ public Map<RegistryKey<Enchantment>, Integer> getDefaultEnchantments() {`
`47`	`48`	`return Map.of(Enchantments.SWEEPING, 4);`
`48`	`49`	`}`
`49`	`50`