fix

HO-Artisan · Jul 26, 2024 · c1dfb20 · c1dfb20
1 parent aceb038
commit c1dfb20
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 26 deletions.
diff --git a/src/main/java/ho/artisan/farmaway/client/renderer/MelonRocketRenderer.java b/src/main/java/ho/artisan/farmaway/client/renderer/MelonRocketRenderer.java
@@ -11,7 +11,10 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.Items;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.api.distmarker.OnlyIn;
 
+@OnlyIn(Dist.CLIENT)
 public class MelonRocketRenderer extends EntityRenderer<MelonRocketEntity> {
 	private final ItemRenderer itemRenderer;
 

diff --git a/src/main/java/ho/artisan/farmaway/client/renderer/PotatoLaserRenderer.java b/src/main/java/ho/artisan/farmaway/client/renderer/PotatoLaserRenderer.java
@@ -11,7 +11,10 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.Items;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.api.distmarker.OnlyIn;
 
+@OnlyIn(Dist.CLIENT)
 public class PotatoLaserRenderer extends EntityRenderer<PotatoLaserEntity> {
 
 	private final ItemRenderer itemRenderer;

diff --git a/src/main/java/ho/artisan/farmaway/common/event/FAEvents.java b/src/main/java/ho/artisan/farmaway/common/event/FAEvents.java
@@ -1,13 +1,16 @@
 package ho.artisan.farmaway.common.event;
 
 import ho.artisan.farmaway.FarmAway;
+import ho.artisan.farmaway.common.registry.FABlockTags;
 import ho.artisan.farmaway.common.registry.FABlocks;
 import ho.artisan.farmaway.common.registry.FAMobEffects;
-import ho.artisan.farmaway.common.util.RandomUtil;
+import net.minecraft.core.Holder;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.CropBlock;
+import net.minecraft.world.level.block.state.BlockState;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent;
@@ -34,13 +37,14 @@ private static void onLivingIncomingDamage(LivingIncomingDamageEvent event) {
 
 	@SubscribeEvent
 	private static void onBlockBreak(BlockEvent.BreakEvent event) {
-		Optional<Block> block = RandomUtil.randomBlock();
-		var block_state = event.getLevel().getBlockState(event.getPos());
+		Optional<Block> block = BuiltInRegistries.BLOCK.getRandomElementOf(FABlockTags.PHANTOM_RANDOM_BLOCKS, RandomSource.create()).map(Holder::value);
+
+		BlockState state = event.getLevel().getBlockState(event.getPos());
 		if (event.getPlayer().hasEffect(FAMobEffects.VOID)) {
 			event.setCanceled(true);
 		} else if (event.getPlayer().hasEffect(FAMobEffects.PHANTOM)) {
 			if (!event.getLevel().getBlockState(event.getPos()).is(FABlocks.PHANTOM_DIRT)) {
-				if (block_state.getBlock() instanceof CropBlock crop && crop != FABlocks.EMPTY_ROOT.get() && crop.getAge(block_state) == 0) {
+				if (state.getBlock() instanceof CropBlock crop && crop != FABlocks.EMPTY_ROOT.get() && crop.getAge(state) == 0) {
 					event.setCanceled(true);
 					event.getLevel().setBlock(event.getPos(), FABlocks.EMPTY_ROOT.get().defaultBlockState(), 2);
 				} else {

diff --git a/src/main/java/ho/artisan/farmaway/common/util/RandomUtil.java b/src/main/java/ho/artisan/farmaway/common/util/RandomUtil.java
diff --git a/src/main/java/ho/artisan/farmaway/datagen/DataGenerators.java b/src/main/java/ho/artisan/farmaway/datagen/DataGenerators.java
@@ -1,12 +1,12 @@
 package ho.artisan.farmaway.datagen;
 
 import ho.artisan.farmaway.FarmAway;
+import ho.artisan.farmaway.datagen.datapack.FADatapackBuiltinEntriesProvider;
 import ho.artisan.farmaway.datagen.lang.FAChineseLanguageProvider;
 import ho.artisan.farmaway.datagen.lang.FAEnglishLanguageProvider;
 import ho.artisan.farmaway.datagen.loot.FALootProvider;
 import ho.artisan.farmaway.datagen.model.FABlockStateProvider;
 import ho.artisan.farmaway.datagen.model.FAItemModelProvider;
-import ho.artisan.farmaway.datagen.rotual.FARitualsProvider;
 import ho.artisan.farmaway.datagen.tags.FABlockTagsProvider;
 import ho.artisan.farmaway.datagen.tags.FAItemTagsProvider;
 import net.minecraft.core.HolderLookup;
@@ -41,6 +41,6 @@ public static void onGatherData(GatherDataEvent event) {
 		generator.addProvider(event.includeServer(), new FARecipeProvider(output, lookupProvider));
 		generator.addProvider(event.includeServer(), new FALootProvider(output, lookupProvider));
 
-		generator.addProvider(event.includeServer(), new FARitualsProvider(output, lookupProvider));
+		generator.addProvider(event.includeServer(), new FADatapackBuiltinEntriesProvider(output, lookupProvider));
 	}
 }
diff --git a/...way/datagen/rotual/FARitualsProvider.java → ...ack/FADatapackBuiltinEntriesProvider.java b/...way/datagen/rotual/FARitualsProvider.java → ...ack/FADatapackBuiltinEntriesProvider.java
@@ -1,4 +1,4 @@
-package ho.artisan.farmaway.datagen.rotual;
+package ho.artisan.farmaway.datagen.datapack;
 
 import ho.artisan.farmaway.FarmAway;
 import ho.artisan.farmaway.common.data.FARegistries;
@@ -11,10 +11,11 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
-public class FARitualsProvider extends DatapackBuiltinEntriesProvider {
-	public static final RegistrySetBuilder BUILDER = new RegistrySetBuilder().add(FARegistries.RITUAL, FARituals::init);
+public class FADatapackBuiltinEntriesProvider extends DatapackBuiltinEntriesProvider {
+	public static final RegistrySetBuilder BUILDER = new RegistrySetBuilder()
+		.add(FARegistries.RITUAL, FARituals::init);
 
-	public FARitualsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
+	public FADatapackBuiltinEntriesProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
 		super(output, registries, BUILDER, Set.of(FarmAway.MOD_ID));
 	}
 }