It's finally in an acceptable state

kckarnige · Aug 21, 2024 · 685b016 · 685b016
1 parent 238d593
commit 685b016
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/main/java/com/kckarnige/oye/item/AntiCatalyst.java b/src/main/java/com/kckarnige/oye/item/AntiCatalyst.java
@@ -20,12 +20,12 @@ public AntiCatalyst(Settings settings) {
     @Override
     public TypedActionResult<ItemStack> use(World world, PlayerEntity player, Hand hand) {
         if (!world.isClient()) {
-            world.playSound(null, player.getBlockPos(), SoundEvents.ENTITY_PLAYER_BREATH, SoundCategory.VOICE);
-            player.addStatusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 120, 2, false, false, false));
-            player.addStatusEffect(new StatusEffectInstance(StatusEffects.SPEED, 120, 3, false, false, false));
-            player.addStatusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 120, 3, false, false, false));
-            player.addStatusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 120, 2, false, false, false));
-            player.addStatusEffect(new StatusEffectInstance(StatusEffects.SATURATION, 120, 2, false, false, false));
+            world.playSound(null, player.getBlockPos(), SoundEvents.BLOCK_ENCHANTMENT_TABLE_USE, SoundCategory.PLAYERS);
+            player.addStatusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 120, 2, false, false, true));
+            player.addStatusEffect(new StatusEffectInstance(StatusEffects.SPEED, 120, 3, false, false, true));
+            player.addStatusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 120, 3, false, false, true));
+            player.addStatusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 120, 2, false, false, true));
+            player.addStatusEffect(new StatusEffectInstance(StatusEffects.SATURATION, 120, 2, false, false, true));
         }
         return TypedActionResult.consume(ItemStack.EMPTY);
     }

diff --git a/src/main/java/com/kckarnige/oye/item/EndCatalyst.java b/src/main/java/com/kckarnige/oye/item/EndCatalyst.java
@@ -7,10 +7,6 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
-import net.minecraft.util.Hand;
-import net.minecraft.util.TypedActionResult;
 import net.minecraft.world.World;
 
 public class EndCatalyst extends Item {

diff --git a/src/main/resources/data/openyoureye/advancement/recipes/anti_end_matter.json b/src/main/resources/data/openyoureye/advancement/recipes/anti_end_matter.json
@@ -1,7 +1,7 @@
 {
 	"parent": "minecraft:recipes/root",
 	"criteria": {
-	  "has_nether_star": {
+	  "has_dragon_breath": {
 		"conditions": {
 		  "items": [
 			{
@@ -21,7 +21,7 @@
 	"requirements": [
 	  [
 		"has_the_recipe",
-		"has_nether_star"
+		"has_dragon_breath"
 	  ]
 	],
 	"rewards": {

diff --git a/src/main/resources/data/openyoureye/recipe/anti_end_matter.json b/src/main/resources/data/openyoureye/recipe/anti_end_matter.json
@@ -6,7 +6,7 @@
       "item": "minecraft:wither_rose"
     },
     {
-      "item": "openyoureye:end_matter"
+      "item": "minecraft:nether_star"
     },
     {
       "item": "minecraft:dragon_breath"