fix forge fireblock mixin and some refactoring
This commit is contained in:
parent
2dca74282e
commit
8b274631bd
@ -1,6 +1,5 @@
|
|||||||
package io.github.flemmli97.flan.fabric;
|
package io.github.flemmli97.flan.fabric;
|
||||||
|
|
||||||
import io.github.flemmli97.flan.FabricRegistryWrapper;
|
|
||||||
import io.github.flemmli97.flan.SimpleRegistryWrapper;
|
import io.github.flemmli97.flan.SimpleRegistryWrapper;
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
import net.fabricmc.loader.api.FabricLoader;
|
||||||
import net.minecraft.core.Registry;
|
import net.minecraft.core.Registry;
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package io.github.flemmli97.flan;
|
package io.github.flemmli97.flan.fabric;
|
||||||
|
|
||||||
|
import io.github.flemmli97.flan.SimpleRegistryWrapper;
|
||||||
import net.minecraft.core.Registry;
|
import net.minecraft.core.Registry;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
|
@ -1,5 +1,6 @@
|
|||||||
package io.github.flemmli97.flan;
|
package io.github.flemmli97.flan.fabric;
|
||||||
|
|
||||||
|
import io.github.flemmli97.flan.Flan;
|
||||||
import io.github.flemmli97.flan.api.permission.ObjectToPermissionMap;
|
import io.github.flemmli97.flan.api.permission.ObjectToPermissionMap;
|
||||||
import io.github.flemmli97.flan.commands.CommandClaim;
|
import io.github.flemmli97.flan.commands.CommandClaim;
|
||||||
import io.github.flemmli97.flan.config.ConfigHandler;
|
import io.github.flemmli97.flan.config.ConfigHandler;
|
@ -1,6 +1,5 @@
|
|||||||
package io.github.flemmli97.flan.forge;
|
package io.github.flemmli97.flan.forge;
|
||||||
|
|
||||||
import io.github.flemmli97.flan.ForgeRegistryWrapper;
|
|
||||||
import io.github.flemmli97.flan.SimpleRegistryWrapper;
|
import io.github.flemmli97.flan.SimpleRegistryWrapper;
|
||||||
import net.minecraft.nbt.CompoundTag;
|
import net.minecraft.nbt.CompoundTag;
|
||||||
import net.minecraft.world.Container;
|
import net.minecraft.world.Container;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package io.github.flemmli97.flan;
|
package io.github.flemmli97.flan.forge;
|
||||||
|
|
||||||
import io.github.flemmli97.flan.SimpleRegistryWrapper;
|
import io.github.flemmli97.flan.SimpleRegistryWrapper;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
@ -19,7 +19,7 @@ public abstract class ForgeFireMixin {
|
|||||||
/**
|
/**
|
||||||
* Check for blocks reacting to fire (e.g. tnt)
|
* Check for blocks reacting to fire (e.g. tnt)
|
||||||
*/
|
*/
|
||||||
@Inject(method = "tryCatchFire", at = @At(value = "HEAD"), cancellable = true)
|
@Inject(method = "tryCatchFire", at = @At(value = "HEAD"), cancellable = true, remap = false)
|
||||||
private void spread(Level world, BlockPos pos, int spreadFactor, Random rand, int currentAge, Direction dir, CallbackInfo info) {
|
private void spread(Level world, BlockPos pos, int spreadFactor, Random rand, int currentAge, Direction dir, CallbackInfo info) {
|
||||||
if (!world.isClientSide && !WorldEvents.canFireSpread((ServerLevel) world, pos)) {
|
if (!world.isClientSide && !WorldEvents.canFireSpread((ServerLevel) world, pos)) {
|
||||||
info.cancel();
|
info.cancel();
|
||||||
|
Loading…
Reference in New Issue
Block a user