Rewrite poss ball

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'net.minecraftforge.gradle' version '5.1+'
     id 'org.parchmentmc.librarian.forgegradle' version '1.+'
 }
 
@@ -38,10 +38,6 @@ minecraft {
     // enableEclipsePrepareRuns = true
     // enableIdeaPrepareRuns = true
 
-    // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game.
-    // It is REQUIRED to be set to true for this template to function.
-    // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
-    copyIdeResources = true
 
     // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations.
     // The folder name can be set on a run configuration using the "folderName" property.
@@ -158,7 +154,7 @@ dependencies {
     //compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei}")
     //runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei}")
 
-    runtimeOnly fg.deobf("curse.maven:mekanism-268560:4866575")
+    //runtimeOnly fg.deobf("curse.maven:mekanism-268560:4866575")
 
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
@@ -176,24 +172,6 @@ dependencies {
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
 }
 
-// This block of code expands all declared replace properties in the specified resource targets.
-// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
-// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
-// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
-tasks.named('processResources', ProcessResources).configure {
-    var replaceProperties = [
-            minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
-            forge_version: forge_version, forge_version_range: forge_version_range,
-            loader_version_range: loader_version_range,
-            mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
-            mod_authors: mod_authors, mod_description: mod_description,
-    ]
-    inputs.properties replaceProperties
-
-    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
-        expand replaceProperties + [project: project]
-    }
-}
 
 // Example for how to get properties into the manifest for reading at runtime.
 tasks.named('jar', Jar).configure {

gradle.properties

@@ -3,22 +3,22 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-libzontreck=1.10.011524.0045
+libzontreck=1.10.012124.1709
 
 ## Environment Properties
 
 # The Minecraft version must agree with the Forge version to get a valid artifact
-minecraft_version=1.20.1
+minecraft_version=1.18.2
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.20.1,1.21)
+minecraft_version_range=[1.18.2,1.19)
 # The Forge version must agree with the Minecraft version to get a valid artifact
-forge_version=47.2.0
+forge_version=40.2.1
 # The Forge version range can use any version of Forge as bounds or match the loader version range
-forge_version_range=[47,)
+forge_version_range=[40,)
 # The loader version range can only use the major version of Forge/FML as bounds
-loader_version_range=[47,)
+loader_version_range=[40,)
 # The mapping channel to use for mappings.
 # The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
 # Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
@@ -36,7 +36,7 @@ loader_version_range=[47,)
 mapping_channel=parchment
 # The mapping version to query from the mapping channel.
 # This must match the format required by the mapping channel.
-mapping_version=2023.09.03-1.20.1
+mapping_version=2022.11.06-1.18.2
 
 
 ## Mod Properties
@@ -49,7 +49,7 @@ mod_name=Thresholds
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=GPLv3
 # The mod version. See https://semver.org/
-mod_version=1.4.011524.2246
+mod_version=1.4.013024.2101
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -4,7 +4,3 @@ pluginManagement {
         maven { url = "https://maven.zontreck.com/repository/internal" }
     }
 }
-
-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
-}

src/main/java/dev/zontreck/otemod/OTEMod.java

@@ -1,22 +1,16 @@
 package dev.zontreck.otemod;
 
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import com.mojang.logging.LogUtils;
 import dev.zontreck.libzontreck.chat.ChatColor;
 import dev.zontreck.libzontreck.profiles.Profile;
 import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException;
 import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.libzontreck.util.ServerUtilities;
 import dev.zontreck.libzontreck.vectors.Vector3;
 import dev.zontreck.otemod.effects.ModEffects;
+import dev.zontreck.otemod.enchantments.FlightEnchantment;
+import dev.zontreck.otemod.enchantments.NightVisionEnchantment;
 import dev.zontreck.otemod.implementation.CreativeModeTabs;
 import dev.zontreck.otemod.implementation.InventoryBackup;
 import dev.zontreck.otemod.implementation.Messages;
@@ -24,22 +18,16 @@ import dev.zontreck.otemod.implementation.PlayerFirstJoinTag;
 import dev.zontreck.otemod.implementation.compressor.CompressionChamberScreen;
 import dev.zontreck.otemod.implementation.vault.*;
 import dev.zontreck.otemod.integrations.KeyBindings;
+import dev.zontreck.otemod.ore.OreGenerator;
 import dev.zontreck.otemod.recipe.ModRecipes;
 import net.minecraft.client.gui.screens.MenuScreens;
-import net.minecraft.client.renderer.entity.EntityRenderers;
-import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.commands.GiveCommand;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.GameType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
@@ -55,6 +43,8 @@ import net.minecraftforge.event.server.ServerStoppingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 import net.minecraftforge.items.ItemStackHandler;
+import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.ForgeRegistries;
 import org.slf4j.Logger;
 
 import dev.zontreck.otemod.blocks.ModBlocks;
@@ -64,13 +54,11 @@ import dev.zontreck.otemod.commands.CommandRegistry;
 import dev.zontreck.otemod.configs.OTEServerConfig;
 import dev.zontreck.otemod.enchantments.ModEnchantments;
 import dev.zontreck.otemod.entities.ModEntityTypes;
-import dev.zontreck.otemod.entities.monsters.client.PossumRenderer;
 import dev.zontreck.otemod.events.LoreHandlers;
 import dev.zontreck.otemod.implementation.inits.ModMenuTypes;
 import dev.zontreck.otemod.implementation.scrubber.ItemScrubberScreen;
 import dev.zontreck.otemod.implementation.scrubber.MagicalScrubberScreen;
 import dev.zontreck.otemod.items.ModItems;
-//import dev.zontreck.otemod.ore.Modifier.ModifierOfBiomes;
 import dev.zontreck.otemod.networking.ModMessages;
 
 // The value here should match an entry in the META-INF/mods.toml file
@@ -112,23 +100,19 @@ public class OTEMod
         ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, OTEServerConfig.SPEC, "otemod-rss-server.toml");
 
 
-        
-        // Register ourselves for server and other game events we are interested in
-        //final DeferredRegister<Codec<? extends BiomeModifier>> serializers = DeferredRegister.create(ForgeRegistries.Keys.BIOME_MODIFIER_SERIALIZERS, OTEMod.MOD_ID);
-        //serializers.register(bus);
-        //serializers.register(MODIFY_BIOMES, ModifierOfBiomes::makeCodec);
-
-
         MinecraftForge.EVENT_BUS.register(this);
         MinecraftForge.EVENT_BUS.register(new LoreHandlers());
         MinecraftForge.EVENT_BUS.register(new ChatServerOverride());
         MinecraftForge.EVENT_BUS.register(new CommandRegistry());
         MinecraftForge.EVENT_BUS.register(new VaultWatcher());
         MinecraftForge.EVENT_BUS.register(new dev.zontreck.otemod.zschem.EventHandler());
-        ModMenuTypes.CONTAINERS.register(bus);
+        MinecraftForge.EVENT_BUS.register(OreGenerator.class);
+        MinecraftForge.EVENT_BUS.register(FlightEnchantment.class);
+        MinecraftForge.EVENT_BUS.register(NightVisionEnchantment.class);
 
+
+        ModMenuTypes.CONTAINERS.register(bus);
         ModBlocks.register(bus);
-        CreativeModeTabs.REGISTER.register(bus);
         ModItems.register(bus);
         ModEntities.register(bus);
         ModEnchantments.register(bus);
@@ -156,11 +140,11 @@ public class OTEMod
         restore.restore();
         backup.save();
 
-        if(event.getNewGameMode() == GameType.CREATIVE)
+        /*if(event.getNewGameMode() == GameType.CREATIVE)
         {
             player.getInventory().clearContent();
             return;
-        }
+        }*/
         restore.apply();
     }
 
@@ -271,7 +255,7 @@ public class OTEMod
     @SubscribeEvent
     public void onItemExpire(final ItemExpireEvent ev)
     {
-        if(ev.getEntity().level().isClientSide)return;
+        if(ServerUtilities.isClient()) return;
 
         if(OTEServerConfig.ITEM_DESPAWN_TIMER.get()<=0)return;
 
@@ -325,13 +309,6 @@ public class OTEMod
         }
 
 
-        @OnlyIn(Dist.CLIENT)
-        @SubscribeEvent
-        public static void onRegisterKeybinds(RegisterKeyMappingsEvent ev)
-        {
-            ev.register(KeyBindings.OPEN_VAULT);
-        }
-
     }
 
 }

src/main/java/dev/zontreck/otemod/blocks/AuroraDoorBlock.java

@@ -3,9 +3,9 @@ package dev.zontreck.otemod.blocks;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.DoorBlock;
+import net.minecraft.world.level.block.DoubleBlockCombiner;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.block.state.properties.BlockSetType;
 
 public class AuroraDoorBlock extends DoorBlock
 {
@@ -16,7 +16,7 @@ public class AuroraDoorBlock extends DoorBlock
     }
 
     public AuroraDoorBlock() {
-        super(DOOR_PROPS, BlockSetType.IRON);
+        super(DOOR_PROPS);
         
         
     }

src/main/java/dev/zontreck/otemod/blocks/CompressionChamberBlock.java

@@ -54,7 +54,7 @@ public class CompressionChamberBlock extends HorizontalDirectionalBlock implemen
             if(be instanceof CompressionChamberBlockEntity)
             {
                 CompressionChamberBlockEntity entity = (CompressionChamberBlockEntity) be;
-                NetworkHooks.openScreen(((ServerPlayer)player), entity, pos);
+                NetworkHooks.openGui(((ServerPlayer)player), entity, pos);
 
                 ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player);
 

src/main/java/dev/zontreck/otemod/blocks/ItemScrubberBlock.java

@@ -67,7 +67,7 @@ public class ItemScrubberBlock extends HorizontalDirectionalBlock implements Ent
             if(be instanceof ItemScrubberBlockEntity)
             {
                 ItemScrubberBlockEntity entity = (ItemScrubberBlockEntity)be;
-                NetworkHooks.openScreen(((ServerPlayer)player), entity, pos);
+                NetworkHooks.openGui(((ServerPlayer)player), entity, pos);
 
                 ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player);
 

src/main/java/dev/zontreck/otemod/blocks/MagicalScrubberBlock.java

@@ -65,7 +65,7 @@ public class MagicalScrubberBlock extends HorizontalDirectionalBlock implements
             if(be instanceof MagicalScrubberBlockEntity)
             {
                 MagicalScrubberBlockEntity entity = (MagicalScrubberBlockEntity)be;
-                NetworkHooks.openScreen(((ServerPlayer)player), entity, pos);
+                NetworkHooks.openGui(((ServerPlayer)player), entity, pos);
 
                 ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player);
             }else{

src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java

@@ -4,12 +4,14 @@ import dev.zontreck.otemod.OTEMod;
 import dev.zontreck.otemod.implementation.CreativeModeTabs;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.FlintAndSteelItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.*;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.material.Material;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -25,82 +27,82 @@ public class ModBlocks {
         OTEMod.LOGGER.info("Registering all blocks...");
     }
 
-    public static final RegistryObject<Block> ETERNIUM_ORE_BLOCK = BLOCKS.register("eternium_ore_block", () -> new Block(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(7F).explosionResistance(1200).destroyTime(6)));
+    public static final RegistryObject<Block> ETERNIUM_ORE_BLOCK = BLOCKS.register("eternium_ore_block", () -> new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(7F).explosionResistance(1200).destroyTime(6)));
 
-    public static final RegistryObject<Item> ETERNIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_ore_block", () -> new BlockItem(ETERNIUM_ORE_BLOCK.get(), new Item.Properties())));
+    public static final RegistryObject<Item> ETERNIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_ore_block", () -> new BlockItem(ETERNIUM_ORE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
-    public static final RegistryObject<Block> VAULT_STEEL_ORE_BLOCK = BLOCKS.register("vault_steel_ore_block", ()->new Block(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(8F).explosionResistance(1200).destroyTime(100)));
+    public static final RegistryObject<Block> VAULT_STEEL_ORE_BLOCK = BLOCKS.register("vault_steel_ore_block", ()->new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(8F).explosionResistance(1200).destroyTime(100)));
 
-    public static final RegistryObject<Item> VAULT_STEEL_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_steel_ore_block", ()->new BlockItem(VAULT_STEEL_ORE_BLOCK.get(), new Item.Properties())));
+    public static final RegistryObject<Item> VAULT_STEEL_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_steel_ore_block", ()->new BlockItem(VAULT_STEEL_ORE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
-    public static final RegistryObject<Block> NETHER_VAULT_STEEL_ORE_BLOCK = BLOCKS.register("nether_vault_steel_ore_block", ()->new Block(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(8F).explosionResistance(1200).destroyTime(100)));
+    public static final RegistryObject<Block> NETHER_VAULT_STEEL_ORE_BLOCK = BLOCKS.register("nether_vault_steel_ore_block", ()->new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(8F).explosionResistance(1200).destroyTime(100)));
 
-    public static final RegistryObject<Item> NETHER_VAULT_STEEL_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("nether_vault_steel_ore_block", ()->new BlockItem(NETHER_VAULT_STEEL_ORE_BLOCK.get(), new Item.Properties())));
+    public static final RegistryObject<Item> NETHER_VAULT_STEEL_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("nether_vault_steel_ore_block", ()->new BlockItem(NETHER_VAULT_STEEL_ORE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
-    public static final RegistryObject<Block> ETERNIUM_BLOCK = BLOCKS.register("eternium_block", ()->new Block(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(8F).explosionResistance(1200).destroyTime(100)));
+    public static final RegistryObject<Block> ETERNIUM_BLOCK = BLOCKS.register("eternium_block", ()->new Block(BlockBehaviour.Properties.of(Material.HEAVY_METAL).requiresCorrectToolForDrops().strength(8F).explosionResistance(1200).destroyTime(100)));
 
-    public static final RegistryObject<Item> ETERNIUM_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_block", ()->new FoiledBlockItem(ETERNIUM_BLOCK.get(), new Item.Properties())));
+    public static final RegistryObject<Item> ETERNIUM_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_block", ()->new FoiledBlockItem(ETERNIUM_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
-    public static final RegistryObject<Block> DEEPSLATE_ETERNIUM_ORE_BLOCK = BLOCKS.register("deepslate_eternium_ore_block", () -> new Block(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(5f).explosionResistance(1200).destroyTime(7)));
+    public static final RegistryObject<Block> DEEPSLATE_ETERNIUM_ORE_BLOCK = BLOCKS.register("deepslate_eternium_ore_block", () -> new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(5f).explosionResistance(1200).destroyTime(7)));
 
-    public static final RegistryObject<Item> DEEPSLATE_ETERNIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("deepslate_eternium_ore_block", () -> new BlockItem(DEEPSLATE_ETERNIUM_ORE_BLOCK.get(), new Item.Properties())));
+    public static final RegistryObject<Item> DEEPSLATE_ETERNIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("deepslate_eternium_ore_block", () -> new BlockItem(DEEPSLATE_ETERNIUM_ORE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
-    public static final RegistryObject<Block> AURORA_BLOCK = BLOCKS.register("aurora_block", () -> new Block(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(9f).explosionResistance(100000f).destroyTime(10).sound(SoundType.NETHERITE_BLOCK)));
+    public static final RegistryObject<Block> AURORA_BLOCK = BLOCKS.register("aurora_block", () -> new Block(BlockBehaviour.Properties.of(Material.HEAVY_METAL).requiresCorrectToolForDrops().strength(9f).explosionResistance(100000f).destroyTime(10).sound(SoundType.NETHERITE_BLOCK)));
 
-    public static final RegistryObject<Item> AURORA_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("aurora_block", () -> new BlockItem(AURORA_BLOCK.get(), new Item.Properties())));
+    public static final RegistryObject<Item> AURORA_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("aurora_block", () -> new BlockItem(AURORA_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
 
     public static final RegistryObject<Block> AURORA_DOOR = BLOCKS.register("aurora_door", AuroraDoorBlock::new);
 
-    public static final RegistryObject<Item> AURORA_DOOR_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("aurora_door", () -> new BlockItem(AURORA_DOOR.get(), new Item.Properties())));
+    public static final RegistryObject<Item> AURORA_DOOR_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("aurora_door", () -> new BlockItem(AURORA_DOOR.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
     public static final RegistryObject<Block> CLEAR_GLASS_BLOCK = BLOCKS.register("clear_glass_block", () -> new Block(BlockBehaviour.Properties.copy(Blocks.GLASS).strength(1f).destroyTime(6).noOcclusion().isViewBlocking(ModBlocks::never)));
 
-    public static final RegistryObject<Item> CLEAR_GLASS_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("clear_glass_block", () -> new BlockItem(CLEAR_GLASS_BLOCK.get(), new Item.Properties())));
+    public static final RegistryObject<Item> CLEAR_GLASS_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("clear_glass_block", () -> new BlockItem(CLEAR_GLASS_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
     public static final RegistryObject<Block> ITEM_SCRUBBER = BLOCKS.register("item_scrubber", ()->new ItemScrubberBlock(BlockBehaviour.Properties.copy(ModBlocks.AURORA_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never)));
 
-    public static final RegistryObject<Item> ITEM_SCRUBBER_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("item_scrubber", ()->new BlockItem(ITEM_SCRUBBER.get(), new Item.Properties())));
+    public static final RegistryObject<Item> ITEM_SCRUBBER_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("item_scrubber", ()->new BlockItem(ITEM_SCRUBBER.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
     public static final RegistryObject<Block> MAGICAL_SCRUBBER = BLOCKS.register("magical_scrubber", ()->new MagicalScrubberBlock(BlockBehaviour.Properties.copy(ModBlocks.AURORA_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never)));
 
-    public static final RegistryObject<Item> MAGICAL_SCRUBBER_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("magical_scrubber", ()->new BlockItem(MAGICAL_SCRUBBER.get(), new Item.Properties())));
+    public static final RegistryObject<Item> MAGICAL_SCRUBBER_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("magical_scrubber", ()->new BlockItem(MAGICAL_SCRUBBER.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
     
 
     public static final RegistryObject<Block> STABLE_SINGULARITY = BLOCKS.register("stable_singularity", ()->new Block(BlockBehaviour.Properties.copy(ModBlocks.AURORA_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never)));
 
-    public static final RegistryObject<Item> STABLE_SINGULARITY_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("stable_singularity", ()->new BlockItem(STABLE_SINGULARITY.get(), new Item.Properties())));
+    public static final RegistryObject<Item> STABLE_SINGULARITY_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("stable_singularity", ()->new BlockItem(STABLE_SINGULARITY.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
     public static final RegistryObject<Block> ILUSIUM_ORE_BLOCK = BLOCKS.register("ilusium_ore_block", () -> new Block(BlockBehaviour.Properties.copy(ModBlocks.ETERNIUM_ORE_BLOCK.get()).noOcclusion()));
 
-    public static final RegistryObject<Item> ILUSIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_ore_block", () -> new BlockItem(ILUSIUM_ORE_BLOCK.get(), new Item.Properties())));
+    public static final RegistryObject<Item> ILUSIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_ore_block", () -> new BlockItem(ILUSIUM_ORE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
     public static final RegistryObject<Block> DEEPSLATE_ILUSIUM_ORE_BLOCK = BLOCKS.register("deepslate_ilusium_ore_block", () -> new Block(BlockBehaviour.Properties.copy(ILUSIUM_ORE_BLOCK.get()).noOcclusion()));
 
-    public static final RegistryObject<Item> DEEPSLATE_ILUSIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("deepslate_ilusium_ore_block", () -> new BlockItem(DEEPSLATE_ILUSIUM_ORE_BLOCK.get(), new Item.Properties())));
+    public static final RegistryObject<Item> DEEPSLATE_ILUSIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("deepslate_ilusium_ore_block", () -> new BlockItem(DEEPSLATE_ILUSIUM_ORE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
     public static final RegistryObject<Block> ILUSIUM_BLOCK = BLOCKS.register("ilusium_block", () -> new Block(BlockBehaviour.Properties.copy(ModBlocks.ETERNIUM_BLOCK.get()).noOcclusion().strength(5, 20).requiresCorrectToolForDrops()));
 
-    public static final RegistryObject<Item> ILUSIUM_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_block", () -> new BlockItem(ILUSIUM_BLOCK.get(), new Item.Properties())));
+    public static final RegistryObject<Item> ILUSIUM_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_block", () -> new BlockItem(ILUSIUM_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
     public static final RegistryObject<Block> COMPRESSION_CHAMBER_BLOCK = BLOCKS.register("compression_chamber", ()->new CompressionChamberBlock(BlockBehaviour.Properties.copy(ModBlocks.ILUSIUM_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never)));
 
-    public static final RegistryObject<Item> COMPRESSION_CHAMBER_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("compression_chamber", ()->new BlockItem(COMPRESSION_CHAMBER_BLOCK.get(), new Item.Properties())));
+    public static final RegistryObject<Item> COMPRESSION_CHAMBER_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("compression_chamber", ()->new BlockItem(COMPRESSION_CHAMBER_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
     public static final RegistryObject<Block> COMPRESSED_OBSIDIAN_BLOCK = BLOCKS.register("compressed_obsidian_block", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN)));
 
-    public static final RegistryObject<Item> COMPRESSED_OBSIDIAN_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("compressed_obsidian_block", ()->new BlockItem(COMPRESSED_OBSIDIAN_BLOCK.get(), new Item.Properties())));
+    public static final RegistryObject<Item> COMPRESSED_OBSIDIAN_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("compressed_obsidian_block", ()->new BlockItem(COMPRESSED_OBSIDIAN_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
     public static final RegistryObject<Block> LAYERED_COMPRESSED_OBSIDIAN_BLOCK = BLOCKS.register("layered_compressed_obsidian_block", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN)));
 
-    public static final RegistryObject<Item> LAYERED_COMPRESSED_OBSIDIAN_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("layered_compressed_obsidian_block", ()->new BlockItem(LAYERED_COMPRESSED_OBSIDIAN_BLOCK.get(), new Item.Properties())));
+    public static final RegistryObject<Item> LAYERED_COMPRESSED_OBSIDIAN_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("layered_compressed_obsidian_block", ()->new BlockItem(LAYERED_COMPRESSED_OBSIDIAN_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
 
@@ -112,33 +114,232 @@ public class ModBlocks {
 
     public static final RegistryObject<Block> LIMINAL_TILES = BLOCKS.register("liminal_tiles", ()-> new Block(BlockBehaviour.Properties.copy(Blocks.BEDROCK)));
 
-    public static final RegistryObject<Item> LIMINAL_TILES_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("liminal_tiles", ()->new BlockItem(LIMINAL_TILES.get(), new Item.Properties())));
-
-    public static final RegistryObject<Block> BLACK = BLOCKS.register("black", ()->new Block(BlockBehaviour.Properties.copy(Blocks.BEDROCK)));
-
-    public static final RegistryObject<Item> BLACK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("black", ()->new FoiledBlockItem(BLACK.get(), new Item.Properties().stacksTo(128))));
+    public static final RegistryObject<Item> LIMINAL_TILES_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("liminal_tiles", ()->new BlockItem(LIMINAL_TILES.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
     public static final RegistryObject<Block> LIMINAL_TILE_STAIRS = BLOCKS.register("liminal_tile_stairs", ()->new StairBlock(LIMINAL_TILES.get()::defaultBlockState, BlockBehaviour.Properties.copy(Blocks.BEDROCK).destroyTime(1000).strength(1000)));
 
-    public static final RegistryObject<Item> LIMINAL_TILE_STAIRS_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("liminal_tile_stairs", ()->new BlockItem(LIMINAL_TILE_STAIRS.get(), new Item.Properties())));
+    public static final RegistryObject<Item> LIMINAL_TILE_STAIRS_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("liminal_tile_stairs", ()->new BlockItem(LIMINAL_TILE_STAIRS.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
     public static final RegistryObject<Block> LIMINAL_TILE_SLAB = BLOCKS.register("liminal_tile_slab", ()->new SlabBlock(BlockBehaviour.Properties.copy(Blocks.BEDROCK)));
 
-    public static final RegistryObject<Item> LIMINAL_TILE_SLAB_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("liminal_tile_slab", ()->new BlockItem(LIMINAL_TILE_SLAB.get(), new Item.Properties())));
+    public static final RegistryObject<Item> LIMINAL_TILE_SLAB_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("liminal_tile_slab", ()->new BlockItem(LIMINAL_TILE_SLAB.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
     public static final RegistryObject<Block> LIMINAL_WINDOW = BLOCKS.register("liminal_window", () -> new ParallaxWindow(15));
 
-    public static final RegistryObject<Item> LIMINAL_WINDOW_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("liminal_window", () -> new BlockItem(LIMINAL_WINDOW.get(), new Item.Properties())));
+    public static final RegistryObject<Item> LIMINAL_WINDOW_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("liminal_window", () -> new BlockItem(LIMINAL_WINDOW.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> VOID_BLOCK = BLOCKS.register("void", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN).lightLevel((X)->{
+        return 15;
+    }).noCollission()));
+
+    public static final RegistryObject<Item> VOID_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("void", ()-> new BlockItem(VOID_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> WHITE = BLOCKS.register("whiteout", ()->new Block(BlockBehaviour.Properties.copy(Blocks.WHITE_WOOL)));
+
+    public static final RegistryObject<Item> WHITE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("whiteout", ()->new BlockItem(WHITE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_BLOOD_RED = BLOCKS.register("blood_red", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_BLOOD_RED_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("blood_red", ()-> new BlockItem(T_BLOOD_RED.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_RED_TILE = BLOCKS.register("red_tile", ()->new Block(BlockBehaviour.Properties.copy(T_BLOOD_RED.get()).lightLevel((X)->{
+        return 15;
+    }).noOcclusion()));
+
+    public static final RegistryObject<Item> T_RED_TILE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("red_tile", ()->new BlockItem(T_RED_TILE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_RED_STAIRS = BLOCKS.register("red_stairs", ()->new StairBlock(T_BLOOD_RED.get()::defaultBlockState, BlockBehaviour.Properties.copy(T_BLOOD_RED.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_RED_STAIRS_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("red_stairs", ()->new BlockItem(T_RED_STAIRS.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_RED_TILE_TRANSITON_BR = BLOCKS.register("red_tile_br", ()->new RotatableBlock(BlockBehaviour.Properties.copy(T_BLOOD_RED.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_RED_TILE_TRANSITION_BR_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("red_tile_br", ()->new BlockItem(T_RED_TILE_TRANSITON_BR.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_RED_TILE_WALL = BLOCKS.register("red_tile_to_wall", ()->new Block(BlockBehaviour.Properties.copy(T_RED_TILE.get())));
+
+    public static final RegistryObject<Item> T_RED_TILE_WALL_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("red_tile_to_wall", ()->new BlockItem(T_RED_TILE_WALL.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_RED_WALL = BLOCKS.register("red_wall_variant_1", ()->new Block(BlockBehaviour.Properties.copy(T_RED_TILE.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_RED_WALL_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("red_wall_variant_1", ()->new BlockItem(T_RED_WALL.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_RED_WALL2 = BLOCKS.register("red_wall_variant_2", ()->new Block(BlockBehaviour.Properties.copy(T_RED_TILE.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_RED_WALL2_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("red_wall_variant_2", ()->new BlockItem(T_RED_WALL2.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
-    /*
+    public static final RegistryObject<Block> T_CYAN = BLOCKS.register("cyan", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN).lightLevel((X)->{
+        return 15;
+    }).noOcclusion()));
+
+    public static final RegistryObject<Item> T_CYAN_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan", ()-> new BlockItem(T_CYAN.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_CYAN_TILE = BLOCKS.register("cyan_tile", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_CYAN_TILE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan_tile", ()->new BlockItem(T_CYAN_TILE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
-    public static final class_2248 LIMINAL_WINDOW_NOON = (class_2248)createBlock("liminal_window_noon", new LiminalWindowBlock(QuiltBlockSettings.method_9630((class_4970)class_2246.field_31037).method_9626(class_2498.field_11537)), true, (class_1761)ModItems.LIMINAL_POOLS_ITEM_GROUP);
+    public static final RegistryObject<Block> T_CYAN_STAIRS = BLOCKS.register("cyan_stairs", ()->new StairBlock(T_CYAN.get()::defaultBlockState, BlockBehaviour.Properties.copy(T_CYAN.get()).lightLevel((X)->{
+        return 15;
+    })));
 
-    public static final class_2248 LIMINAL_WINDOW_DUSK = (class_2248)createBlock("liminal_window_dusk", new LiminalWindowBlock(QuiltBlockSettings.method_9630((class_4970)class_2246.field_31037).method_9626(class_2498.field_11537)), true, (class_1761)ModItems.LIMINAL_POOLS_ITEM_GROUP);
+    public static final RegistryObject<Item> T_CYAN_STAIRS_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan_stairs", ()->new BlockItem(T_CYAN_STAIRS.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
-    public static final class_2248 LIMINAL_WINDOW_ABYSS = (class_2248)createBlock("liminal_window_abyss", new LiminalWindowBlock(QuiltBlockSettings.method_9630((class_4970)class_2246.field_31037).method_9626(class_2498.field_11537)), true, (class_1761)ModItems.LIMINAL_POOLS_ITEM_GROUP);*/
+    public static final RegistryObject<Block> T_CYAN_TILE_TRANSITON_BR = BLOCKS.register("cyan_tile_br", ()->new RotatableBlock(BlockBehaviour.Properties.copy(T_CYAN.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_CYAN_TILE_TRANSITION_BR_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan_tile_br", ()->new BlockItem(T_CYAN_TILE_TRANSITON_BR.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+
+    public static final RegistryObject<Block> T_CYAN_TILE_WALL = BLOCKS.register("cyan_tile_to_wall", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN_TILE.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_CYAN_TILE_WALL_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan_tile_to_wall", ()->new BlockItem(T_CYAN_TILE_WALL.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_CYAN_WALL = BLOCKS.register("cyan_wall_variant_1", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN_TILE.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_CYAN_WALL_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan_wall_variant_1", ()->new BlockItem(T_CYAN_WALL.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_CYAN_WALL2 = BLOCKS.register("cyan_wall_variant_2", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN_TILE.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_CYAN_WALL2_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan_wall_variant_2", ()->new BlockItem(T_CYAN_WALL2.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+
+
+    public static final RegistryObject<Block> T_LIME = BLOCKS.register("lime", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN).lightLevel((X)->{
+        return 15;
+    }).noOcclusion()));
+
+    public static final RegistryObject<Item> T_LIME_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("lime", ()-> new BlockItem(T_LIME.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_LIME_TILE = BLOCKS.register("lime_tile", ()->new Block(BlockBehaviour.Properties.copy(T_LIME.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_LIME_TILE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("lime_tile", ()->new BlockItem(T_LIME_TILE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+
+    public static final RegistryObject<Block> T_LIME_STAIRS = BLOCKS.register("lime_stairs", ()->new StairBlock(T_LIME.get()::defaultBlockState, BlockBehaviour.Properties.copy(T_LIME.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_LIME_STAIRS_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("lime_stairs", ()->new BlockItem(T_LIME_STAIRS.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_LIME_TILE_TRANSITON_BR = BLOCKS.register("lime_tile_br", ()->new RotatableBlock(BlockBehaviour.Properties.copy(T_LIME.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_LIME_TILE_TRANSITION_BR_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("lime_tile_br", ()->new BlockItem(T_LIME_TILE_TRANSITON_BR.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+
+    public static final RegistryObject<Block> T_LIME_TILE_WALL = BLOCKS.register("lime_tile_to_wall", ()->new Block(BlockBehaviour.Properties.copy(T_LIME_TILE.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_LIME_TILE_WALL_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("lime_tile_to_wall", ()->new BlockItem(T_LIME_TILE_WALL.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_LIME_WALL = BLOCKS.register("lime_wall_variant_1", ()->new Block(BlockBehaviour.Properties.copy(T_LIME_TILE.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_LIME_WALL_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("lime_wall_variant_1", ()->new BlockItem(T_LIME_WALL.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_LIME_WALL2 = BLOCKS.register("lime_wall_variant_2", ()->new Block(BlockBehaviour.Properties.copy(T_LIME_TILE.get()).lightLevel((X)->{
+        return 15;
+    })));
+
+    public static final RegistryObject<Item> T_LIME_WALL2_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("lime_wall_variant_2", ()->new BlockItem(T_LIME_WALL2.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+
+    public static final RegistryObject<Block> T_POOL_TILE = BLOCKS.register("pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_POOL_TILE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("pool_tile", ()->new BlockItem(T_POOL_TILE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_POOL_TILE_STAIRS = BLOCKS.register("pool_tile_stairs", ()->new StairBlock(T_POOL_TILE.get()::defaultBlockState, BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_POOL_TILE_STAIRS_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("pool_tile_stairs", ()->new BlockItem(T_POOL_TILE_STAIRS.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_POOL_LIGHT = BLOCKS.register("pool_light", ()->new Block(BlockBehaviour.Properties.copy(Blocks.STONE).lightLevel((X)->15).sound(SoundType.GLASS)));
+    public static final RegistryObject<Item> T_POOL_LIGHT_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("pool_light", ()->new BlockItem(T_POOL_LIGHT.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_DIRTY_POOL_TILE = BLOCKS.register("dirty_pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_DIRTY_POOL_TILE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("dirty_pool_tile", ()-> new BlockItem(T_DIRTY_POOL_TILE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+
+    public static final RegistryObject<Block> T_DIRTY_POOL_TILE_STAIRS = BLOCKS.register("dirty_pool_tile_stairs", ()->new StairBlock(T_DIRTY_POOL_TILE.get()::defaultBlockState, BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_DIRTY_POOL_TILE_STAIRS_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("dirty_pool_tile_stairs", ()->new BlockItem(T_DIRTY_POOL_TILE_STAIRS.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+
+    public static final RegistryObject<Block> T_DIRTY_POOL_LIGHT = BLOCKS.register("dirty_pool_light", ()->new Block(BlockBehaviour.Properties.copy(Blocks.STONE).lightLevel((X)->15).sound(SoundType.GLASS)));
+    public static final RegistryObject<Item> T_DIRTY_POOL_LIGHT_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("dirty_pool_light", ()->new BlockItem(T_DIRTY_POOL_LIGHT.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Block> T_FILTHY_POOL_LIGHT = BLOCKS.register("filthy_pool_light", ()->new Block(BlockBehaviour.Properties.copy(Blocks.STONE).lightLevel((X)->8).sound(SoundType.GLASS)));
+    public static final RegistryObject<Item> T_FILTHY_POOL_LIGHT_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("filthy_pool_light", ()->new BlockItem(T_FILTHY_POOL_LIGHT.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+
+    public static final RegistryObject<Block> T_DARK_POOL_TILE = BLOCKS.register("dark_pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_DARK_POOL_TILE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("dark_pool_tile", ()->new BlockItem(T_DARK_POOL_TILE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_DARK_POOL_LIGHT = BLOCKS.register("dark_pool_light", ()->new Block(BlockBehaviour.Properties.copy(Blocks.STONE).lightLevel((X)->15).sound(SoundType.GLASS)));
+    public static final RegistryObject<Item> T_DARK_POOL_LIGHT_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("dark_pool_light", ()->new BlockItem(T_DARK_POOL_LIGHT.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_DARK_POOL_TILE_STAIRS = BLOCKS.register("dark_pool_tile_stairs", ()->new StairBlock(T_DARK_POOL_TILE.get()::defaultBlockState, BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_DARK_POOL_TILE_STAIRS_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("dark_pool_tile_stairs", ()->new BlockItem(T_DARK_POOL_TILE_STAIRS.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_BLUE_POOL_TILE = BLOCKS.register("blue_pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_BLUE_POOL_TILE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("blue_pool_tile", ()->new BlockItem(T_BLUE_POOL_TILE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Block> T_BLUE_POOL_TILE_STAIRS = BLOCKS.register("blue_pool_tile_stairs", ()->new StairBlock(T_BLUE_POOL_TILE.get()::defaultBlockState, BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_BLUE_POOL_TILE_STAIRS_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("blue_pool_tile_stairs", ()->new BlockItem(T_BLUE_POOL_TILE_STAIRS.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_BLUE_POOL_LIGHT = BLOCKS.register("blue_pool_light", ()->new Block(BlockBehaviour.Properties.copy(Blocks.STONE).lightLevel((X)->15).sound(SoundType.GLASS)));
+    public static final RegistryObject<Item> T_BLUE_POOL_LIGHT_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("blue_pool_light", ()->new BlockItem(T_BLUE_POOL_LIGHT.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+
+    public static final RegistryObject<Block> T_RED_POOL_TILE = BLOCKS.register("red_pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_RED_POOL_TILE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("red_pool_tile", ()->new BlockItem(T_RED_POOL_TILE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Block> T_RED_POOL_TILE_STAIRS = BLOCKS.register("red_pool_tile_stairs", ()->new StairBlock(T_RED_POOL_TILE.get()::defaultBlockState, BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_RED_POOL_TILE_STAIRS_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("red_pool_tile_stairs", ()->new BlockItem(T_RED_POOL_TILE_STAIRS.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_RED_POOL_LIGHT = BLOCKS.register("red_pool_light", ()->new Block(BlockBehaviour.Properties.copy(Blocks.STONE).lightLevel((X)->15).sound(SoundType.GLASS)));
+    public static final RegistryObject<Item> T_RED_POOL_LIGHT_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("red_pool_light", ()->new BlockItem(T_RED_POOL_LIGHT.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+
+    public static final RegistryObject<Block> T_DIRTY_RED_POOL_TILE = BLOCKS.register("dirty_red_pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_DIRTY_RED_POOL_TILE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("dirty_red_pool_tile", ()->new BlockItem(T_DIRTY_RED_POOL_TILE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Block> T_DIRTY_RED_POOL_TILE_STAIRS = BLOCKS.register("dirty_red_pool_tile_stairs", ()->new StairBlock(T_DIRTY_RED_POOL_TILE.get()::defaultBlockState, BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_DIRTY_RED_POOL_TILE_STAIRS_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("dirty_red_pool_tile_stairs", ()->new BlockItem(T_DIRTY_RED_POOL_TILE_STAIRS.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_DIRTY_RED_POOL_LIGHT = BLOCKS.register("dirty_red_pool_light", ()->new Block(BlockBehaviour.Properties.copy(Blocks.STONE).lightLevel((X)->15).sound(SoundType.GLASS)));
+    public static final RegistryObject<Item> T_DIRTY_RED_POOL_LIGHT_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("dirty_red_pool_light", ()->new BlockItem(T_DIRTY_RED_POOL_LIGHT.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Block> T_FILTHY_RED_POOL_LIGHT = BLOCKS.register("filthy_red_pool_light", ()->new Block(BlockBehaviour.Properties.copy(Blocks.STONE).lightLevel((X)->8).sound(SoundType.GLASS)));
+    public static final RegistryObject<Item> T_FILTHY_RED_POOL_LIGHT_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("filthy_red_pool_light", ()->new BlockItem(T_FILTHY_RED_POOL_LIGHT.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+
+    public static final RegistryObject<Block> T_DIRTY_BLUE_POOL_TILE = BLOCKS.register("dirty_blue_pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_DIRTY_BLUE_POOL_TILE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("dirty_blue_pool_tile", ()->new BlockItem(T_DIRTY_BLUE_POOL_TILE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Block> T_DIRTY_BLUE_POOL_TILE_STAIRS = BLOCKS.register("dirty_blue_pool_tile_stairs", ()->new StairBlock(T_DIRTY_BLUE_POOL_TILE.get()::defaultBlockState, BlockBehaviour.Properties.copy(Blocks.COBBLESTONE)));
+    public static final RegistryObject<Item> T_DIRTY_BLUE_POOL_TILE_STAIRS_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("dirty_blue_pool_tile_stairs", ()->new BlockItem(T_DIRTY_BLUE_POOL_TILE_STAIRS.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+
+    public static final RegistryObject<Block> T_DIRTY_BLUE_POOL_LIGHT = BLOCKS.register("dirty_blue_pool_light", ()->new Block(BlockBehaviour.Properties.copy(Blocks.STONE).lightLevel((X)->15).sound(SoundType.GLASS)));
+    public static final RegistryObject<Item> T_DIRTY_BLUE_POOL_LIGHT_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("dirty_blue_pool_light", ()->new BlockItem(T_DIRTY_BLUE_POOL_LIGHT.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Block> T_FILTHY_BLUE_POOL_LIGHT = BLOCKS.register("filthy_blue_pool_light", ()->new Block(BlockBehaviour.Properties.copy(Blocks.STONE).lightLevel((X)->8).sound(SoundType.GLASS)));
+    public static final RegistryObject<Item> T_FILTHY_BLUE_POOL_LIGHT_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("filthy_blue_pool_light", ()->new BlockItem(T_FILTHY_BLUE_POOL_LIGHT.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
     private static boolean never(BlockState p_50806_, BlockGetter p_50807_, BlockPos p_50808_) {

src/main/java/dev/zontreck/otemod/blocks/RotatableBlock.java

@@ -0,0 +1,26 @@
+package dev.zontreck.otemod.blocks;
+
+import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.HorizontalDirectionalBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.StateDefinition;
+
+public class RotatableBlock extends HorizontalDirectionalBlock
+{
+    protected RotatableBlock(Properties pProperties) {
+        super(pProperties);
+    }
+
+    @Override
+    protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> pBuilder) {
+        super.createBlockStateDefinition(pBuilder);
+        pBuilder.add(FACING);
+    }
+
+
+    @Override
+    public BlockState getStateForPlacement(BlockPlaceContext pContext) {
+        return defaultBlockState().setValue(FACING, pContext.getHorizontalDirection());
+    }
+}

src/main/java/dev/zontreck/otemod/blocks/VoidBlock.java

@@ -0,0 +1,12 @@
+package dev.zontreck.otemod.blocks;
+
+import net.minecraft.world.level.block.Block;
+
+public class VoidBlock extends Block
+{
+    public VoidBlock(Properties pProperties) {
+        super(pProperties);
+    }
+
+    
+}

src/main/java/dev/zontreck/otemod/blocks/entity/CompressionChamberBlockEntity.java

@@ -1,5 +1,6 @@
 package dev.zontreck.otemod.blocks.entity;
 
+import dev.zontreck.libzontreck.util.ChatHelpers;
 import dev.zontreck.otemod.implementation.OutputItemStackHandler;
 import dev.zontreck.otemod.implementation.compressor.CompressionChamberMenu;
 import dev.zontreck.otemod.implementation.energy.OTEEnergy;
@@ -25,10 +26,11 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.energy.EnergyStorage;
 import net.minecraftforge.energy.IEnergyStorage;
+import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemStackHandler;
 
@@ -109,7 +111,7 @@ public class CompressionChamberBlockEntity extends BlockEntity implements MenuPr
 
     @Override
     public Component getDisplayName() {
-        return Component.literal("Compression Chamber");
+        return ChatHelpers.macro("Compression Chamber");
     }
 
     @Override
@@ -122,16 +124,16 @@ public class CompressionChamberBlockEntity extends BlockEntity implements MenuPr
     @Override
     public <T> LazyOptional<T> getCapability(Capability<T> cap, Direction side)
     {
-        if(cap == ForgeCapabilities.ENERGY)
+        if(cap == CapabilityEnergy.ENERGY)
         {
             return lazyEnergyHandler.cast();
         }
-        if(side == Direction.DOWN && cap == ForgeCapabilities.ITEM_HANDLER)
+        if(side == Direction.DOWN && cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
         {
             // Return the output slot only
             return lazyOutputItems.cast();
         }
-        if(cap == ForgeCapabilities.ITEM_HANDLER)
+        if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
         {
             return lazyItemHandler.cast();
         }
@@ -249,9 +251,9 @@ public class CompressionChamberBlockEntity extends BlockEntity implements MenuPr
 
             if(existing.is(Items.AIR))
             {
-                existing = recipe.get().getResultItem(entity.level.registryAccess());
+                existing = recipe.get().getResultItem();
             }else
-                existing.setCount(recipe.get().getResultItem(entity.level.registryAccess()).getCount() + existing.getCount());
+                existing.setCount(recipe.get().getResultItem().getCount() + existing.getCount());
 
             entity.outputItems.setStackInSlot(0, existing);
             entity.itemsHandler.extractItem(0,1,false);
@@ -275,7 +277,7 @@ public class CompressionChamberBlockEntity extends BlockEntity implements MenuPr
 
         Optional<CompressionChamberRecipe> recipe = entity.level.getRecipeManager().getRecipeFor(CompressionChamberRecipe.Type.INSTANCE, inventory, entity.level);
 
-        boolean ret = recipe.isPresent() && canInsertIntoOutput(output, recipe.get().getResultItem(entity.level.registryAccess()));
+        boolean ret = recipe.isPresent() && canInsertIntoOutput(output, recipe.get().getResultItem());
 
         if(ret)
         {

src/main/java/dev/zontreck/otemod/blocks/entity/ItemScrubberBlockEntity.java

@@ -9,6 +9,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.Containers;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.SimpleContainer;
@@ -22,9 +23,10 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.energy.IEnergyStorage;
+import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemStackHandler;
 
@@ -111,22 +113,22 @@ public class ItemScrubberBlockEntity extends BlockEntity implements MenuProvider
 
     @Override
     public Component getDisplayName() {
-        return Component.translatable("block.otemod.item_scrubber");
+        return new TranslatableComponent("block.otemod.item_scrubber");
     }
 
     @Override
     public <T> LazyOptional<T> getCapability(Capability<T> cap, Direction side)
     {
-        if(cap == ForgeCapabilities.ENERGY)
+        if(cap == CapabilityEnergy.ENERGY)
         {
             return lazyEnergyHandler.cast();
         }
-        if(side == Direction.DOWN && cap == ForgeCapabilities.ITEM_HANDLER)
+        if(side == Direction.DOWN && cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
         {
             // Return the output slot only
             return lazyOutputItems.cast();
         }
-        if(cap == ForgeCapabilities.ITEM_HANDLER)
+        if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
         {
             return lazyItemHandler.cast();
         }

src/main/java/dev/zontreck/otemod/blocks/entity/MagicalScrubberBlockEntity.java

@@ -10,6 +10,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.Containers;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.SimpleContainer;
@@ -26,9 +27,10 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.energy.IEnergyStorage;
+import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemStackHandler;
 
@@ -117,22 +119,22 @@ public class MagicalScrubberBlockEntity extends BlockEntity implements MenuProvi
 
     @Override
     public Component getDisplayName() {
-        return Component.translatable("block.otemod.magical_scrubber");
+        return new TranslatableComponent("block.otemod.magical_scrubber");
     }
 
     @Override
     public <T> LazyOptional<T> getCapability(Capability<T> cap, Direction side)
     {
-        if(cap == ForgeCapabilities.ENERGY)
+        if(cap == CapabilityEnergy.ENERGY)
         {
             return lazyEnergyHandler.cast();
         }
-        if(side == Direction.DOWN && cap == ForgeCapabilities.ITEM_HANDLER)
+        if(side == Direction.DOWN && cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
         {
             // Return the output slot only
             return lazyOutputItems.cast();
         }
-        if(cap == ForgeCapabilities.ITEM_HANDLER)
+        if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
         {
             return lazyItemHandler.cast();
         }

src/main/java/dev/zontreck/otemod/blocks/entity/ModEntities.java

@@ -12,7 +12,7 @@ import net.minecraftforge.registries.RegistryObject;
 
 public class ModEntities {
     
-    public static final DeferredRegister<BlockEntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, OTEMod.MOD_ID);
+    public static final DeferredRegister<BlockEntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, OTEMod.MOD_ID);
 
     public static final RegistryObject <BlockEntityType <ItemScrubberBlockEntity>> ITEM_SCRUBBER = ENTITIES.register("item_scrubber", ()-> BlockEntityType.Builder.of(ItemScrubberBlockEntity::new, ModBlocks.ITEM_SCRUBBER.get()).build(null));
 

src/main/java/dev/zontreck/otemod/blocks/entity/ParallaxWindowEntity.java

@@ -1,14 +1,11 @@
 package dev.zontreck.otemod.blocks.entity;
 
-import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
-import org.joml.Matrix4f;
 
 import java.util.Arrays;
 

src/main/java/dev/zontreck/otemod/chat/ChatServerOverride.java

@@ -48,11 +48,21 @@ public class ChatServerOverride {
         ItemStack feet = play.getItemBySlot(EquipmentSlot.FEET);
         if(ItemUtils.getEnchantmentLevel(ModEnchantments.FLIGHT_ENCHANTMENT.get(), feet)>0)mayFly = true;
 
-        playerAbilities.mayfly=mayFly;
-        PlayerFlyCache c = PlayerFlyCache.cachePlayer(play);
-        c.Flying=prof.flying;
-        c.FlyEnabled = mayFly;
-        c.Assert(play);
+        if(play.gameMode.isCreative())
+        {
+            // Skip all this!
+            playerAbilities.mayfly=true;
+            playerAbilities.flying=true;
+
+            play.onUpdateAbilities();
+        }else{
+
+            playerAbilities.mayfly=mayFly;
+            PlayerFlyCache c = PlayerFlyCache.cachePlayer(play);
+            c.Flying=prof.flying;
+            c.FlyEnabled = mayFly;
+            c.Assert(play);
+        }
 
         if(StarterProvider.exists())
             OTEMod.checkFirstJoin(ev.player);
@@ -85,10 +95,10 @@ public class ChatServerOverride {
     @SubscribeEvent
     public void onClone(final PlayerEvent.Clone ev)
     {
-        if(ev.getEntity().level().isClientSide)return;
+        if(ev.getEntity().getLevel().isClientSide)return;
         // Fix for fly ability not copying to new instance on death or other circumstances
         Player old = ev.getOriginal();
-        Player n = ev.getEntity();
+        Player n = ev.getPlayer();
 
         PlayerFlyCache c = PlayerFlyCache.cachePlayer((ServerPlayer)old);
         c.Assert((ServerPlayer)n);
@@ -96,7 +106,7 @@ public class ChatServerOverride {
 
     @SubscribeEvent
     public void onChat(final ServerChatEvent ev){
-        if(ev.getPlayer().level().isClientSide)return;
+        if(ev.getPlayer().getLevel().isClientSide)return;
         // Player has chatted, apply override
         if(!OTEServerConfig.USE_CUSTOM_CHATREPLACER.get()) return;
 
@@ -117,7 +127,7 @@ public class ChatServerOverride {
             prefixStr = ChatColor.DARK_GRAY + "[" + ChatColor.BOLD + XD.prefix_color + XD.prefix + ChatColor.resetChat() + ChatColor.DARK_GRAY + "] ";
         }
 
-        String msg = ev.getRawText();
+        String msg = ev.getMessage();
         msg= ChatColor.doColors(msg);
 
         String nameStr = ChatColor.resetChat() + "< "+ XD.name_color + XD.nickname + ChatColor.resetChat() + " >";
@@ -126,7 +136,7 @@ public class ChatServerOverride {
         hover=hover.withFont(Style.DEFAULT_FONT).withHoverEvent(HoverTip.get(ChatColor.MINECOIN_GOLD+"User Name: "+XD.username));
         ev.setCanceled(true);
 
-        ChatHelpers.broadcast(Component.literal(prefixStr + nameStr + message).setStyle(hover), ev.getPlayer().server);
+        ChatHelpers.broadcast(ChatHelpers.macro(prefixStr + nameStr + message).setStyle(hover), ev.getPlayer().server);
     }
 
 

src/main/java/dev/zontreck/otemod/client/renderer/ParallaxWindowEntityRenderer.java

@@ -2,13 +2,12 @@ package dev.zontreck.otemod.client.renderer;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import dev.zontreck.otemod.blocks.ParallaxWindow;
+import com.mojang.math.Matrix4f;
 import dev.zontreck.otemod.blocks.entity.ParallaxWindowEntity;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.core.Direction;
-import org.joml.Matrix4f;
 
 public class ParallaxWindowEntityRenderer implements BlockEntityRenderer<ParallaxWindowEntity>
 {

src/main/java/dev/zontreck/otemod/commands/FlyCommand.java

@@ -3,6 +3,7 @@ package dev.zontreck.otemod.commands;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.context.CommandContext;
 import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.libzontreck.util.ChatHelpers;
 import dev.zontreck.otemod.OTEMod;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
@@ -38,12 +39,12 @@ public class FlyCommand {
             p.onUpdateAbilities();
 
 
-            ctx.sendSystemMessage(Component.literal(OTEMod.OTEPrefix + ChatColor.DARK_PURPLE + " Your ability to fly has been disabled"));
+            ChatHelpers.broadcastTo(p.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix + ChatColor.DARK_PURPLE + " Your ability to fly has been disabled"), p.server);
         }else {
             p.getAbilities().mayfly=true;
             p.onUpdateAbilities();
 
-            ctx.sendSystemMessage(Component.literal(OTEMod.OTEPrefix + ChatColor.DARK_PURPLE + " You can now fly"));
+            ChatHelpers.broadcastTo(p.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix + ChatColor.DARK_PURPLE + " You can now fly"), p.server);
         }
 
         return 0;

src/main/java/dev/zontreck/otemod/commands/vaults/StarterCommand.java

@@ -2,6 +2,7 @@ package dev.zontreck.otemod.commands.vaults;
 
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import dev.zontreck.libzontreck.profiles.Profile;
 import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException;
 import dev.zontreck.libzontreck.util.ChatHelpers;
@@ -55,14 +56,19 @@ public class StarterCommand
 
     public static int openStarterMenu(CommandSourceStack ctx)
     {
-        ServerPlayer player = ctx.getPlayer();
+        ServerPlayer player = null;
+        try {
+            player = ctx.getPlayerOrException();
+        } catch (CommandSyntaxException e) {
+            throw new RuntimeException(e);
+        }
         if(player != null)
         {
             if(player.hasPermissions(ctx.getServer().getOperatorUserPermissionLevel()))
             {
                 try {
                     StarterContainer container = new StarterContainer(player);
-                    NetworkHooks.openScreen(player, new SimpleMenuProvider(container.serverMenu, Component.literal("Starter Gear")));
+                    NetworkHooks.openGui(player, new SimpleMenuProvider(container.serverMenu, ChatHelpers.macro("Starter Gear")));
 
 
                     // Add to the master vault registry
@@ -93,7 +99,7 @@ public class StarterCommand
             return;
         }
 
-        NetworkHooks.openScreen(p, new SimpleMenuProvider(container.serverMenu, Component.literal("Starter Gear")));
+        NetworkHooks.openGui(p, new SimpleMenuProvider(container.serverMenu, ChatHelpers.macro("Starter Gear")));
 
         // Add to the master vault registry
         if(StarterContainer.VAULT_REGISTRY.containsKey(p.getUUID()))VaultContainer.VAULT_REGISTRY.remove(p.getUUID());

src/main/java/dev/zontreck/otemod/commands/vaults/TrashCommand.java

@@ -37,7 +37,7 @@ public class TrashCommand {
             return 0;
         }
         
-        NetworkHooks.openScreen(play, new SimpleMenuProvider(container.serverMenu, Component.literal("Trash")));
+        NetworkHooks.openGui(play, new SimpleMenuProvider(container.serverMenu, ChatHelpers.macro("Trash")));
         
         // Add to the master vault registry
         if(VaultContainer.VAULT_REGISTRY.containsKey(play.getUUID()))VaultContainer.VAULT_REGISTRY.remove(play.getUUID());

src/main/java/dev/zontreck/otemod/commands/vaults/VaultCommand.java

@@ -51,7 +51,7 @@ public class VaultCommand {
             return;
         }
         
-        NetworkHooks.openScreen(p, new SimpleMenuProvider(container.serverMenu, Component.literal("Vault " + i)));
+        NetworkHooks.openGui(p, new SimpleMenuProvider(container.serverMenu, ChatHelpers.macro("Vault " + i)));
         
         // Add to the master vault registry
         if(VaultContainer.VAULT_REGISTRY.containsKey(p.getUUID()))VaultContainer.VAULT_REGISTRY.remove(p.getUUID());

src/main/java/dev/zontreck/otemod/commands/zschem/SetPos1.java

@@ -37,7 +37,7 @@ public class SetPos1 {
         MemoryHolder.setPos1(play, new Vector3(source.getPosition()));
         MemoryHolder.setLevel(play, source.getLevel());
 
-        ChatHelpers.broadcastTo(play.getUUID(), Component.literal(OTEMod.OTEPrefix+ChatColor.doColors(" !Dark_Green!Position 1 set!")), OTEMod.THE_SERVER);
+        ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+ChatColor.doColors(" !Dark_Green!Position 1 set!")), OTEMod.THE_SERVER);
 
         return 0;
     }

src/main/java/dev/zontreck/otemod/commands/zschem/SetPos2.java

@@ -37,7 +37,7 @@ public class SetPos2 {
         MemoryHolder.setPos2(play, new Vector3(source.getPosition()));
         MemoryHolder.setLevel(play, source.getLevel());
 
-        ChatHelpers.broadcastTo(play.getUUID(), Component.literal(OTEMod.OTEPrefix+ChatColor.doColors(" !Dark_Green!Position 2 set!")), OTEMod.THE_SERVER);
+        ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+ChatColor.doColors(" !Dark_Green!Position 2 set!")), OTEMod.THE_SERVER);
 
         return 0;
     }

src/main/java/dev/zontreck/otemod/configs/PlayerFlyCache.java

@@ -18,6 +18,7 @@ public class PlayerFlyCache
     }
 
     public void Assert(ServerPlayer play){
+        if(play.gameMode.isCreative()) return;
         Abilities playerAbilities = play.getAbilities();
         playerAbilities.flying=Flying;
         playerAbilities.mayfly=FlyEnabled;

src/main/java/dev/zontreck/otemod/effects/FlightEffect.java

@@ -61,7 +61,13 @@ public class FlightEffect extends MobEffect {
 
     private static void recheck(ServerPlayer sp)
     {
-        if(sp.gameMode.isCreative())return; // Don't mess with the creative mode attributes
+        if(sp.gameMode.isCreative()){
+            Abilities a = sp.getAbilities();
+            a.mayfly=true;
+
+            sp.onUpdateAbilities();
+            return;
+        } // Don't mess with the creative mode attributes
 
 
         ItemStack feet = sp.getItemBySlot(EquipmentSlot.FEET);
@@ -79,7 +85,7 @@ public class FlightEffect extends MobEffect {
         Abilities playerAbilities = sp.getAbilities();
         if(hasFlight)
         {
-            if(playerAbilities.mayfly == false)
+            if(!playerAbilities.mayfly)
             {
                 playerAbilities.mayfly=true;
                 sp.onUpdateAbilities();

src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java

@@ -0,0 +1,165 @@
+package dev.zontreck.otemod.enchantments;
+
+import dev.zontreck.libzontreck.util.ItemUtils;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.SwordItem;
+import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.world.item.enchantment.EnchantmentCategory;
+import net.minecraft.world.item.enchantment.EnchantmentHelper;
+import net.minecraft.world.item.enchantment.MendingEnchantment;
+import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.server.ServerLifecycleHooks;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class ConsumptionMending extends Enchantment
+{
+    protected ConsumptionMending(EquipmentSlot... slots) {
+        super(Rarity.RARE, EnchantmentCategory.BREAKABLE, slots);
+    }
+
+    @Override
+    public int getMaxLevel() {
+        return 1;
+    }
+
+    @Override
+    public boolean isTradeable() {
+        return true;
+    }
+
+    @Override
+    public boolean isTreasureOnly() {
+        return false;
+    }
+
+    @Override
+    public boolean isCurse() {
+        return true;
+    }
+
+    @Override
+    public int getMinCost(int pLevel) {
+        return 25 + (pLevel-1);
+    }
+
+    @Override
+    public int getMaxCost(int pLevel) {
+        return pLevel * 23;
+    }
+
+    private static List<ItemStack> append(ServerPlayer player, List<ItemStack> items)
+    {
+        List<ItemStack> enchanted = new ArrayList<>();
+
+        for(ItemStack stack : player.getInventory().items)
+        {
+            if(ItemUtils.getEnchantmentLevel(ModEnchantments.CONSUMPTION_MENDING.get(), stack) > 0)
+            {
+                enchanted.add(stack);
+            }
+        }
+
+        return enchanted;
+    }
+
+    public static void onEntityTick(ServerPlayer player)
+    {
+        // Check what items have this enchantment
+        // If any, check for like-items that lack the enchant.
+
+        List<ItemStack> enchanted = new ArrayList<>();
+        enchanted.addAll(append(player, player.getInventory().items));
+        enchanted.addAll(append(player, player.getInventory().armor));
+
+        List<ItemStack> procList = new ArrayList<>();
+        procList.addAll(append(player, player.getInventory().offhand));
+        procList.addAll(append(player, player.getInventory().items));
+
+        for(ItemStack stack : enchanted)
+        {
+            for(ItemStack item : player.getInventory().items)
+            {
+                // Is this a like item, and does it have the enchant?
+                boolean eligible = false;
+                if(!(ItemUtils.getEnchantmentLevel(ModEnchantments.CONSUMPTION_MENDING.get(), item)>0))
+                {
+                    eligible=true;
+                    if(!item.isDamageableItem())
+                    {
+                        eligible=false;
+                    }
+                }
+
+                if(stack.getDamageValue()==0)
+                {
+                    eligible=false;
+                }
+
+                if(eligible)
+                {
+                    // Let's eat
+                    int iDamage = stack.getDamageValue();
+                    int iMax = stack.getMaxDamage();
+
+                    int iNeeds = iDamage * 2;
+
+                    // The stack we are inspecting:
+                    int nDamage = item.getDamageValue();
+                    int nMax = item.getMaxDamage();
+
+                    int iRemain = nMax - nDamage;
+
+                    if(iRemain == iNeeds)
+                    {
+                        nDamage = nMax;
+                        iDamage=0;
+                    } else {
+                        if(iRemain > iNeeds)
+                        {
+                            iDamage -= iNeeds;
+                            nDamage += iNeeds;
+                        } else {
+                            iDamage -= iRemain;
+                            nDamage = nMax;
+                        }
+                    }
+
+                    if(nDamage == nMax){
+                        // Check for curses on the item
+                        if(item.isEnchanted())
+                        {
+                            Map<Enchantment, Integer> enchantments = ItemUtils.getEnchantments(item);
+                            for(Map.Entry<Enchantment,Integer> entry : enchantments.entrySet())
+                            {
+                                Enchantment id = entry.getKey();
+                                int dice = player.getRandom().nextInt(0,20);
+
+                                if(id.isCurse() && ((dice >= 13) && (dice <= 18)))
+                                {
+                                    stack.enchant(id, entry.getValue());
+                                    player.getLevel().playSound(null, player.getOnPos(), SoundEvents.ANVIL_USE, SoundSource.NEUTRAL,1, player.getRandom().nextFloat(0,1));
+                                }
+                            }
+                        }
+
+                        item.shrink(1);
+                        player.getLevel().playSound(null, player.getOnPos(), SoundEvents.PLAYER_BURP, SoundSource.NEUTRAL,1, player.getRandom().nextFloat(0,1));
+                    }
+                    else item.setDamageValue(nDamage);
+
+                    stack.setDamageValue(iDamage);
+                }
+            }
+        }
+    }
+}

src/main/java/dev/zontreck/otemod/enchantments/EnchantmentEvents.java

@@ -0,0 +1,39 @@
+package dev.zontreck.otemod.enchantments;
+
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.event.entity.living.LivingEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.server.ServerLifecycleHooks;
+
+@Mod.EventBusSubscriber
+public class EnchantmentEvents
+{
+    private static boolean canTick = false;
+    @SubscribeEvent
+    public static void onServerTick(TickEvent.ServerTickEvent event)
+    {
+        if(event.phase == TickEvent.Phase.START)
+        {
+            MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
+            canTick = server!=null && server.getTickCount()%20==0;
+        }
+    }
+
+    @SubscribeEvent
+    public static void onTick(LivingEvent.LivingUpdateEvent tick)
+    {
+        if(canTick)
+        {
+            // Process Enchantments
+
+            if(tick.getEntityLiving() instanceof ServerPlayer sp)
+            {
+                FlightEnchantment.runEntityTick(sp);
+                ConsumptionMending.onEntityTick(sp);
+            }
+        }
+    }
+}

src/main/java/dev/zontreck/otemod/enchantments/FlightEnchantment.java

@@ -28,7 +28,6 @@ import net.minecraftforge.fml.common.Mod;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-@Mod.EventBusSubscriber(modid = OTEMod.MOD_ID)
 public class FlightEnchantment extends Enchantment
 {
 
@@ -74,44 +73,28 @@ public class FlightEnchantment extends Enchantment
     }
 
 
-    public static AtomicInteger TICKS = new AtomicInteger(0);
-    @SubscribeEvent
-    public static void onEnchantmentTick(TickEvent.PlayerTickEvent event)
+    public static void runEntityTick(ServerPlayer player)
     {
-        if(event.side == LogicalSide.CLIENT) return;
 
-        if(TICKS.getAndIncrement() >= (5*20))
+        if(OTEServerConfig.DEBUG.get())
         {
-            TICKS.set(0);
-
-
-
-            if(OTEServerConfig.DEBUG.get())
-            {
-                OTEMod.LOGGER.info("> Flight Enchantment Tick <");
-            }
-
-            if(event.phase == TickEvent.Phase.END)
-            {
-
-                ServerPlayer sp = (ServerPlayer) event.player;
-
-                ItemStack feet = sp.getItemBySlot(EquipmentSlot.FEET);
-
-                boolean hasFlight = false;
-
-                if(ItemUtils.getEnchantmentLevel(ModEnchantments.FLIGHT_ENCHANTMENT.get(), feet)>0)hasFlight=true;
-
-                if(hasFlight)
-                {
-                    MobEffectInstance inst = new MobEffectInstance(ModEffects.FLIGHT.get(), -1, 0, false, false, true);
-
-                    event.player.addEffect(inst);
-                }
-            }
+            OTEMod.LOGGER.info("> Flight Enchantment Tick <");
         }
 
 
+        ItemStack feet = player.getItemBySlot(EquipmentSlot.FEET);
+
+        boolean hasFlight = false;
+
+        if(ItemUtils.getEnchantmentLevel(ModEnchantments.FLIGHT_ENCHANTMENT.get(), feet)>0)hasFlight=true;
+
+        if(hasFlight)
+        {
+            MobEffectInstance inst = new MobEffectInstance(ModEffects.FLIGHT.get(), 30*20, 0, false, false, true);
+
+            player.addEffect(inst);
+        }
+
     }
 
 }

src/main/java/dev/zontreck/otemod/enchantments/MobEggEnchantment.java

@@ -67,7 +67,7 @@ public class MobEggEnchantment extends Enchantment
         CHANCE *= (level / 0.5);
         CHANCE += bias;
 
-        double rng = Math.random()*100000;
+        double rng = Math.random()*10000;
 
         if(OTEServerConfig.DEBUG.get())
         {

src/main/java/dev/zontreck/otemod/enchantments/ModEnchantments.java

@@ -22,6 +22,8 @@ public class ModEnchantments {
 
     public static final RegistryObject<Enchantment> NIGHT_VISION_ENCHANT = REGISTERS.register("night_vision", ()->new NightVisionEnchantment(EquipmentSlot.HEAD));
 
+    public static final RegistryObject<Enchantment> CONSUMPTION_MENDING = REGISTERS.register("consumption_mending", ()->new ConsumptionMending(EquipmentSlot.HEAD, EquipmentSlot.CHEST, EquipmentSlot.FEET, EquipmentSlot.LEGS, EquipmentSlot.MAINHAND, EquipmentSlot.OFFHAND));
+
     public static void register(IEventBus bus){
         REGISTERS.register(bus);
     }

src/main/java/dev/zontreck/otemod/enchantments/NightVisionEnchantment.java

@@ -19,7 +19,6 @@ import net.minecraftforge.fml.common.Mod;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-@Mod.EventBusSubscriber(modid = OTEMod.MOD_ID)
 public class NightVisionEnchantment extends Enchantment
 {
 
@@ -58,7 +57,7 @@ public class NightVisionEnchantment extends Enchantment
     {
         if(event.side == LogicalSide.CLIENT) return;
 
-        if(TICKS.getAndIncrement() >= (2*20))
+        if(TICKS.getAndIncrement() >= (5*20))
         {
             TICKS.set(0);
 

src/main/java/dev/zontreck/otemod/events/ClientEvents.java

@@ -20,7 +20,7 @@ public class ClientEvents {
         static long lastPress;
 
         @SubscribeEvent
-        public static void onKeyInput(InputEvent.Key event)
+        public static void onKeyInput(InputEvent.KeyInputEvent event)
         {
             //OTEMod.LOGGER.info("KEY PRESS: "+event.getKey());
             if(KeyBindings.OPEN_VAULT.matches(event.getKey(), event.getScanCode()) && Minecraft.getInstance().screen == null && lastPress+10 < Instant.now().getEpochSecond())

src/main/java/dev/zontreck/otemod/events/EventHandler.java

@@ -93,7 +93,7 @@ public class EventHandler {
         }
 
         try {
-            ChatHelpers.broadcast(Component.literal(DeathMessages.getRandomDeathMessage(Profile.get_profile_of(event.getEntity().getStringUUID()), event.getSource())), event.getEntity().level().getServer());
+            ChatHelpers.broadcast(ChatHelpers.macro(DeathMessages.getRandomDeathMessage(Profile.get_profile_of(event.getEntity().getStringUUID()), event.getSource())), event.getEntity().getLevel().getServer());
         } catch (UserProfileNotYetExistsException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -102,14 +102,14 @@ public class EventHandler {
 
     @SubscribeEvent
     public void onEntityKilled(LivingDropsEvent ev){
-        if(ev.getEntity().level().isClientSide)return;
+        if(ev.getEntity().getLevel().isClientSide)return;
 
         Entity killedentity = ev.getEntity();
         Entity ent = ev.getSource().getEntity();
         if(ent instanceof Player)
         {
             ServerPlayer play = (ServerPlayer)ent;
-            LivingEntity killed = ev.getEntity();
+            LivingEntity killed = ev.getEntityLiving();
 
             ItemStack stack = play.getMainHandItem();
             int levelOfEgging = ItemUtils.getEnchantmentLevel(ModEnchantments.MOB_EGGING_ENCHANTMENT.get(),stack);
@@ -128,7 +128,7 @@ public class EventHandler {
                 int level = ItemUtils.getEnchantmentLevel (Enchantments.MOB_LOOTING,stack);
                 if(level==3){
                     ItemStack egg = new ItemStack(ForgeSpawnEggItem.fromEntityType(killed.getType()));
-                    ev.getDrops().add(new ItemEntity(killed.level(), killed.getX(), killed.getY(), killed.getZ(), egg));
+                    ev.getDrops().add(new ItemEntity(killed.getLevel(), killed.getX(), killed.getY(), killed.getZ(), egg));
                     //LoreHandlers.updateItem(stack, ItemStatType.EGGING);
                 }
             }else{

src/main/java/dev/zontreck/otemod/events/LoreHandlers.java

@@ -1,26 +1,6 @@
 package dev.zontreck.otemod.events;
 
-import dev.zontreck.libzontreck.lore.LoreContainer;
-import dev.zontreck.libzontreck.lore.LoreEntry;
-import dev.zontreck.libzontreck.util.ChatHelpers;
 import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.items.tags.ItemStatTag;
-import dev.zontreck.otemod.items.tags.ItemStatType;
-import dev.zontreck.otemod.items.tags.ItemStatistics;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.event.entity.living.LivingDeathEvent;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-import net.minecraftforge.event.level.BlockEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.registries.ForgeRegistries;

src/main/java/dev/zontreck/otemod/implementation/CreativeModeTabs.java

@@ -1,38 +1,18 @@
 package dev.zontreck.otemod.implementation;
 
 import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.items.ModItems;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.level.ItemLike;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Supplier;
 
 @Mod.EventBusSubscriber(modid = OTEMod.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class CreativeModeTabs
 {
-    public static final DeferredRegister<CreativeModeTab> REGISTER = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, OTEMod.MOD_ID);
-
-    public static final List<Supplier<? extends ItemLike>> OTEMOD_TAB_ITEMS = new ArrayList<>();
-
-    public static final RegistryObject<CreativeModeTab> OTE_TAB = REGISTER.register("otemod", () -> CreativeModeTab.builder()
-            .title(Component.translatable("itemGroup.tabs.otemod"))
-            .icon(ModItems.IHAN_CRYSTAL.get()::getDefaultInstance)
-            .displayItems((display, output) -> OTEMOD_TAB_ITEMS.forEach(it->output.accept(it.get())))
-            .build()
-    );
 
     public static <T extends Item> RegistryObject<T> addToOTEModTab(RegistryObject<T> itemLike)
     {
-        OTEMOD_TAB_ITEMS.add(itemLike);
         return itemLike;
     }
 

src/main/java/dev/zontreck/otemod/implementation/DeathMessages.java

@@ -7,8 +7,6 @@ import java.util.Random;
 import dev.zontreck.libzontreck.profiles.Profile;
 import dev.zontreck.libzontreck.util.ChatHelpers;
 import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.damagesource.DamageTypes;
-import net.minecraft.world.entity.Entity;
 
 public class DeathMessages {
     private static final List<String> messages;
@@ -40,7 +38,7 @@ public class DeathMessages {
         {
             sourceName = "A godlike player";
         }
-        if(source.is(DamageTypes.FALL))
+        if(source.isFall())
         {
             msg = rng.nextInt(0,messages_falling.size()-1);
             return ChatHelpers.macroize(messages_falling.get(msg), String.valueOf(playerWhoDied.deaths), playerWhoDied.name_color + playerWhoDied.nickname);

src/main/java/dev/zontreck/otemod/implementation/compressor/CompressionChamberMenu.java

@@ -14,7 +14,7 @@ import net.minecraft.world.inventory.*;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.common.capabilities.ForgeCapabilities;
+import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.SlotItemHandler;
 
 public class CompressionChamberMenu extends AbstractContainerMenu
@@ -25,7 +25,7 @@ public class CompressionChamberMenu extends AbstractContainerMenu
 
     public CompressionChamberMenu(int id, Inventory inv, FriendlyByteBuf buf)
     {
-        this(id, inv, inv.player.level().getBlockEntity(buf.readBlockPos()), new SimpleContainerData(1));
+        this(id, inv, inv.player.getLevel().getBlockEntity(buf.readBlockPos()), new SimpleContainerData(1));
     }
 
     public CompressionChamberMenu(int id, Inventory inv, BlockEntity entity, ContainerData data)
@@ -42,11 +42,11 @@ public class CompressionChamberMenu extends AbstractContainerMenu
         addPlayerInventory(inv);
         addPlayerHotbar(inv);
 
-        this.entity.getCapability(ForgeCapabilities.ITEM_HANDLER, Direction.UP).ifPresent(handler->{
+        this.entity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.UP).ifPresent(handler->{
             addSlot(new SlotItemHandler(handler, 0, 34,34));
         });
 
-        this.entity.getCapability(ForgeCapabilities.ITEM_HANDLER, Direction.DOWN).ifPresent(handler->{
+        this.entity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN).ifPresent(handler->{
             addSlot(new SlotItemHandler(handler, 0, 113, 34));
         });
 

src/main/java/dev/zontreck/otemod/implementation/compressor/CompressionChamberScreen.java

@@ -1,10 +1,10 @@
 package dev.zontreck.otemod.implementation.compressor;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import dev.zontreck.otemod.OTEMod;
 import dev.zontreck.otemod.implementation.MouseHelpers;
 import dev.zontreck.otemod.implementation.energy.screenrenderer.EnergyInfoArea;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.network.chat.Component;
@@ -45,23 +45,23 @@ public class CompressionChamberScreen extends AbstractContainerScreen<Compressio
     }
 
     @Override
-    protected void renderBg(GuiGraphics guiGraphics, float v, int i, int i1) {
+    protected void renderBg(PoseStack guiGraphics, float v, int i, int i1) {
 
         RenderSystem.setShader(GameRenderer::getPositionTexShader);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
         RenderSystem.setShaderTexture(0, TEXTURE);
 
 
-        guiGraphics.blit(TEXTURE, this.leftPos, this.topPos, 0,0, imageWidth, imageHeight);
+        blit(guiGraphics, this.leftPos, this.topPos, 0,0, imageWidth, imageHeight);
         renderCraftingProgress(guiGraphics);
         EIA.draw(guiGraphics);
     }
 
 
     @Override
-    protected void renderLabels(GuiGraphics stack, int mouseX, int mouseY)
+    protected void renderLabels(PoseStack stack, int mouseX, int mouseY)
     {
-        stack.drawString(font, this.title.getString(), 32, 4, 0xFFFFFF);
+        drawString(stack, font, this.title.getString(), 32, 4, 0xFFFFFF);
 
         int x = (width - imageWidth )/2;
         int y = (height - imageHeight)/2;
@@ -69,23 +69,23 @@ public class CompressionChamberScreen extends AbstractContainerScreen<Compressio
         //this.font.draw(stack, this.playerInventoryTitle.getString(), this.leftPos + 17, this.topPos + 123, 0xFFFFFF);
     }
 
-    private void renderEnergy(GuiGraphics stack, int mouseX, int mouseY, int x, int y) {
+    private void renderEnergy(PoseStack stack, int mouseX, int mouseY, int x, int y) {
         if(isMouseAbove(mouseX, mouseY, x, y, 63, 46, 39, 6)){
-            stack.renderTooltip(font, EIA.getTooltips(), Optional.empty(), mouseX-x, mouseY-y);
+            renderTooltip(stack, EIA.getTooltips(), Optional.empty(), mouseX-x, mouseY-y, font);
         }
     }
 
 
-    private void renderCraftingProgress(GuiGraphics stack)
+    private void renderCraftingProgress(PoseStack stack)
     {
         if(menu.isCrafting())
         {
-            stack.blit(TEXTURE, leftPos+63, topPos+34, 179, 11, menu.getScaledProgress(),6);
+            blit(stack, leftPos+63, topPos+34, 179, 11, menu.getScaledProgress(),6);
         }
     }
 
     @Override
-    public void render(GuiGraphics stack, int mouseX, int mouseY, float delta)
+    public void render(PoseStack stack, int mouseX, int mouseY, float delta)
     {
         renderBackground(stack);
         super.render(stack, mouseX, mouseY, delta);

src/main/java/dev/zontreck/otemod/implementation/energy/screenrenderer/EnergyInfoArea.java

@@ -1,8 +1,7 @@
 package dev.zontreck.otemod.implementation.energy.screenrenderer;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import dev.zontreck.libzontreck.util.ChatHelpers;
 import net.minecraft.client.renderer.Rect2i;
 import net.minecraft.network.chat.Component;
 import net.minecraftforge.energy.IEnergyStorage;
@@ -33,18 +32,18 @@ public class EnergyInfoArea extends InfoArea {
     }
 
     public List<Component> getTooltips() {
-        return List.of(Component.literal(energy.getEnergyStored()+"/"+energy.getMaxEnergyStored()+" FE"));
+        return List.of(ChatHelpers.macro(energy.getEnergyStored()+"/"+energy.getMaxEnergyStored()+" FE"));
     }
 
     @Override
-    public void draw(GuiGraphics transform) {
+    public void draw(PoseStack transform) {
         final int height = area.getHeight();
         final int width = area.getWidth();
         int stored = (int)(height*(energy.getEnergyStored()/(float)energy.getMaxEnergyStored()));
 
 
         if(area.getHeight() > area.getWidth())
-            transform.fillGradient(area.getX(), area.getY() + (height + stored), area.getX() + area.getWidth(), area.getY() + area.getHeight(), 0xff0000, 0xff550000);
-        else transform.fillGradient(area.getX() + (width + stored), area.getY(),area.getX() + area.getWidth(), area.getY() + area.getHeight(), 0xff0000, 0xff005500);
+            fillGradient(transform, area.getX(), area.getY() + (height + stored), area.getX() + area.getWidth(), area.getY() + area.getHeight(), 0xff0000, 0xff550000);
+        else fillGradient(transform, area.getX() + (width + stored), area.getY(),area.getX() + area.getWidth(), area.getY() + area.getHeight(), 0xff0000, 0xff005500);
     }
 }

src/main/java/dev/zontreck/otemod/implementation/energy/screenrenderer/InfoArea.java

@@ -2,8 +2,7 @@ package dev.zontreck.otemod.implementation.energy.screenrenderer;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.renderer.Rect2i;
 
 /*
@@ -13,13 +12,13 @@ import net.minecraft.client.renderer.Rect2i;
  *  This code is licensed under "Blu's License of Common Sense"
  *  Details can be found in the license file in the root folder of this project
  */
-public abstract class InfoArea {
+public abstract class InfoArea extends GuiComponent {
     protected final Rect2i area;
 
     protected InfoArea(Rect2i area) {
         this.area = area;
     }
 
-    public abstract void draw(GuiGraphics transform);
+    public abstract void draw(PoseStack transform);
 }
 

src/main/java/dev/zontreck/otemod/implementation/inits/ModMenuTypes.java

@@ -17,7 +17,7 @@ import net.minecraftforge.registries.RegistryObject;
 
 public final class ModMenuTypes 
 {
-    public static final DeferredRegister<MenuType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, OTEMod.MOD_ID);
+    public static final DeferredRegister<MenuType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, OTEMod.MOD_ID);
 
     public static final RegistryObject<MenuType<VaultMenu>> VAULT = registerMenuType(VaultMenu::new, "vault");
 

src/main/java/dev/zontreck/otemod/implementation/scrubber/ItemScrubberMenu.java

@@ -11,7 +11,7 @@ import net.minecraft.world.inventory.*;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.common.capabilities.ForgeCapabilities;
+import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.SlotItemHandler;
 
 public class ItemScrubberMenu extends AbstractContainerMenu
@@ -22,7 +22,7 @@ public class ItemScrubberMenu extends AbstractContainerMenu
 
     public ItemScrubberMenu(int id, Inventory inv, FriendlyByteBuf buf)
     {
-        this(id, inv, inv.player.level().getBlockEntity(buf.readBlockPos()), new SimpleContainerData(1));
+        this(id, inv, inv.player.getLevel().getBlockEntity(buf.readBlockPos()), new SimpleContainerData(1));
     }
 
     public ItemScrubberMenu(int id, Inventory inv, BlockEntity entity, ContainerData data){
@@ -31,15 +31,15 @@ public class ItemScrubberMenu extends AbstractContainerMenu
         checkContainerSize(inv, 1);
         this.entity = (ItemScrubberBlockEntity)entity;
         this.data=data;
-        this.level = inv.player.level();
+        this.level = inv.player.getLevel();
 
         addPlayerInventory(inv);
         addPlayerHotbar(inv);
 
-        this.entity.getCapability(ForgeCapabilities.ITEM_HANDLER, Direction.UP).ifPresent(handler->{
+        this.entity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.UP).ifPresent(handler->{
             addSlot(new SlotItemHandler(handler, 0, 16, 41));
         });
-        this.entity.getCapability(ForgeCapabilities.ITEM_HANDLER, Direction.DOWN).ifPresent(handler->{
+        this.entity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN).ifPresent(handler->{
             addSlot(new SlotItemHandler(handler, 0, 177, 41));
         });
 

src/main/java/dev/zontreck/otemod/implementation/scrubber/ItemScrubberScreen.java

@@ -8,7 +8,6 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import dev.zontreck.otemod.OTEMod;
 import dev.zontreck.otemod.implementation.MouseHelpers;
 import dev.zontreck.otemod.implementation.energy.screenrenderer.EnergyInfoArea;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.network.chat.Component;
@@ -47,22 +46,22 @@ public class ItemScrubberScreen extends AbstractContainerScreen<ItemScrubberMenu
     }
 
     @Override
-    protected void renderBg(GuiGraphics poseStack, float partialTick, int mouseX, int mouseY) {
+    protected void renderBg(PoseStack poseStack, float partialTick, int mouseX, int mouseY) {
         RenderSystem.setShader(GameRenderer::getPositionTexShader);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
         RenderSystem.setShaderTexture(0, TEXTURE);
         
 
-        poseStack.blit(TEXTURE, this.leftPos, this.topPos, 0,0, imageWidth, imageHeight);
+        blit(poseStack, this.leftPos, this.topPos, 0,0, imageWidth, imageHeight);
         renderUncraftingProgress(poseStack);
         EIA.draw(poseStack);
     }
 
     
     @Override
-    protected void renderLabels(GuiGraphics stack, int mouseX, int mouseY)
+    protected void renderLabels(PoseStack stack, int mouseX, int mouseY)
     {
-        stack.drawString(font, this.title.getString(), 63, 12, 0xFFFFFF);
+        drawString(stack, font, this.title.getString(), 63, 12, 0xFFFFFF);
         
         int x = (width - imageWidth )/2;
         int y = (height - imageHeight)/2;
@@ -70,22 +69,22 @@ public class ItemScrubberScreen extends AbstractContainerScreen<ItemScrubberMenu
         //this.font.draw(stack, this.playerInventoryTitle.getString(), this.leftPos + 17, this.topPos + 123, 0xFFFFFF);
     }
 
-    private void renderEnergy(GuiGraphics stack, int mouseX, int mouseY, int x, int y) {
+    private void renderEnergy(PoseStack stack, int mouseX, int mouseY, int x, int y) {
         if(isMouseAbove(mouseX, mouseY, x, y, 188, 69, 7, 72)){
-            stack.renderTooltip(font, EIA.getTooltips(), Optional.empty(), mouseX-x, mouseY-y);
+            renderTooltip(stack, EIA.getTooltips(), Optional.empty(), mouseX-x, mouseY-y, font);
         }
     }
 
-    private void renderUncraftingProgress(GuiGraphics stack)
+    private void renderUncraftingProgress(PoseStack stack)
     {
         if(menu.isCrafting())
         {
-            stack.blit(TEXTURE, leftPos+42, topPos+45, 1, 168, menu.getScaledProgress(),6);
+            blit(stack, leftPos+42, topPos+45, 1, 168, menu.getScaledProgress(),6);
         }
     }
 
     @Override
-    public void render(GuiGraphics stack, int mouseX, int mouseY, float delta)
+    public void render(PoseStack stack, int mouseX, int mouseY, float delta)
     {
         renderBackground(stack);
         super.render(stack, mouseX, mouseY, delta);

src/main/java/dev/zontreck/otemod/implementation/scrubber/MagicalScrubberMenu.java

@@ -11,7 +11,7 @@ import net.minecraft.world.inventory.*;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.common.capabilities.ForgeCapabilities;
+import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.SlotItemHandler;
 
 public class MagicalScrubberMenu extends AbstractContainerMenu
@@ -22,7 +22,7 @@ public class MagicalScrubberMenu extends AbstractContainerMenu
 
     public MagicalScrubberMenu(int id, Inventory inv, FriendlyByteBuf buf)
     {
-        this(id, inv, inv.player.level().getBlockEntity(buf.readBlockPos()), new SimpleContainerData(1));
+        this(id, inv, inv.player.getLevel().getBlockEntity(buf.readBlockPos()), new SimpleContainerData(1));
     }
 
     public MagicalScrubberMenu(int id, Inventory inv, BlockEntity entity, ContainerData data){
@@ -31,15 +31,15 @@ public class MagicalScrubberMenu extends AbstractContainerMenu
         checkContainerSize(inv, 1);
         this.entity = (MagicalScrubberBlockEntity)entity;
         this.data=data;
-        this.level = inv.player.level();
+        this.level = inv.player.getLevel();
 
         addPlayerInventory(inv);
         addPlayerHotbar(inv);
 
-        this.entity.getCapability(ForgeCapabilities.ITEM_HANDLER, Direction.UP).ifPresent(handler->{
+        this.entity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.UP).ifPresent(handler->{
             addSlot(new SlotItemHandler(handler, 0, 16, 41));
         });
-        this.entity.getCapability(ForgeCapabilities.ITEM_HANDLER, Direction.DOWN).ifPresent(handler->{
+        this.entity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN).ifPresent(handler->{
             addSlot(new SlotItemHandler(handler, 0, 177, 41));
         });
 

src/main/java/dev/zontreck/otemod/implementation/scrubber/MagicalScrubberScreen.java

@@ -3,12 +3,11 @@ package dev.zontreck.otemod.implementation.scrubber;
 import java.util.Optional;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import dev.zontreck.otemod.OTEMod;
 import dev.zontreck.otemod.implementation.MouseHelpers;
 import dev.zontreck.otemod.implementation.energy.screenrenderer.EnergyInfoArea;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.network.chat.Component;
@@ -48,22 +47,22 @@ public class MagicalScrubberScreen extends AbstractContainerScreen<MagicalScrubb
     }
 
     @Override
-    protected void renderBg(GuiGraphics poseStack, float partialTick, int mouseX, int mouseY) {
+    protected void renderBg(PoseStack poseStack, float partialTick, int mouseX, int mouseY) {
         RenderSystem.setShader(GameRenderer::getPositionTexShader);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
         RenderSystem.setShaderTexture(0, TEXTURE);
 
 
-        poseStack.blit(TEXTURE, this.leftPos, this.topPos, 0, 0, imageWidth, imageHeight);
+        blit(poseStack, this.leftPos, this.topPos, 0, 0, imageWidth, imageHeight);
         renderUncraftingProgress(poseStack);
         EIA.draw(poseStack);
     }
 
 
     @Override
-    protected void renderLabels(GuiGraphics stack, int mouseX, int mouseY)
+    protected void renderLabels(PoseStack stack, int mouseX, int mouseY)
     {
-        stack.drawString(font, title.getString(), 63, 12, 0xFFFFFF);
+        drawString(stack, font, title.getString(), 63, 12, 0xFFFFFF);
 
         int x = (width - imageWidth )/2;
         int y = (height - imageHeight)/2;
@@ -71,22 +70,22 @@ public class MagicalScrubberScreen extends AbstractContainerScreen<MagicalScrubb
         //this.font.draw(stack, this.playerInventoryTitle.getString(), this.leftPos + 17, this.topPos + 123, 0xFFFFFF);
     }
 
-    private void renderEnergy(GuiGraphics stack, int mouseX, int mouseY, int x, int y) {
+    private void renderEnergy(PoseStack stack, int mouseX, int mouseY, int x, int y) {
         if(isMouseAbove(mouseX, mouseY, x, y, 188, 69, 7, 72)){
-            stack.renderTooltip(font, EIA.getTooltips(), Optional.empty(), mouseX-x, mouseY-y);
+            renderTooltip(stack, EIA.getTooltips(), Optional.empty(), mouseX-x, mouseY-y, font);
         }
     }
 
-    private void renderUncraftingProgress(GuiGraphics stack)
+    private void renderUncraftingProgress(PoseStack stack)
     {
         if(menu.isCrafting())
         {
-            stack.blit(TEXTURE, leftPos+42, topPos+45, 1, 168, menu.getScaledProgress(), 6);
+            blit(stack, leftPos+42, topPos+45, 1, 168, menu.getScaledProgress(), 6);
         }
     }
 
     @Override
-    public void render(GuiGraphics stack, int mouseX, int mouseY, float delta)
+    public void render(PoseStack stack, int mouseX, int mouseY, float delta)
     {
         renderBackground(stack);
         super.render(stack, mouseX, mouseY, delta);

src/main/java/dev/zontreck/otemod/implementation/vault/StarterContainer.java

@@ -73,7 +73,7 @@ public class StarterContainer
         if(invalid)return;
         boolean isEmpty=true;
         CompoundTag saved = myInventory.serializeNBT();
-        ChatHelpers.broadcastToAbove(owner, Component.literal(ChatColor.BOLD+ChatColor.DARK_GREEN+"Saving the starter kit's contents..."), server);
+        ChatHelpers.broadcastToAbove(owner, ChatHelpers.macro(ChatColor.BOLD+ChatColor.DARK_GREEN+"Saving the starter kit's contents..."), server);
 
         main_accessor.setLastChanged(Instant.now().getEpochSecond());
 

src/main/java/dev/zontreck/otemod/implementation/vault/StarterScreen.java

@@ -1,12 +1,8 @@
 package dev.zontreck.otemod.implementation.vault;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.networking.ModMessages;
-import dev.zontreck.otemod.networking.packets.OpenStarterVaultC2SPacket;
-import dev.zontreck.otemod.networking.packets.OpenVaultC2SPacket;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.network.chat.Component;
@@ -39,7 +35,7 @@ public class StarterScreen extends AbstractContainerScreen <StarterMenu>
     }
 
     @Override
-    public void render(GuiGraphics stack, int mouseX, int mouseY, float partialTicks)
+    public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks)
     {
         this.renderBackground(stack);
         super.render(stack, mouseX, mouseY, partialTicks);
@@ -58,13 +54,13 @@ public class StarterScreen extends AbstractContainerScreen <StarterMenu>
 
 
     @Override
-    protected void renderBg(GuiGraphics pGuiGraphics, float pPartialTick, int pMouseX, int pMouseY)
+    protected void renderBg(PoseStack pGuiGraphics, float pPartialTick, int pMouseX, int pMouseY)
     {
         renderBackground(pGuiGraphics);
         RenderSystem.setShader(GameRenderer::getPositionTexShader);
         RenderSystem.setShaderColor (1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.setShaderTexture(0, TEXTURE);
 
-        pGuiGraphics.blit(TEXTURE, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight);
+        blit(pGuiGraphics, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight);
     }
 }

src/main/java/dev/zontreck/otemod/implementation/vault/VaultContainer.java

@@ -78,7 +78,7 @@ public class VaultContainer
         if(VAULT_NUMBER == -1)return; // We have no need to save the trash
         boolean isEmpty=true;
         CompoundTag saved = myInventory.serializeNBT();
-        ChatHelpers.broadcastToAbove(owner, Component.literal(ChatColor.BOLD+ChatColor.DARK_GREEN+"Saving the vault's contents..."), server);
+        ChatHelpers.broadcastToAbove(owner, ChatHelpers.macro(ChatColor.BOLD+ChatColor.DARK_GREEN+"Saving the vault's contents..."), server);
 
         Profile profile=null;
         try {

src/main/java/dev/zontreck/otemod/implementation/vault/VaultScreen.java

@@ -5,14 +5,11 @@ import java.util.UUID;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 
+import dev.zontreck.libzontreck.util.ChatHelpers;
 import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.commands.vaults.VaultCommand;
 import dev.zontreck.otemod.networking.ModMessages;
 import dev.zontreck.otemod.networking.packets.OpenVaultC2SPacket;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.Button.OnPress;
-import net.minecraft.client.gui.font.TextFieldHelper;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.network.chat.Component;
@@ -46,7 +43,7 @@ public class VaultScreen extends AbstractContainerScreen <VaultMenu>
     }
 
     @Override
-    public void render(GuiGraphics stack, int mouseX, int mouseY, float partialTicks)
+    public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks)
     {
         this.renderBackground(stack);
         super.render(stack, mouseX, mouseY, partialTicks);
@@ -64,28 +61,31 @@ public class VaultScreen extends AbstractContainerScreen <VaultMenu>
 
         // This is where custom controls would be added!
 
-        this.addWidget(Button.builder(Component.literal(""), (BTN)->{
+        this.addWidget(new Button(this.leftPos + 7, this.topPos + 86, 16, 16, ChatHelpers.macro(""), (BTN)->{
+
             thePlayer.closeContainer();
             ModMessages.sendToServer(new OpenVaultC2SPacket(0, true, -1));
-        }).size(16,16).pos(this.leftPos+7, this.topPos+86).build());
+        }));
 
 
-        this.addWidget(Button.builder(Component.literal(""), (BTN)->{
+        this.addWidget(new Button(this.leftPos + 187, this.topPos + 88, 16, 16, ChatHelpers.macro(""), (BTN)->{
+
             thePlayer.closeContainer();
             ModMessages.sendToServer(new OpenVaultC2SPacket(0, true, 1));
-        }).size(16,16).pos(this.leftPos+187, this.topPos+84).build());
+        }));
+
 
     }
 
 
     @Override
-    protected void renderBg(GuiGraphics pGuiGraphics, float pPartialTick, int pMouseX, int pMouseY)
+    protected void renderBg(PoseStack pGuiGraphics, float pPartialTick, int pMouseX, int pMouseY)
     {
         renderBackground(pGuiGraphics);
         RenderSystem.setShader(GameRenderer::getPositionTexShader);
         RenderSystem.setShaderColor (1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.setShaderTexture(0, TEXTURE);
 
-        pGuiGraphics.blit(TEXTURE, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight);
+        blit(pGuiGraphics, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight);
     }
 }

src/main/java/dev/zontreck/otemod/implementation/vault/VaultWatcher.java

@@ -3,6 +3,7 @@ package dev.zontreck.otemod.implementation.vault;
 import java.util.Map;
 import java.util.UUID;
 
+import dev.zontreck.libzontreck.util.ServerUtilities;
 import dev.zontreck.otemod.OTEMod;
 import net.minecraftforge.client.event.ContainerScreenEvent;
 import net.minecraftforge.event.entity.player.PlayerContainerEvent;
@@ -16,7 +17,7 @@ public class VaultWatcher {
     @SubscribeEvent
     public void onClosedContainer(PlayerContainerEvent.Close ev)
     {
-        if(ev.getEntity().level().isClientSide)return;
+        if(ServerUtilities.isClient()) return;
         //OTEMod.LOGGER.info("Player closed a container");
         // Player closed the container
         // Check if it is a vault Container

src/main/java/dev/zontreck/otemod/integrations/KeyBindings.java

@@ -3,12 +3,8 @@ package dev.zontreck.otemod.integrations;
 import com.mojang.blaze3d.platform.InputConstants;
 
 import net.minecraft.client.KeyMapping;
-import net.minecraft.client.multiplayer.ClientRegistryLayer;
-import net.minecraft.core.registries.Registries;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 @OnlyIn(Dist.CLIENT)
 public class KeyBindings {
@@ -22,9 +18,4 @@ public class KeyBindings {
         return key;
     }
 
-    @SubscribeEvent
-    public static void registerKeyMappings(RegisterKeyMappingsEvent event)
-    {
-        event.register(OPEN_VAULT);
-    }
 }

src/main/java/dev/zontreck/otemod/items/ModItems.java

@@ -14,58 +14,58 @@ import net.minecraftforge.registries.RegistryObject;
 public class ModItems {
     public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, OTEMod.MOD_ID);
 
-    public static final RegistryObject<Item> ETERNIUM_FRAGMENT = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_fragment", () -> new Item(new Item.Properties())));
+    public static final RegistryObject<Item> ETERNIUM_FRAGMENT = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_fragment", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
-    public static final RegistryObject<Item> IHAN_CRYSTAL = CreativeModeTabs.addToOTEModTab(ITEMS.register("ihan_crystal", () -> new Item(new Item.Properties())));
+    public static final RegistryObject<Item> IHAN_CRYSTAL = CreativeModeTabs.addToOTEModTab(ITEMS.register("ihan_crystal", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
-    public static final RegistryObject<Item> AURORA_COMPOUND = CreativeModeTabs.addToOTEModTab(ITEMS.register("aurora_compound", () -> new Item(new Item.Properties())));
+    public static final RegistryObject<Item> AURORA_COMPOUND = CreativeModeTabs.addToOTEModTab(ITEMS.register("aurora_compound", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
-    public static final RegistryObject<Item> ETERNIUM_RAW_ORE = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_ore", () -> new Item(new Item.Properties())));
+    public static final RegistryObject<Item> ETERNIUM_RAW_ORE = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_ore", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
-    public static final RegistryObject<Item> ETERNIUM_INGOT = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_ingot", ()-> new SimpleFoiledItem(new Item.Properties())));
+    public static final RegistryObject<Item> ETERNIUM_INGOT = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_ingot", ()-> new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
 
-    public static final RegistryObject<Item> MELTED_ENDER_PEARL = CreativeModeTabs.addToOTEModTab(ITEMS.register("melted_ender_pearl", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64))));
-    public static final RegistryObject<Item> SINGULARITY = CreativeModeTabs.addToOTEModTab(ITEMS.register("singularity", () -> new UnstableSingularity(new Item.Properties().stacksTo(1))));
+    public static final RegistryObject<Item> MELTED_ENDER_PEARL = CreativeModeTabs.addToOTEModTab(ITEMS.register("melted_ender_pearl", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> SINGULARITY = CreativeModeTabs.addToOTEModTab(ITEMS.register("singularity", () -> new UnstableSingularity(new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_DECORATIONS))));
 
-    public static final RegistryObject<Item> COMPRESSED_OBSIDIAN_SHEET = CreativeModeTabs.addToOTEModTab(ITEMS.register("compressed_obsidian_sheet", ()->new Item(new Item.Properties())));
+    public static final RegistryObject<Item> COMPRESSED_OBSIDIAN_SHEET = CreativeModeTabs.addToOTEModTab(ITEMS.register("compressed_obsidian_sheet", ()->new Item(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
-    public static final RegistryObject<Item> LAYERED_COMPRESSED_OBSIDIAN_SHEET = CreativeModeTabs.addToOTEModTab(ITEMS.register("layered_compressed_obsidian_sheet", ()->new SimpleFoiledItem(new Item.Properties())));
-    public static final RegistryObject<Item> ENCASED_SINGULARITY = CreativeModeTabs.addToOTEModTab(ITEMS.register("encased_singularity", ()->new SimpleFoiledItem(new Item.Properties())));
+    public static final RegistryObject<Item> LAYERED_COMPRESSED_OBSIDIAN_SHEET = CreativeModeTabs.addToOTEModTab(ITEMS.register("layered_compressed_obsidian_sheet", ()->new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> ENCASED_SINGULARITY = CreativeModeTabs.addToOTEModTab(ITEMS.register("encased_singularity", ()->new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
-    public static final RegistryObject<Item> ETERNIUM_ROD = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_rod", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64))));
-    public static final RegistryObject<Item> SCRUBBER_FRAME_PIECE = CreativeModeTabs.addToOTEModTab(ITEMS.register("scrubber_frame_piece", () -> new Item(new Item.Properties().stacksTo(64))));
-    public static final RegistryObject<Item> SCRUBBER_FRAME = CreativeModeTabs.addToOTEModTab(ITEMS.register("scrubber_frame", () -> new Item(new Item.Properties().stacksTo(64))));
+    public static final RegistryObject<Item> ETERNIUM_ROD = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_rod", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> SCRUBBER_FRAME_PIECE = CreativeModeTabs.addToOTEModTab(ITEMS.register("scrubber_frame_piece", () -> new Item(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> SCRUBBER_FRAME = CreativeModeTabs.addToOTEModTab(ITEMS.register("scrubber_frame", () -> new Item(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
 
 
-    public static final RegistryObject<Item> VAULTSTEEL_INGOT = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_steel_ingot", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64))));
-    public static final RegistryObject<Item> VAULT_FRAG_BL = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_lower_left", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64))));
-    public static final RegistryObject<Item> VAULT_FRAG_LC = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_lower", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64))));
-    public static final RegistryObject<Item> VAULT_FRAG_BR = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_lower_right", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64))));
-    public static final RegistryObject<Item> VAULT_FRAG_L = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_left", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64))));
-    public static final RegistryObject<Item> VAULT_FRAG_R = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_right", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64))));
-    public static final RegistryObject<Item> VAULT_FRAG_UR = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_upper_right", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64))));
-    public static final RegistryObject<Item> VAULT_FRAG_UL = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_upper_left", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64))));
-    public static final RegistryObject<Item> VAULT_FRAG_U = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_upper", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64))));
-    public static final RegistryObject<Item> VAULT_FRAG_C = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_center", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64))));
+    public static final RegistryObject<Item> VAULTSTEEL_INGOT = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_steel_ingot", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> VAULT_FRAG_BL = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_lower_left", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> VAULT_FRAG_LC = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_lower", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> VAULT_FRAG_BR = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_lower_right", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> VAULT_FRAG_L = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_left", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> VAULT_FRAG_R = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_right", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> VAULT_FRAG_UR = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_upper_right", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> VAULT_FRAG_UL = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_upper_left", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> VAULT_FRAG_U = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_upper", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> VAULT_FRAG_C = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_center", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
 
     
-    public static final RegistryObject<Item> VAULT = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault", () -> new VaultItem(new Item.Properties().stacksTo(64))));
+    public static final RegistryObject<Item> VAULT = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault", () -> new VaultItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
     
-    public static final RegistryObject<Item> VAULT_RAW_ORE = CreativeModeTabs.addToOTEModTab(ITEMS.register("raw_vault_steel_ore", () -> new Item(new Item.Properties().stacksTo(64))));
+    public static final RegistryObject<Item> VAULT_RAW_ORE = CreativeModeTabs.addToOTEModTab(ITEMS.register("raw_vault_steel_ore", () -> new Item(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS))));
 
-    public static final RegistryObject<Item> POSS_BALL = CreativeModeTabs.addToOTEModTab(ITEMS.register("poss_ball", () -> new PossBallItem(new Item.Properties())));
+    public static final RegistryObject<Item> POSS_BALL = CreativeModeTabs.addToOTEModTab(ITEMS.register("poss_ball", () -> new PossBallItem(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
-    public static final RegistryObject<Item> ILUSIUM_ORE = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_ore", () -> new Item(new Item.Properties().fireResistant())));
-    public static final RegistryObject<Item> ILUSIUM_ROD = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_rod", () -> new Item(new Item.Properties().fireResistant())));
+    public static final RegistryObject<Item> ILUSIUM_ORE = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_ore", () -> new Item(new Item.Properties().fireResistant().tab(CreativeModeTab.TAB_DECORATIONS))));
+    public static final RegistryObject<Item> ILUSIUM_ROD = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_rod", () -> new Item(new Item.Properties().fireResistant().tab(CreativeModeTab.TAB_DECORATIONS))));
 
     //public static final RegistryObject<Item> ILUSIUM_DUST = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_dust", () -> new Item(new Item.Properties().fireResistant())));
 
-    public static final RegistryObject<Item> ILUSIUM_INGOT = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_ingot", () -> new Item(new Item.Properties().fireResistant())));
+    public static final RegistryObject<Item> ILUSIUM_INGOT = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_ingot", () -> new Item(new Item.Properties().fireResistant().tab(CreativeModeTab.TAB_DECORATIONS))));
 
-    public static final RegistryObject<Item> EMPTY_SPAWN_EGG = CreativeModeTabs.addToOTEModTab(ITEMS.register("empty_spawn_egg", () -> new Item(new Item.Properties())));
+    public static final RegistryObject<Item> EMPTY_SPAWN_EGG = CreativeModeTabs.addToOTEModTab(ITEMS.register("empty_spawn_egg", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
 
     
     //public static final RegistryObject<Item> POSSUM_SPAWN_EGG = ITEMS.register("possum_spawn_egg", () -> new ForgeSpawnEggItem(ModEntityTypes.POSSUM, 0x938686, 0xc68787, new Item.Properties())));

src/main/java/dev/zontreck/otemod/items/PossBallItem.java

@@ -6,10 +6,7 @@ import net.minecraft.sounds.SoundSource;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResultHolder;
-import net.minecraft.world.entity.monster.Guardian;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.projectile.Arrow;
-import net.minecraft.world.item.EggItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
@@ -19,9 +16,10 @@ public class PossBallItem extends Item
     public PossBallItem(Properties pProperties) {
         super(pProperties);
     }
+
     @Override
     public boolean isFoil(ItemStack pStack) {
-        if(!pStack.hasTag())
+        if(!pStack.hasTag() || pStack.getTag()==null)
         {
             pStack.setTag(new CompoundTag());
         }
@@ -31,37 +29,23 @@ public class PossBallItem extends Item
         } else return false;
     }
 
-    @Override
-    public boolean isDamageable(ItemStack stack) {
-        return true;
-    }
-
-    @Override
-    public int getMaxDamage(ItemStack stack) {
-        return 2;
-    }
-
     @Override
     public InteractionResultHolder<ItemStack> use(Level pLevel, Player pPlayer, InteractionHand pUsedHand) {
         ItemStack stack = pPlayer.getItemInHand(pUsedHand);
         pLevel.playSound((Player) null, pPlayer.getX(), pPlayer.getY(), pPlayer.getZ(), SoundEvents.EGG_THROW, SoundSource.PLAYERS, 0.5F, 0.4F / (pLevel.random.nextFloat() * 0.4f + 0.8f));
         if(!pLevel.isClientSide)
         {
-            ThrownPossBall TPB = new ThrownPossBall(pLevel, pPlayer);
-            if(pPlayer.getAbilities().instabuild) TPB.setItem(stack.copy());
-            else
-                TPB.setItem(stack);
+            ItemStack single = stack.copy();
+            single.setCount(1);
+
+            stack.shrink(1);
+
+            ThrownPossBall TPB = new ThrownPossBall(pLevel, pPlayer, single);
             TPB.shootFromRotation(pPlayer, pPlayer.getXRot(), pPlayer.getYRot(), 0.0F, 1.5F, 1.0F);
             pLevel.addFreshEntity(TPB);
         }
 
         pPlayer.awardStat(Stats.ITEM_USED.get(this));
-        if(!pPlayer.getAbilities().instabuild)
-        {
-            stack.shrink(1);
-        }else {
-
-        }
         return super.use(pLevel, pPlayer, pUsedHand);
     }
 }

src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java

@@ -1,16 +1,12 @@
 package dev.zontreck.otemod.items;
 
 import dev.zontreck.libzontreck.chat.ChatColor;
-import dev.zontreck.libzontreck.lore.ExtraLore;
 import dev.zontreck.libzontreck.lore.LoreContainer;
 import dev.zontreck.libzontreck.lore.LoreEntry;
-import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.libzontreck.util.ServerUtilities;
 import net.minecraft.core.particles.ItemParticleOption;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtUtils;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
@@ -20,7 +16,6 @@ import net.minecraft.world.entity.projectile.ThrowableItemProjectile;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.DropperBlock;
 import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.world.phys.HitResult;
 
@@ -31,28 +26,40 @@ public class ThrownPossBall extends ThrowableItemProjectile
 {
     boolean captured = false;
     LivingEntity shooter;
+    ItemStack self;
     public ThrownPossBall(EntityType<? extends ThrownPossBall> entity, Level level)
     {
         super(entity, level);
     }
-    public ThrownPossBall(Level level, LivingEntity shooter)
+    public ThrownPossBall(Level level, LivingEntity shooter, ItemStack item)
     {
         super(EntityType.SNOWBALL, shooter, level);
 
         this.shooter = shooter;
-    }
-
-    public ThrownPossBall(Level pLevel, double pX, double pY, double pZ)
-    {
-        super(EntityType.SNOWBALL, pX, pY, pZ, pLevel);
+        if(item.getTag() == null)
+        {
+            item.setTag(new CompoundTag());
+        }
+        self=item;
     }
 
     @Override
-    protected Item getDefaultItem()
-    {
+    protected Item getDefaultItem() {
         return ModItems.POSS_BALL.get();
     }
 
+    void returnBall()
+    {
+
+        ItemEntity x;
+
+        if(shooter!=null)
+            x = new ItemEntity(getLevel(), shooter.position().x, shooter.position().y, shooter.position().z, self, 0, 0, 0);
+        else
+            x = new ItemEntity(getLevel(), position().x, position().y, position().z, self, 0, 0, 0);
+        getLevel().addFreshEntity(x);
+    }
+
     @Override
     public void handleEntityEvent(byte pId) {
         if(pId == 3)
@@ -61,7 +68,7 @@ public class ThrownPossBall extends ThrowableItemProjectile
 
             for (int i = 0; i < 8; ++i)
             {
-                this.level().addParticle(new ItemParticleOption(ParticleTypes.ITEM, this.getItem()), this.getX(), this.getY(), this.getZ(), ((double)this.random.nextFloat() - 0.5) * 0.08, ((double)this.random.nextFloat() - 0.5) * 0.08, ((double)this.random.nextFloat() - 0.5) * 0.08);
+                this.getLevel().addParticle(new ItemParticleOption(ParticleTypes.ITEM, this.getItem()), this.getX(), this.getY(), this.getZ(), ((double)this.random.nextFloat() - 0.5) * 0.08, ((double)this.random.nextFloat() - 0.5) * 0.08, ((double)this.random.nextFloat() - 0.5) * 0.08);
             }
         }
     }
@@ -69,31 +76,52 @@ public class ThrownPossBall extends ThrowableItemProjectile
     @Override
     protected void onHitEntity(EntityHitResult pResult) {
         super.onHitEntity(pResult);
-        if(getItem().getTag().contains("entity"))
+        if(ServerUtilities.isServer())
         {
-            // Don't capture the entity
-
-            pResult.getEntity().hurt(this.damageSources().thrown(this, this.getOwner()), 0.1F);
-        } else {
-            if(pResult.getEntity() instanceof LivingEntity le && !(le instanceof Player))
+            CompoundTag tag = self.getTag();
+            if(tag == null)tag = new CompoundTag();
+            if(tag.contains(ItemStack.TAG_DAMAGE))
             {
-                // We don't want to capture players
-                // Store the entity in the entity tag, then kill the entity
-                CompoundTag tag = new CompoundTag();
-                String entityName = le.getName().getString();
-                le.save(tag);
+                tag.remove(ItemStack.TAG_DAMAGE);
+            }
 
-                getItem().getTag().put("entity", tag);
-                captured=true;
 
-                LoreContainer cont = new LoreContainer(getItem());
-                cont.miscData.loreData.clear();
-                LoreEntry entry = new LoreEntry.Builder().bold(true).text(ChatColor.doColors("!Dark_Green!Captured Mob: !Dark_Purple!" + entityName)).build();
-                cont.miscData.loreData.add(entry);
+            if(self.getTag() == null || !self.getTag().contains("entity"))
+            {
+            /*
 
-                cont.commitLore();
+            Ensure the tag is not null
 
-                le.remove(RemovalReason.DISCARDED);
+             */
+
+                if(pResult.getEntity() instanceof LivingEntity le && !(le instanceof Player player))
+                {
+                    // We don't want to capture players
+                    // Store the entity in the entity tag, then kill the entity
+
+
+                    CompoundTag store = new CompoundTag();
+                    String entityName = le.getName().getString();
+                    le.save(store);
+
+                    self.getTag().put("entity", store);
+                    self.setCount(1);
+                    captured=true;
+
+                    LoreContainer cont = new LoreContainer(self);
+                    cont.miscData.loreData.clear();
+                    LoreEntry entry = new LoreEntry.Builder().bold(true).text(ChatColor.doColors("!Dark_Green!Captured Mob: !Dark_Purple!" + entityName)).build();
+                    cont.miscData.loreData.add(entry);
+
+                    cont.commitLore();
+
+                    le.remove(RemovalReason.DISCARDED);
+                }
+            } else {
+
+                // Don't capture the entity
+
+                //pResult.getEntity().hurt(this.shooter.getLastDamageSource().thrown(this, this.getOwner()), 0.1F);
             }
         }
     }
@@ -101,7 +129,8 @@ public class ThrownPossBall extends ThrowableItemProjectile
     @Override
     protected void onHit(HitResult pResult) {
         super.onHit(pResult);
-        if(!this.level().isClientSide)
+
+        if(ServerUtilities.isServer())
         {
             // We do two things here
 
@@ -109,28 +138,31 @@ public class ThrownPossBall extends ThrowableItemProjectile
             // 2. If no entity, and none was captured, decrease the durability a little
             // 3. Drop the PossBall with entity, or without
 
-            ItemStack item = getItem();
+            ItemStack item = self;
             CompoundTag tag = item.getTag();
+
+            if(tag==null)tag=new CompoundTag();
+
+            if(tag.contains(ItemStack.TAG_DAMAGE))
+            {
+                tag.remove(ItemStack.TAG_DAMAGE); // Migrate existing poss balls to remove the obsolete damage tag
+            }
+
             if(tag.contains("entity"))
             {
                 if(captured)
                 {
                     // Spawn poss ball item with the entity NBT
-                    ItemEntity entity;
-                    if(shooter != null)
-                        entity = new ItemEntity(level(), shooter.position().x, shooter.position().y, shooter.position().z, item, 0, 0, 0);
-                    else
-                        entity = new ItemEntity(level(), shooter.position().x, shooter.position().y, shooter.position().z, item, 0, 0, 0);
-                    level().addFreshEntity(entity);
+                    returnBall();
                 } else {
                     // Spawn the real entity
-                    Optional<Entity> entity = EntityType.create(tag.getCompound("entity"), level());
+                    Optional<Entity> entity = EntityType.create(tag.getCompound("entity"), getLevel());
                     if(entity.isPresent())
                     {
                         Entity xEntity = entity.get();
                         xEntity.setUUID(UUID.randomUUID());
                         xEntity.setPos(position());
-                        level().addFreshEntity(xEntity);
+                        getLevel().addFreshEntity(xEntity);
                     }
 
                     LoreContainer cont = new LoreContainer(item);
@@ -144,13 +176,8 @@ public class ThrownPossBall extends ThrowableItemProjectile
                         tag.remove("entity");
                     }
 
-                    ItemEntity x;
 
-                    if(shooter!=null)
-                        x = new ItemEntity(level(), shooter.position().x, shooter.position().y, shooter.position().z, item, 0, 0, 0);
-                    else
-                        x = new ItemEntity(level(), position().x, position().y, position().z, item, 0, 0, 0);
-                    level().addFreshEntity(x);
+                    returnBall();
                 }
             } else {
                 // No capture
@@ -161,21 +188,21 @@ public class ThrownPossBall extends ThrowableItemProjectile
                 // Ensure no entity tag!
                 tag.remove("entity");
 
+                if(tag.size()==0)
+                {
+                    tag=null;
+                    item.setTag(new CompoundTag());
+                }
+
 
                 //if(item.getDamageValue() >= item.getMaxDamage())
                 //    return;
 
-                ItemEntity entity;
 
-                if(shooter!= null)
-                    entity = new ItemEntity(level(),shooter.position().x, shooter.position().y, shooter.position().z, item, 0, 0, 0);
-                else
-
-                    entity = new ItemEntity(level(), position().x, position().y, position().z, item, 0, 0, 0);
-                level().addFreshEntity(entity);
+                returnBall();
             }
 
-            this.level().broadcastEntityEvent(this, (byte)3);
+            this.getLevel().broadcastEntityEvent(this, (byte)3);
             this.discard();
 
         }

src/main/java/dev/zontreck/otemod/items/UnstableSingularity.java

@@ -10,6 +10,7 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraftforge.event.world.ExplosionEvent;
 
 public class UnstableSingularity extends SimpleFoiledItem
 {
@@ -24,7 +25,7 @@ public class UnstableSingularity extends SimpleFoiledItem
 
         if(block.getBlock().defaultDestroyTime() < 0)
         {
-            pContext.getLevel().explode(pContext.getPlayer(), pContext.getClickedPos().getX(), pContext.getClickedPos().getY(), pContext.getClickedPos().getZ(), 16, true, Level.ExplosionInteraction.TNT);
+            pContext.getLevel().explode(pContext.getPlayer(), pContext.getClickedPos().getX(), pContext.getClickedPos().getY(), pContext.getClickedPos().getZ(), 16, true, Explosion.BlockInteraction.DESTROY);
 
             pContext.getLevel().setBlock(pContext.getClickedPos(), Blocks.AIR.defaultBlockState(), 0, 0);
 

src/main/java/dev/zontreck/otemod/networking/ModMessages.java

@@ -32,13 +32,13 @@ public class ModMessages {
         net.messageBuilder(OpenVaultC2SPacket.class, id(), NetworkDirection.PLAY_TO_SERVER)
             .decoder(OpenVaultC2SPacket::new)
             .encoder(OpenVaultC2SPacket::toBytes)
-            .consumerMainThread(OpenVaultC2SPacket::handle)
+            .consumer(OpenVaultC2SPacket::handle)
             .add();
 
         net.messageBuilder(EnergySyncS2CPacket.class, id(), NetworkDirection.PLAY_TO_CLIENT)
             .decoder(EnergySyncS2CPacket::new)
             .encoder(EnergySyncS2CPacket::toBytes)
-            .consumerMainThread(EnergySyncS2CPacket::handle)
+            .consumer(EnergySyncS2CPacket::handle)
             .add();
     }
 

src/main/java/dev/zontreck/otemod/ore/OreGenerator.java

@@ -1,8 +1,28 @@
 package dev.zontreck.otemod.ore;
 
 
+import dev.zontreck.otemod.OTEMod;
+import dev.zontreck.otemod.blocks.ModBlocks;
+import net.minecraft.core.Holder;
+import net.minecraft.data.worldgen.features.FeatureUtils;
+import net.minecraft.data.worldgen.features.OreFeatures;
+import net.minecraft.data.worldgen.placement.PlacementUtils;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.VerticalAnchor;
+import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.OreFeature;
+import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
+import net.minecraft.world.level.levelgen.placement.HeightRangePlacement;
+import net.minecraft.world.level.levelgen.placement.PlacedFeature;
+import net.minecraftforge.event.world.BiomeLoadingEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+
 public class OreGenerator {
-/*
+
 
     public static final List<ConfiguredFeature<OreConfiguration, OreFeature>> OVERWORLD_ORES = new ArrayList();
 
@@ -13,36 +33,39 @@ public class OreGenerator {
 
     public static final List<OreConfiguration.TargetBlockState> NETHER_VAULTSTEEL_ORE = List.of( OreConfiguration.target(OreFeatures.NETHER_ORE_REPLACEABLES,  ModBlocks.NETHER_VAULT_STEEL_ORE_BLOCK.get().defaultBlockState()));
 
+    public static final List<OreConfiguration.TargetBlockState> OVERWORLD_ILUSIUM_ORE = List.of(OreConfiguration.target(OreFeatures.STONE_ORE_REPLACEABLES, ModBlocks.ILUSIUM_ORE_BLOCK.get().defaultBlockState()), OreConfiguration.target(OreFeatures.DEEPSLATE_ORE_REPLACEABLES, ModBlocks.DEEPSLATE_ILUSIUM_ORE_BLOCK.get().defaultBlockState()));
 
-    public static final Holder<ConfiguredFeature<OreConfiguration, ?>> ETERNIUM_ORE = FeatureUtils.register("eternium_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_ETERNIUM_ORE, 8));
 
-    public static final Holder<ConfiguredFeature<OreConfiguration, ?>> VAULTSTEEL_ORE = FeatureUtils.register("vault_steel_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_VAULTSTEEL_ORE, 6));
+    public static final Holder<ConfiguredFeature<OreConfiguration, ?>> ETERNIUM_ORE = FeatureUtils.register("eternium_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_ETERNIUM_ORE, 4));
 
-    public static final Holder<ConfiguredFeature<OreConfiguration, ?>> VAULTSTEEL_ORE_NETHER = FeatureUtils.register("nether_vault_steel_ore_block", Feature.ORE, new OreConfiguration(NETHER_VAULTSTEEL_ORE, 8));
+    public static final Holder<ConfiguredFeature<OreConfiguration, ?>> VAULTSTEEL_ORE = FeatureUtils.register("vault_steel_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_VAULTSTEEL_ORE, 3));
+
+    public static final Holder<ConfiguredFeature<OreConfiguration, ?>> ILUSIUM_ORE = FeatureUtils.register("ilusium_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_ILUSIUM_ORE, 8));
+
+    public static final Holder<ConfiguredFeature<OreConfiguration, ?>> VAULTSTEEL_ORE_NETHER = FeatureUtils.register("nether_vault_steel_ore_block", Feature.ORE, new OreConfiguration(NETHER_VAULTSTEEL_ORE, 3));
 
     public static final Holder<PlacedFeature> ETERNIUM_ORE_PLACED = PlacementUtils.register("eternium_ore_placed",
             ETERNIUM_ORE, ModdedOrePlacement.commonOrePlacement(3, // VeinsPerChunk
                     HeightRangePlacement.triangle(VerticalAnchor.absolute(-20), VerticalAnchor.absolute(20))));
 
-    public static final Holder<PlacedFeature> VAULT_STEEL_ORE_PLACED = PlacementUtils.register("vaultsteel_ore_placed", VAULTSTEEL_ORE, ModdedOrePlacement.rareOrePlacement(4, // Veins per chunk
-                    HeightRangePlacement.triangle(VerticalAnchor.absolute(-63), VerticalAnchor.absolute(-50))));
+    public static final Holder<PlacedFeature> ILUSIUM_ORE_PLACED = PlacementUtils.register("ilusium_ore_placed", ILUSIUM_ORE, ModdedOrePlacement.commonOrePlacement(4, HeightRangePlacement.triangle(VerticalAnchor.absolute(-20), VerticalAnchor.absolute(30))));
 
-    public static final Holder<PlacedFeature> NETHER_VAULTSTEEL_ORE_PLACED = PlacementUtils.register("nether_vaultsteel_ore_placed", VAULTSTEEL_ORE_NETHER, ModdedOrePlacement.rareOrePlacement(5, // Veins per chunk
+    public static final Holder<PlacedFeature> VAULT_STEEL_ORE_PLACED = PlacementUtils.register("vaultsteel_ore_placed", VAULTSTEEL_ORE, ModdedOrePlacement.commonOrePlacement(4, // Veins per chunk
+                    HeightRangePlacement.triangle(VerticalAnchor.absolute(-63), VerticalAnchor.absolute(-40))));
+
+    public static final Holder<PlacedFeature> NETHER_VAULTSTEEL_ORE_PLACED = PlacementUtils.register("nether_vaultsteel_ore_placed", VAULTSTEEL_ORE_NETHER, ModdedOrePlacement.rareOrePlacement(4, // Veins per chunk
                         HeightRangePlacement.triangle(VerticalAnchor.absolute(1), VerticalAnchor.absolute(16))));
 
-        //public static final Holder<PlacedFeature> DEEPSLATE_AION_ORE_PLACED = PlacementUtils.register("deepslate_aion_ore_placed",
-        //                    DEEPSLATE_AION_ORE, ModdedOrePlacement.commonOrePlacement(3, // VeinsPerChunk
-        //                            HeightRangePlacement.triangle(VerticalAnchor.aboveBottom(-20), VerticalAnchor.aboveBottom(0))));
 
+    @SubscribeEvent
     public static void generateOres(final BiomeLoadingEvent ev)
     {
             
         List<Holder<PlacedFeature>> base = ev.getGeneration().getFeatures(GenerationStep.Decoration.UNDERGROUND_ORES);
 
-        //ShapedAionResources.LOGGER.info("Register: AION_ORE");
         base.add(ETERNIUM_ORE_PLACED);
         base.add(VAULT_STEEL_ORE_PLACED);
         base.add(NETHER_VAULTSTEEL_ORE_PLACED);
-        //base.add(DEEPSLATE_AION_ORE_PLACED);
-    }*/
+        base.add(ILUSIUM_ORE_PLACED);
+    }
 }

src/main/java/dev/zontreck/otemod/recipe/CompressionChamberRecipe.java

@@ -10,6 +10,7 @@ import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.*;
 import net.minecraft.world.level.Level;
+import net.minecraftforge.registries.ForgeRegistryEntry;
 import org.jetbrains.annotations.Nullable;
 
 public class CompressionChamberRecipe implements Recipe<SimpleContainer> {
@@ -34,7 +35,7 @@ public class CompressionChamberRecipe implements Recipe<SimpleContainer> {
     }
 
     @Override
-    public ItemStack assemble(SimpleContainer simpleContainer, RegistryAccess registryAccess) {
+    public ItemStack assemble(SimpleContainer simpleContainer) {
         return output;
     }
 
@@ -44,7 +45,7 @@ public class CompressionChamberRecipe implements Recipe<SimpleContainer> {
     }
 
     @Override
-    public ItemStack getResultItem(RegistryAccess registryAccess) {
+    public ItemStack getResultItem() {
         return output.copy();
     }
 
@@ -74,7 +75,7 @@ public class CompressionChamberRecipe implements Recipe<SimpleContainer> {
         public static final String ID = "compressing";
     }
 
-    public static class Serializer implements RecipeSerializer<CompressionChamberRecipe>
+    public static class Serializer extends ForgeRegistryEntry<RecipeSerializer<?>> implements RecipeSerializer<CompressionChamberRecipe>
     {
         public static final Serializer INSTANCE = new Serializer();
         public static final ResourceLocation ID = new ResourceLocation(OTEMod.MOD_ID, Type.ID);

src/main/java/dev/zontreck/otemod/zschem/EventHandler.java

@@ -6,12 +6,11 @@ import java.util.Map;
 import dev.zontreck.libzontreck.vectors.Vector3;
 import dev.zontreck.libzontreck.vectors.WorldPosition;
 import dev.zontreck.otemod.configs.OTEServerConfig;
-import net.minecraft.client.telemetry.events.WorldLoadEvent;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.event.level.ExplosionEvent;
-import net.minecraftforge.event.level.LevelEvent;
 import net.minecraftforge.event.server.ServerStoppingEvent;
+import net.minecraftforge.event.world.ExplosionEvent;
+import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 public class EventHandler {
@@ -19,17 +18,17 @@ public class EventHandler {
     @SubscribeEvent
     public void onDetonate(ExplosionEvent ev)
     {
-        if(ev.getLevel().isClientSide)return;
+        if(ev.getWorld().isClientSide)return;
 
         //Entity explodes = ev.getExplosion().getSourceMob();
         // Register blocks to be healed
-        WorldPosition wpos = new WorldPosition(new Vector3(ev.getExplosion().getPosition()), (ServerLevel) ev.getLevel());
+        WorldPosition wpos = new WorldPosition(new Vector3(ev.getExplosion().getPosition()), (ServerLevel) ev.getWorld());
 
         if(OTEServerConfig.EXCLUDE_DIMS.get().contains(wpos.Dimension)){
             // Dimension is on the exclusion list. Do not process.
             return;
         }
-        WorldProp wp = WorldProp.acquire((ServerLevel)ev.getLevel());
+        WorldProp wp = WorldProp.acquire((ServerLevel)ev.getWorld());
 
         if(wp!=null){
             wp.onDetonate(ev);
@@ -45,21 +44,21 @@ public class EventHandler {
     }
 
     @SubscribeEvent
-    public void onLoadLevel(LevelEvent.Load ev)
+    public void onLoadLevel(WorldEvent.Load ev)
     {
-        if(!ev.getLevel().isClientSide() && ev.getLevel() instanceof ServerLevel)
+        if(!ev.getWorld().isClientSide() && ev.getWorld() instanceof ServerLevel)
         {
-            healers.put((ServerLevel)ev.getLevel(), WorldProp.acquire((ServerLevel)ev.getLevel()));
+            healers.put((ServerLevel)ev.getWorld(), WorldProp.acquire((ServerLevel)ev.getWorld()));
             
         }
     }
 
     @SubscribeEvent
-    public void onUnload(LevelEvent.Unload ev)
+    public void onUnload(WorldEvent.Unload ev)
     {
-        if(!ev.getLevel().isClientSide())
+        if(!ev.getWorld().isClientSide())
         {
-            healers.remove(ev.getLevel());
+            healers.remove(ev.getWorld());
         }
     }
 
@@ -70,16 +69,16 @@ public class EventHandler {
     }
 
     @SubscribeEvent
-    public void onSaving(LevelEvent.Save ev)
+    public void onSaving(WorldEvent.Save ev)
     {
         WorldProp.SaveAll();
     }
 
     @SubscribeEvent
-    public void onLevelTick(TickEvent.LevelTickEvent ev)
+    public void onLevelTick(TickEvent.WorldTickEvent ev)
     {
-        if(!ev.level.isClientSide){
-            WorldProp wp = WorldProp.acquire((ServerLevel)ev.level);
+        if(!ev.world.isClientSide){
+            WorldProp wp = WorldProp.acquire((ServerLevel)ev.world);
             if(wp!=null){
                 wp.onTick();
             }

src/main/java/dev/zontreck/otemod/zschem/StoredBlock.java

@@ -4,9 +4,6 @@ import dev.zontreck.libzontreck.exceptions.InvalidDeserialization;
 import dev.zontreck.libzontreck.vectors.Vector3;
 import dev.zontreck.libzontreck.vectors.WorldPosition;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.HolderGetter;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.Tag;
@@ -150,10 +147,8 @@ public class StoredBlock
             e.printStackTrace();
         }
 
-        HolderGetter<Block> hg = position.getActualDimension().holderLookup(Registries.BLOCK);
 
-
-        state = NbtUtils.readBlockState(hg, tag.getCompound("state"));
+        state = NbtUtils.readBlockState(tag.getCompound("state"));
 
         final CompoundTag tmp = tag.getCompound("entity");
         blockEntity = tmp.isEmpty() ? null : tmp;

src/main/java/dev/zontreck/otemod/zschem/WorldProp.java

@@ -15,7 +15,7 @@ import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.event.level.ExplosionEvent;
+import net.minecraftforge.event.world.ExplosionEvent;
 
 public class WorldProp implements Supplier<Object>
 {
@@ -34,7 +34,7 @@ public class WorldProp implements Supplier<Object>
 
     public void onDetonate(ExplosionEvent ev)
     {
-        Level w = ev.getLevel();
+        Level w = ev.getWorld();
         //int maxTicks = 0;
 
         for(BlockPos p : ev.getExplosion().getToBlow())

src/main/resources/META-INF/mods.toml

@@ -6,72 +6,67 @@
 # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
 modLoader="javafml" #mandatory
 # A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
+loaderVersion="[40,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
 # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
 # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
-license="${mod_license}"
+license="GPLv3"
 # A URL to refer people to when problems occur with this mod
-#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
+issueTrackerURL="https://github.com/zontreck/OTEMod" #optional
 # A list of mods - how many allowed here is determined by the individual mod loader
 [[mods]] #mandatory
 # The modid of the mod
-modId="${mod_id}" #mandatory
-# The version number of the mod
-version="${mod_version}" #mandatory
+modId="otemod" #mandatory
+# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
+# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
+# see the associated build.gradle script for how to populate this completely automatically during a build
+version="${file.jarVersion}" #mandatory
 # A display name for the mod
-displayName="${mod_name}" #mandatory
-# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/
+displayName="Thesholds Mod" #mandatory
+# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
 #updateJSONURL="https://change.me.example.invalid/updates.json" #optional
 # A URL for the "homepage" for this mod, displayed in the mod UI
 #displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
 # A file name (in the root of the mod JAR) containing a logo for display
-#logoFile="examplemod.png" #optional
+#logoFile="thresholds.png" #optional
 # A text field displayed in the mod UI
-#credits="" #optional
+credits="zontreck" #optional
 # A text field displayed in the mod UI
-authors="${mod_authors}" #optional
+authors="zontreck" #optional
 # Display Test controls the display for your mod in the server connection screen
 # MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod.
 # IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod.
 # IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
 # NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
 # IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
-#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)
+displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)
 
 # The description text for the mod (multi line!) (#mandatory)
-description='''${mod_description}'''
+description='''
+Thresholds mod! The space in between spaces
+'''
 # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
-[[dependencies.${mod_id}]] #optional
-    # the modid of the dependency
-    modId="forge" #mandatory
-    # Does this dependency have to exist - if not, ordering below must be specified
-    mandatory=true #mandatory
-    # The version range of the dependency
-    versionRange="${forge_version_range}" #mandatory
-    # An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory
-    # BEFORE - This mod is loaded BEFORE the dependency
-    # AFTER - This mod is loaded AFTER the dependency
-    ordering="NONE"
-    # Side this dependency is applied on - BOTH, CLIENT, or SERVER
-    side="BOTH"
+[[dependencies.otemod]] #optional
+# the modid of the dependency
+modId="forge" #mandatory
+# Does this dependency have to exist - if not, ordering below must be specified
+mandatory=true #mandatory
+# The version range of the dependency
+versionRange="[40,)" #mandatory
+# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
+ordering="NONE"
+# Side this dependency is applied on - BOTH, CLIENT or SERVER
+side="BOTH"
 # Here's another dependency
-[[dependencies.${mod_id}]]
-    modId="minecraft"
-    mandatory=true
-    # This version range declares a minimum of the current minecraft version up to but not including the next major version
-    versionRange="${minecraft_version_range}"
-    ordering="NONE"
-    side="BOTH"
-
-[[dependencies.${mod_id}]]
-    modId="libzontreck"
-    mandatory=true
-    versionRange="[1.10,1.11)"
-    ordering="NONE"
-    side="BOTH"
-
-# Features are specific properties of the game environment, that you may want to declare you require. This example declares
-# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
-# stop your mod loading on the server for example.
-#[features.${mod_id}]
-#openGLVersion="[3.2,)"
+[[dependencies.otemod]]
+modId="minecraft"
+mandatory=true
+# This version range declares a minimum of the current minecraft version up to but not including the next major version
+versionRange="[1.18.2,1.19)"
+ordering="NONE"
+side="BOTH"
+[[dependencies.libzontreck]]
+modIf="libzontreck"
+mandatory=true
+versionRange="[1.10,1.11)"
+ordering="NONE"
+side="BOTH"

src/main/resources/assets/otemod/blockstates/blood_red.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/blood_red"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/blue_pool_light.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/light/blue_pool_light"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/blue_pool_tile.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/tiles/blue_pool_tile"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/blue_pool_tile_stairs.json

@@ -0,0 +1,209 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=east,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner"
+    },
+    "facing=east,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=east,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer"
+    },
+    "facing=east,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs"
+    },
+    "facing=east,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner"
+    },
+    "facing=south,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer"
+    },
+    "facing=south,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/cyan.json

@@ -1,7 +1,7 @@
 {
   "variants": {
     "": {
-      "model": "otemod:block/black"
+      "model": "otemod:block/cyan"
     }
   }
 }

src/main/resources/assets/otemod/blockstates/cyan_stairs.json

@@ -0,0 +1,209 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=inner_left": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,half=bottom,shape=inner_right": {
+      "model": "otemod:block/cyan_stairs_inner"
+    },
+    "facing=east,half=bottom,shape=outer_left": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,half=bottom,shape=outer_right": {
+      "model": "otemod:block/cyan_stairs_outer"
+    },
+    "facing=east,half=bottom,shape=straight": {
+      "model": "otemod:block/cyan_stairs"
+    },
+    "facing=east,half=top,shape=inner_left": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=east,half=top,shape=inner_right": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=east,half=top,shape=outer_left": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=east,half=top,shape=outer_right": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=east,half=top,shape=straight": {
+      "model": "otemod:block/cyan_stairs",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=bottom,shape=inner_left": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,half=bottom,shape=inner_right": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=bottom,shape=outer_left": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,half=bottom,shape=outer_right": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=bottom,shape=straight": {
+      "model": "otemod:block/cyan_stairs",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=top,shape=inner_left": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=north,half=top,shape=inner_right": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=top,shape=outer_left": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=north,half=top,shape=outer_right": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=top,shape=straight": {
+      "model": "otemod:block/cyan_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=south,half=bottom,shape=inner_left": {
+      "model": "otemod:block/cyan_stairs_inner"
+    },
+    "facing=south,half=bottom,shape=inner_right": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=bottom,shape=outer_left": {
+      "model": "otemod:block/cyan_stairs_outer"
+    },
+    "facing=south,half=bottom,shape=outer_right": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=bottom,shape=straight": {
+      "model": "otemod:block/cyan_stairs",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=top,shape=inner_left": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=south,half=top,shape=inner_right": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=south,half=top,shape=outer_left": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=south,half=top,shape=outer_right": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=south,half=top,shape=straight": {
+      "model": "otemod:block/cyan_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=inner_left": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=inner_right": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=bottom,shape=outer_left": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=outer_right": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=bottom,shape=straight": {
+      "model": "otemod:block/cyan_stairs",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=top,shape=inner_left": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=west,half=top,shape=inner_right": {
+      "model": "otemod:block/cyan_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=west,half=top,shape=outer_left": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=west,half=top,shape=outer_right": {
+      "model": "otemod:block/cyan_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=west,half=top,shape=straight": {
+      "model": "otemod:block/cyan_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/cyan_tile.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/cyan_tile"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/cyan_tile_br.json

@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "otemod:block/cyan_tile_br",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "otemod:block/cyan_tile_br"
+    },
+    "facing=south": {
+      "model": "otemod:block/cyan_tile_br",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "otemod:block/cyan_tile_br",
+      "y": 270
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/cyan_tile_to_wall.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/cyan_tile_to_wall"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/cyan_wall_variant_1.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/cyan_wall_variant_1"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/cyan_wall_variant_2.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/cyan_wall_variant_2"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/dark_pool_light.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/light/dark_pool_light"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/dark_pool_tile.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/tiles/dark_pool_tile"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/dark_pool_tile_stairs.json

@@ -0,0 +1,209 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=east,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner"
+    },
+    "facing=east,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=east,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer"
+    },
+    "facing=east,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs"
+    },
+    "facing=east,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner"
+    },
+    "facing=south,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer"
+    },
+    "facing=south,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/dirty_blue_pool_light.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/light/dirty_blue_pool_light"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/dirty_blue_pool_tile.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/tiles/dirty_blue_pool_tile"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/dirty_blue_pool_tile_stairs.json

@@ -0,0 +1,209 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=east,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner"
+    },
+    "facing=east,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=east,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer"
+    },
+    "facing=east,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs"
+    },
+    "facing=east,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner"
+    },
+    "facing=south,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer"
+    },
+    "facing=south,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/dirty_pool_light.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/light/dirty_pool_light"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/dirty_pool_tile.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/tiles/dirty_pool_tile"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/dirty_pool_tile_stairs.json

@@ -0,0 +1,209 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=east,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner"
+    },
+    "facing=east,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=east,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer"
+    },
+    "facing=east,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs"
+    },
+    "facing=east,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner"
+    },
+    "facing=south,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer"
+    },
+    "facing=south,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/dirty_red_pool_light.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/light/dirty_red_pool_light"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/dirty_red_pool_tile.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/tiles/dirty_red_pool_tile"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/dirty_red_pool_tile_stairs.json

@@ -0,0 +1,209 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=east,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner"
+    },
+    "facing=east,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=east,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer"
+    },
+    "facing=east,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs"
+    },
+    "facing=east,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner"
+    },
+    "facing=south,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer"
+    },
+    "facing=south,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/filthy_blue_pool_light.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/light/filthy_blue_pool_light"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/filthy_pool_light.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/light/filthy_pool_light"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/filthy_red_pool_light.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/light/filthy_red_pool_light"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/lime.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/lime"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/lime_stairs.json

@@ -0,0 +1,209 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=inner_left": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,half=bottom,shape=inner_right": {
+      "model": "otemod:block/lime_stairs_inner"
+    },
+    "facing=east,half=bottom,shape=outer_left": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,half=bottom,shape=outer_right": {
+      "model": "otemod:block/lime_stairs_outer"
+    },
+    "facing=east,half=bottom,shape=straight": {
+      "model": "otemod:block/lime_stairs"
+    },
+    "facing=east,half=top,shape=inner_left": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=east,half=top,shape=inner_right": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=east,half=top,shape=outer_left": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=east,half=top,shape=outer_right": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=east,half=top,shape=straight": {
+      "model": "otemod:block/lime_stairs",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=bottom,shape=inner_left": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,half=bottom,shape=inner_right": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=bottom,shape=outer_left": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,half=bottom,shape=outer_right": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=bottom,shape=straight": {
+      "model": "otemod:block/lime_stairs",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=top,shape=inner_left": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=north,half=top,shape=inner_right": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=top,shape=outer_left": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=north,half=top,shape=outer_right": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=top,shape=straight": {
+      "model": "otemod:block/lime_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=south,half=bottom,shape=inner_left": {
+      "model": "otemod:block/lime_stairs_inner"
+    },
+    "facing=south,half=bottom,shape=inner_right": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=bottom,shape=outer_left": {
+      "model": "otemod:block/lime_stairs_outer"
+    },
+    "facing=south,half=bottom,shape=outer_right": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=bottom,shape=straight": {
+      "model": "otemod:block/lime_stairs",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=top,shape=inner_left": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=south,half=top,shape=inner_right": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=south,half=top,shape=outer_left": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=south,half=top,shape=outer_right": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=south,half=top,shape=straight": {
+      "model": "otemod:block/lime_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=inner_left": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=inner_right": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=bottom,shape=outer_left": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=outer_right": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=bottom,shape=straight": {
+      "model": "otemod:block/lime_stairs",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=top,shape=inner_left": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=west,half=top,shape=inner_right": {
+      "model": "otemod:block/lime_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=west,half=top,shape=outer_left": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=west,half=top,shape=outer_right": {
+      "model": "otemod:block/lime_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=west,half=top,shape=straight": {
+      "model": "otemod:block/lime_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/lime_tile.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/lime_tile"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/lime_tile_br.json

@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "otemod:block/lime_tile_br",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "otemod:block/lime_tile_br"
+    },
+    "facing=south": {
+      "model": "otemod:block/lime_tile_br",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "otemod:block/lime_tile_br",
+      "y": 270
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/lime_tile_to_wall.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/lime_tile_to_wall"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/lime_wall_variant_1.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/lime_wall_variant_1"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/lime_wall_variant_2.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/lime_wall_variant_2"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/pool_light.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/light/pool_light"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/pool_tile.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "otemod:block/thresholds/pool/tiles/pool_tile"
+    }
+  }
+}

src/main/resources/assets/otemod/blockstates/pool_tile_stairs.json

@@ -0,0 +1,209 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=east,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner"
+    },
+    "facing=east,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=east,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer"
+    },
+    "facing=east,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs"
+    },
+    "facing=east,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=east,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs",
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "x": 180,
+      "uvlock": true
+    },
+    "facing=north,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner"
+    },
+    "facing=south,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer"
+    },
+    "facing=south,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=south,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs",
+      "x": 180,
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "y": 90,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=bottom,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs",
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=inner_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=inner_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_inner",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=outer_left": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=outer_right": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs_outer",
+      "x": 180,
+      "y": 270,
+      "uvlock": true
+    },
+    "facing=west,half=top,shape=straight": {
+      "model": "otemod:block/thresholds/pool/stairs/pool_tile_stairs",
+      "x": 180,
+      "y": 180,
+      "uvlock": true
+    }
+  }
+}