mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 11:29:15 +00:00
Remove DistExecutor calls in PistonEventTest (#9348)
This commit is contained in:
1 parent
73e68c9322
commit
576ff81856
1 file changed
+50
-48
@@ -5,40 +5,40 @@
|
||||
|
||||
package net.minecraftforge.debug.block;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.item.BlockItem;
|
||||
import net.minecraft.world.item.CreativeModeTabs;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.LevelAccessor;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.piston.PistonBaseBlock;
|
||||
import net.minecraft.world.level.block.piston.PistonStructureResolver;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.material.Material;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.BlockItem;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.client.model.generators.BlockStateProvider;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
import net.minecraftforge.data.event.GatherDataEvent;
|
||||
import net.minecraftforge.event.CreativeModeTabEvent;
|
||||
import net.minecraftforge.event.level.PistonEvent;
|
||||
import net.minecraftforge.event.level.PistonEvent.PistonMoveType;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.DistExecutor;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.data.event.GatherDataEvent;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* This test mod blocks pistons from moving cobblestone at all except indirectly
|
||||
@@ -50,13 +50,15 @@ import net.minecraftforge.registries.ForgeRegistries;
|
||||
@Mod(value = PistonEventTest.MODID)
|
||||
public class PistonEventTest
|
||||
{
|
||||
static final boolean ENABLE_PISTON_EVENT_LOGGING = false;
|
||||
|
||||
public static final String MODID = "piston_event_test";
|
||||
public static String blockName = "shiftonmove";
|
||||
private static DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
|
||||
private static DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
|
||||
private static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
|
||||
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
|
||||
|
||||
private static RegistryObject<Block> SHIFT_ON_MOVE = BLOCKS.register(blockName, () -> new Block(Block.Properties.of(Material.STONE)));
|
||||
private static RegistryObject<Item> SHIFT_ON_MOVE_ITEM = ITEMS.register(blockName, () -> new BlockItem(SHIFT_ON_MOVE.get(), new Item.Properties()));
|
||||
private static final RegistryObject<Block> SHIFT_ON_MOVE = BLOCKS.register(blockName, () -> new Block(Block.Properties.of(Material.STONE)));
|
||||
private static final RegistryObject<Item> SHIFT_ON_MOVE_ITEM = ITEMS.register(blockName, () -> new BlockItem(SHIFT_ON_MOVE.get(), new Item.Properties()));
|
||||
|
||||
public PistonEventTest()
|
||||
{
|
||||
@@ -79,22 +81,11 @@ public class PistonEventTest
|
||||
if (event.getPistonMoveType() == PistonMoveType.EXTEND)
|
||||
{
|
||||
Level world = (Level) event.getLevel();
|
||||
PistonStructureResolver pistonHelper = event.getStructureHelper();
|
||||
Player player = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().player);
|
||||
if (world.isClientSide && player != null)
|
||||
{
|
||||
if (pistonHelper.resolve())
|
||||
{
|
||||
player.sendSystemMessage(Component.literal(String.format(Locale.ENGLISH, "Piston will extend moving %d blocks and destroy %d blocks", pistonHelper.getToPush().size(), pistonHelper.getToDestroy().size())));
|
||||
}
|
||||
else
|
||||
{
|
||||
player.sendSystemMessage(Component.literal("Piston won't extend"));
|
||||
}
|
||||
}
|
||||
PistonStructureResolver pistonHelper = Objects.requireNonNull(event.getStructureHelper());
|
||||
|
||||
if (pistonHelper.resolve())
|
||||
{
|
||||
sendMessage(world, String.format(Locale.ENGLISH, "Piston will extend moving %d blocks and destroy %d blocks", pistonHelper.getToPush().size(), pistonHelper.getToDestroy().size()));
|
||||
List<BlockPos> posList = pistonHelper.getToPush();
|
||||
for (BlockPos newPos : posList)
|
||||
{
|
||||
@@ -106,6 +97,10 @@ public class PistonEventTest
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
sendMessage(world, "Piston won't extend");
|
||||
}
|
||||
|
||||
// Make the block move up and out of the way so long as it won't replace the piston
|
||||
BlockPos pushedBlockPos = event.getFaceOffsetPos();
|
||||
@@ -122,26 +117,33 @@ public class PistonEventTest
|
||||
{
|
||||
boolean isSticky = event.getLevel().getBlockState(event.getPos()).getBlock() == Blocks.STICKY_PISTON;
|
||||
|
||||
Player player = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().player);
|
||||
if (event.getLevel().isClientSide() && player != null)
|
||||
if (isSticky)
|
||||
{
|
||||
if (isSticky)
|
||||
{
|
||||
BlockPos targetPos = event.getFaceOffsetPos().relative(event.getDirection());
|
||||
boolean canPush = PistonBaseBlock.isPushable(event.getLevel().getBlockState(targetPos), (Level) event.getLevel(), event.getFaceOffsetPos(), event.getDirection().getOpposite(), false, event.getDirection());
|
||||
boolean isAir = event.getLevel().isEmptyBlock(targetPos);
|
||||
player.sendSystemMessage(Component.literal(String.format(Locale.ENGLISH, "Piston will retract moving %d blocks", !isAir && canPush ? 1 : 0)));
|
||||
}
|
||||
else
|
||||
{
|
||||
player.sendSystemMessage(Component.literal("Piston will retract"));
|
||||
}
|
||||
BlockPos targetPos = event.getFaceOffsetPos().relative(event.getDirection());
|
||||
boolean canPush = PistonBaseBlock.isPushable(event.getLevel().getBlockState(targetPos), (Level) event.getLevel(), event.getFaceOffsetPos(), event.getDirection().getOpposite(), false, event.getDirection());
|
||||
boolean isAir = event.getLevel().isEmptyBlock(targetPos);
|
||||
sendMessage(event.getLevel(), String.format(Locale.ENGLISH, "Piston will retract moving %d blocks", !isAir && canPush ? 1 : 0));
|
||||
}
|
||||
else
|
||||
{
|
||||
sendMessage(event.getLevel(), "Piston will retract");
|
||||
}
|
||||
|
||||
// Offset twice to see if retraction will pull cobblestone
|
||||
event.setCanceled(event.getLevel().getBlockState(event.getFaceOffsetPos().relative(event.getDirection())).getBlock() == Blocks.COBBLESTONE && isSticky);
|
||||
}
|
||||
}
|
||||
|
||||
private static void sendMessage(LevelAccessor levelAccessor, String message)
|
||||
{
|
||||
if (!ENABLE_PISTON_EVENT_LOGGING) return;
|
||||
|
||||
if (!levelAccessor.isClientSide() && levelAccessor instanceof ServerLevel level)
|
||||
{
|
||||
level.getServer().sendSystemMessage(Component.literal(message));
|
||||
}
|
||||
}
|
||||
|
||||
public void gatherData(GatherDataEvent event)
|
||||
{
|
||||
DataGenerator gen = event.getGenerator();
|
||||
@@ -149,7 +151,7 @@ public class PistonEventTest
|
||||
gen.addProvider(event.includeClient(), new BlockStates(gen.getPackOutput(), event.getExistingFileHelper()));
|
||||
}
|
||||
|
||||
private class BlockStates extends BlockStateProvider
|
||||
private static class BlockStates extends BlockStateProvider
|
||||
{
|
||||
public BlockStates(PackOutput output, ExistingFileHelper exFileHelper)
|
||||
{
|
||||
@@ -159,7 +161,7 @@ public class PistonEventTest
|
||||
@Override
|
||||
protected void registerStatesAndModels()
|
||||
{
|
||||
simpleBlockWithItem(SHIFT_ON_MOVE.get(), models().cubeAll(SHIFT_ON_MOVE.getId().getPath(), mcLoc("block/furnace_top")));
|
||||
simpleBlockWithItem(SHIFT_ON_MOVE.get(), models().cubeAll(Objects.requireNonNull(SHIFT_ON_MOVE.getId()).getPath(), mcLoc("block/furnace_top")));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user