Added Poison Effect Upon leaving room's area (#534)

robotgryphon · BuildTools · robotgryphon · commit 90f716992274 · 2022-07-30T03:20:20.000-04:00
* Fixed CompactStructureGenerator
 Should now properly remove MachineVoidAir

* Added Config for damaging players outside of machine related to MachineVoidAir

Co-authored-by: BuildTools &lt;unconfigured@null.spigotmc.org&gt;
diff --git a/src/datagen/java/dev/compactmods/machines/datagen/LevelBiomeGenerator.java b/src/datagen/java/dev/compactmods/machines/datagen/LevelBiomeGenerator.java
@@ -8,6 +8,7 @@
 import com.google.gson.JsonObject;
 import com.mojang.serialization.JsonOps;
 import dev.compactmods.machines.CompactMachines;
+import dev.compactmods.machines.core.Registration;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
@@ -18,7 +19,6 @@
 import net.minecraft.world.level.biome.BiomeGenerationSettings;
 import net.minecraft.world.level.biome.BiomeSpecialEffects;
 import net.minecraft.world.level.biome.MobSpawnSettings;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.dimension.LevelStem;
@@ -93,7 +93,7 @@ private void writeDimensions(HashMap<ResourceLocation, Biome> biomes, HashMap<Re
         var flatSettings = new FlatLevelGeneratorSettings(Optional.empty(), BuiltinRegistries.BIOME);
 
         flatSettings.setBiome(Holder.direct(biomes.get(COMPACT_BIOME)));
-        flatSettings.getLayersInfo().add(new FlatLayerInfo(1, Blocks.AIR));
+        flatSettings.getLayersInfo().add(new FlatLayerInfo(dimTypes.get(COMPACT_LEVEL).height(), Registration.BLOCK_MACHINE_VOID_AIR.get()));
         flatSettings.updateLayers();
 
         var stem = new LevelStem(Holder.direct(dimTypes.get(COMPACT_LEVEL)), new FlatLevelSource(ssreg, flatSettings));
diff --git a/src/datagen/java/dev/compactmods/machines/datagen/lang/EnglishLangGenerator.java b/src/datagen/java/dev/compactmods/machines/datagen/lang/EnglishLangGenerator.java
@@ -9,6 +9,7 @@
 import dev.compactmods.machines.core.Tunnels;
 import dev.compactmods.machines.room.RoomSize;
 import dev.compactmods.machines.upgrade.MachineRoomUpgrades;
+import dev.compactmods.machines.wall.MachineVoidAir;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.world.item.Item;
 import net.minecraftforge.registries.RegistryObject;
@@ -120,6 +121,7 @@ protected void addTranslations() {
         add("jei.compactmachines.machines", "Machines are used to make pocket dimensions. Craft a machine and place it in world, then use a Personal Shrinking Device to go inside.");
         add("jei.compactmachines.shrinking_device", "Use the Personal Shrinking Device (PSD) on a machine in order to enter a compact space. " +
                 "You can also right click it in the overworld for more info.");
+        add("death.attack." + MachineVoidAir.DAMAGE_SOURCE.msgId, "%1$s failed to enter the void");
     }
 
     @Override
diff --git a/src/main/java/dev/compactmods/machines/config/ServerConfig.java b/src/main/java/dev/compactmods/machines/config/ServerConfig.java
@@ -22,6 +22,8 @@ public class ServerConfig {
 
     private static ForgeConfigSpec.IntValue CHANGE_ROOM_UPGRADES;
 
+    private static ForgeConfigSpec.BooleanValue ALLOWED_OUTSIDE_MACHINE;
+
     static {
         generateConfig();
     }
@@ -51,6 +53,11 @@ private static void generateConfig() {
                 .comment("The Y-dimension to spawn machine floors at.")
                 .defineInRange("floor", 40, 10, 200);
 
+        ALLOWED_OUTSIDE_MACHINE = builder
+                .comment("Specify if we want to damage player's that managed to escape the boundries")
+                .comment("default: false")
+                .define("allowOutside", false);
+
         builder.pop();
 
         builder
@@ -76,6 +83,7 @@ private static void generateConfig() {
                 .comment("Command level required for changing room upgrades.")
                 .defineInRange("upgrades", Commands.LEVEL_GAMEMASTERS, Commands.LEVEL_ALL, Commands.LEVEL_OWNERS);
 
+
         builder.pop(2);
 
         CONFIG = builder.build();
@@ -94,4 +102,8 @@ public static int changeRoomSpawn() {
     }
 
     public static int changeUpgrades() { return CHANGE_ROOM_UPGRADES.get(); }
+
+    public static Boolean isAllowedOutsideOfMachine() {
+        return ALLOWED_OUTSIDE_MACHINE.get();
+    }
 }
diff --git a/src/main/java/dev/compactmods/machines/core/Registration.java b/src/main/java/dev/compactmods/machines/core/Registration.java
@@ -4,6 +4,9 @@
 import dev.compactmods.machines.item.PersonalShrinkingDevice;
 import dev.compactmods.machines.machine.CompactMachineBlock;
 import dev.compactmods.machines.machine.CompactMachineBlockEntity;
+import dev.compactmods.machines.wall.BreakableWallBlock;
+import dev.compactmods.machines.wall.MachineVoidAir;
+import dev.compactmods.machines.wall.SolidWallBlock;
 import dev.compactmods.machines.machine.CompactMachineItem;
 import dev.compactmods.machines.room.ItemBlockWall;
 import dev.compactmods.machines.room.RoomSize;
@@ -124,6 +127,12 @@ public class Registration {
     public static final RegistryObject<Item> ITEM_BREAKABLE_WALL = ITEMS.register("wall", () ->
             new ItemBlockWall(BLOCK_BREAKABLE_WALL.get(), BASIC_ITEM_PROPS.get()));
 
+    // ================================================================================================================
+    //   Machine Void Air
+    // ================================================================================================================
+    public static final RegistryObject<Block> BLOCK_MACHINE_VOID_AIR = BLOCKS.register("machine_void_air", () ->
+            new MachineVoidAir());
+
     // ================================================================================================================
     //   DIMENSION
     // ================================================================================================================
diff --git a/src/main/java/dev/compactmods/machines/upgrade/ChunkloadUpgradeItem.java b/src/main/java/dev/compactmods/machines/upgrade/ChunkloadUpgradeItem.java
@@ -10,7 +10,6 @@ public class ChunkloadUpgradeItem extends RoomUpgradeItem {
     public ChunkloadUpgradeItem(Properties props) {
         super(props);
     }
-
     @Override
     public void fillItemCategory(CreativeModeTab tab, NonNullList<ItemStack> stacks) {
         final var stack = new ItemStack(MachineRoomUpgrades.CHUNKLOADER.get(), 1);
@@ -19,7 +18,6 @@ public void fillItemCategory(CreativeModeTab tab, NonNullList<ItemStack> stacks)
 
         stacks.add(stack);
     }
-
     @Override
     public RoomUpgrade getUpgradeType() {
         return MachineRoomUpgrades.CHUNKLOAD.get();
diff --git a/src/main/java/dev/compactmods/machines/util/CompactStructureGenerator.java b/src/main/java/dev/compactmods/machines/util/CompactStructureGenerator.java
@@ -5,6 +5,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.phys.AABB;
 
 import java.util.Arrays;
@@ -75,15 +76,23 @@ public static void generateCompactStructure(LevelAccessor world, RoomSize size,
         int s = size.getInternalSize() / 2;
 
         BlockPos floorCenter = center.relative(Direction.DOWN, s);
+        BlockPos machineTopCenter = center.relative(Direction.UP, s);
+
         AABB floorBlocks = new AABB(floorCenter, floorCenter)
                 .inflate(s, 0, s);
+        AABB machineInternal = new AABB(machineTopCenter, floorCenter)
+                .inflate(s, 0, s);
+
 
         boolean anyAir = BlockPos.betweenClosedStream(floorBlocks).anyMatch(world::isEmptyBlock);
 
-        if (anyAir) {
-            // Generate the walls
+        if (anyAir) {            // Generate the walls
             Arrays.stream(Direction.values())
                     .forEach(d -> generateCompactWall(world, size, center, d));
+
+            BlockPos.betweenClosedStream(machineInternal)
+                    .forEach(p -> world.setBlock(p, Blocks.AIR.defaultBlockState(), 7));
+
         }
     }
 }
diff --git a/src/main/java/dev/compactmods/machines/util/PlayerUtil.java b/src/main/java/dev/compactmods/machines/util/PlayerUtil.java
@@ -5,7 +5,6 @@
 import dev.compactmods.machines.advancement.AdvancementTriggers;
 import dev.compactmods.machines.api.core.Messages;
 import dev.compactmods.machines.core.Capabilities;
-import dev.compactmods.machines.location.LevelBlockPosition;
 import dev.compactmods.machines.core.MissingDimensionException;
 import dev.compactmods.machines.core.Registration;
 import dev.compactmods.machines.i18n.TranslationUtil;
@@ -27,7 +26,6 @@
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.common.util.LazyOptional;
-
 import javax.annotation.Nonnull;
 import java.util.Optional;
 import java.util.UUID;
diff --git a/src/main/java/dev/compactmods/machines/wall/MachineVoidAir.java b/src/main/java/dev/compactmods/machines/wall/MachineVoidAir.java
@@ -0,0 +1,48 @@
+package dev.compactmods.machines.wall;
+
+import dev.compactmods.machines.CompactMachines;
+import dev.compactmods.machines.config.ServerConfig;
+import dev.compactmods.machines.core.Registration;
+import dev.compactmods.machines.util.PlayerUtil;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.AirBlock;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.material.Material;
+
+import static dev.compactmods.machines.CompactMachines.MOD_ID;
+
+
+public class MachineVoidAir extends AirBlock {
+    final public static DamageSource DAMAGE_SOURCE = new DamageSource(MOD_ID + "_voidair");
+
+    public MachineVoidAir() {
+        super(BlockBehaviour.Properties.of(Material.AIR).noCollission().noDrops().air());
+    }
+
+
+    @Override
+    public void entityInside(BlockState pState, Level pLevel, BlockPos pPos, Entity pEntity) {
+        if (ServerConfig.isAllowedOutsideOfMachine()) return;
+        if (pLevel.isClientSide) return;
+
+        if (pEntity instanceof ServerPlayer player) {
+            if (player.isCreative()) return;
+
+            if (player.getActiveEffectsMap().containsKey(MobEffects.BLINDNESS))
+                PlayerUtil.teleportPlayerOutOfMachine((ServerLevel) pLevel, player);
+
+
+            player.addEffect(new MobEffectInstance(MobEffects.POISON, 5 * 20));
+            player.addEffect(new MobEffectInstance(MobEffects.BLINDNESS, 5 * 20));
+            player.hurt(DAMAGE_SOURCE, 1);
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ public class ChunkloadUpgradeItem extends RoomUpgradeItem {`
`10`	`10`	`public ChunkloadUpgradeItem(Properties props) {`
`11`	`11`	`super(props);`
`12`	`12`	`}`
`13`		`-`
`14`	`13`	`@Override`
`15`	`14`	`public void fillItemCategory(CreativeModeTab tab, NonNullList<ItemStack> stacks) {`
`16`	`15`	`final var stack = new ItemStack(MachineRoomUpgrades.CHUNKLOADER.get(), 1);`
`@@ -19,7 +18,6 @@ public void fillItemCategory(CreativeModeTab tab, NonNullList<ItemStack> stacks)`
`19`	`18`
`20`	`19`	`stacks.add(stack);`
`21`	`20`	`}`
`22`		`-`
`23`	`21`	`@Override`
`24`	`22`	`public RoomUpgrade getUpgradeType() {`
`25`	`23`	`return MachineRoomUpgrades.CHUNKLOAD.get();`