reverting that merge of mixins since it will cause havoc on the future version branches
This commit is contained in:
1 parent
b2391b4d8c
commit
40b537501f
3 files changed
+42
-30
No files matched your search
@@ -0,0 +1,35 @@
|
|||||||
|
package carpet.mixins;
|
||||||
|
|
||||||
|
import carpet.CarpetSettings;
|
||||||
|
import net.minecraft.block.entity.StructureBlockBlockEntity;
|
||||||
|
import net.minecraft.structure.Structure;
|
||||||
|
import net.minecraft.structure.StructurePlacementData;
|
||||||
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.world.ServerWorldAccess;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||||
|
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
|
@Mixin(StructureBlockBlockEntity.class)
|
||||||
|
public abstract class StructureBlockBlockEntity_fillUpdatesMixin
|
||||||
|
{
|
||||||
|
@Redirect(method = "place", at = @At(
|
||||||
|
value = "INVOKE",
|
||||||
|
target = "Lnet/minecraft/structure/Structure;place(Lnet/minecraft/world/ServerWorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/structure/StructurePlacementData;Ljava/util/Random;)V"
|
||||||
|
))
|
||||||
|
private void onStructurePlacen(Structure structure, ServerWorldAccess serverWorldAccess, BlockPos pos, StructurePlacementData placementData, Random random)
|
||||||
|
{
|
||||||
|
if(!CarpetSettings.fillUpdates)
|
||||||
|
CarpetSettings.impendingFillSkipUpdates = true;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
structure.place(serverWorldAccess, pos, placementData, random);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
CarpetSettings.impendingFillSkipUpdates = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+5
-29
@@ -5,39 +5,15 @@ import net.fabricmc.api.EnvType;
|
|||||||
import net.fabricmc.api.Environment;
|
import net.fabricmc.api.Environment;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.entity.StructureBlockBlockEntity;
|
import net.minecraft.block.entity.StructureBlockBlockEntity;
|
||||||
import net.minecraft.structure.Structure;
|
|
||||||
import net.minecraft.structure.StructurePlacementData;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.util.registry.Registry;
|
|
||||||
import net.minecraft.world.ServerWorldAccess;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.*;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Constant;
|
||||||
import java.util.Random;
|
import org.spongepowered.asm.mixin.injection.ModifyArg;
|
||||||
|
import org.spongepowered.asm.mixin.injection.ModifyConstant;
|
||||||
|
|
||||||
@Mixin(StructureBlockBlockEntity.class)
|
@Mixin(StructureBlockBlockEntity.class)
|
||||||
public abstract class StructureBlockBlockEntityMixin
|
public abstract class StructureBlockBlockEntity_limitsMixin
|
||||||
{
|
{
|
||||||
@Redirect(method = "place", at = @At(
|
|
||||||
value = "INVOKE",
|
|
||||||
target = "Lnet/minecraft/structure/Structure;place(Lnet/minecraft/world/ServerWorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/structure/StructurePlacementData;Ljava/util/Random;)V"
|
|
||||||
))
|
|
||||||
private void onStructurePlacen(Structure structure, ServerWorldAccess serverWorldAccess, BlockPos pos, StructurePlacementData placementData, Random random)
|
|
||||||
{
|
|
||||||
if(!CarpetSettings.fillUpdates)
|
|
||||||
CarpetSettings.impendingFillSkipUpdates = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
structure.place(serverWorldAccess, pos, placementData, random);
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
CarpetSettings.impendingFillSkipUpdates = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@ModifyConstant(
|
@ModifyConstant(
|
||||||
method = "fromTag",
|
method = "fromTag",
|
||||||
constant = @Constant(intValue = 48)
|
constant = @Constant(intValue = 48)
|
||||||
@@ -17,7 +17,8 @@
|
|||||||
"BlockStateArgument_fillUpdatesMixin",
|
"BlockStateArgument_fillUpdatesMixin",
|
||||||
"World_fillUpdatesMixin",
|
"World_fillUpdatesMixin",
|
||||||
"WorldChunk_fillUpdatesMixin",
|
"WorldChunk_fillUpdatesMixin",
|
||||||
"StructureBlockBlockEntityMixin",
|
"StructureBlockBlockEntity_fillUpdatesMixin",
|
||||||
|
"StructureBlockBlockEntity_limitsMixin",
|
||||||
"UpdateStructureBlockC2SPacketMixin",
|
"UpdateStructureBlockC2SPacketMixin",
|
||||||
"Structure_fillUpdatesMixin",
|
"Structure_fillUpdatesMixin",
|
||||||
"ServerPlayNetworkHandler_interactionUpdatesMixin",
|
"ServerPlayNetworkHandler_interactionUpdatesMixin",
|
||||||
|
|||||||
Reference in new issue
Block a user