fix bushes dropping sweet berries on dedicated server

Sunconure11 · Jul 11, 2022 · 561ad95 · 561ad95
1 parent ed19c0c
commit 561ad95
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 20 deletions.
diff --git a/src/main/java/com/github/platymemo/alaskanativecraft/block/BlueberryBushBlock.java b/src/main/java/com/github/platymemo/alaskanativecraft/block/BlueberryBushBlock.java
@@ -1,8 +1,6 @@
 package com.github.platymemo.alaskanativecraft.block;
 
 import com.github.platymemo.alaskanativecraft.item.AlaskaItems;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
@@ -14,7 +12,6 @@ public BlueberryBushBlock(Settings settings) {
     }
 
     @Override
-    @Environment(EnvType.CLIENT)
     public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) {
         return AlaskaItems.BLUEBERRIES.getDefaultStack();
     }

diff --git a/src/main/java/com/github/platymemo/alaskanativecraft/block/BushBlock.java b/src/main/java/com/github/platymemo/alaskanativecraft/block/BushBlock.java
@@ -44,7 +44,7 @@ public ActionResult onUse(@NotNull BlockState state, World world, BlockPos pos,
             world.setBlockState(pos, state.with(AGE, 1), 2);
             return ActionResult.success(world.isClient);
         } else {
-            return super.onUse(state, world, pos, player, hand, hit);
+            return ActionResult.PASS;
         }
     }
 

diff --git a/src/main/java/com/github/platymemo/alaskanativecraft/block/CloudberryBushBlock.java b/src/main/java/com/github/platymemo/alaskanativecraft/block/CloudberryBushBlock.java
@@ -1,8 +1,6 @@
 package com.github.platymemo.alaskanativecraft.block;
 
 import com.github.platymemo.alaskanativecraft.item.AlaskaItems;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
@@ -26,7 +24,6 @@ public CloudberryBushBlock(Settings settings) {
     }
 
     @Override
-    @Environment(EnvType.CLIENT)
     public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) {
         return AlaskaItems.CLOUDBERRIES.getDefaultStack();
     }

diff --git a/src/main/java/com/github/platymemo/alaskanativecraft/block/LabradorTeaBlock.java b/src/main/java/com/github/platymemo/alaskanativecraft/block/LabradorTeaBlock.java
@@ -1,12 +1,7 @@
 package com.github.platymemo.alaskanativecraft.block;
 
 import com.github.platymemo.alaskanativecraft.item.AlaskaItems;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.block.AbstractBlock;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Fertilizable;
-import net.minecraft.block.FlowerBlock;
+import net.minecraft.block.*;
 import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.world.ServerWorld;
@@ -21,7 +16,6 @@ public LabradorTeaBlock(StatusEffect suspiciousStewEffect, int effectDuration, A
     }
 
     @Override
-    @Environment(EnvType.CLIENT)
     public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) {
         return AlaskaItems.LABRADOR_TEA.getDefaultStack();
     }

diff --git a/src/main/java/com/github/platymemo/alaskanativecraft/block/RaspberryBushBlock.java b/src/main/java/com/github/platymemo/alaskanativecraft/block/RaspberryBushBlock.java
@@ -1,8 +1,6 @@
 package com.github.platymemo.alaskanativecraft.block;
 
 import com.github.platymemo.alaskanativecraft.item.AlaskaItems;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
@@ -14,7 +12,6 @@ public RaspberryBushBlock(Settings settings) {
     }
 
     @Override
-    @Environment(EnvType.CLIENT)
     public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) {
         return AlaskaItems.RASPBERRIES.getDefaultStack();
     }

diff --git a/src/main/java/com/github/platymemo/alaskanativecraft/block/SalmonberryBushBlock.java b/src/main/java/com/github/platymemo/alaskanativecraft/block/SalmonberryBushBlock.java
@@ -1,8 +1,6 @@
 package com.github.platymemo.alaskanativecraft.block;
 
 import com.github.platymemo.alaskanativecraft.item.AlaskaItems;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
@@ -14,7 +12,6 @@ public SalmonberryBushBlock(Settings settings) {
     }
 
     @Override
-    @Environment(EnvType.CLIENT)
     public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) {
         return AlaskaItems.SALMONBERRIES.getDefaultStack();
     }