Minecraft 1.19 update

Tigereye504 · Jul 4, 2023 · 4b7f823 · 4b7f823
1 parent 1b6fd14
commit 4b7f823
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 18 deletions.
diff --git a/src/main/java/net/tigereye/passivecharms/items/contingency_reactors/Featherfall.java b/src/main/java/net/tigereye/passivecharms/items/contingency_reactors/Featherfall.java
@@ -9,8 +9,6 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.world.World;
 
-import java.util.Random;
-
 public class Featherfall extends ContingencyCharmReaction{
     private static final int COST = 333;
     private static final int DURATION = 600;

diff --git a/src/main/java/net/tigereye/passivecharms/items/contingency_reactors/Gills.java b/src/main/java/net/tigereye/passivecharms/items/contingency_reactors/Gills.java
@@ -8,9 +8,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.world.World;
-
-import java.util.Random;
-
 public class Gills extends ContingencyCharmReaction{
     private static final int COST = 333;
     private static final int DURATION = 600;

diff --git a/src/main/java/net/tigereye/passivecharms/items/contingency_reactors/Regeneration.java b/src/main/java/net/tigereye/passivecharms/items/contingency_reactors/Regeneration.java
@@ -9,8 +9,6 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.world.World;
 
-import java.util.Random;
-
 public class Regeneration extends ContingencyCharmReaction{
     private static final int COST = 333;
     private static final int DURATION = 600;

diff --git a/src/main/java/net/tigereye/passivecharms/items/contingency_reactors/Warp.java b/src/main/java/net/tigereye/passivecharms/items/contingency_reactors/Warp.java
@@ -21,6 +21,9 @@ public void React(ItemStack stack, World world, Entity entity, int slot, boolean
         int x;
         int y = 64;
         int z;
+        if(world.isClient()){
+            return;
+        }
         RegistryKey<World> dim = World.OVERWORLD;
         if(stack.getMaxDamage()-stack.getDamage() > COST){
             if(entity instanceof LivingEntity lEntity){
@@ -31,7 +34,7 @@ public void React(ItemStack stack, World world, Entity entity, int slot, boolean
                 z = nbt.getInt("WarpZ");
                 if(nbt.contains("WarpWorld")) {
                     dim = RegistryKey.of(Registry.WORLD_KEY, //TODO: if warping acts badly, this may be the wrong registry. It was .DIMENSION
-                            new Identifier(Reactant.getNbt().getString("WarpWorld")));
+                            new Identifier(nbt.getString("WarpWorld")));
                 }
                 if(entity.getEntityWorld().getRegistryKey() != dim) {
                     entity.moveToWorld(entity.getServer().getWorld(dim));

diff --git a/src/main/java/net/tigereye/passivecharms/recipes/IndustryCharmRecipe.java b/src/main/java/net/tigereye/passivecharms/recipes/IndustryCharmRecipe.java
@@ -1,21 +1,16 @@
 package net.tigereye.passivecharms.recipes;
 
-import net.minecraft.entity.effect.StatusEffect;
-import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.potion.PotionUtil;
 import net.minecraft.recipe.RecipeSerializer;
 import net.minecraft.recipe.SpecialCraftingRecipe;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.World;
 import net.tigereye.passivecharms.registration.PCItems;
 import net.tigereye.passivecharms.registration.PCRecipes;
 
-import java.util.List;
-
 public class IndustryCharmRecipe extends SpecialCraftingRecipe {
 
     public IndustryCharmRecipe(Identifier id) {

diff --git a/src/main/java/net/tigereye/passivecharms/recipes/IndustryCharmReloadRecipe.java b/src/main/java/net/tigereye/passivecharms/recipes/IndustryCharmReloadRecipe.java
@@ -1,13 +1,10 @@
 package net.tigereye.passivecharms.recipes;
 
 import net.fabricmc.fabric.api.registry.FuelRegistry;
-import net.minecraft.entity.effect.StatusEffect;
-import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.potion.PotionUtil;
 import net.minecraft.recipe.RecipeSerializer;
 import net.minecraft.recipe.SpecialCraftingRecipe;
 import net.minecraft.util.Identifier;
@@ -16,8 +13,6 @@
 import net.tigereye.passivecharms.registration.PCItems;
 import net.tigereye.passivecharms.registration.PCRecipes;
 
-import java.util.List;
-
 public class IndustryCharmReloadRecipe extends SpecialCraftingRecipe {
 
     public IndustryCharmReloadRecipe(Identifier id) {