From c344b5c0b6a4ecb4bd8922409121bbb74838ca2e Mon Sep 17 00:00:00 2001 From: zontreck Date: Wed, 17 Jan 2024 02:25:27 -0700 Subject: [PATCH 01/22] Backport to 1.18.2 --- build.gradle | 26 +- gradle.properties | 16 +- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 4 - src/main/java/dev/zontreck/otemod/OTEMod.java | 43 +- .../otemod/blocks/AuroraDoorBlock.java | 4 +- .../blocks/CompressionChamberBlock.java | 2 +- .../otemod/blocks/ItemScrubberBlock.java | 2 +- .../otemod/blocks/MagicalScrubberBlock.java | 2 +- .../dev/zontreck/otemod/blocks/ModBlocks.java | 13 +- .../entity/CompressionChamberBlockEntity.java | 18 +- .../entity/ItemScrubberBlockEntity.java | 12 +- .../entity/MagicalScrubberBlockEntity.java | 12 +- .../otemod/blocks/entity/ModEntities.java | 2 +- .../blocks/entity/ParallaxWindowEntity.java | 3 - .../otemod/chat/ChatServerOverride.java | 10 +- .../ParallaxWindowEntityRenderer.java | 3 +- .../zontreck/otemod/commands/FlyCommand.java | 5 +- .../commands/vaults/StarterCommand.java | 12 +- .../otemod/commands/vaults/TrashCommand.java | 2 +- .../otemod/commands/vaults/VaultCommand.java | 2 +- .../otemod/commands/zschem/SetPos1.java | 2 +- .../otemod/commands/zschem/SetPos2.java | 2 +- .../otemod/configs/PlayerFlyCache.java | 1 + .../zontreck/otemod/effects/FlightEffect.java | 10 +- .../enchantments/FlightEnchantment.java | 4 +- .../enchantments/NightVisionEnchantment.java | 2 +- .../zontreck/otemod/events/ClientEvents.java | 2 +- .../zontreck/otemod/events/EventHandler.java | 8 +- .../zontreck/otemod/events/LoreHandlers.java | 20 - .../implementation/CreativeModeTabs.java | 21 - .../otemod/implementation/DeathMessages.java | 4 +- .../compressor/CompressionChamberMenu.java | 8 +- .../compressor/CompressionChamberScreen.java | 20 +- .../energy/screenrenderer/EnergyInfoArea.java | 11 +- .../energy/screenrenderer/InfoArea.java | 7 +- .../implementation/inits/ModMenuTypes.java | 2 +- .../scrubber/ItemScrubberMenu.java | 10 +- .../scrubber/ItemScrubberScreen.java | 19 +- .../scrubber/MagicalScrubberMenu.java | 10 +- .../scrubber/MagicalScrubberScreen.java | 21 +- .../vault/StarterContainer.java | 2 +- .../implementation/vault/StarterScreen.java | 12 +- .../implementation/vault/VaultContainer.java | 2 +- .../implementation/vault/VaultScreen.java | 22 +- .../implementation/vault/VaultWatcher.java | 3 +- .../otemod/integrations/KeyBindings.java | 9 - .../zontreck/otemod/items/ThrownPossBall.java | 31 +- .../otemod/items/UnstableSingularity.java | 3 +- .../otemod/networking/ModMessages.java | 4 +- .../dev/zontreck/otemod/ore/OreGenerator.java | 45 +- .../recipe/CompressionChamberRecipe.java | 7 +- .../zontreck/otemod/zschem/EventHandler.java | 31 +- .../zontreck/otemod/zschem/StoredBlock.java | 7 +- .../dev/zontreck/otemod/zschem/WorldProp.java | 4 +- src/main/resources/META-INF/mods.toml | 87 +- .../data/otemod/dimension/resource.json | 852 ++--- .../data/otemod/dimension/threshold.json | 4 +- .../data/otemod/dimension_type/resource.json | 4 +- .../data/otemod/dimension_type/threshold.json | 12 +- .../chunkdel.mcfunction | 64 +- .../eternium_oregen_overworld.json | 2 +- .../ilusium_oregen_overworld.json | 2 +- .../vaultsteel_oregen_overworld.json | 2 +- .../worldgen/noise_settings/resource.json | 3027 +++++++++++++++-- .../worldgen/noise_settings/threshold.json | 2568 +------------- src/main/resources/pack.mcmeta | 8 +- 67 files changed, 3335 insertions(+), 3858 deletions(-) rename src/main/resources/data/otemod/{disabled_stuff => functions}/chunkdel.mcfunction (81%) diff --git a/build.gradle b/build.gradle index beaad90..944b40b 100644 --- a/build.gradle +++ b/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 { diff --git a/gradle.properties b/gradle.properties index f34cc7b..f473a05 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,22 +3,22 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -libzontreck=1.10.011524.0045 +libzontreck=1.10.011624.1712 ## 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.17 # 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.011724.0213 # 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d..81b8f92 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/settings.gradle b/settings.gradle index 4e8d059..9ea21df 100644 --- a/settings.gradle +++ b/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' -} \ No newline at end of file diff --git a/src/main/java/dev/zontreck/otemod/OTEMod.java b/src/main/java/dev/zontreck/otemod/OTEMod.java index eb8d6d3..7da3ba4 100644 --- a/src/main/java/dev/zontreck/otemod/OTEMod.java +++ b/src/main/java/dev/zontreck/otemod/OTEMod.java @@ -1,20 +1,12 @@ 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.implementation.CreativeModeTabs; @@ -24,22 +16,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 +41,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 +52,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 @@ -110,13 +96,6 @@ 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> 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); @@ -125,10 +104,11 @@ public class OTEMod 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); + + ModMenuTypes.CONTAINERS.register(bus); ModBlocks.register(bus); - CreativeModeTabs.REGISTER.register(bus); ModItems.register(bus); ModEntities.register(bus); ModEnchantments.register(bus); @@ -271,7 +251,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 +305,6 @@ public class OTEMod } - @OnlyIn(Dist.CLIENT) - @SubscribeEvent - public static void onRegisterKeybinds(RegisterKeyMappingsEvent ev) - { - ev.register(KeyBindings.OPEN_VAULT); - } - } } diff --git a/src/main/java/dev/zontreck/otemod/blocks/AuroraDoorBlock.java b/src/main/java/dev/zontreck/otemod/blocks/AuroraDoorBlock.java index cc2acee..eace1e3 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/AuroraDoorBlock.java +++ b/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); } diff --git a/src/main/java/dev/zontreck/otemod/blocks/CompressionChamberBlock.java b/src/main/java/dev/zontreck/otemod/blocks/CompressionChamberBlock.java index 04083bd..688b406 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/CompressionChamberBlock.java +++ b/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); diff --git a/src/main/java/dev/zontreck/otemod/blocks/ItemScrubberBlock.java b/src/main/java/dev/zontreck/otemod/blocks/ItemScrubberBlock.java index 9be2ac5..dcbb17b 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/ItemScrubberBlock.java +++ b/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); diff --git a/src/main/java/dev/zontreck/otemod/blocks/MagicalScrubberBlock.java b/src/main/java/dev/zontreck/otemod/blocks/MagicalScrubberBlock.java index ae0ce19..02987a0 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/MagicalScrubberBlock.java +++ b/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{ diff --git a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java index 25356c2..de8b23a 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java +++ b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java @@ -10,6 +10,7 @@ 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,30 +26,30 @@ public class ModBlocks { OTEMod.LOGGER.info("Registering all blocks..."); } - public static final RegistryObject ETERNIUM_ORE_BLOCK = BLOCKS.register("eternium_ore_block", () -> new Block(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(7F).explosionResistance(1200).destroyTime(6))); + public static final RegistryObject 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 ETERNIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_ore_block", () -> new BlockItem(ETERNIUM_ORE_BLOCK.get(), new Item.Properties()))); - public static final RegistryObject 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 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 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 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 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 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 ETERNIUM_BLOCK = BLOCKS.register("eternium_block", ()->new Block(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(8F).explosionResistance(1200).destroyTime(100))); + public static final RegistryObject 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 ETERNIUM_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_block", ()->new FoiledBlockItem(ETERNIUM_BLOCK.get(), new Item.Properties()))); - public static final RegistryObject 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 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 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 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 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 AURORA_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("aurora_block", () -> new BlockItem(AURORA_BLOCK.get(), new Item.Properties()))); diff --git a/src/main/java/dev/zontreck/otemod/blocks/entity/CompressionChamberBlockEntity.java b/src/main/java/dev/zontreck/otemod/blocks/entity/CompressionChamberBlockEntity.java index 383dd10..c47a0a9 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/entity/CompressionChamberBlockEntity.java +++ b/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 LazyOptional getCapability(Capability 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 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) { diff --git a/src/main/java/dev/zontreck/otemod/blocks/entity/ItemScrubberBlockEntity.java b/src/main/java/dev/zontreck/otemod/blocks/entity/ItemScrubberBlockEntity.java index 19ba81d..465d804 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/entity/ItemScrubberBlockEntity.java +++ b/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 LazyOptional getCapability(Capability 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(); } diff --git a/src/main/java/dev/zontreck/otemod/blocks/entity/MagicalScrubberBlockEntity.java b/src/main/java/dev/zontreck/otemod/blocks/entity/MagicalScrubberBlockEntity.java index 4e56a86..f8116da 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/entity/MagicalScrubberBlockEntity.java +++ b/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 LazyOptional getCapability(Capability 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(); } diff --git a/src/main/java/dev/zontreck/otemod/blocks/entity/ModEntities.java b/src/main/java/dev/zontreck/otemod/blocks/entity/ModEntities.java index 56cb9ad..765753d 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/entity/ModEntities.java +++ b/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> ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, OTEMod.MOD_ID); + public static final DeferredRegister> ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, OTEMod.MOD_ID); public static final RegistryObject > ITEM_SCRUBBER = ENTITIES.register("item_scrubber", ()-> BlockEntityType.Builder.of(ItemScrubberBlockEntity::new, ModBlocks.ITEM_SCRUBBER.get()).build(null)); diff --git a/src/main/java/dev/zontreck/otemod/blocks/entity/ParallaxWindowEntity.java b/src/main/java/dev/zontreck/otemod/blocks/entity/ParallaxWindowEntity.java index ad6fc98..84f50bb 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/entity/ParallaxWindowEntity.java +++ b/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; diff --git a/src/main/java/dev/zontreck/otemod/chat/ChatServerOverride.java b/src/main/java/dev/zontreck/otemod/chat/ChatServerOverride.java index bb56ccf..bfbf27b 100644 --- a/src/main/java/dev/zontreck/otemod/chat/ChatServerOverride.java +++ b/src/main/java/dev/zontreck/otemod/chat/ChatServerOverride.java @@ -85,10 +85,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 +96,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 +117,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 +126,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); } diff --git a/src/main/java/dev/zontreck/otemod/client/renderer/ParallaxWindowEntityRenderer.java b/src/main/java/dev/zontreck/otemod/client/renderer/ParallaxWindowEntityRenderer.java index 263bd12..af941b3 100644 --- a/src/main/java/dev/zontreck/otemod/client/renderer/ParallaxWindowEntityRenderer.java +++ b/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 { diff --git a/src/main/java/dev/zontreck/otemod/commands/FlyCommand.java b/src/main/java/dev/zontreck/otemod/commands/FlyCommand.java index 0309c12..79bfa1e 100644 --- a/src/main/java/dev/zontreck/otemod/commands/FlyCommand.java +++ b/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; diff --git a/src/main/java/dev/zontreck/otemod/commands/vaults/StarterCommand.java b/src/main/java/dev/zontreck/otemod/commands/vaults/StarterCommand.java index ec307c3..049e81f 100644 --- a/src/main/java/dev/zontreck/otemod/commands/vaults/StarterCommand.java +++ b/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()); diff --git a/src/main/java/dev/zontreck/otemod/commands/vaults/TrashCommand.java b/src/main/java/dev/zontreck/otemod/commands/vaults/TrashCommand.java index 9d6cee0..c219564 100644 --- a/src/main/java/dev/zontreck/otemod/commands/vaults/TrashCommand.java +++ b/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()); diff --git a/src/main/java/dev/zontreck/otemod/commands/vaults/VaultCommand.java b/src/main/java/dev/zontreck/otemod/commands/vaults/VaultCommand.java index 0dbd9b0..a91e93f 100644 --- a/src/main/java/dev/zontreck/otemod/commands/vaults/VaultCommand.java +++ b/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()); diff --git a/src/main/java/dev/zontreck/otemod/commands/zschem/SetPos1.java b/src/main/java/dev/zontreck/otemod/commands/zschem/SetPos1.java index fb779fd..7e37148 100644 --- a/src/main/java/dev/zontreck/otemod/commands/zschem/SetPos1.java +++ b/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; } diff --git a/src/main/java/dev/zontreck/otemod/commands/zschem/SetPos2.java b/src/main/java/dev/zontreck/otemod/commands/zschem/SetPos2.java index c348da0..3be62c6 100644 --- a/src/main/java/dev/zontreck/otemod/commands/zschem/SetPos2.java +++ b/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; } diff --git a/src/main/java/dev/zontreck/otemod/configs/PlayerFlyCache.java b/src/main/java/dev/zontreck/otemod/configs/PlayerFlyCache.java index 90498c2..1ef1b7d 100644 --- a/src/main/java/dev/zontreck/otemod/configs/PlayerFlyCache.java +++ b/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; diff --git a/src/main/java/dev/zontreck/otemod/effects/FlightEffect.java b/src/main/java/dev/zontreck/otemod/effects/FlightEffect.java index 9027ea1..ff1de4f 100644 --- a/src/main/java/dev/zontreck/otemod/effects/FlightEffect.java +++ b/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(); diff --git a/src/main/java/dev/zontreck/otemod/enchantments/FlightEnchantment.java b/src/main/java/dev/zontreck/otemod/enchantments/FlightEnchantment.java index 9cf3ddd..697c3b5 100644 --- a/src/main/java/dev/zontreck/otemod/enchantments/FlightEnchantment.java +++ b/src/main/java/dev/zontreck/otemod/enchantments/FlightEnchantment.java @@ -80,7 +80,7 @@ public class FlightEnchantment extends Enchantment { if(event.side == LogicalSide.CLIENT) return; - if(TICKS.getAndIncrement() >= (5*20)) + if(TICKS.getAndIncrement() >= (10*20)) { TICKS.set(0); @@ -104,7 +104,7 @@ public class FlightEnchantment extends Enchantment if(hasFlight) { - MobEffectInstance inst = new MobEffectInstance(ModEffects.FLIGHT.get(), -1, 0, false, false, true); + MobEffectInstance inst = new MobEffectInstance(ModEffects.FLIGHT.get(), 30*20, 0, false, false, true); event.player.addEffect(inst); } diff --git a/src/main/java/dev/zontreck/otemod/enchantments/NightVisionEnchantment.java b/src/main/java/dev/zontreck/otemod/enchantments/NightVisionEnchantment.java index 3cf33c9..276ad72 100644 --- a/src/main/java/dev/zontreck/otemod/enchantments/NightVisionEnchantment.java +++ b/src/main/java/dev/zontreck/otemod/enchantments/NightVisionEnchantment.java @@ -58,7 +58,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); diff --git a/src/main/java/dev/zontreck/otemod/events/ClientEvents.java b/src/main/java/dev/zontreck/otemod/events/ClientEvents.java index f064d80..115aef5 100644 --- a/src/main/java/dev/zontreck/otemod/events/ClientEvents.java +++ b/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()) diff --git a/src/main/java/dev/zontreck/otemod/events/EventHandler.java b/src/main/java/dev/zontreck/otemod/events/EventHandler.java index ae9412f..a636edf 100644 --- a/src/main/java/dev/zontreck/otemod/events/EventHandler.java +++ b/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{ diff --git a/src/main/java/dev/zontreck/otemod/events/LoreHandlers.java b/src/main/java/dev/zontreck/otemod/events/LoreHandlers.java index 510f0a0..a45ebab 100644 --- a/src/main/java/dev/zontreck/otemod/events/LoreHandlers.java +++ b/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; diff --git a/src/main/java/dev/zontreck/otemod/implementation/CreativeModeTabs.java b/src/main/java/dev/zontreck/otemod/implementation/CreativeModeTabs.java index cebc8d0..725ab76 100644 --- a/src/main/java/dev/zontreck/otemod/implementation/CreativeModeTabs.java +++ b/src/main/java/dev/zontreck/otemod/implementation/CreativeModeTabs.java @@ -1,38 +1,17 @@ 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 REGISTER = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, OTEMod.MOD_ID); - - public static final List> OTEMOD_TAB_ITEMS = new ArrayList<>(); - - public static final RegistryObject 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 RegistryObject addToOTEModTab(RegistryObject itemLike) { - OTEMOD_TAB_ITEMS.add(itemLike); return itemLike; } diff --git a/src/main/java/dev/zontreck/otemod/implementation/DeathMessages.java b/src/main/java/dev/zontreck/otemod/implementation/DeathMessages.java index 43b3c8b..abcd605 100644 --- a/src/main/java/dev/zontreck/otemod/implementation/DeathMessages.java +++ b/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 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); diff --git a/src/main/java/dev/zontreck/otemod/implementation/compressor/CompressionChamberMenu.java b/src/main/java/dev/zontreck/otemod/implementation/compressor/CompressionChamberMenu.java index 4e32517..77c4c29 100644 --- a/src/main/java/dev/zontreck/otemod/implementation/compressor/CompressionChamberMenu.java +++ b/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)); }); diff --git a/src/main/java/dev/zontreck/otemod/implementation/compressor/CompressionChamberScreen.java b/src/main/java/dev/zontreck/otemod/implementation/compressor/CompressionChamberScreen.java index 4000a7e..b06f4c9 100644 --- a/src/main/java/dev/zontreck/otemod/implementation/compressor/CompressionChamberScreen.java +++ b/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 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); } } diff --git a/src/main/java/dev/zontreck/otemod/implementation/energy/screenrenderer/InfoArea.java b/src/main/java/dev/zontreck/otemod/implementation/energy/screenrenderer/InfoArea.java index f1534a5..3acdf48 100644 --- a/src/main/java/dev/zontreck/otemod/implementation/energy/screenrenderer/InfoArea.java +++ b/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); } diff --git a/src/main/java/dev/zontreck/otemod/implementation/inits/ModMenuTypes.java b/src/main/java/dev/zontreck/otemod/implementation/inits/ModMenuTypes.java index 06dfd3d..c48e144 100644 --- a/src/main/java/dev/zontreck/otemod/implementation/inits/ModMenuTypes.java +++ b/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> CONTAINERS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, OTEMod.MOD_ID); + public static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, OTEMod.MOD_ID); public static final RegistryObject> VAULT = registerMenuType(VaultMenu::new, "vault"); diff --git a/src/main/java/dev/zontreck/otemod/implementation/scrubber/ItemScrubberMenu.java b/src/main/java/dev/zontreck/otemod/implementation/scrubber/ItemScrubberMenu.java index 41ddfe6..d7fc1e1 100644 --- a/src/main/java/dev/zontreck/otemod/implementation/scrubber/ItemScrubberMenu.java +++ b/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)); }); diff --git a/src/main/java/dev/zontreck/otemod/implementation/scrubber/ItemScrubberScreen.java b/src/main/java/dev/zontreck/otemod/implementation/scrubber/ItemScrubberScreen.java index 4ebf9e0..9cd3c16 100644 --- a/src/main/java/dev/zontreck/otemod/implementation/scrubber/ItemScrubberScreen.java +++ b/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{ + 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)); }); diff --git a/src/main/java/dev/zontreck/otemod/implementation/scrubber/MagicalScrubberScreen.java b/src/main/java/dev/zontreck/otemod/implementation/scrubber/MagicalScrubberScreen.java index 76b662a..2cc5d75 100644 --- a/src/main/java/dev/zontreck/otemod/implementation/scrubber/MagicalScrubberScreen.java +++ b/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 } @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 @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); } } diff --git a/src/main/java/dev/zontreck/otemod/implementation/vault/VaultContainer.java b/src/main/java/dev/zontreck/otemod/implementation/vault/VaultContainer.java index f37cd61..0325ae0 100644 --- a/src/main/java/dev/zontreck/otemod/implementation/vault/VaultContainer.java +++ b/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 { diff --git a/src/main/java/dev/zontreck/otemod/implementation/vault/VaultScreen.java b/src/main/java/dev/zontreck/otemod/implementation/vault/VaultScreen.java index 85e8dfd..4a8e5ad 100644 --- a/src/main/java/dev/zontreck/otemod/implementation/vault/VaultScreen.java +++ b/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 } @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 // 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); } } diff --git a/src/main/java/dev/zontreck/otemod/implementation/vault/VaultWatcher.java b/src/main/java/dev/zontreck/otemod/implementation/vault/VaultWatcher.java index 888ffcc..17e28c4 100644 --- a/src/main/java/dev/zontreck/otemod/implementation/vault/VaultWatcher.java +++ b/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 diff --git a/src/main/java/dev/zontreck/otemod/integrations/KeyBindings.java b/src/main/java/dev/zontreck/otemod/integrations/KeyBindings.java index e31cc47..930f3cd 100644 --- a/src/main/java/dev/zontreck/otemod/integrations/KeyBindings.java +++ b/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); - } } diff --git a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java index b23f037..aa12145 100644 --- a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java +++ b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java @@ -5,6 +5,7 @@ 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; @@ -61,7 +62,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); } } } @@ -73,7 +74,7 @@ public class ThrownPossBall extends ThrowableItemProjectile { // Don't capture the entity - pResult.getEntity().hurt(this.damageSources().thrown(this, this.getOwner()), 0.1F); + pResult.getEntity().hurt(this.shooter.getLastDamageSource().thrown(this, this.getOwner()), 0.1F); } else { if(pResult.getEntity() instanceof LivingEntity le && !(le instanceof Player)) { @@ -101,7 +102,7 @@ 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 @@ -118,19 +119,19 @@ public class ThrownPossBall extends ThrowableItemProjectile // 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); + entity = new ItemEntity(getLevel(), 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); + entity = new ItemEntity(getLevel(), shooter.position().x, shooter.position().y, shooter.position().z, item, 0, 0, 0); + getLevel().addFreshEntity(entity); } else { // Spawn the real entity - Optional entity = EntityType.create(tag.getCompound("entity"), level()); + Optional 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); @@ -147,10 +148,10 @@ public class ThrownPossBall extends ThrowableItemProjectile ItemEntity x; if(shooter!=null) - x = new ItemEntity(level(), shooter.position().x, shooter.position().y, shooter.position().z, item, 0, 0, 0); + x = new ItemEntity(getLevel(), 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); + x = new ItemEntity(getLevel(), position().x, position().y, position().z, item, 0, 0, 0); + getLevel().addFreshEntity(x); } } else { // No capture @@ -168,14 +169,14 @@ public class ThrownPossBall extends ThrowableItemProjectile ItemEntity entity; if(shooter!= null) - entity = new ItemEntity(level(),shooter.position().x, shooter.position().y, shooter.position().z, item, 0, 0, 0); + entity = new ItemEntity(getLevel(),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); + entity = new ItemEntity(getLevel(), position().x, position().y, position().z, item, 0, 0, 0); + getLevel().addFreshEntity(entity); } - this.level().broadcastEntityEvent(this, (byte)3); + this.getLevel().broadcastEntityEvent(this, (byte)3); this.discard(); } diff --git a/src/main/java/dev/zontreck/otemod/items/UnstableSingularity.java b/src/main/java/dev/zontreck/otemod/items/UnstableSingularity.java index 9ac9c04..510f41a 100644 --- a/src/main/java/dev/zontreck/otemod/items/UnstableSingularity.java +++ b/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); diff --git a/src/main/java/dev/zontreck/otemod/networking/ModMessages.java b/src/main/java/dev/zontreck/otemod/networking/ModMessages.java index c24e11c..d99a2fb 100644 --- a/src/main/java/dev/zontreck/otemod/networking/ModMessages.java +++ b/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(); } diff --git a/src/main/java/dev/zontreck/otemod/ore/OreGenerator.java b/src/main/java/dev/zontreck/otemod/ore/OreGenerator.java index dc6bf88..3482ed6 100644 --- a/src/main/java/dev/zontreck/otemod/ore/OreGenerator.java +++ b/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> OVERWORLD_ORES = new ArrayList(); @@ -13,36 +33,39 @@ public class OreGenerator { public static final List NETHER_VAULTSTEEL_ORE = List.of( OreConfiguration.target(OreFeatures.NETHER_ORE_REPLACEABLES, ModBlocks.NETHER_VAULT_STEEL_ORE_BLOCK.get().defaultBlockState())); + public static final List 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> ETERNIUM_ORE = FeatureUtils.register("eternium_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_ETERNIUM_ORE, 8)); - public static final Holder> VAULTSTEEL_ORE = FeatureUtils.register("vault_steel_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_VAULTSTEEL_ORE, 6)); + public static final Holder> ETERNIUM_ORE = FeatureUtils.register("eternium_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_ETERNIUM_ORE, 4)); - public static final Holder> VAULTSTEEL_ORE_NETHER = FeatureUtils.register("nether_vault_steel_ore_block", Feature.ORE, new OreConfiguration(NETHER_VAULTSTEEL_ORE, 8)); + public static final Holder> VAULTSTEEL_ORE = FeatureUtils.register("vault_steel_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_VAULTSTEEL_ORE, 2)); + + public static final Holder> ILUSIUM_ORE = FeatureUtils.register("ilusium_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_ILUSIUM_ORE, 8)); + + public static final Holder> VAULTSTEEL_ORE_NETHER = FeatureUtils.register("nether_vault_steel_ore_block", Feature.ORE, new OreConfiguration(NETHER_VAULTSTEEL_ORE, 2)); public static final Holder ETERNIUM_ORE_PLACED = PlacementUtils.register("eternium_ore_placed", - ETERNIUM_ORE, ModdedOrePlacement.commonOrePlacement(3, // VeinsPerChunk + ETERNIUM_ORE, ModdedOrePlacement.rareOrePlacement(3, // VeinsPerChunk HeightRangePlacement.triangle(VerticalAnchor.absolute(-20), VerticalAnchor.absolute(20)))); + public static final Holder 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 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 NETHER_VAULTSTEEL_ORE_PLACED = PlacementUtils.register("nether_vaultsteel_ore_placed", VAULTSTEEL_ORE_NETHER, ModdedOrePlacement.rareOrePlacement(5, // Veins per chunk HeightRangePlacement.triangle(VerticalAnchor.absolute(1), VerticalAnchor.absolute(16)))); - //public static final Holder 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> 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); + } } diff --git a/src/main/java/dev/zontreck/otemod/recipe/CompressionChamberRecipe.java b/src/main/java/dev/zontreck/otemod/recipe/CompressionChamberRecipe.java index acc149d..0dbfc7a 100644 --- a/src/main/java/dev/zontreck/otemod/recipe/CompressionChamberRecipe.java +++ b/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 { @@ -34,7 +35,7 @@ public class CompressionChamberRecipe implements Recipe { } @Override - public ItemStack assemble(SimpleContainer simpleContainer, RegistryAccess registryAccess) { + public ItemStack assemble(SimpleContainer simpleContainer) { return output; } @@ -44,7 +45,7 @@ public class CompressionChamberRecipe implements Recipe { } @Override - public ItemStack getResultItem(RegistryAccess registryAccess) { + public ItemStack getResultItem() { return output.copy(); } @@ -74,7 +75,7 @@ public class CompressionChamberRecipe implements Recipe { public static final String ID = "compressing"; } - public static class Serializer implements RecipeSerializer + public static class Serializer extends ForgeRegistryEntry> implements RecipeSerializer { public static final Serializer INSTANCE = new Serializer(); public static final ResourceLocation ID = new ResourceLocation(OTEMod.MOD_ID, Type.ID); diff --git a/src/main/java/dev/zontreck/otemod/zschem/EventHandler.java b/src/main/java/dev/zontreck/otemod/zschem/EventHandler.java index 06f2222..59b3e53 100644 --- a/src/main/java/dev/zontreck/otemod/zschem/EventHandler.java +++ b/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(); } diff --git a/src/main/java/dev/zontreck/otemod/zschem/StoredBlock.java b/src/main/java/dev/zontreck/otemod/zschem/StoredBlock.java index 8e502ef..f1094c9 100644 --- a/src/main/java/dev/zontreck/otemod/zschem/StoredBlock.java +++ b/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; @@ -149,11 +146,9 @@ public class StoredBlock } catch (InvalidDeserialization e) { e.printStackTrace(); } - - HolderGetter 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; diff --git a/src/main/java/dev/zontreck/otemod/zschem/WorldProp.java b/src/main/java/dev/zontreck/otemod/zschem/WorldProp.java index f3c7dc4..131982c 100644 --- a/src/main/java/dev/zontreck/otemod/zschem/WorldProp.java +++ b/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 { @@ -34,7 +34,7 @@ public class WorldProp implements Supplier public void onDetonate(ExplosionEvent ev) { - Level w = ev.getLevel(); + Level w = ev.getWorld(); //int maxTicks = 0; for(BlockPos p : ev.getExplosion().getToBlow()) diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index fd6697d..ef62834 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/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,)" \ No newline at end of file +[[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" \ No newline at end of file diff --git a/src/main/resources/data/otemod/dimension/resource.json b/src/main/resources/data/otemod/dimension/resource.json index d24f9e3..00d6893 100644 --- a/src/main/resources/data/otemod/dimension/resource.json +++ b/src/main/resources/data/otemod/dimension/resource.json @@ -2,6 +2,7 @@ "type": "otemod:resource", "generator": { "type": "minecraft:noise", + "seed": -202175433, "settings": "otemod:resource", "biome_source": { "type": "minecraft:multi_noise", @@ -659,7 +660,7 @@ "parameters": { "temperature": [ -0.45, - 0.2 + 1 ], "humidity": [ -1, @@ -686,60 +687,6 @@ "parameters": { "temperature": [ -0.45, - 0.2 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - -1, - -0.9333 - ], - "depth": 1, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - -1, - -0.9333 - ], - "depth": 0, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, 1 ], "humidity": [ @@ -16207,7 +16154,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -16234,7 +16181,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -16369,7 +16316,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -16396,7 +16343,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -16531,7 +16478,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -16558,7 +16505,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -16963,7 +16910,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -16990,7 +16937,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -17125,7 +17072,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -17152,7 +17099,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -17287,7 +17234,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -17314,7 +17261,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -34081,7 +34028,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -34108,7 +34055,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -34135,7 +34082,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -34162,7 +34109,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -34351,7 +34298,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -34378,7 +34325,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -34783,7 +34730,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -34810,7 +34757,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -34837,7 +34784,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -34864,7 +34811,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -35053,7 +35000,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -35080,7 +35027,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -49363,7 +49310,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -49390,7 +49337,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -49417,7 +49364,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -49444,7 +49391,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -49471,7 +49418,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -49498,7 +49445,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -49633,7 +49580,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -49660,7 +49607,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -49957,7 +49904,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -49984,7 +49931,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -50011,7 +49958,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -50038,7 +49985,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -50065,7 +50012,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -50092,7 +50039,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -50227,7 +50174,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -50254,7 +50201,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -66481,7 +66428,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -66508,7 +66455,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -66535,7 +66482,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -66562,7 +66509,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -66751,7 +66698,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -66778,7 +66725,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -67183,7 +67130,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -67210,7 +67157,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -67237,7 +67184,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -67264,7 +67211,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -67453,7 +67400,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -67480,7 +67427,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -69941,7 +69888,7 @@ "parameters": { "temperature": [ -0.45, - 0.2 + 1 ], "humidity": [ -1, @@ -69968,60 +69915,6 @@ "parameters": { "temperature": [ -0.45, - 0.2 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - -0.4, - -0.2666 - ], - "depth": 1, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - -0.4, - -0.2666 - ], - "depth": 0, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, 1 ], "humidity": [ @@ -85489,7 +85382,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -85516,7 +85409,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -85651,7 +85544,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -85678,7 +85571,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -85813,7 +85706,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -85840,7 +85733,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -86245,7 +86138,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -86272,7 +86165,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -86407,7 +86300,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -86434,7 +86327,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -86569,7 +86462,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -86596,7 +86489,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -89273,7 +89166,7 @@ "parameters": { "temperature": [ -0.45, - 0.2 + 1 ], "humidity": [ -1, @@ -89300,60 +89193,6 @@ "parameters": { "temperature": [ -0.45, - 0.2 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - -0.2666, - -0.05 - ], - "depth": 1, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - -0.2666, - -0.05 - ], - "depth": 0, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, 1 ], "humidity": [ @@ -100447,7 +100286,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -100474,7 +100313,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -100501,7 +100340,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -100528,7 +100367,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -100609,7 +100448,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -100636,7 +100475,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -100987,7 +100826,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -101014,7 +100853,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -101041,7 +100880,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -101068,7 +100907,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -101149,7 +100988,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -101176,7 +101015,7 @@ } }, { - "biome": "minecraft:badlands", + "biome": "minecraft:eroded_badlands", "parameters": { "temperature": [ 0.55, @@ -103583,7 +103422,7 @@ "parameters": { "temperature": [ -0.45, - 0.2 + 1 ], "humidity": [ -1, @@ -103610,60 +103449,6 @@ "parameters": { "temperature": [ -0.45, - 0.2 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - -0.05, - 0.05 - ], - "depth": 1, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - -0.05, - 0.05 - ], - "depth": 0, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, 1 ], "humidity": [ @@ -104821,7 +104606,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -104848,7 +104633,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -104875,7 +104660,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -104902,7 +104687,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -105149,7 +104934,7 @@ "parameters": { "temperature": [ -0.45, - 0.2 + 1 ], "humidity": [ -1, @@ -105176,60 +104961,6 @@ "parameters": { "temperature": [ -0.45, - 0.2 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - 0.05, - 0.2666 - ], - "depth": 1, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - 0.05, - 0.2666 - ], - "depth": 0, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, 1 ], "humidity": [ @@ -116323,7 +116054,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -116350,7 +116081,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -116377,7 +116108,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -116404,7 +116135,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -116485,7 +116216,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -116512,7 +116243,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -116863,7 +116594,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -116890,7 +116621,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -116917,7 +116648,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -116944,7 +116675,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -117025,7 +116756,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -117052,7 +116783,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -119081,7 +118812,7 @@ "parameters": { "temperature": [ -0.45, - 0.2 + 1 ], "humidity": [ -1, @@ -119108,60 +118839,6 @@ "parameters": { "temperature": [ -0.45, - 0.2 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - 0.2666, - 0.4 - ], - "depth": 1, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - 0.2666, - 0.4 - ], - "depth": 0, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, 1 ], "humidity": [ @@ -123073,7 +122750,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -123100,7 +122777,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -123235,7 +122912,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -123262,7 +122939,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -126583,7 +126260,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -126610,7 +126287,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -126745,7 +126422,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -126772,7 +126449,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -127285,7 +126962,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -127312,7 +126989,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -127447,7 +127124,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -127474,7 +127151,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -133549,7 +133226,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -133576,7 +133253,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -133711,7 +133388,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -133738,7 +133415,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -133873,7 +133550,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -133900,7 +133577,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -134251,7 +133928,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -134278,7 +133955,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -134413,7 +134090,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -134440,7 +134117,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -134575,7 +134252,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -134602,7 +134279,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -140839,7 +140516,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -140866,7 +140543,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -140947,7 +140624,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -140974,7 +140651,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -144349,7 +144026,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -144376,7 +144053,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -144457,7 +144134,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -144484,7 +144161,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -145051,7 +144728,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -145078,7 +144755,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -145159,7 +144836,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -145186,7 +144863,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -151153,7 +150830,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -151180,7 +150857,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -151207,7 +150884,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -151234,7 +150911,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -151423,7 +151100,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -151450,7 +151127,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -151855,7 +151532,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -151882,7 +151559,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -151909,7 +151586,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -151936,7 +151613,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -152125,7 +151802,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -152152,7 +151829,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -157741,7 +157418,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -157768,7 +157445,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -157849,7 +157526,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -157876,7 +157553,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -160711,7 +160388,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -160738,7 +160415,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -160819,7 +160496,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -160846,7 +160523,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -161305,7 +160982,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -161332,7 +161009,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -161413,7 +161090,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -161440,7 +161117,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -166435,7 +166112,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -166462,7 +166139,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -166489,7 +166166,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -166516,7 +166193,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -166543,7 +166220,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -166570,7 +166247,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -166705,7 +166382,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -166732,7 +166409,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -167029,7 +166706,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -167056,7 +166733,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -167083,7 +166760,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -167110,7 +166787,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -167137,7 +166814,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -167164,7 +166841,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -167299,7 +166976,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -167326,7 +167003,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -173239,7 +172916,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -173266,7 +172943,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -173347,7 +173024,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -173374,7 +173051,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -176749,7 +176426,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -176776,7 +176453,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -176857,7 +176534,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -176884,7 +176561,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -177451,7 +177128,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -177478,7 +177155,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -177559,7 +177236,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -177586,7 +177263,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -183553,7 +183230,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -183580,7 +183257,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -183607,7 +183284,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -183634,7 +183311,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -183823,7 +183500,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -183850,7 +183527,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -184255,7 +183932,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -184282,7 +183959,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -184309,7 +183986,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -184336,7 +184013,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -184525,7 +184202,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -184552,7 +184229,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -187013,7 +186690,7 @@ "parameters": { "temperature": [ -0.45, - 0.2 + 1 ], "humidity": [ -1, @@ -187040,60 +186717,6 @@ "parameters": { "temperature": [ -0.45, - 0.2 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - 0.9333, - 1 - ], - "depth": 1, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - 0.55, - 1 - ], - "weirdness": [ - 0.9333, - 1 - ], - "depth": 0, - "offset": 0 - } - }, - { - "biome": "minecraft:mangrove_swamp", - "parameters": { - "temperature": [ - 0.2, 1 ], "humidity": [ @@ -191005,7 +190628,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -191032,7 +190655,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -191167,7 +190790,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -191194,7 +190817,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.45, @@ -194515,7 +194138,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -194542,7 +194165,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -194677,7 +194300,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -194704,7 +194327,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -195217,7 +194840,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -195244,7 +194867,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -195379,7 +195002,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -195406,7 +195029,7 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:meadow", "parameters": { "temperature": [ -0.15, @@ -201481,7 +201104,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -201508,7 +201131,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -201643,7 +201266,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -201670,7 +201293,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -201805,7 +201428,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -201832,7 +201455,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -202183,7 +201806,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -202210,7 +201833,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -202345,7 +201968,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -202372,7 +201995,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -202507,7 +202130,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -202534,7 +202157,7 @@ } }, { - "biome": "minecraft:eroded_badlands", + "biome": "minecraft:badlands", "parameters": { "temperature": [ 0.55, @@ -204995,33 +204618,6 @@ ], "offset": 0 } - }, - { - "biome": "minecraft:deep_dark", - "parameters": { - "temperature": [ - -1, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -1, - 1 - ], - "erosion": [ - -1, - -0.375 - ], - "weirdness": [ - -1, - 1 - ], - "depth": 1.1, - "offset": 0 - } } ] } diff --git a/src/main/resources/data/otemod/dimension/threshold.json b/src/main/resources/data/otemod/dimension/threshold.json index b739637..1572c8b 100644 --- a/src/main/resources/data/otemod/dimension/threshold.json +++ b/src/main/resources/data/otemod/dimension/threshold.json @@ -2,9 +2,11 @@ "type": "otemod:threshold", "generator": { "type": "minecraft:noise", + "seed": -1544839021, "settings": "otemod:threshold", "biome_source": { - "type": "minecraft:the_end" + "type": "minecraft:the_end", + "seed": -1544839021 } } } diff --git a/src/main/resources/data/otemod/dimension_type/resource.json b/src/main/resources/data/otemod/dimension_type/resource.json index 4e6ea5e..5a19271 100644 --- a/src/main/resources/data/otemod/dimension_type/resource.json +++ b/src/main/resources/data/otemod/dimension_type/resource.json @@ -14,7 +14,5 @@ "effects": "minecraft:the_end", "infiniburn": "#minecraft:infiniburn_overworld", "min_y": -64, - "height": 384, - "monster_spawn_light_level": 0, - "monster_spawn_block_light_limit": 0 + "height": 384 } diff --git a/src/main/resources/data/otemod/dimension_type/threshold.json b/src/main/resources/data/otemod/dimension_type/threshold.json index 8010ba6..91766ec 100644 --- a/src/main/resources/data/otemod/dimension_type/threshold.json +++ b/src/main/resources/data/otemod/dimension_type/threshold.json @@ -10,16 +10,8 @@ "coordinate_scale": 16, "ambient_light": 0, "logical_height": 384, - "effects": "minecraft:end", + "effects": "minecraft:the_end", "infiniburn": "#minecraft:infiniburn_overworld", "min_y": -64, - "height": 384, - "monster_spawn_light_level": { - "type": "minecraft:uniform", - "value": { - "min_inclusive": 0, - "max_inclusive": 7 - } - }, - "monster_spawn_block_light_limit": 0 + "height": 384 } diff --git a/src/main/resources/data/otemod/disabled_stuff/chunkdel.mcfunction b/src/main/resources/data/otemod/functions/chunkdel.mcfunction similarity index 81% rename from src/main/resources/data/otemod/disabled_stuff/chunkdel.mcfunction rename to src/main/resources/data/otemod/functions/chunkdel.mcfunction index 7f4cd0b..2b30b37 100644 --- a/src/main/resources/data/otemod/disabled_stuff/chunkdel.mcfunction +++ b/src/main/resources/data/otemod/functions/chunkdel.mcfunction @@ -1,36 +1,30 @@ -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:grass_block -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:dirt -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:stone -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:bedrock -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:gravel -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:andesite -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:diorite -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:granite -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:tuff -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:water -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:lava -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace otemod:aurora_block -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_diamond_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:diamond_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_iron_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:iron_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_gold_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:gold_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_redstone_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:redstone_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_lapis_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:lapis_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_copper_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:copper_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:dripstone_block -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace mekanism:deepslate_lead_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace mekanism:deepslate_fluorite_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace mekanism:deepslate_uranium_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace mekanism:deepslate_osmium_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace mekanism:deepslate_tin_ore -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:netherrack -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:soul_sand -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:soul_soil -fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:magma_block +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:grass_block +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:dirt +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:stone +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:bedrock +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:gravel +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:andesite +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:diorite +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:granite +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:tuff +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:water +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:lava +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_diamond_ore +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:diamond_ore +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_iron_ore +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:iron_ore +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_gold_ore +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:gold_ore +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_redstone_ore +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:redstone_ore +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_lapis_ore +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:lapis_ore +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_copper_ore +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:copper_ore +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:dripstone_block +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:netherrack +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:soul_sand +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:soul_soil +fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:magma_block fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:blackstone \ No newline at end of file diff --git a/src/main/resources/data/otemod/worldgen/configured_feature/eternium_oregen_overworld.json b/src/main/resources/data/otemod/worldgen/configured_feature/eternium_oregen_overworld.json index 5a345bb..1026cc6 100644 --- a/src/main/resources/data/otemod/worldgen/configured_feature/eternium_oregen_overworld.json +++ b/src/main/resources/data/otemod/worldgen/configured_feature/eternium_oregen_overworld.json @@ -24,4 +24,4 @@ } ] } -} \ No newline at end of file +} diff --git a/src/main/resources/data/otemod/worldgen/configured_feature/ilusium_oregen_overworld.json b/src/main/resources/data/otemod/worldgen/configured_feature/ilusium_oregen_overworld.json index cf10da2..2b495ce 100644 --- a/src/main/resources/data/otemod/worldgen/configured_feature/ilusium_oregen_overworld.json +++ b/src/main/resources/data/otemod/worldgen/configured_feature/ilusium_oregen_overworld.json @@ -19,7 +19,7 @@ "tag": "minecraft:deepslate_ore_replaceables" }, "state": { - "Name": "minecraft:deepslate_ilusium_ore_block" + "Name": "otemod:deepslate_ilusium_ore_block" } } ] diff --git a/src/main/resources/data/otemod/worldgen/configured_feature/vaultsteel_oregen_overworld.json b/src/main/resources/data/otemod/worldgen/configured_feature/vaultsteel_oregen_overworld.json index d758775..e071f7c 100644 --- a/src/main/resources/data/otemod/worldgen/configured_feature/vaultsteel_oregen_overworld.json +++ b/src/main/resources/data/otemod/worldgen/configured_feature/vaultsteel_oregen_overworld.json @@ -15,4 +15,4 @@ } ] } -} \ No newline at end of file +} diff --git a/src/main/resources/data/otemod/worldgen/noise_settings/resource.json b/src/main/resources/data/otemod/worldgen/noise_settings/resource.json index 13acbdb..95c3191 100644 --- a/src/main/resources/data/otemod/worldgen/noise_settings/resource.json +++ b/src/main/resources/data/otemod/worldgen/noise_settings/resource.json @@ -17,7 +17,2650 @@ "min_y": -64, "height": 384, "size_horizontal": 1, - "size_vertical": 2 + "size_vertical": 2, + "sampling": { + "xz_scale": 1, + "y_scale": 1, + "xz_factor": 80, + "y_factor": 160 + }, + "bottom_slide": { + "target": 0.4, + "size": 3, + "offset": 0 + }, + "top_slide": { + "target": -0.078125, + "size": 2, + "offset": 0 + }, + "terrain_shaper": { + "offset": { + "coordinate": "continents", + "points": [ + { + "location": -1.1, + "derivative": 0, + "value": 0.088 + }, + { + "location": -1.02, + "derivative": 0, + "value": -0.2222 + }, + { + "location": -0.51, + "derivative": 0, + "value": -0.2222 + }, + { + "location": -0.44, + "derivative": 0, + "value": -0.12 + }, + { + "location": -0.18, + "derivative": 0, + "value": -0.12 + }, + { + "location": -0.16, + "derivative": 0, + "value": { + "coordinate": "erosion", + "points": [ + { + "location": -0.85, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.38940096, + "value": -0.08880186 + }, + { + "location": 1, + "derivative": 0.38940096, + "value": 1.3800001 + } + ] + } + }, + { + "location": -0.7, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.37788022, + "value": -0.115760356 + }, + { + "location": 1, + "derivative": 0.37788022, + "value": 1.2800002 + } + ] + } + }, + { + "location": -0.4, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": -0.2222 + }, + { + "location": -0.75, + "derivative": 0, + "value": -0.2222 + }, + { + "location": -0.65, + "derivative": 0, + "value": 0 + }, + { + "location": 0.5954547, + "derivative": 0, + "value": 5.9604645e-8 + }, + { + "location": 0.6054547, + "derivative": 0.2534563, + "value": 5.9604645e-8 + }, + { + "location": 1, + "derivative": 0.2534563, + "value": 0.20000005 + } + ] + } + }, + { + "location": -0.35, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.3 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.1 + }, + { + "location": 0, + "derivative": 0, + "value": 0.1 + }, + { + "location": 0.4, + "derivative": 0, + "value": 0.1 + }, + { + "location": 1, + "derivative": 0.007000001, + "value": 0.120000005 + } + ] + } + }, + { + "location": -0.1, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.15 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0 + }, + { + "location": 0, + "derivative": 0, + "value": 0 + }, + { + "location": 0.4, + "derivative": 0.1, + "value": 0.1 + }, + { + "location": 1, + "derivative": 0.007000001, + "value": 0.120000005 + } + ] + } + }, + { + "location": 0.2, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.15 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0 + }, + { + "location": 0, + "derivative": 0, + "value": 0 + }, + { + "location": 0.4, + "derivative": 0, + "value": 0 + }, + { + "location": 1, + "derivative": 0, + "value": 0 + } + ] + } + }, + { + "location": 0.7, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": -0.02 + }, + { + "location": -0.4, + "derivative": 0, + "value": -0.03 + }, + { + "location": 0, + "derivative": 0, + "value": -0.03 + }, + { + "location": 0.4, + "derivative": 0.06, + "value": 0 + }, + { + "location": 1, + "derivative": 0, + "value": 0 + } + ] + } + } + ] + } + }, + { + "location": -0.15, + "derivative": 0, + "value": { + "coordinate": "erosion", + "points": [ + { + "location": -0.85, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.38940096, + "value": -0.08880186 + }, + { + "location": 1, + "derivative": 0.38940096, + "value": 1.3800001 + } + ] + } + }, + { + "location": -0.7, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.37788022, + "value": -0.115760356 + }, + { + "location": 1, + "derivative": 0.37788022, + "value": 1.2800002 + } + ] + } + }, + { + "location": -0.4, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": -0.2222 + }, + { + "location": -0.75, + "derivative": 0, + "value": -0.2222 + }, + { + "location": -0.65, + "derivative": 0, + "value": 0 + }, + { + "location": 0.5954547, + "derivative": 0, + "value": 5.9604645e-8 + }, + { + "location": 0.6054547, + "derivative": 0.2534563, + "value": 5.9604645e-8 + }, + { + "location": 1, + "derivative": 0.2534563, + "value": 0.20000005 + } + ] + } + }, + { + "location": -0.35, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.3 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.1 + }, + { + "location": 0, + "derivative": 0, + "value": 0.1 + }, + { + "location": 0.4, + "derivative": 0, + "value": 0.1 + }, + { + "location": 1, + "derivative": 0.007000001, + "value": 0.120000005 + } + ] + } + }, + { + "location": -0.1, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.15 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0 + }, + { + "location": 0, + "derivative": 0, + "value": 0 + }, + { + "location": 0.4, + "derivative": 0.1, + "value": 0.1 + }, + { + "location": 1, + "derivative": 0.007000001, + "value": 0.120000005 + } + ] + } + }, + { + "location": 0.2, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.15 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0 + }, + { + "location": 0, + "derivative": 0, + "value": 0 + }, + { + "location": 0.4, + "derivative": 0, + "value": 0 + }, + { + "location": 1, + "derivative": 0, + "value": 0 + } + ] + } + }, + { + "location": 0.7, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": -0.02 + }, + { + "location": -0.4, + "derivative": 0, + "value": -0.03 + }, + { + "location": 0, + "derivative": 0, + "value": -0.03 + }, + { + "location": 0.4, + "derivative": 0.06, + "value": 0 + }, + { + "location": 1, + "derivative": 0, + "value": 0 + } + ] + } + } + ] + } + }, + { + "location": -0.1, + "derivative": 0, + "value": { + "coordinate": "erosion", + "points": [ + { + "location": -0.85, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.38940096, + "value": -0.08880186 + }, + { + "location": 1, + "derivative": 0.38940096, + "value": 1.3800001 + } + ] + } + }, + { + "location": -0.7, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.37788022, + "value": -0.115760356 + }, + { + "location": 1, + "derivative": 0.37788022, + "value": 1.2800002 + } + ] + } + }, + { + "location": -0.4, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": -0.2222 + }, + { + "location": -0.75, + "derivative": 0, + "value": -0.2222 + }, + { + "location": -0.65, + "derivative": 0, + "value": 0 + }, + { + "location": 0.5954547, + "derivative": 0, + "value": 5.9604645e-8 + }, + { + "location": 0.6054547, + "derivative": 0.2534563, + "value": 5.9604645e-8 + }, + { + "location": 1, + "derivative": 0.2534563, + "value": 0.20000005 + } + ] + } + }, + { + "location": -0.35, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.25 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.1 + }, + { + "location": 0, + "derivative": 0, + "value": 0.1 + }, + { + "location": 0.4, + "derivative": 0, + "value": 0.1 + }, + { + "location": 1, + "derivative": 0.007000001, + "value": 0.120000005 + } + ] + } + }, + { + "location": -0.1, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.1 + }, + { + "location": -0.4, + "derivative": 0.01, + "value": 0.002 + }, + { + "location": 0, + "derivative": 0.01, + "value": 0.006 + }, + { + "location": 0.4, + "derivative": 0.094000004, + "value": 0.1 + }, + { + "location": 1, + "derivative": 0.007000001, + "value": 0.120000005 + } + ] + } + }, + { + "location": 0.2, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.1 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0.4, + "derivative": 0.04, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + }, + { + "location": 0.7, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": -0.02 + }, + { + "location": -0.4, + "derivative": 0, + "value": -0.03 + }, + { + "location": 0, + "derivative": 0, + "value": -0.03 + }, + { + "location": 0.4, + "derivative": 0.12, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + } + ] + } + }, + { + "location": 0.25, + "derivative": 0, + "value": { + "coordinate": "erosion", + "points": [ + { + "location": -0.85, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0.40470043 + }, + { + "location": 0, + "derivative": 0.5138249, + "value": 1.4323502 + }, + { + "location": 1, + "derivative": 0.5138249, + "value": 2.46 + } + ] + } + }, + { + "location": -0.7, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0.4 + }, + { + "location": 0, + "derivative": 0.43317974, + "value": 0.8936405 + }, + { + "location": 1, + "derivative": 0.43317974, + "value": 1.76 + } + ] + } + }, + { + "location": -0.4, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0.4 + }, + { + "location": 0, + "derivative": 0.3917051, + "value": 0.6165899 + }, + { + "location": 1, + "derivative": 0.3917051, + "value": 1.4000001 + } + ] + } + }, + { + "location": -0.35, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.25 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.7 + }, + { + "location": 0, + "derivative": 0, + "value": 0.7 + }, + { + "location": 0.4, + "derivative": 0, + "value": 0.7 + }, + { + "location": 1, + "derivative": 0.049000014, + "value": 0.84000003 + } + ] + } + }, + { + "location": -0.1, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.1 + }, + { + "location": -0.4, + "derivative": 0.07, + "value": 0.0139999995 + }, + { + "location": 0, + "derivative": 0.07, + "value": 0.042 + }, + { + "location": 0.4, + "derivative": 0.658, + "value": 0.7 + }, + { + "location": 1, + "derivative": 0.049000014, + "value": 0.84000003 + } + ] + } + }, + { + "location": 0.2, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.1 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0.4, + "derivative": 0.04, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + }, + { + "location": 0.4, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.1 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0.4, + "derivative": 0.04, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + }, + { + "location": 0.45, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": -0.1 + }, + { + "location": -0.4, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.1 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0.4, + "derivative": 0.04, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + }, + { + "location": 0, + "derivative": 0, + "value": 0.34 + } + ] + } + }, + { + "location": 0.55, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": -0.1 + }, + { + "location": -0.4, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.1 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0.4, + "derivative": 0.04, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + }, + { + "location": 0, + "derivative": 0, + "value": 0.34 + } + ] + } + }, + { + "location": 0.58, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.1 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0.4, + "derivative": 0.04, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + }, + { + "location": 0.7, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": -0.02 + }, + { + "location": -0.4, + "derivative": 0, + "value": -0.03 + }, + { + "location": 0, + "derivative": 0, + "value": -0.03 + }, + { + "location": 0.4, + "derivative": 0.12, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + } + ] + } + }, + { + "location": 1, + "derivative": 0, + "value": { + "coordinate": "erosion", + "points": [ + { + "location": -0.85, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0.6958525 + }, + { + "location": 0, + "derivative": 0.5760369, + "value": 1.8479263 + }, + { + "location": 1, + "derivative": 0.5760369, + "value": 3 + } + ] + } + }, + { + "location": -0.7, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0.4 + }, + { + "location": 0, + "derivative": 0.4608295, + "value": 1.078341 + }, + { + "location": 1, + "derivative": 0.4608295, + "value": 2 + } + ] + } + }, + { + "location": -0.4, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0.4 + }, + { + "location": 0, + "derivative": 0.4608295, + "value": 1.078341 + }, + { + "location": 1, + "derivative": 0.4608295, + "value": 2 + } + ] + } + }, + { + "location": -0.35, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.2 + }, + { + "location": -0.4, + "derivative": 0, + "value": 1 + }, + { + "location": 0, + "derivative": 0, + "value": 1 + }, + { + "location": 0.4, + "derivative": 0, + "value": 1 + }, + { + "location": 1, + "derivative": 0.070000015, + "value": 1.2 + } + ] + } + }, + { + "location": -0.1, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.05 + }, + { + "location": -0.4, + "derivative": 0.099999994, + "value": 0.02 + }, + { + "location": 0, + "derivative": 0.099999994, + "value": 0.06 + }, + { + "location": 0.4, + "derivative": 0.94, + "value": 1 + }, + { + "location": 1, + "derivative": 0.070000015, + "value": 1.2 + } + ] + } + }, + { + "location": 0.2, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.05 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0.4, + "derivative": 0.04, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + }, + { + "location": 0.4, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.05 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0.4, + "derivative": 0.04, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + }, + { + "location": 0.45, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": -0.05 + }, + { + "location": -0.4, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.05 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0.4, + "derivative": 0.04, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + }, + { + "location": 0, + "derivative": 0, + "value": 0.34 + } + ] + } + }, + { + "location": 0.55, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0, + "value": -0.05 + }, + { + "location": -0.4, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.05 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0.4, + "derivative": 0.04, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + }, + { + "location": 0, + "derivative": 0, + "value": 0.34 + } + ] + } + }, + { + "location": 0.58, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.5, + "value": -0.05 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0.4, + "derivative": 0.04, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + }, + { + "location": 0.7, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -1, + "derivative": 0.015, + "value": -0.02 + }, + { + "location": -0.4, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0, + "derivative": 0, + "value": 0.02 + }, + { + "location": 0.4, + "derivative": 0.04, + "value": 0.06 + }, + { + "location": 1, + "derivative": 0.049, + "value": 0.2 + } + ] + } + } + ] + } + } + ] + }, + "factor": { + "coordinate": "continents", + "points": [ + { + "location": -0.19, + "derivative": 0, + "value": 3.95 + }, + { + "location": -0.15, + "derivative": 0, + "value": { + "coordinate": "erosion", + "points": [ + { + "location": -0.6, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 6.3 + }, + { + "location": 0.2, + "derivative": 0, + "value": 6.25 + } + ] + } + }, + { + "location": -0.5, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.05, + "derivative": 0, + "value": 6.3 + }, + { + "location": 0.05, + "derivative": 0, + "value": 2.67 + } + ] + } + }, + { + "location": -0.35, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 6.3 + }, + { + "location": 0.2, + "derivative": 0, + "value": 6.25 + } + ] + } + }, + { + "location": -0.25, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 6.3 + }, + { + "location": 0.2, + "derivative": 0, + "value": 6.25 + } + ] + } + }, + { + "location": -0.1, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.05, + "derivative": 0, + "value": 2.67 + }, + { + "location": 0.05, + "derivative": 0, + "value": 6.3 + } + ] + } + }, + { + "location": 0.03, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 6.3 + }, + { + "location": 0.2, + "derivative": 0, + "value": 6.25 + } + ] + } + }, + { + "location": 0.35, + "derivative": 0, + "value": 6.25 + }, + { + "location": 0.45, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -0.9, + "derivative": 0, + "value": 6.25 + }, + { + "location": -0.69, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": 0, + "derivative": 0, + "value": 6.25 + }, + { + "location": 0.1, + "derivative": 0, + "value": 0.625 + } + ] + } + } + ] + } + }, + { + "location": 0.55, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -0.9, + "derivative": 0, + "value": 6.25 + }, + { + "location": -0.69, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": 0, + "derivative": 0, + "value": 6.25 + }, + { + "location": 0.1, + "derivative": 0, + "value": 0.625 + } + ] + } + } + ] + } + }, + { + "location": 0.62, + "derivative": 0, + "value": 6.25 + } + ] + } + }, + { + "location": -0.1, + "derivative": 0, + "value": { + "coordinate": "erosion", + "points": [ + { + "location": -0.6, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6530563 + } + ] + } + }, + { + "location": -0.5, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.05, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.05, + "derivative": 0, + "value": 0.4351369 + } + ] + } + }, + { + "location": -0.35, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6530563 + } + ] + } + }, + { + "location": -0.25, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6530563 + } + ] + } + }, + { + "location": -0.1, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.05, + "derivative": 0, + "value": 0.4351369 + }, + { + "location": 0.05, + "derivative": 0, + "value": 0.6969027 + } + ] + } + }, + { + "location": 0.03, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6530563 + } + ] + } + }, + { + "location": 0.35, + "derivative": 0, + "value": 0.6530563 + }, + { + "location": 0.45, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -0.9, + "derivative": 0, + "value": 0.6530563 + }, + { + "location": -0.69, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": 0, + "derivative": 0, + "value": 0.6530563 + }, + { + "location": 0.1, + "derivative": 0, + "value": 0.13888884 + } + ] + } + } + ] + } + }, + { + "location": 0.55, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -0.9, + "derivative": 0, + "value": 0.6530563 + }, + { + "location": -0.69, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": 0, + "derivative": 0, + "value": 0.6530563 + }, + { + "location": 0.1, + "derivative": 0, + "value": 0.13888884 + } + ] + } + } + ] + } + }, + { + "location": 0.62, + "derivative": 0, + "value": 0.6530563 + } + ] + } + }, + { + "location": 0.03, + "derivative": 0, + "value": { + "coordinate": "erosion", + "points": [ + { + "location": -0.6, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6299603 + } + ] + } + }, + { + "location": -0.5, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.05, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.05, + "derivative": 0, + "value": 0.4351369 + } + ] + } + }, + { + "location": -0.35, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6299603 + } + ] + } + }, + { + "location": -0.25, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6299603 + } + ] + } + }, + { + "location": -0.1, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.05, + "derivative": 0, + "value": 0.4351369 + }, + { + "location": 0.05, + "derivative": 0, + "value": 0.6969027 + } + ] + } + }, + { + "location": 0.03, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6299603 + } + ] + } + }, + { + "location": 0.35, + "derivative": 0, + "value": 0.6299603 + }, + { + "location": 0.45, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -0.9, + "derivative": 0, + "value": 0.6299603 + }, + { + "location": -0.69, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": 0, + "derivative": 0, + "value": 0.6299603 + }, + { + "location": 0.1, + "derivative": 0, + "value": 0.13888884 + } + ] + } + } + ] + } + }, + { + "location": 0.55, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -0.9, + "derivative": 0, + "value": 0.6299603 + }, + { + "location": -0.69, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": 0, + "derivative": 0, + "value": 0.6299603 + }, + { + "location": 0.1, + "derivative": 0, + "value": 0.13888884 + } + ] + } + } + ] + } + }, + { + "location": 0.62, + "derivative": 0, + "value": 0.6299603 + } + ] + } + }, + { + "location": 0.06, + "derivative": 0, + "value": { + "coordinate": "erosion", + "points": [ + { + "location": -0.6, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6050052 + } + ] + } + }, + { + "location": -0.5, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.05, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.05, + "derivative": 0, + "value": 0.4351369 + } + ] + } + }, + { + "location": -0.35, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6050052 + } + ] + } + }, + { + "location": -0.25, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6050052 + } + ] + } + }, + { + "location": -0.1, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.05, + "derivative": 0, + "value": 0.4351369 + }, + { + "location": 0.05, + "derivative": 0, + "value": 0.6969027 + } + ] + } + }, + { + "location": 0.03, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6050052 + } + ] + } + }, + { + "location": 0.05, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": 0.45, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6050052 + } + ] + } + }, + { + "location": 0.7, + "derivative": 0, + "value": 0.2972561 + } + ] + } + }, + { + "location": 0.4, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": 0.45, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6050052 + } + ] + } + }, + { + "location": 0.7, + "derivative": 0, + "value": 0.2972561 + } + ] + } + }, + { + "location": 0.45, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -0.7, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6050052 + } + ] + } + }, + { + "location": -0.15, + "derivative": 0, + "value": 0.2688383 + } + ] + } + }, + { + "location": 0.55, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": -0.7, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.2, + "derivative": 0, + "value": 0.6969027 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6050052 + } + ] + } + }, + { + "location": -0.15, + "derivative": 0, + "value": 0.2688383 + } + ] + } + }, + { + "location": 0.58, + "derivative": 0, + "value": 0.6050052 + } + ] + } + } + ] + }, + "jaggedness": { + "coordinate": "continents", + "points": [ + { + "location": -0.11, + "derivative": 0, + "value": 0 + }, + { + "location": 0.03, + "derivative": 0, + "value": { + "coordinate": "erosion", + "points": [ + { + "location": -1, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": 0.19999999, + "derivative": 0, + "value": 0 + }, + { + "location": 0.44999996, + "derivative": 0, + "value": 0 + }, + { + "location": 1, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.01, + "derivative": 0, + "value": 1.26 + }, + { + "location": 0.01, + "derivative": 0, + "value": 0.6 + } + ] + } + } + ] + } + }, + { + "location": -0.78, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": 0.19999999, + "derivative": 0, + "value": 0 + }, + { + "location": 0.44999996, + "derivative": 0, + "value": 0 + }, + { + "location": 1, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.01, + "derivative": 0, + "value": 0.63 + }, + { + "location": 0.01, + "derivative": 0, + "value": 0.3 + } + ] + } + } + ] + } + }, + { + "location": -0.5775, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": 0.19999999, + "derivative": 0, + "value": 0 + }, + { + "location": 0.44999996, + "derivative": 0, + "value": 0 + }, + { + "location": 1, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.01, + "derivative": 0, + "value": 0.63 + }, + { + "location": 0.01, + "derivative": 0, + "value": 0.3 + } + ] + } + } + ] + } + }, + { + "location": -0.375, + "derivative": 0, + "value": 0 + } + ] + } + }, + { + "location": 0.65, + "derivative": 0, + "value": { + "coordinate": "erosion", + "points": [ + { + "location": -1, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": 0.19999999, + "derivative": 0, + "value": 0 + }, + { + "location": 0.44999996, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.01, + "derivative": 0, + "value": 1.26 + }, + { + "location": 0.01, + "derivative": 0, + "value": 0.6 + } + ] + } + }, + { + "location": 1, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.01, + "derivative": 0, + "value": 1.26 + }, + { + "location": 0.01, + "derivative": 0, + "value": 0.6 + } + ] + } + } + ] + } + }, + { + "location": -0.78, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": 0.19999999, + "derivative": 0, + "value": 0 + }, + { + "location": 0.44999996, + "derivative": 0, + "value": 0 + }, + { + "location": 1, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.01, + "derivative": 0, + "value": 1.26 + }, + { + "location": 0.01, + "derivative": 0, + "value": 0.6 + } + ] + } + } + ] + } + }, + { + "location": -0.5775, + "derivative": 0, + "value": { + "coordinate": "ridges", + "points": [ + { + "location": 0.19999999, + "derivative": 0, + "value": 0 + }, + { + "location": 0.44999996, + "derivative": 0, + "value": 0 + }, + { + "location": 1, + "derivative": 0, + "value": { + "coordinate": "weirdness", + "points": [ + { + "location": -0.01, + "derivative": 0, + "value": 1.26 + }, + { + "location": 0.01, + "derivative": 0, + "value": 0.6 + } + ] + } + } + ] + } + }, + { + "location": -0.375, + "derivative": 0, + "value": 0 + } + ] + } + } + ] + } + } }, "noise_router": { "barrier": { @@ -64,64 +2707,19 @@ }, "continents": "minecraft:overworld/continents", "erosion": "minecraft:overworld/erosion", - "depth": "minecraft:overworld_amplified/depth", + "depth": "minecraft:overworld/depth", "ridges": "minecraft:overworld/ridges", "initial_density_without_jaggedness": { - "type": "minecraft:add", - "argument1": 0.4, + "type": "minecraft:mul", + "argument1": 4, "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": -64, - "to_y": -40, - "from_value": 0, - "to_value": 1 - }, - "argument2": { - "type": "minecraft:add", - "argument1": -0.4, + "type": "minecraft:quarter_negative", + "argument": { + "type": "minecraft:mul", + "argument1": "minecraft:overworld/depth", "argument2": { - "type": "minecraft:add", - "argument1": -0.078125, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 304, - "to_y": 320, - "from_value": 1, - "to_value": 0 - }, - "argument2": { - "type": "minecraft:add", - "argument1": 0.078125, - "argument2": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": -0.703125, - "argument2": { - "type": "minecraft:mul", - "argument1": 4, - "argument2": { - "type": "minecraft:quarter_negative", - "argument": { - "type": "minecraft:mul", - "argument1": "minecraft:overworld_amplified/depth", - "argument2": { - "type": "minecraft:cache_2d", - "argument": "minecraft:overworld_amplified/factor" - } - } - } - } - }, - "min": -64, - "max": 64 - } - } - } + "type": "minecraft:cache_2d", + "argument": "minecraft:overworld/factor" } } } @@ -138,123 +2736,90 @@ "argument": { "type": "minecraft:blend_density", "argument": { - "type": "minecraft:add", - "argument1": 0.4, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": -64, - "to_y": -40, - "from_value": 0, - "to_value": 1 - }, - "argument2": { - "type": "minecraft:add", - "argument1": -0.4, + "type": "minecraft:slide", + "argument": { + "type": "minecraft:range_choice", + "input": "minecraft:overworld/sloped_cheese", + "min_inclusive": -1000000, + "max_exclusive": 1.5625, + "when_in_range": { + "type": "minecraft:min", + "argument1": "minecraft:overworld/sloped_cheese", "argument2": { - "type": "minecraft:add", - "argument1": -0.078125, - "argument2": { - "type": "minecraft:mul", + "type": "minecraft:mul", + "argument1": 5, + "argument2": "minecraft:overworld/caves/entrances" + } + }, + "when_out_of_range": { + "type": "minecraft:max", + "argument1": { + "type": "minecraft:min", + "argument1": { + "type": "minecraft:min", "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 304, - "to_y": 320, - "from_value": 1, - "to_value": 0 - }, - "argument2": { "type": "minecraft:add", - "argument1": 0.078125, - "argument2": { - "type": "minecraft:range_choice", - "input": "minecraft:overworld_amplified/sloped_cheese", - "min_inclusive": -1000000, - "max_exclusive": 1.5625, - "when_in_range": { - "type": "minecraft:min", - "argument1": "minecraft:overworld_amplified/sloped_cheese", - "argument2": { - "type": "minecraft:mul", - "argument1": 5, - "argument2": "minecraft:overworld/caves/entrances" - } - }, - "when_out_of_range": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:mul", - "argument1": 4, - "argument2": { - "type": "minecraft:square", - "argument": { - "type": "minecraft:noise", - "noise": "minecraft:cave_layer", - "xz_scale": 1, - "y_scale": 8 - } - } - }, - "argument2": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": 0.27, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:cave_cheese", - "xz_scale": 1, - "y_scale": 0.6666666666666666 - } - }, - "min": -1, - "max": 1 - }, - "argument2": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": 1.5, - "argument2": { - "type": "minecraft:mul", - "argument1": -0.64, - "argument2": "minecraft:overworld_amplified/sloped_cheese" - } - }, - "min": 0, - "max": 0.5 - } - } - }, - "argument2": "minecraft:overworld/caves/entrances" - }, - "argument2": { - "type": "minecraft:add", - "argument1": "minecraft:overworld/caves/spaghetti_2d", - "argument2": "minecraft:overworld/caves/spaghetti_roughness_function" - } - }, - "argument2": { - "type": "minecraft:range_choice", - "input": "minecraft:overworld/caves/pillars", - "min_inclusive": -1000000, - "max_exclusive": 0.03, - "when_in_range": -1000000, - "when_out_of_range": "minecraft:overworld/caves/pillars" + "argument1": { + "type": "minecraft:mul", + "argument1": 4, + "argument2": { + "type": "minecraft:square", + "argument": { + "type": "minecraft:noise", + "noise": "minecraft:cave_layer", + "xz_scale": 1, + "y_scale": 8 } } + }, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:clamp", + "input": { + "type": "minecraft:add", + "argument1": 0.27, + "argument2": { + "type": "minecraft:noise", + "noise": "minecraft:cave_cheese", + "xz_scale": 1, + "y_scale": 0.6666666666666666 + } + }, + "min": -1, + "max": 1 + }, + "argument2": { + "type": "minecraft:clamp", + "input": { + "type": "minecraft:add", + "argument1": 1.5, + "argument2": { + "type": "minecraft:mul", + "argument1": -0.64, + "argument2": "minecraft:overworld/sloped_cheese" + } + }, + "min": 0, + "max": 0.5 + } } - } + }, + "argument2": "minecraft:overworld/caves/entrances" + }, + "argument2": { + "type": "minecraft:add", + "argument1": "minecraft:overworld/caves/spaghetti_2d", + "argument2": "minecraft:overworld/caves/spaghetti_roughness_function" } + }, + "argument2": { + "type": "minecraft:range_choice", + "input": "minecraft:overworld/caves/pillars", + "min_inclusive": -1000000, + "max_exclusive": 0.03, + "when_in_range": -1000000, + "when_out_of_range": "minecraft:overworld/caves/pillars" } } } @@ -333,56 +2898,6 @@ "y_scale": 1 } }, - "spawn_target": [ - { - "temperature": [ - -1, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - -1, - 1 - ], - "weirdness": [ - -1, - -0.16 - ], - "depth": 0, - "offset": 0 - }, - { - "temperature": [ - -1, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - -1, - 1 - ], - "weirdness": [ - 0.16, - 1 - ], - "depth": 0, - "offset": 0 - } - ], "surface_rule": { "type": "minecraft:sequence", "sequence": [ @@ -575,58 +3090,6 @@ } } } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:mangrove_swamp" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 60 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 63 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - } - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface_swamp", - "min_threshold": 0, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:water", - "Properties": { - "level": "0" - } - } - } - } - } - } } ] } @@ -1676,21 +4139,6 @@ } } }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:mangrove_swamp" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:mud" - } - } - }, { "type": "minecraft:condition", "if_true": { @@ -2337,21 +4785,6 @@ ] } }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:mangrove_swamp" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:mud" - } - } - }, { "type": "minecraft:block", "result_state": { diff --git a/src/main/resources/data/otemod/worldgen/noise_settings/threshold.json b/src/main/resources/data/otemod/worldgen/noise_settings/threshold.json index 514a460..460a698 100644 --- a/src/main/resources/data/otemod/worldgen/noise_settings/threshold.json +++ b/src/main/resources/data/otemod/worldgen/noise_settings/threshold.json @@ -1,2542 +1,84 @@ { - "sea_level": 63, + "sea_level": 0, "disable_mob_generation": true, - "aquifers_enabled": true, - "ore_veins_enabled": true, - "legacy_random_source": false, + "aquifers_enabled": false, + "ore_veins_enabled": false, + "legacy_random_source": true, "default_block": { "Name": "minecraft:stone" }, "default_fluid": { - "Name": "minecraft:water", - "Properties": { - "level": "0" - } + "Name": "minecraft:water" }, "noise": { "min_y": -64, "height": 384, - "size_horizontal": 1, - "size_vertical": 2 + "size_horizontal": 2, + "size_vertical": 1, + "sampling": { + "xz_scale": 2, + "y_scale": 1, + "xz_factor": 80, + "y_factor": 160 + }, + "bottom_slide": { + "target": -0.234375, + "size": 7, + "offset": 1 + }, + "top_slide": { + "target": -23.4375, + "size": 64, + "offset": -46 + }, + "terrain_shaper": { + "offset": 0, + "factor": 1, + "jaggedness": 0 + } }, "noise_router": { - "barrier": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_barrier", - "xz_scale": 1, - "y_scale": 0.5 - }, - "fluid_level_floodedness": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_fluid_level_floodedness", - "xz_scale": 1, - "y_scale": 0.67 - }, - "fluid_level_spread": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_fluid_level_spread", - "xz_scale": 1, - "y_scale": 0.7142857142857143 - }, - "lava": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_lava", - "xz_scale": 1, - "y_scale": 1 - }, - "temperature": { - "type": "minecraft:shifted_noise", - "noise": "minecraft:temperature", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - }, - "vegetation": { - "type": "minecraft:shifted_noise", - "noise": "minecraft:vegetation", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - }, - "continents": "minecraft:overworld/continents", - "erosion": "minecraft:overworld/erosion", - "depth": "minecraft:overworld/depth", - "ridges": "minecraft:overworld/ridges", + "barrier": 0, + "fluid_level_floodedness": 0, + "fluid_level_spread": 0, + "lava": 0, + "temperature": 0, + "vegetation": 0, + "continents": 0, + "erosion": 0, + "depth": 0, + "ridges": 0, "initial_density_without_jaggedness": { - "type": "minecraft:add", - "argument1": 0.1171875, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": -64, - "to_y": -40, - "from_value": 0, - "to_value": 1 - }, - "argument2": { - "type": "minecraft:add", - "argument1": -0.1171875, - "argument2": { - "type": "minecraft:add", - "argument1": -0.078125, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 240, - "to_y": 256, - "from_value": 1, - "to_value": 0 - }, - "argument2": { - "type": "minecraft:add", - "argument1": 0.078125, - "argument2": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": -0.703125, - "argument2": { - "type": "minecraft:mul", - "argument1": 4, - "argument2": { - "type": "minecraft:quarter_negative", - "argument": { - "type": "minecraft:mul", - "argument1": "minecraft:overworld/depth", - "argument2": { - "type": "minecraft:cache_2d", - "argument": "minecraft:overworld/factor" - } - } - } - } - }, - "min": -64, - "max": 64 - } - } - } - } - } + "type": "minecraft:cache_2d", + "argument": { + "type": "minecraft:end_islands" } }, "final_density": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:squeeze", - "argument": { - "type": "minecraft:mul", - "argument1": 0.64, - "argument2": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:blend_density", - "argument": { - "type": "minecraft:add", - "argument1": 0.1171875, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": -64, - "to_y": -40, - "from_value": 0, - "to_value": 1 - }, - "argument2": { - "type": "minecraft:add", - "argument1": -0.1171875, - "argument2": { - "type": "minecraft:add", - "argument1": -0.078125, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 240, - "to_y": 256, - "from_value": 1, - "to_value": 0 - }, - "argument2": { - "type": "minecraft:add", - "argument1": 0.078125, - "argument2": { - "type": "minecraft:range_choice", - "input": "minecraft:overworld/sloped_cheese", - "min_inclusive": -1000000, - "max_exclusive": 1.5625, - "when_in_range": { - "type": "minecraft:min", - "argument1": "minecraft:overworld/sloped_cheese", - "argument2": { - "type": "minecraft:mul", - "argument1": 5, - "argument2": "minecraft:overworld/caves/entrances" - } - }, - "when_out_of_range": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:mul", - "argument1": 4, - "argument2": { - "type": "minecraft:square", - "argument": { - "type": "minecraft:noise", - "noise": "minecraft:cave_layer", - "xz_scale": 1, - "y_scale": 8 - } - } - }, - "argument2": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": 0.27, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:cave_cheese", - "xz_scale": 1, - "y_scale": 0.6666666666666666 - } - }, - "min": -1, - "max": 1 - }, - "argument2": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": 1.5, - "argument2": { - "type": "minecraft:mul", - "argument1": -0.64, - "argument2": "minecraft:overworld/sloped_cheese" - } - }, - "min": 0, - "max": 0.5 - } - } - }, - "argument2": "minecraft:overworld/caves/entrances" - }, - "argument2": { - "type": "minecraft:add", - "argument1": "minecraft:overworld/caves/spaghetti_2d", - "argument2": "minecraft:overworld/caves/spaghetti_roughness_function" - } - }, - "argument2": { - "type": "minecraft:range_choice", - "input": "minecraft:overworld/caves/pillars", - "min_inclusive": -1000000, - "max_exclusive": 0.03, - "when_in_range": -1000000, - "when_out_of_range": "minecraft:overworld/caves/pillars" - } - } - } - } - } - } - } - } - } - } - } - } - }, - "argument2": "minecraft:overworld/caves/noodle" - }, - "vein_toggle": { - "type": "minecraft:interpolated", + "type": "minecraft:squeeze", "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "min_inclusive": -60, - "max_exclusive": 51, - "when_in_range": { - "type": "minecraft:noise", - "noise": "minecraft:ore_veininess", - "xz_scale": 1.5, - "y_scale": 1.5 - }, - "when_out_of_range": 0 - } - }, - "vein_ridged": { - "type": "minecraft:add", - "argument1": -0.07999999821186066, - "argument2": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "min_inclusive": -60, - "max_exclusive": 51, - "when_in_range": { - "type": "minecraft:noise", - "noise": "minecraft:ore_vein_a", - "xz_scale": 4, - "y_scale": 4 - }, - "when_out_of_range": 0 - } - } - }, + "type": "minecraft:mul", + "argument1": 0.64, "argument2": { - "type": "minecraft:abs", + "type": "minecraft:interpolated", "argument": { - "type": "minecraft:interpolated", + "type": "minecraft:blend_density", "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "min_inclusive": -60, - "max_exclusive": 51, - "when_in_range": { - "type": "minecraft:noise", - "noise": "minecraft:ore_vein_b", - "xz_scale": 4, - "y_scale": 4 - }, - "when_out_of_range": 0 + "type": "minecraft:slide", + "argument": "minecraft:end/sloped_cheese" } } } } }, - "vein_gap": { - "type": "minecraft:noise", - "noise": "minecraft:ore_gap", - "xz_scale": 1, - "y_scale": 1 - } + "vein_toggle": 0, + "vein_ridged": 0, + "vein_gap": 0 }, - "spawn_target": [ - { - "temperature": [ - -1, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - -1, - 1 - ], - "weirdness": [ - -1, - -0.16 - ], - "depth": 0, - "offset": 0 - }, - { - "temperature": [ - -1, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - -1, - 1 - ], - "weirdness": [ - 0.16, - 1 - ], - "depth": 0, - "offset": 0 - } - ], "surface_rule": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:vertical_gradient", - "random_name": "minecraft:bedrock_floor", - "true_at_and_below": { - "above_bottom": 0 - }, - "false_at_and_above": { - "above_bottom": 5 - } - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:bedrock" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:above_preliminary_surface" - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:wooded_badlands" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 97 - }, - "surface_depth_multiplier": 2, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.909, - "max_threshold": -0.5454 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:coarse_dirt" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.1818, - "max_threshold": 0.1818 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:coarse_dirt" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.5454, - "max_threshold": 0.909 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:coarse_dirt" - } - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:grass_block", - "Properties": { - "snowy": "false" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:dirt" - } - } - ] - } - ] - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:swamp" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 62 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 63 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - } - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface_swamp", - "min_threshold": 0, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:water", - "Properties": { - "level": "0" - } - } - } - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:mangrove_swamp" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 60 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 63 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - } - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface_swamp", - "min_threshold": 0, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:water", - "Properties": { - "level": "0" - } - } - } - } - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:badlands", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 256 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:orange_terracotta" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 74 - }, - "surface_depth_multiplier": 1, - "add_stone_depth": true - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.909, - "max_threshold": -0.5454 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:terracotta" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.1818, - "max_threshold": 0.1818 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:terracotta" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.5454, - "max_threshold": 0.909 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:terracotta" - } - } - }, - { - "type": "minecraft:bandlands" - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": -1, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:red_sandstone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:red_sand" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:hole" - } - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:orange_terracotta" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": -6, - "surface_depth_multiplier": -1, - "add_stone_depth": true - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:white_terracotta" - } - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 63 - }, - "surface_depth_multiplier": -1, - "add_stone_depth": true - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 63 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 74 - }, - "surface_depth_multiplier": 1, - "add_stone_depth": true - } - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:orange_terracotta" - } - } - } - }, - { - "type": "minecraft:bandlands" - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": true, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": -6, - "surface_depth_multiplier": -1, - "add_stone_depth": true - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:white_terracotta" - } - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": -1, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_ocean", - "minecraft:deep_frozen_ocean" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:hole" - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:air" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:temperature" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:ice" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:water", - "Properties": { - "level": "0" - } - } - } - ] - } - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_peaks" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:steep" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:packed_ice" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:packed_ice", - "min_threshold": 0, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:packed_ice" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:ice", - "min_threshold": 0, - "max_threshold": 0.025 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:ice" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:snowy_slopes" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:steep" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": 0.35, - "max_threshold": 0.6 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:powder_snow" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:jagged_peaks" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:steep" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:grove" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": 0.35, - "max_threshold": 0.6 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:powder_snow" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - ] - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:stony_peaks" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:calcite", - "min_threshold": -0.0125, - "max_threshold": 0.0125 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:calcite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:stony_shore" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:gravel", - "min_threshold": -0.05, - "max_threshold": 0.05 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_hills" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:warm_ocean", - "minecraft:beach", - "minecraft:snowy_beach" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sand" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:desert" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sand" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:dripstone_caves" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - } - ] - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_savanna" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.21212121212121213, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.06060606060606061, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:coarse_dirt" - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_gravelly_hills" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.24242424242424243, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:grass_block", - "Properties": { - "snowy": "false" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:dirt" - } - } - ] - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:old_growth_pine_taiga", - "minecraft:old_growth_spruce_taiga" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.21212121212121213, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:coarse_dirt" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.11515151515151514, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:podzol", - "Properties": { - "snowy": "false" - } - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:ice_spikes" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:mangrove_swamp" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:mud" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:mushroom_fields" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:mycelium", - "Properties": { - "snowy": "false" - } - } - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:grass_block", - "Properties": { - "snowy": "false" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:dirt" - } - } - ] - } - ] - } - ] - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": -6, - "surface_depth_multiplier": -1, - "add_stone_depth": true - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_ocean", - "minecraft:deep_frozen_ocean" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:hole" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:water", - "Properties": { - "level": "0" - } - } - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": true, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_peaks" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:steep" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:packed_ice" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:packed_ice", - "min_threshold": -0.5, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:packed_ice" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:ice", - "min_threshold": -0.0625, - "max_threshold": 0.025 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:ice" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:snowy_slopes" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:steep" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": 0.45, - "max_threshold": 0.58 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:powder_snow" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:jagged_peaks" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:grove" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": 0.45, - "max_threshold": 0.58 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:powder_snow" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:dirt" - } - } - ] - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:stony_peaks" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:calcite", - "min_threshold": -0.0125, - "max_threshold": 0.0125 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:calcite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:stony_shore" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:gravel", - "min_threshold": -0.05, - "max_threshold": 0.05 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_hills" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:warm_ocean", - "minecraft:beach", - "minecraft:snowy_beach" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sand" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:desert" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sand" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:dripstone_caves" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - } - ] - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_savanna" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.21212121212121213, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_gravelly_hills" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.24242424242424243, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:dirt" - } - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:mangrove_swamp" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:mud" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:dirt" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:warm_ocean", - "minecraft:beach", - "minecraft:snowy_beach" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": true, - "secondary_depth_range": 6 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:desert" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": true, - "secondary_depth_range": 30 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_peaks", - "minecraft:jagged_peaks" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:warm_ocean", - "minecraft:lukewarm_ocean", - "minecraft:deep_lukewarm_ocean" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sand" - } - } - ] - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - ] - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:vertical_gradient", - "random_name": "minecraft:deepslate", - "true_at_and_below": { - "absolute": 0 - }, - "false_at_and_above": { - "absolute": 8 - } - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:deepslate", - "Properties": { - "axis": "y" - } - } - } - } - ] + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:end_stone" + } } } diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index eca79ae..1928ad7 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,8 +1,8 @@ { "pack": { - "description": { - "text": "${mod_id} resources" - }, - "pack_format": 15 + "description": "Thresholds resources", + "pack_format": 9, + "forge:resource_pack_format": 8, + "forge:data_pack_format": 9 } } \ No newline at end of file From 43575fe2c7b2b5986a0ae746821af1f063177a53 Mon Sep 17 00:00:00 2001 From: zontreck Date: Mon, 22 Jan 2024 00:52:13 -0700 Subject: [PATCH 02/22] Make some QOL fixes to Thresholds --- gradle.properties | 4 +- src/main/java/dev/zontreck/otemod/OTEMod.java | 4 + .../enchantments/FlightEnchantment.java | 1 - .../enchantments/MobEggEnchantment.java | 2 +- .../enchantments/NightVisionEnchantment.java | 1 - .../dev/zontreck/otemod/ore/OreGenerator.java | 12 +- .../forge/tags/blocks/uncrafting_tables.json | 5 + .../blocks/uncrafting_tables/uncrafter.json | 6 + .../bop_rosequartz_chunk_polish.json | 13 + .../bop_rosequartz_shard_polish.json | 13 + .../worldgen/noise_settings/resource.json | 414 +++++++++--------- .../worldgen/noise_settings/threshold.json | 68 ++- 12 files changed, 289 insertions(+), 254 deletions(-) create mode 100644 src/main/resources/data/forge/tags/blocks/uncrafting_tables.json create mode 100644 src/main/resources/data/forge/tags/blocks/uncrafting_tables/uncrafter.json create mode 100644 src/main/resources/data/otemod/recipes/sandpaper/bop_rosequartz_chunk_polish.json create mode 100644 src/main/resources/data/otemod/recipes/sandpaper/bop_rosequartz_shard_polish.json diff --git a/gradle.properties b/gradle.properties index f473a05..bba6397 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -libzontreck=1.10.011624.1712 +libzontreck=1.10.012124.1709 ## Environment 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.011724.0213 +mod_version=1.4.012224.0025 # 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 diff --git a/src/main/java/dev/zontreck/otemod/OTEMod.java b/src/main/java/dev/zontreck/otemod/OTEMod.java index 7da3ba4..fadb608 100644 --- a/src/main/java/dev/zontreck/otemod/OTEMod.java +++ b/src/main/java/dev/zontreck/otemod/OTEMod.java @@ -9,6 +9,8 @@ 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; @@ -105,6 +107,8 @@ public class OTEMod MinecraftForge.EVENT_BUS.register(new VaultWatcher()); MinecraftForge.EVENT_BUS.register(new dev.zontreck.otemod.zschem.EventHandler()); MinecraftForge.EVENT_BUS.register(OreGenerator.class); + MinecraftForge.EVENT_BUS.register(FlightEnchantment.class); + MinecraftForge.EVENT_BUS.register(NightVisionEnchantment.class); ModMenuTypes.CONTAINERS.register(bus); diff --git a/src/main/java/dev/zontreck/otemod/enchantments/FlightEnchantment.java b/src/main/java/dev/zontreck/otemod/enchantments/FlightEnchantment.java index 697c3b5..fd85ebc 100644 --- a/src/main/java/dev/zontreck/otemod/enchantments/FlightEnchantment.java +++ b/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 { diff --git a/src/main/java/dev/zontreck/otemod/enchantments/MobEggEnchantment.java b/src/main/java/dev/zontreck/otemod/enchantments/MobEggEnchantment.java index c5bad29..b4dfa1a 100644 --- a/src/main/java/dev/zontreck/otemod/enchantments/MobEggEnchantment.java +++ b/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()) { diff --git a/src/main/java/dev/zontreck/otemod/enchantments/NightVisionEnchantment.java b/src/main/java/dev/zontreck/otemod/enchantments/NightVisionEnchantment.java index 276ad72..4088260 100644 --- a/src/main/java/dev/zontreck/otemod/enchantments/NightVisionEnchantment.java +++ b/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 { diff --git a/src/main/java/dev/zontreck/otemod/ore/OreGenerator.java b/src/main/java/dev/zontreck/otemod/ore/OreGenerator.java index 3482ed6..d5ae6b3 100644 --- a/src/main/java/dev/zontreck/otemod/ore/OreGenerator.java +++ b/src/main/java/dev/zontreck/otemod/ore/OreGenerator.java @@ -38,22 +38,22 @@ public class OreGenerator { public static final Holder> ETERNIUM_ORE = FeatureUtils.register("eternium_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_ETERNIUM_ORE, 4)); - public static final Holder> VAULTSTEEL_ORE = FeatureUtils.register("vault_steel_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_VAULTSTEEL_ORE, 2)); + public static final Holder> VAULTSTEEL_ORE = FeatureUtils.register("vault_steel_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_VAULTSTEEL_ORE, 3)); public static final Holder> ILUSIUM_ORE = FeatureUtils.register("ilusium_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_ILUSIUM_ORE, 8)); - public static final Holder> VAULTSTEEL_ORE_NETHER = FeatureUtils.register("nether_vault_steel_ore_block", Feature.ORE, new OreConfiguration(NETHER_VAULTSTEEL_ORE, 2)); + public static final Holder> VAULTSTEEL_ORE_NETHER = FeatureUtils.register("nether_vault_steel_ore_block", Feature.ORE, new OreConfiguration(NETHER_VAULTSTEEL_ORE, 3)); public static final Holder ETERNIUM_ORE_PLACED = PlacementUtils.register("eternium_ore_placed", - ETERNIUM_ORE, ModdedOrePlacement.rareOrePlacement(3, // VeinsPerChunk + ETERNIUM_ORE, ModdedOrePlacement.commonOrePlacement(3, // VeinsPerChunk HeightRangePlacement.triangle(VerticalAnchor.absolute(-20), VerticalAnchor.absolute(20)))); public static final Holder 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 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 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 NETHER_VAULTSTEEL_ORE_PLACED = PlacementUtils.register("nether_vaultsteel_ore_placed", VAULTSTEEL_ORE_NETHER, ModdedOrePlacement.rareOrePlacement(5, // Veins per chunk + public static final Holder 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)))); diff --git a/src/main/resources/data/forge/tags/blocks/uncrafting_tables.json b/src/main/resources/data/forge/tags/blocks/uncrafting_tables.json new file mode 100644 index 0000000..97779e9 --- /dev/null +++ b/src/main/resources/data/forge/tags/blocks/uncrafting_tables.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#forge:uncrafting_tables/uncrafter" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/uncrafting_tables/uncrafter.json b/src/main/resources/data/forge/tags/blocks/uncrafting_tables/uncrafter.json new file mode 100644 index 0000000..cf5be9c --- /dev/null +++ b/src/main/resources/data/forge/tags/blocks/uncrafting_tables/uncrafter.json @@ -0,0 +1,6 @@ +{ + "values": [ + "twilightforest:uncrafting_table", + "minecraft:crafting_table" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/otemod/recipes/sandpaper/bop_rosequartz_chunk_polish.json b/src/main/resources/data/otemod/recipes/sandpaper/bop_rosequartz_chunk_polish.json new file mode 100644 index 0000000..95fc727 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/sandpaper/bop_rosequartz_chunk_polish.json @@ -0,0 +1,13 @@ +{ + "type": "create:sandpaper_polishing", + "ingredients": [ + { + "item": "biomesoplenty:rose_quartz_chunk" + } + ], + "results": [ + { + "item": "create:polished_rose_quartz" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/otemod/recipes/sandpaper/bop_rosequartz_shard_polish.json b/src/main/resources/data/otemod/recipes/sandpaper/bop_rosequartz_shard_polish.json new file mode 100644 index 0000000..5df9c24 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/sandpaper/bop_rosequartz_shard_polish.json @@ -0,0 +1,13 @@ +{ + "type": "create:sandpaper_polishing", + "ingredients": [ + { + "item": "biomesoplenty:rose_quartz_shard" + } + ], + "results": [ + { + "item": "create:polished_rose_quartz" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/otemod/worldgen/noise_settings/resource.json b/src/main/resources/data/otemod/worldgen/noise_settings/resource.json index 95c3191..e342552 100644 --- a/src/main/resources/data/otemod/worldgen/noise_settings/resource.json +++ b/src/main/resources/data/otemod/worldgen/noise_settings/resource.json @@ -25,14 +25,14 @@ "y_factor": 160 }, "bottom_slide": { - "target": 0.4, + "target": 0.1171875, "size": 3, "offset": 0 }, "top_slide": { "target": -0.078125, "size": 2, - "offset": 0 + "offset": 8 }, "terrain_shaper": { "offset": { @@ -41,7 +41,7 @@ { "location": -1.1, "derivative": 0, - "value": 0.088 + "value": 0.044 }, { "location": -1.02, @@ -83,7 +83,7 @@ { "location": 1, "derivative": 0.38940096, - "value": 1.3800001 + "value": 0.69000006 } ] } @@ -102,7 +102,7 @@ { "location": 1, "derivative": 0.37788022, - "value": 1.2800002 + "value": 0.6400001 } ] } @@ -131,17 +131,17 @@ { "location": 0.5954547, "derivative": 0, - "value": 5.9604645e-8 + "value": 2.9802322e-8 }, { "location": 0.6054547, "derivative": 0.2534563, - "value": 5.9604645e-8 + "value": 2.9802322e-8 }, { "location": 1, "derivative": 0.2534563, - "value": 0.20000005 + "value": 0.100000024 } ] } @@ -160,22 +160,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.1 + "value": 0.05 }, { "location": 0, "derivative": 0, - "value": 0.1 + "value": 0.05 }, { "location": 0.4, "derivative": 0, - "value": 0.1 + "value": 0.05 }, { "location": 1, "derivative": 0.007000001, - "value": 0.120000005 + "value": 0.060000002 } ] } @@ -204,12 +204,12 @@ { "location": 0.4, "derivative": 0.1, - "value": 0.1 + "value": 0.05 }, { "location": 1, "derivative": 0.007000001, - "value": 0.120000005 + "value": 0.060000002 } ] } @@ -305,7 +305,7 @@ { "location": 1, "derivative": 0.38940096, - "value": 1.3800001 + "value": 0.69000006 } ] } @@ -324,7 +324,7 @@ { "location": 1, "derivative": 0.37788022, - "value": 1.2800002 + "value": 0.6400001 } ] } @@ -353,17 +353,17 @@ { "location": 0.5954547, "derivative": 0, - "value": 5.9604645e-8 + "value": 2.9802322e-8 }, { "location": 0.6054547, "derivative": 0.2534563, - "value": 5.9604645e-8 + "value": 2.9802322e-8 }, { "location": 1, "derivative": 0.2534563, - "value": 0.20000005 + "value": 0.100000024 } ] } @@ -382,22 +382,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.1 + "value": 0.05 }, { "location": 0, "derivative": 0, - "value": 0.1 + "value": 0.05 }, { "location": 0.4, "derivative": 0, - "value": 0.1 + "value": 0.05 }, { "location": 1, "derivative": 0.007000001, - "value": 0.120000005 + "value": 0.060000002 } ] } @@ -426,12 +426,12 @@ { "location": 0.4, "derivative": 0.1, - "value": 0.1 + "value": 0.05 }, { "location": 1, "derivative": 0.007000001, - "value": 0.120000005 + "value": 0.060000002 } ] } @@ -527,7 +527,7 @@ { "location": 1, "derivative": 0.38940096, - "value": 1.3800001 + "value": 0.69000006 } ] } @@ -546,7 +546,7 @@ { "location": 1, "derivative": 0.37788022, - "value": 1.2800002 + "value": 0.6400001 } ] } @@ -575,17 +575,17 @@ { "location": 0.5954547, "derivative": 0, - "value": 5.9604645e-8 + "value": 2.9802322e-8 }, { "location": 0.6054547, "derivative": 0.2534563, - "value": 5.9604645e-8 + "value": 2.9802322e-8 }, { "location": 1, "derivative": 0.2534563, - "value": 0.20000005 + "value": 0.100000024 } ] } @@ -604,22 +604,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.1 + "value": 0.05 }, { "location": 0, "derivative": 0, - "value": 0.1 + "value": 0.05 }, { "location": 0.4, "derivative": 0, - "value": 0.1 + "value": 0.05 }, { "location": 1, "derivative": 0.007000001, - "value": 0.120000005 + "value": 0.060000002 } ] } @@ -638,22 +638,22 @@ { "location": -0.4, "derivative": 0.01, - "value": 0.002 + "value": 0.001 }, { "location": 0, "derivative": 0.01, - "value": 0.006 + "value": 0.003 }, { "location": 0.4, "derivative": 0.094000004, - "value": 0.1 + "value": 0.05 }, { "location": 1, "derivative": 0.007000001, - "value": 0.120000005 + "value": 0.060000002 } ] } @@ -672,22 +672,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0.4, "derivative": 0.04, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -716,12 +716,12 @@ { "location": 0.4, "derivative": 0.12, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -744,17 +744,17 @@ { "location": -1, "derivative": 0, - "value": 0.40470043 + "value": 0.20235021 }, { "location": 0, "derivative": 0.5138249, - "value": 1.4323502 + "value": 0.7161751 }, { "location": 1, "derivative": 0.5138249, - "value": 2.46 + "value": 1.23 } ] } @@ -768,17 +768,17 @@ { "location": -1, "derivative": 0, - "value": 0.4 + "value": 0.2 }, { "location": 0, "derivative": 0.43317974, - "value": 0.8936405 + "value": 0.44682026 }, { "location": 1, "derivative": 0.43317974, - "value": 1.76 + "value": 0.88 } ] } @@ -792,17 +792,17 @@ { "location": -1, "derivative": 0, - "value": 0.4 + "value": 0.2 }, { "location": 0, "derivative": 0.3917051, - "value": 0.6165899 + "value": 0.30829495 }, { "location": 1, "derivative": 0.3917051, - "value": 1.4000001 + "value": 0.70000005 } ] } @@ -821,22 +821,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.7 + "value": 0.35 }, { "location": 0, "derivative": 0, - "value": 0.7 + "value": 0.35 }, { "location": 0.4, "derivative": 0, - "value": 0.7 + "value": 0.35 }, { "location": 1, "derivative": 0.049000014, - "value": 0.84000003 + "value": 0.42000002 } ] } @@ -855,22 +855,22 @@ { "location": -0.4, "derivative": 0.07, - "value": 0.0139999995 + "value": 0.0069999998 }, { "location": 0, "derivative": 0.07, - "value": 0.042 + "value": 0.021 }, { "location": 0.4, "derivative": 0.658, - "value": 0.7 + "value": 0.35 }, { "location": 1, "derivative": 0.049000014, - "value": 0.84000003 + "value": 0.42000002 } ] } @@ -889,22 +889,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0.4, "derivative": 0.04, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -923,22 +923,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0.4, "derivative": 0.04, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -968,22 +968,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0.4, "derivative": 0.04, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -991,7 +991,7 @@ { "location": 0, "derivative": 0, - "value": 0.34 + "value": 0.17 } ] } @@ -1021,22 +1021,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0.4, "derivative": 0.04, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -1044,7 +1044,7 @@ { "location": 0, "derivative": 0, - "value": 0.34 + "value": 0.17 } ] } @@ -1063,22 +1063,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0.4, "derivative": 0.04, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -1107,12 +1107,12 @@ { "location": 0.4, "derivative": 0.12, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -1135,17 +1135,17 @@ { "location": -1, "derivative": 0, - "value": 0.6958525 + "value": 0.34792626 }, { "location": 0, "derivative": 0.5760369, - "value": 1.8479263 + "value": 0.9239631 }, { "location": 1, "derivative": 0.5760369, - "value": 3 + "value": 1.5 } ] } @@ -1159,17 +1159,17 @@ { "location": -1, "derivative": 0, - "value": 0.4 + "value": 0.2 }, { "location": 0, "derivative": 0.4608295, - "value": 1.078341 + "value": 0.5391705 }, { "location": 1, "derivative": 0.4608295, - "value": 2 + "value": 1 } ] } @@ -1183,17 +1183,17 @@ { "location": -1, "derivative": 0, - "value": 0.4 + "value": 0.2 }, { "location": 0, "derivative": 0.4608295, - "value": 1.078341 + "value": 0.5391705 }, { "location": 1, "derivative": 0.4608295, - "value": 2 + "value": 1 } ] } @@ -1212,22 +1212,22 @@ { "location": -0.4, "derivative": 0, - "value": 1 + "value": 0.5 }, { "location": 0, "derivative": 0, - "value": 1 + "value": 0.5 }, { "location": 0.4, "derivative": 0, - "value": 1 + "value": 0.5 }, { "location": 1, "derivative": 0.070000015, - "value": 1.2 + "value": 0.6 } ] } @@ -1246,22 +1246,22 @@ { "location": -0.4, "derivative": 0.099999994, - "value": 0.02 + "value": 0.01 }, { "location": 0, "derivative": 0.099999994, - "value": 0.06 + "value": 0.03 }, { "location": 0.4, "derivative": 0.94, - "value": 1 + "value": 0.5 }, { "location": 1, "derivative": 0.070000015, - "value": 1.2 + "value": 0.6 } ] } @@ -1280,22 +1280,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0.4, "derivative": 0.04, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -1314,22 +1314,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0.4, "derivative": 0.04, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -1359,22 +1359,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0.4, "derivative": 0.04, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -1382,7 +1382,7 @@ { "location": 0, "derivative": 0, - "value": 0.34 + "value": 0.17 } ] } @@ -1412,22 +1412,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0.4, "derivative": 0.04, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -1435,7 +1435,7 @@ { "location": 0, "derivative": 0, - "value": 0.34 + "value": 0.17 } ] } @@ -1454,22 +1454,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0.4, "derivative": 0.04, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -1488,22 +1488,22 @@ { "location": -0.4, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0, "derivative": 0, - "value": 0.02 + "value": 0.01 }, { "location": 0.4, "derivative": 0.04, - "value": 0.06 + "value": 0.03 }, { "location": 1, "derivative": 0.049, - "value": 0.2 + "value": 0.1 } ] } @@ -1735,12 +1735,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6530563 + "value": 5.47 } ] } @@ -1754,12 +1754,12 @@ { "location": -0.05, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.05, "derivative": 0, - "value": 0.4351369 + "value": 2.67 } ] } @@ -1773,12 +1773,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6530563 + "value": 5.47 } ] } @@ -1792,12 +1792,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6530563 + "value": 5.47 } ] } @@ -1811,12 +1811,12 @@ { "location": -0.05, "derivative": 0, - "value": 0.4351369 + "value": 2.67 }, { "location": 0.05, "derivative": 0, - "value": 0.6969027 + "value": 6.3 } ] } @@ -1830,12 +1830,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6530563 + "value": 5.47 } ] } @@ -1843,7 +1843,7 @@ { "location": 0.35, "derivative": 0, - "value": 0.6530563 + "value": 5.47 }, { "location": 0.45, @@ -1854,7 +1854,7 @@ { "location": -0.9, "derivative": 0, - "value": 0.6530563 + "value": 5.47 }, { "location": -0.69, @@ -1865,12 +1865,12 @@ { "location": 0, "derivative": 0, - "value": 0.6530563 + "value": 5.47 }, { "location": 0.1, "derivative": 0, - "value": 0.13888884 + "value": 0.625 } ] } @@ -1887,7 +1887,7 @@ { "location": -0.9, "derivative": 0, - "value": 0.6530563 + "value": 5.47 }, { "location": -0.69, @@ -1898,12 +1898,12 @@ { "location": 0, "derivative": 0, - "value": 0.6530563 + "value": 5.47 }, { "location": 0.1, "derivative": 0, - "value": 0.13888884 + "value": 0.625 } ] } @@ -1914,7 +1914,7 @@ { "location": 0.62, "derivative": 0, - "value": 0.6530563 + "value": 5.47 } ] } @@ -1934,12 +1934,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6299603 + "value": 5.08 } ] } @@ -1953,12 +1953,12 @@ { "location": -0.05, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.05, "derivative": 0, - "value": 0.4351369 + "value": 2.67 } ] } @@ -1972,12 +1972,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6299603 + "value": 5.08 } ] } @@ -1991,12 +1991,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6299603 + "value": 5.08 } ] } @@ -2010,12 +2010,12 @@ { "location": -0.05, "derivative": 0, - "value": 0.4351369 + "value": 2.67 }, { "location": 0.05, "derivative": 0, - "value": 0.6969027 + "value": 6.3 } ] } @@ -2029,12 +2029,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6299603 + "value": 5.08 } ] } @@ -2042,7 +2042,7 @@ { "location": 0.35, "derivative": 0, - "value": 0.6299603 + "value": 5.08 }, { "location": 0.45, @@ -2053,7 +2053,7 @@ { "location": -0.9, "derivative": 0, - "value": 0.6299603 + "value": 5.08 }, { "location": -0.69, @@ -2064,12 +2064,12 @@ { "location": 0, "derivative": 0, - "value": 0.6299603 + "value": 5.08 }, { "location": 0.1, "derivative": 0, - "value": 0.13888884 + "value": 0.625 } ] } @@ -2086,7 +2086,7 @@ { "location": -0.9, "derivative": 0, - "value": 0.6299603 + "value": 5.08 }, { "location": -0.69, @@ -2097,12 +2097,12 @@ { "location": 0, "derivative": 0, - "value": 0.6299603 + "value": 5.08 }, { "location": 0.1, "derivative": 0, - "value": 0.13888884 + "value": 0.625 } ] } @@ -2113,7 +2113,7 @@ { "location": 0.62, "derivative": 0, - "value": 0.6299603 + "value": 5.08 } ] } @@ -2133,12 +2133,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6050052 + "value": 4.69 } ] } @@ -2152,12 +2152,12 @@ { "location": -0.05, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.05, "derivative": 0, - "value": 0.4351369 + "value": 2.67 } ] } @@ -2171,12 +2171,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6050052 + "value": 4.69 } ] } @@ -2190,12 +2190,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6050052 + "value": 4.69 } ] } @@ -2209,12 +2209,12 @@ { "location": -0.05, "derivative": 0, - "value": 0.4351369 + "value": 2.67 }, { "location": 0.05, "derivative": 0, - "value": 0.6969027 + "value": 6.3 } ] } @@ -2228,12 +2228,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6050052 + "value": 4.69 } ] } @@ -2253,12 +2253,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6050052 + "value": 4.69 } ] } @@ -2266,7 +2266,7 @@ { "location": 0.7, "derivative": 0, - "value": 0.2972561 + "value": 1.56 } ] } @@ -2286,12 +2286,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6050052 + "value": 4.69 } ] } @@ -2299,7 +2299,7 @@ { "location": 0.7, "derivative": 0, - "value": 0.2972561 + "value": 1.56 } ] } @@ -2319,12 +2319,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6050052 + "value": 4.69 } ] } @@ -2332,7 +2332,7 @@ { "location": -0.15, "derivative": 0, - "value": 0.2688383 + "value": 1.37 } ] } @@ -2352,12 +2352,12 @@ { "location": -0.2, "derivative": 0, - "value": 0.6969027 + "value": 6.3 }, { "location": 0.2, "derivative": 0, - "value": 0.6050052 + "value": 4.69 } ] } @@ -2365,7 +2365,7 @@ { "location": -0.15, "derivative": 0, - "value": 0.2688383 + "value": 1.37 } ] } @@ -2373,7 +2373,7 @@ { "location": 0.58, "derivative": 0, - "value": 0.6050052 + "value": 4.69 } ] } @@ -2419,12 +2419,12 @@ { "location": -0.01, "derivative": 0, - "value": 1.26 + "value": 0.63 }, { "location": 0.01, "derivative": 0, - "value": 0.6 + "value": 0.3 } ] } @@ -2457,12 +2457,12 @@ { "location": -0.01, "derivative": 0, - "value": 0.63 + "value": 0.315 }, { "location": 0.01, "derivative": 0, - "value": 0.3 + "value": 0.15 } ] } @@ -2495,12 +2495,12 @@ { "location": -0.01, "derivative": 0, - "value": 0.63 + "value": 0.315 }, { "location": 0.01, "derivative": 0, - "value": 0.3 + "value": 0.15 } ] } @@ -2542,12 +2542,12 @@ { "location": -0.01, "derivative": 0, - "value": 1.26 + "value": 0.63 }, { "location": 0.01, "derivative": 0, - "value": 0.6 + "value": 0.3 } ] } @@ -2561,12 +2561,12 @@ { "location": -0.01, "derivative": 0, - "value": 1.26 + "value": 0.63 }, { "location": 0.01, "derivative": 0, - "value": 0.6 + "value": 0.3 } ] } @@ -2599,12 +2599,12 @@ { "location": -0.01, "derivative": 0, - "value": 1.26 + "value": 0.63 }, { "location": 0.01, "derivative": 0, - "value": 0.6 + "value": 0.3 } ] } @@ -2637,12 +2637,12 @@ { "location": -0.01, "derivative": 0, - "value": 1.26 + "value": 0.63 }, { "location": 0.01, "derivative": 0, - "value": 0.6 + "value": 0.3 } ] } diff --git a/src/main/resources/data/otemod/worldgen/noise_settings/threshold.json b/src/main/resources/data/otemod/worldgen/noise_settings/threshold.json index 460a698..5ca4172 100644 --- a/src/main/resources/data/otemod/worldgen/noise_settings/threshold.json +++ b/src/main/resources/data/otemod/worldgen/noise_settings/threshold.json @@ -1,5 +1,5 @@ { - "sea_level": 0, + "sea_level": -64, "disable_mob_generation": true, "aquifers_enabled": false, "ore_veins_enabled": false, @@ -8,11 +8,14 @@ "Name": "minecraft:stone" }, "default_fluid": { - "Name": "minecraft:water" + "Name": "minecraft:water", + "Properties": { + "level": "0" + } }, "noise": { - "min_y": -64, - "height": 384, + "min_y": 0, + "height": 256, "size_horizontal": 2, "size_vertical": 1, "sampling": { @@ -33,7 +36,7 @@ }, "terrain_shaper": { "offset": 0, - "factor": 1, + "factor": 0, "jaggedness": 0 } }, @@ -42,43 +45,36 @@ "fluid_level_floodedness": 0, "fluid_level_spread": 0, "lava": 0, - "temperature": 0, - "vegetation": 0, - "continents": 0, - "erosion": 0, - "depth": 0, - "ridges": 0, - "initial_density_without_jaggedness": { - "type": "minecraft:cache_2d", - "argument": { - "type": "minecraft:end_islands" - } + "temperature": { + "type": "minecraft:shifted_noise", + "noise": "minecraft:temperature", + "xz_scale": 0.25, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" }, - "final_density": { - "type": "minecraft:squeeze", - "argument": { - "type": "minecraft:mul", - "argument1": 0.64, - "argument2": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:blend_density", - "argument": { - "type": "minecraft:slide", - "argument": "minecraft:end/sloped_cheese" - } - } - } - } + "vegetation": { + "type": "minecraft:shifted_noise", + "noise": "minecraft:vegetation", + "xz_scale": 0.25, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" }, + "continents": "minecraft:overworld/continents", + "erosion": "minecraft:overworld/erosion", + "depth": "minecraft:overworld/depth", + "ridges": "minecraft:overworld/ridges", + "initial_density_without_jaggedness": 0, + "final_density": 0, "vein_toggle": 0, "vein_ridged": 0, "vein_gap": 0 }, "surface_rule": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:end_stone" - } + "type": "minecraft:sequence", + "sequence": [] } } From 2e4fac3de46fe6d786f8552460eba686436b8f26 Mon Sep 17 00:00:00 2001 From: zontreck Date: Mon, 22 Jan 2024 22:31:06 -0700 Subject: [PATCH 03/22] Add in some new blocks, and try to fix flight --- gradle.properties | 2 +- src/main/java/dev/zontreck/otemod/OTEMod.java | 4 +- .../dev/zontreck/otemod/blocks/ModBlocks.java | 75 ++++++++++++------ .../otemod/blocks/RotatableBlock.java | 26 ++++++ .../otemod/chat/ChatServerOverride.java | 20 +++-- .../implementation/CreativeModeTabs.java | 1 + .../dev/zontreck/otemod/items/ModItems.java | 60 +++++++------- .../assets/otemod/blockstates/blood_red.json | 7 ++ .../assets/otemod/blockstates/red_tile.json | 7 ++ .../otemod/blockstates/red_tile_to_wall.json | 19 +++++ .../blockstates/red_wall_variant_1.json | 19 +++++ .../blockstates/red_wall_variant_2.json | 19 +++++ .../blockstates/{black.json => void.json} | 2 +- .../assets/otemod/blockstates/whiteout.json | 7 ++ .../resources/assets/otemod/lang/en_us.json | 8 +- .../assets/otemod/models/block/blood_red.json | 6 ++ .../assets/otemod/models/block/red_tile.json | 7 ++ .../otemod/models/block/red_tile_to_wall.json | 7 ++ .../models/block/red_wall_variant_1.json | 7 ++ .../models/block/red_wall_variant_2.json | 7 ++ .../assets/otemod/models/block/rotatable.json | 12 +++ .../models/block/{black.json => void.json} | 2 +- .../assets/otemod/models/block/whiteout.json | 6 ++ .../assets/otemod/models/item/black.json | 3 - .../assets/otemod/models/item/blood_red.json | 3 + .../assets/otemod/models/item/red_tile.json | 3 + .../otemod/models/item/red_tile_to_wall.json | 3 + .../models/item/red_wall_variant_1.json | 3 + .../models/item/red_wall_variant_2.json | 3 + .../assets/otemod/models/item/void.json | 3 + .../assets/otemod/models/item/whiteout.json | 3 + .../textures/block/thresholds/blood_red.png | Bin 0 -> 99 bytes .../hallway/floor/tiles/red_tile.png | Bin 0 -> 189 bytes .../hallway/floor/tiles/red_tile_w_circle.png | Bin 0 -> 243 bytes .../wall/floor_wall_transition.aseprite | Bin 0 -> 627 bytes .../hallway/wall/red_floor_to_wall.png | Bin 0 -> 197 bytes .../thresholds/hallway/wall/red_wall.png | Bin 0 -> 123 bytes .../thresholds/hallway/wall/red_wall2.png | Bin 0 -> 158 bytes .../otemod/textures/block/thresholds/void.png | Bin 0 -> 99 bytes .../textures/block/thresholds/white.png | Bin 0 -> 99 bytes .../otemod/loot_tables/blocks/blood_red.json | 14 ++++ .../otemod/loot_tables/blocks/red_tile.json | 14 ++++ .../loot_tables/blocks/red_tile_to_wall.json | 14 ++++ .../blocks/red_wall_variant_1.json | 14 ++++ .../blocks/red_wall_variant_2.json | 14 ++++ .../data/otemod/loot_tables/blocks/void.json | 14 ++++ .../otemod/loot_tables/blocks/whiteout.json | 14 ++++ .../thresholds/decorative/blood_red.json | 20 +++++ .../thresholds/decorative/red_tile.json | 20 +++++ .../decorative/red_tile_to_wall.json | 20 +++++ .../decorative/red_wall_variant_1.json | 20 +++++ .../decorative/red_wall_variant_2.json | 20 +++++ .../recipes/thresholds/decorative/void.json | 20 +++++ .../thresholds/decorative/whiteout.json | 20 +++++ 54 files changed, 523 insertions(+), 69 deletions(-) create mode 100644 src/main/java/dev/zontreck/otemod/blocks/RotatableBlock.java create mode 100644 src/main/resources/assets/otemod/blockstates/blood_red.json create mode 100644 src/main/resources/assets/otemod/blockstates/red_tile.json create mode 100644 src/main/resources/assets/otemod/blockstates/red_tile_to_wall.json create mode 100644 src/main/resources/assets/otemod/blockstates/red_wall_variant_1.json create mode 100644 src/main/resources/assets/otemod/blockstates/red_wall_variant_2.json rename src/main/resources/assets/otemod/blockstates/{black.json => void.json} (52%) create mode 100644 src/main/resources/assets/otemod/blockstates/whiteout.json create mode 100644 src/main/resources/assets/otemod/models/block/blood_red.json create mode 100644 src/main/resources/assets/otemod/models/block/red_tile.json create mode 100644 src/main/resources/assets/otemod/models/block/red_tile_to_wall.json create mode 100644 src/main/resources/assets/otemod/models/block/red_wall_variant_1.json create mode 100644 src/main/resources/assets/otemod/models/block/red_wall_variant_2.json create mode 100644 src/main/resources/assets/otemod/models/block/rotatable.json rename src/main/resources/assets/otemod/models/block/{black.json => void.json} (60%) create mode 100644 src/main/resources/assets/otemod/models/block/whiteout.json delete mode 100644 src/main/resources/assets/otemod/models/item/black.json create mode 100644 src/main/resources/assets/otemod/models/item/blood_red.json create mode 100644 src/main/resources/assets/otemod/models/item/red_tile.json create mode 100644 src/main/resources/assets/otemod/models/item/red_tile_to_wall.json create mode 100644 src/main/resources/assets/otemod/models/item/red_wall_variant_1.json create mode 100644 src/main/resources/assets/otemod/models/item/red_wall_variant_2.json create mode 100644 src/main/resources/assets/otemod/models/item/void.json create mode 100644 src/main/resources/assets/otemod/models/item/whiteout.json create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/blood_red.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/red_tile.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/red_tile_w_circle.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/floor_wall_transition.aseprite create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/red_floor_to_wall.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/red_wall.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/red_wall2.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/void.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/white.png create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/blood_red.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/red_tile.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/red_tile_to_wall.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/red_wall_variant_1.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/red_wall_variant_2.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/void.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/whiteout.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/blood_red.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/red_tile.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/red_tile_to_wall.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/red_wall_variant_1.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/red_wall_variant_2.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/void.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/whiteout.json diff --git a/gradle.properties b/gradle.properties index bba6397..cd05b3f 100644 --- a/gradle.properties +++ b/gradle.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.012224.0025 +mod_version=1.4.012224.2229 # 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 diff --git a/src/main/java/dev/zontreck/otemod/OTEMod.java b/src/main/java/dev/zontreck/otemod/OTEMod.java index fadb608..abdf4b9 100644 --- a/src/main/java/dev/zontreck/otemod/OTEMod.java +++ b/src/main/java/dev/zontreck/otemod/OTEMod.java @@ -140,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(); } diff --git a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java index de8b23a..cc32385 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java +++ b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java @@ -4,6 +4,7 @@ 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; @@ -28,80 +29,80 @@ public class ModBlocks { public static final RegistryObject 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 ETERNIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_ore_block", () -> new BlockItem(ETERNIUM_ORE_BLOCK.get(), new Item.Properties()))); + public static final RegistryObject 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 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 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 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 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 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 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 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 ETERNIUM_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_block", ()->new FoiledBlockItem(ETERNIUM_BLOCK.get(), new Item.Properties()))); + public static final RegistryObject 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 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 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 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 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 AURORA_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("aurora_block", () -> new BlockItem(AURORA_BLOCK.get(), new Item.Properties()))); + public static final RegistryObject 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 AURORA_DOOR = BLOCKS.register("aurora_door", AuroraDoorBlock::new); - public static final RegistryObject AURORA_DOOR_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("aurora_door", () -> new BlockItem(AURORA_DOOR.get(), new Item.Properties()))); + public static final RegistryObject 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 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 CLEAR_GLASS_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("clear_glass_block", () -> new BlockItem(CLEAR_GLASS_BLOCK.get(), new Item.Properties()))); + public static final RegistryObject 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 ITEM_SCRUBBER = BLOCKS.register("item_scrubber", ()->new ItemScrubberBlock(BlockBehaviour.Properties.copy(ModBlocks.AURORA_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never))); - public static final RegistryObject ITEM_SCRUBBER_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("item_scrubber", ()->new BlockItem(ITEM_SCRUBBER.get(), new Item.Properties()))); + public static final RegistryObject 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 MAGICAL_SCRUBBER = BLOCKS.register("magical_scrubber", ()->new MagicalScrubberBlock(BlockBehaviour.Properties.copy(ModBlocks.AURORA_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never))); - public static final RegistryObject MAGICAL_SCRUBBER_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("magical_scrubber", ()->new BlockItem(MAGICAL_SCRUBBER.get(), new Item.Properties()))); + public static final RegistryObject 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 STABLE_SINGULARITY = BLOCKS.register("stable_singularity", ()->new Block(BlockBehaviour.Properties.copy(ModBlocks.AURORA_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never))); - public static final RegistryObject STABLE_SINGULARITY_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("stable_singularity", ()->new BlockItem(STABLE_SINGULARITY.get(), new Item.Properties()))); + public static final RegistryObject 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 ILUSIUM_ORE_BLOCK = BLOCKS.register("ilusium_ore_block", () -> new Block(BlockBehaviour.Properties.copy(ModBlocks.ETERNIUM_ORE_BLOCK.get()).noOcclusion())); - public static final RegistryObject ILUSIUM_ORE_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_ore_block", () -> new BlockItem(ILUSIUM_ORE_BLOCK.get(), new Item.Properties()))); + public static final RegistryObject 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 DEEPSLATE_ILUSIUM_ORE_BLOCK = BLOCKS.register("deepslate_ilusium_ore_block", () -> new Block(BlockBehaviour.Properties.copy(ILUSIUM_ORE_BLOCK.get()).noOcclusion())); - public static final RegistryObject 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 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 ILUSIUM_BLOCK = BLOCKS.register("ilusium_block", () -> new Block(BlockBehaviour.Properties.copy(ModBlocks.ETERNIUM_BLOCK.get()).noOcclusion().strength(5, 20).requiresCorrectToolForDrops())); - public static final RegistryObject ILUSIUM_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_block", () -> new BlockItem(ILUSIUM_BLOCK.get(), new Item.Properties()))); + public static final RegistryObject 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 COMPRESSION_CHAMBER_BLOCK = BLOCKS.register("compression_chamber", ()->new CompressionChamberBlock(BlockBehaviour.Properties.copy(ModBlocks.ILUSIUM_BLOCK.get()).noOcclusion().isViewBlocking(ModBlocks::never))); - public static final RegistryObject COMPRESSION_CHAMBER_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("compression_chamber", ()->new BlockItem(COMPRESSION_CHAMBER_BLOCK.get(), new Item.Properties()))); + public static final RegistryObject 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 COMPRESSED_OBSIDIAN_BLOCK = BLOCKS.register("compressed_obsidian_block", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN))); - public static final RegistryObject COMPRESSED_OBSIDIAN_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("compressed_obsidian_block", ()->new BlockItem(COMPRESSED_OBSIDIAN_BLOCK.get(), new Item.Properties()))); + public static final RegistryObject 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 LAYERED_COMPRESSED_OBSIDIAN_BLOCK = BLOCKS.register("layered_compressed_obsidian_block", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN))); - public static final RegistryObject 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 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)))); @@ -113,23 +114,47 @@ public class ModBlocks { public static final RegistryObject LIMINAL_TILES = BLOCKS.register("liminal_tiles", ()-> new Block(BlockBehaviour.Properties.copy(Blocks.BEDROCK))); - public static final RegistryObject LIMINAL_TILES_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("liminal_tiles", ()->new BlockItem(LIMINAL_TILES.get(), new Item.Properties()))); - - public static final RegistryObject BLACK = BLOCKS.register("black", ()->new Block(BlockBehaviour.Properties.copy(Blocks.BEDROCK))); - - public static final RegistryObject BLACK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("black", ()->new FoiledBlockItem(BLACK.get(), new Item.Properties().stacksTo(128)))); + public static final RegistryObject 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 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 LIMINAL_TILE_STAIRS_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("liminal_tile_stairs", ()->new BlockItem(LIMINAL_TILE_STAIRS.get(), new Item.Properties()))); + public static final RegistryObject 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 LIMINAL_TILE_SLAB = BLOCKS.register("liminal_tile_slab", ()->new SlabBlock(BlockBehaviour.Properties.copy(Blocks.BEDROCK))); - public static final RegistryObject LIMINAL_TILE_SLAB_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("liminal_tile_slab", ()->new BlockItem(LIMINAL_TILE_SLAB.get(), new Item.Properties()))); + public static final RegistryObject 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 LIMINAL_WINDOW = BLOCKS.register("liminal_window", () -> new ParallaxWindow(15)); - public static final RegistryObject LIMINAL_WINDOW_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("liminal_window", () -> new BlockItem(LIMINAL_WINDOW.get(), new Item.Properties()))); + public static final RegistryObject 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 VOID_BLOCK = BLOCKS.register("void", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN))); + + public static final RegistryObject VOID_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("void", ()-> new BlockItem(VOID_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); + + public static final RegistryObject WHITE = BLOCKS.register("whiteout", ()->new Block(BlockBehaviour.Properties.copy(Blocks.WHITE_WOOL))); + + public static final RegistryObject WHITE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("whiteout", ()->new BlockItem(WHITE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); + + public static final RegistryObject T_BLOOD_RED = BLOCKS.register("blood_red", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN))); + + public static final RegistryObject 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 T_RED_TILE = BLOCKS.register("red_tile", ()->new Block(BlockBehaviour.Properties.copy(T_BLOOD_RED.get()))); + + public static final RegistryObject 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 T_RED_TILE_WALL = BLOCKS.register("red_tile_to_wall", ()->new RotatableBlock(BlockBehaviour.Properties.copy(T_RED_TILE.get()))); + + public static final RegistryObject 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 T_RED_WALL = BLOCKS.register("red_wall_variant_1", ()->new RotatableBlock(BlockBehaviour.Properties.copy(T_RED_TILE.get()))); + + public static final RegistryObject 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 T_RED_WALL2 = BLOCKS.register("red_wall_variant_2", ()->new RotatableBlock(BlockBehaviour.Properties.copy(T_RED_TILE.get()))); + + public static final RegistryObject 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)))); /* diff --git a/src/main/java/dev/zontreck/otemod/blocks/RotatableBlock.java b/src/main/java/dev/zontreck/otemod/blocks/RotatableBlock.java new file mode 100644 index 0000000..c832526 --- /dev/null +++ b/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 pBuilder) { + super.createBlockStateDefinition(pBuilder); + pBuilder.add(FACING); + } + + + @Override + public BlockState getStateForPlacement(BlockPlaceContext pContext) { + return defaultBlockState().setValue(FACING, pContext.getHorizontalDirection()); + } +} diff --git a/src/main/java/dev/zontreck/otemod/chat/ChatServerOverride.java b/src/main/java/dev/zontreck/otemod/chat/ChatServerOverride.java index bfbf27b..3e67522 100644 --- a/src/main/java/dev/zontreck/otemod/chat/ChatServerOverride.java +++ b/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); diff --git a/src/main/java/dev/zontreck/otemod/implementation/CreativeModeTabs.java b/src/main/java/dev/zontreck/otemod/implementation/CreativeModeTabs.java index 725ab76..d790314 100644 --- a/src/main/java/dev/zontreck/otemod/implementation/CreativeModeTabs.java +++ b/src/main/java/dev/zontreck/otemod/implementation/CreativeModeTabs.java @@ -1,6 +1,7 @@ package dev.zontreck.otemod.implementation; import dev.zontreck.otemod.OTEMod; +import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.RegistryObject; diff --git a/src/main/java/dev/zontreck/otemod/items/ModItems.java b/src/main/java/dev/zontreck/otemod/items/ModItems.java index a968fc5..4fd34b0 100644 --- a/src/main/java/dev/zontreck/otemod/items/ModItems.java +++ b/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 ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, OTEMod.MOD_ID); - public static final RegistryObject ETERNIUM_FRAGMENT = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_fragment", () -> new Item(new Item.Properties()))); + public static final RegistryObject ETERNIUM_FRAGMENT = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_fragment", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject IHAN_CRYSTAL = CreativeModeTabs.addToOTEModTab(ITEMS.register("ihan_crystal", () -> new Item(new Item.Properties()))); + public static final RegistryObject IHAN_CRYSTAL = CreativeModeTabs.addToOTEModTab(ITEMS.register("ihan_crystal", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject AURORA_COMPOUND = CreativeModeTabs.addToOTEModTab(ITEMS.register("aurora_compound", () -> new Item(new Item.Properties()))); + public static final RegistryObject AURORA_COMPOUND = CreativeModeTabs.addToOTEModTab(ITEMS.register("aurora_compound", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject ETERNIUM_RAW_ORE = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_ore", () -> new Item(new Item.Properties()))); + public static final RegistryObject ETERNIUM_RAW_ORE = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_ore", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject ETERNIUM_INGOT = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_ingot", ()-> new SimpleFoiledItem(new Item.Properties()))); + public static final RegistryObject ETERNIUM_INGOT = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_ingot", ()-> new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject MELTED_ENDER_PEARL = CreativeModeTabs.addToOTEModTab(ITEMS.register("melted_ender_pearl", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64)))); - public static final RegistryObject SINGULARITY = CreativeModeTabs.addToOTEModTab(ITEMS.register("singularity", () -> new UnstableSingularity(new Item.Properties().stacksTo(1)))); + public static final RegistryObject 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 SINGULARITY = CreativeModeTabs.addToOTEModTab(ITEMS.register("singularity", () -> new UnstableSingularity(new Item.Properties().stacksTo(1).tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject COMPRESSED_OBSIDIAN_SHEET = CreativeModeTabs.addToOTEModTab(ITEMS.register("compressed_obsidian_sheet", ()->new Item(new Item.Properties()))); + public static final RegistryObject COMPRESSED_OBSIDIAN_SHEET = CreativeModeTabs.addToOTEModTab(ITEMS.register("compressed_obsidian_sheet", ()->new Item(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject LAYERED_COMPRESSED_OBSIDIAN_SHEET = CreativeModeTabs.addToOTEModTab(ITEMS.register("layered_compressed_obsidian_sheet", ()->new SimpleFoiledItem(new Item.Properties()))); - public static final RegistryObject ENCASED_SINGULARITY = CreativeModeTabs.addToOTEModTab(ITEMS.register("encased_singularity", ()->new SimpleFoiledItem(new Item.Properties()))); + public static final RegistryObject 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 ENCASED_SINGULARITY = CreativeModeTabs.addToOTEModTab(ITEMS.register("encased_singularity", ()->new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject ETERNIUM_ROD = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_rod", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64)))); - public static final RegistryObject SCRUBBER_FRAME_PIECE = CreativeModeTabs.addToOTEModTab(ITEMS.register("scrubber_frame_piece", () -> new Item(new Item.Properties().stacksTo(64)))); - public static final RegistryObject SCRUBBER_FRAME = CreativeModeTabs.addToOTEModTab(ITEMS.register("scrubber_frame", () -> new Item(new Item.Properties().stacksTo(64)))); + public static final RegistryObject ETERNIUM_ROD = CreativeModeTabs.addToOTEModTab(ITEMS.register("eternium_rod", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS)))); + public static final RegistryObject 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 SCRUBBER_FRAME = CreativeModeTabs.addToOTEModTab(ITEMS.register("scrubber_frame", () -> new Item(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject VAULTSTEEL_INGOT = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_steel_ingot", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64)))); - public static final RegistryObject VAULT_FRAG_BL = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_lower_left", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64)))); - public static final RegistryObject VAULT_FRAG_LC = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_lower", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64)))); - public static final RegistryObject VAULT_FRAG_BR = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_lower_right", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64)))); - public static final RegistryObject VAULT_FRAG_L = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_left", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64)))); - public static final RegistryObject VAULT_FRAG_R = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_right", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64)))); - public static final RegistryObject VAULT_FRAG_UR = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_upper_right", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64)))); - public static final RegistryObject VAULT_FRAG_UL = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_upper_left", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64)))); - public static final RegistryObject VAULT_FRAG_U = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_upper", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64)))); - public static final RegistryObject VAULT_FRAG_C = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_fragment_center", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64)))); + public static final RegistryObject VAULTSTEEL_INGOT = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault_steel_ingot", () -> new SimpleFoiledItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS)))); + public static final RegistryObject 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 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 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 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 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 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 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 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 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 VAULT = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault", () -> new VaultItem(new Item.Properties().stacksTo(64)))); + public static final RegistryObject VAULT = CreativeModeTabs.addToOTEModTab(ITEMS.register("vault", () -> new VaultItem(new Item.Properties().stacksTo(64).tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject VAULT_RAW_ORE = CreativeModeTabs.addToOTEModTab(ITEMS.register("raw_vault_steel_ore", () -> new Item(new Item.Properties().stacksTo(64)))); + public static final RegistryObject 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 POSS_BALL = CreativeModeTabs.addToOTEModTab(ITEMS.register("poss_ball", () -> new PossBallItem(new Item.Properties()))); + public static final RegistryObject POSS_BALL = CreativeModeTabs.addToOTEModTab(ITEMS.register("poss_ball", () -> new PossBallItem(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject ILUSIUM_ORE = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_ore", () -> new Item(new Item.Properties().fireResistant()))); - public static final RegistryObject ILUSIUM_ROD = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_rod", () -> new Item(new Item.Properties().fireResistant()))); + public static final RegistryObject ILUSIUM_ORE = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_ore", () -> new Item(new Item.Properties().fireResistant().tab(CreativeModeTab.TAB_DECORATIONS)))); + public static final RegistryObject ILUSIUM_ROD = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_rod", () -> new Item(new Item.Properties().fireResistant().tab(CreativeModeTab.TAB_DECORATIONS)))); //public static final RegistryObject ILUSIUM_DUST = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_dust", () -> new Item(new Item.Properties().fireResistant()))); - public static final RegistryObject ILUSIUM_INGOT = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_ingot", () -> new Item(new Item.Properties().fireResistant()))); + public static final RegistryObject ILUSIUM_INGOT = CreativeModeTabs.addToOTEModTab(ITEMS.register("ilusium_ingot", () -> new Item(new Item.Properties().fireResistant().tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject EMPTY_SPAWN_EGG = CreativeModeTabs.addToOTEModTab(ITEMS.register("empty_spawn_egg", () -> new Item(new Item.Properties()))); + public static final RegistryObject EMPTY_SPAWN_EGG = CreativeModeTabs.addToOTEModTab(ITEMS.register("empty_spawn_egg", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); //public static final RegistryObject POSSUM_SPAWN_EGG = ITEMS.register("possum_spawn_egg", () -> new ForgeSpawnEggItem(ModEntityTypes.POSSUM, 0x938686, 0xc68787, new Item.Properties()))); diff --git a/src/main/resources/assets/otemod/blockstates/blood_red.json b/src/main/resources/assets/otemod/blockstates/blood_red.json new file mode 100644 index 0000000..c71b0f9 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/blood_red.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/blood_red" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/red_tile.json b/src/main/resources/assets/otemod/blockstates/red_tile.json new file mode 100644 index 0000000..8aaf0be --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/red_tile.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/red_tile" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/red_tile_to_wall.json b/src/main/resources/assets/otemod/blockstates/red_tile_to_wall.json new file mode 100644 index 0000000..75456ee --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/red_tile_to_wall.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "otemod:block/red_tile_to_wall", + "y": 180 + }, + "facing=east": { + "model": "otemod:block/red_tile_to_wall", + "y": 270 + }, + "facing=south": { + "model": "otemod:block/red_tile_to_wall" + }, + "facing=west": { + "model": "otemod:block/red_tile_to_wall", + "y": 90 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/red_wall_variant_1.json b/src/main/resources/assets/otemod/blockstates/red_wall_variant_1.json new file mode 100644 index 0000000..c83e90f --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/red_wall_variant_1.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "otemod:block/red_wall_variant_1", + "y": 180 + }, + "facing=east": { + "model": "otemod:block/red_wall_variant_1", + "y": 270 + }, + "facing=south": { + "model": "otemod:block/red_wall_variant_1" + }, + "facing=west": { + "model": "otemod:block/red_wall_variant_1", + "y": 90 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/red_wall_variant_2.json b/src/main/resources/assets/otemod/blockstates/red_wall_variant_2.json new file mode 100644 index 0000000..24379da --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/red_wall_variant_2.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "otemod:block/red_wall_variant_2", + "y": 180 + }, + "facing=east": { + "model": "otemod:block/red_wall_variant_2", + "y": 270 + }, + "facing=south": { + "model": "otemod:block/red_wall_variant_2" + }, + "facing=west": { + "model": "otemod:block/red_wall_variant_2", + "y": 90 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/black.json b/src/main/resources/assets/otemod/blockstates/void.json similarity index 52% rename from src/main/resources/assets/otemod/blockstates/black.json rename to src/main/resources/assets/otemod/blockstates/void.json index 1271a8a..0c4dfc4 100644 --- a/src/main/resources/assets/otemod/blockstates/black.json +++ b/src/main/resources/assets/otemod/blockstates/void.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "otemod:block/black" + "model": "otemod:block/void" } } } diff --git a/src/main/resources/assets/otemod/blockstates/whiteout.json b/src/main/resources/assets/otemod/blockstates/whiteout.json new file mode 100644 index 0000000..5793d94 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/whiteout.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/whiteout" + } + } +} diff --git a/src/main/resources/assets/otemod/lang/en_us.json b/src/main/resources/assets/otemod/lang/en_us.json index f60a95d..22e906d 100644 --- a/src/main/resources/assets/otemod/lang/en_us.json +++ b/src/main/resources/assets/otemod/lang/en_us.json @@ -57,7 +57,7 @@ "block.otemod.nether_vault_steel_ore_block": "Nether Vault Steel Ore", "block.otemod.eternium_block": "Block of Eternium", "block.otemod.liminal_tiles": "Liminal Tiles", - "block.otemod.black": "The Void", + "block.otemod.void": "Void", "block.otemod.liminal_tile_stairs": "Liminal Stairs", "block.otemod.liminal_tile_slab": "Liminal Slab", "block.otemod.ilusium_ore_block": "Ilusium Ore Block", @@ -67,6 +67,12 @@ "block.otemod.compression_chamber": "Compression Chamber", "block.otemod.compressed_obsidian_block": "Block of Compressed Obsidian", "block.otemod.layered_compressed_obsidian_block": "Layered Block of Compressed Obsidian", + "block.otemod.whiteout": "White", + "block.otemod.blood_red": "Blood Red", + "block.otemod.red_tile": "Red Tile", + "block.otemod.red_tile_to_wall": "Red Floor To Wall Transition", + "block.otemod.red_wall_variant_1": "Red Wall", + "block.otemod.red_wall_variant_2": "Red Wall", "enchantment.otemod.mob_egging": "Mob Egging", diff --git a/src/main/resources/assets/otemod/models/block/blood_red.json b/src/main/resources/assets/otemod/models/block/blood_red.json new file mode 100644 index 0000000..37f0643 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/blood_red.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "otemod:block/thresholds/blood_red" + } +} diff --git a/src/main/resources/assets/otemod/models/block/red_tile.json b/src/main/resources/assets/otemod/models/block/red_tile.json new file mode 100644 index 0000000..c1669e1 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/red_tile.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_top", + "textures": { + "top": "otemod:block/thresholds/hallway/floor/tiles/red_tile_w_circle", + "side": "otemod:block/thresholds/blood_red" + } +} diff --git a/src/main/resources/assets/otemod/models/block/red_tile_to_wall.json b/src/main/resources/assets/otemod/models/block/red_tile_to_wall.json new file mode 100644 index 0000000..f73a450 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/red_tile_to_wall.json @@ -0,0 +1,7 @@ +{ + "parent": "otemod:block/rotatable", + "textures": { + "front": "otemod:block/thresholds/hallway/wall/red_floor_to_wall", + "side": "otemod:block/thresholds/blood_red" + } +} diff --git a/src/main/resources/assets/otemod/models/block/red_wall_variant_1.json b/src/main/resources/assets/otemod/models/block/red_wall_variant_1.json new file mode 100644 index 0000000..1e0c518 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/red_wall_variant_1.json @@ -0,0 +1,7 @@ +{ + "parent": "otemod:block/rotatable", + "textures": { + "front": "otemod:block/thresholds/hallway/wall/red_wall", + "side": "otemod:block/thresholds/blood_red" + } +} diff --git a/src/main/resources/assets/otemod/models/block/red_wall_variant_2.json b/src/main/resources/assets/otemod/models/block/red_wall_variant_2.json new file mode 100644 index 0000000..620eaa4 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/red_wall_variant_2.json @@ -0,0 +1,7 @@ +{ + "parent": "otemod:block/rotatable", + "textures": { + "front": "otemod:block/thresholds/hallway/wall/red_wall2", + "side": "otemod:block/thresholds/blood_red" + } +} diff --git a/src/main/resources/assets/otemod/models/block/rotatable.json b/src/main/resources/assets/otemod/models/block/rotatable.json new file mode 100644 index 0000000..1f9fbc3 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/rotatable.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "#side", + "down": "#side", + "up": "#side", + "north": "#front", + "east": "#side", + "south": "#side", + "west": "#side" + } +} diff --git a/src/main/resources/assets/otemod/models/block/black.json b/src/main/resources/assets/otemod/models/block/void.json similarity index 60% rename from src/main/resources/assets/otemod/models/block/black.json rename to src/main/resources/assets/otemod/models/block/void.json index ea61ef8..a11d30b 100644 --- a/src/main/resources/assets/otemod/models/block/black.json +++ b/src/main/resources/assets/otemod/models/block/void.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "otemod:block/black" + "all": "otemod:block/thresholds/void" } } diff --git a/src/main/resources/assets/otemod/models/block/whiteout.json b/src/main/resources/assets/otemod/models/block/whiteout.json new file mode 100644 index 0000000..994e32c --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/whiteout.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "otemod:block/thresholds/white" + } +} diff --git a/src/main/resources/assets/otemod/models/item/black.json b/src/main/resources/assets/otemod/models/item/black.json deleted file mode 100644 index b8ba48d..0000000 --- a/src/main/resources/assets/otemod/models/item/black.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "otemod:block/black" -} diff --git a/src/main/resources/assets/otemod/models/item/blood_red.json b/src/main/resources/assets/otemod/models/item/blood_red.json new file mode 100644 index 0000000..5b3b473 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/blood_red.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/blood_red" +} diff --git a/src/main/resources/assets/otemod/models/item/red_tile.json b/src/main/resources/assets/otemod/models/item/red_tile.json new file mode 100644 index 0000000..1149db1 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/red_tile.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/red_tile" +} diff --git a/src/main/resources/assets/otemod/models/item/red_tile_to_wall.json b/src/main/resources/assets/otemod/models/item/red_tile_to_wall.json new file mode 100644 index 0000000..79cc03c --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/red_tile_to_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/red_tile_to_wall" +} diff --git a/src/main/resources/assets/otemod/models/item/red_wall_variant_1.json b/src/main/resources/assets/otemod/models/item/red_wall_variant_1.json new file mode 100644 index 0000000..ceabcf7 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/red_wall_variant_1.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/red_wall_variant_1" +} diff --git a/src/main/resources/assets/otemod/models/item/red_wall_variant_2.json b/src/main/resources/assets/otemod/models/item/red_wall_variant_2.json new file mode 100644 index 0000000..460d2f9 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/red_wall_variant_2.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/red_wall_variant_2" +} diff --git a/src/main/resources/assets/otemod/models/item/void.json b/src/main/resources/assets/otemod/models/item/void.json new file mode 100644 index 0000000..c26fe14 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/void.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/void" +} diff --git a/src/main/resources/assets/otemod/models/item/whiteout.json b/src/main/resources/assets/otemod/models/item/whiteout.json new file mode 100644 index 0000000..6ddf00b --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/whiteout.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/whiteout" +} diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/blood_red.png b/src/main/resources/assets/otemod/textures/block/thresholds/blood_red.png new file mode 100644 index 0000000000000000000000000000000000000000..950ac1144044384bc3c6da10a0ea79473dc06099 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|WIbIRLo9le vzoaJoIPbuiu*l`}3dY53JyHfUco-O3FEQpUTHa|6RLJ1z>gTe~DWM4feZ?C( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/red_tile.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/red_tile.png new file mode 100644 index 0000000000000000000000000000000000000000..5e5b9faf4e4ad452416622c9c1c4ce1bcf992650 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|$~|2iLo9md zPCm_hK!L~k?VIqnw@ojXI!$=yUfgxyyh1?*W7qb)xw;Gq6JA;|c(C5Sm$kG>TX@yG zE$r^g&r6pi`YT^_yYAwbn0@H0^#3VWCLKDk@0I7>Rdsy33?`^-WX@-co$Nnh)12@R n3V&rP)GqF6@r-HAxgj?t!&PYIWfxDN6Bs;Q{an^LB{Ts5Fv&@S literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/red_tile_w_circle.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/red_tile_w_circle.png new file mode 100644 index 0000000000000000000000000000000000000000..821d3861d776c94a6e6e7aac068ba6a81578fc3e GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|)_S@)hFJ9W zPTnorY{0{C{?*$i&Ipa1Nl%Rgg_mq#7hpA;Z=>ScyYa%^&8;5!7pB_UZFM?#L5jg! zGhME)T-lyk=-~F}*A$*R?_d%-I8h~YZPvly`2FG+-cskl zs=Qrq*eAy=5PUP&rRkT!lMD~@@ZH}w@;{eh5!&5pd0)t1=)Li&89LsN4sL1FS^B`! rrb6?n5qsN_X2z6vtn-fio@@T;abJeS|MGo6hckG(`njxgN@xNA4su_5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/floor_wall_transition.aseprite b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/floor_wall_transition.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..a14bc754635cbeb704134469bf1f720dc6f508a5 GIT binary patch literal 627 zcmb`F%PWLY7>Cbb3|U~Ktehk>ySZtk8M%~=Q8a1fl1rE}3o;~97KYR)HcBpKHnUJH ztdt@msbL{WSfD7kWY`GxdA>p85Ac4Sr?>ai`90_B^u!5q8PbR}J}ERph&EQNn5o0) zer)=G-7BZRN3_vYEyrfCbTS(GC*+JiQ_7!7)}Nhds|b-T^I)050X+p~IO(>-i|$-_ z8uY-Y?OFKoVuLd`RnWU(g85UO(Ai;xE@uw3I0|42et8GAUjzkf8o|Ny8<$0s6Qj zjy1~oB8w@SI3kE0YIq@q5jv`iqF{jn`Gk{9ESUt7MpTxXB;(<4p&)dkqGh1nC(Wve zR(@|OJc{p9pGE(CxV`ypA!R30{OHV?7`rdoox0VR8Esa>VdX?)n|1Hl9$55mT^{L8 nxpk@4g$>4JPw-)MJiR5+wr=qC?{9|kr<1JDcUs}`uk3#TWB07J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/red_floor_to_wall.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/red_floor_to_wall.png new file mode 100644 index 0000000000000000000000000000000000000000..bb0f88bdd74117ec675056c787a04bdc04f8668f GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|>OEZ?Lo9lq zPO|1}aNuy6f22&)rcwRY>Bi??u$#N@9+Shp1Ft9K_xFVdQ&MBb@0Fmk=y8r+H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/red_wall2.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/red_wall2.png new file mode 100644 index 0000000000000000000000000000000000000000..8f16e27f64176ea726951de76c851f295a8ed9d0 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|B0OCjLo9lq zUe@MoFc4t5aGWjnVs%lei$24$MQtt9N_(U>em<$PTQ=rGK~;O#rOG{5Y?RV2f4x2J zYQlV9`DlkV9qyCo2>#Ctu&38QHne)VMT_n&B22WQ%mvv4F FO#oZjIzj*d literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/void.png b/src/main/resources/assets/otemod/textures/block/thresholds/void.png new file mode 100644 index 0000000000000000000000000000000000000000..d59329cbd56c69938bae3924dc6903f668c9243f GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|WIbIRLo9le uQxXz>oOfVMSmg3~1><729w~zvJPZuJ4vg{*DPBH6g$$mqelF{r5}E)=ml*#5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/white.png b/src/main/resources/assets/otemod/textures/block/thresholds/white.png new file mode 100644 index 0000000000000000000000000000000000000000..a449decfda83ba650f4418e380e7f90a7f528cd7 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|WIbIRLo9le v|NQ^|zn+bYL0EN`JFkRk!j*=DDGUtRr&wf`KP(LfDrE3<^>bP0l+XkKc$*s_ literal 0 HcmV?d00001 diff --git a/src/main/resources/data/otemod/loot_tables/blocks/blood_red.json b/src/main/resources/data/otemod/loot_tables/blocks/blood_red.json new file mode 100644 index 0000000..9f66e69 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/blood_red.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:blood_red" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/red_tile.json b/src/main/resources/data/otemod/loot_tables/blocks/red_tile.json new file mode 100644 index 0000000..2b3ac53 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/red_tile.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:red_tile" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/red_tile_to_wall.json b/src/main/resources/data/otemod/loot_tables/blocks/red_tile_to_wall.json new file mode 100644 index 0000000..cee80f2 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/red_tile_to_wall.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:red_tile_to_wall" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/red_wall_variant_1.json b/src/main/resources/data/otemod/loot_tables/blocks/red_wall_variant_1.json new file mode 100644 index 0000000..59bf0bd --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/red_wall_variant_1.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:red_wall_variant_1" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/red_wall_variant_2.json b/src/main/resources/data/otemod/loot_tables/blocks/red_wall_variant_2.json new file mode 100644 index 0000000..bf055a7 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/red_wall_variant_2.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:red_wall_variant_2" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/void.json b/src/main/resources/data/otemod/loot_tables/blocks/void.json new file mode 100644 index 0000000..6bcae9d --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/void.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:void" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/whiteout.json b/src/main/resources/data/otemod/loot_tables/blocks/whiteout.json new file mode 100644 index 0000000..a459140 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/whiteout.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:whiteout" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/blood_red.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/blood_red.json new file mode 100644 index 0000000..e535d6b --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/blood_red.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "ABA", + "AAA" + ], + "key": { + "A": { + "item": "minecraft:red_wool" + }, + "B": { + "item": "minecraft:obsidian" + } + }, + "result": { + "item": "otemod:blood_red", + "count": 4 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/red_tile.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/red_tile.json new file mode 100644 index 0000000..1a4c235 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/red_tile.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ABA", + "BAB", + "ABA" + ], + "key": { + "A": { + "item": "otemod:blood_red" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:red_tile", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/red_tile_to_wall.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/red_tile_to_wall.json new file mode 100644 index 0000000..bca71b6 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/red_tile_to_wall.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "BAB", + "ABA" + ], + "key": { + "A": { + "item": "otemod:blood_red" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:red_tile_to_wall", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/red_wall_variant_1.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/red_wall_variant_1.json new file mode 100644 index 0000000..3695bac --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/red_wall_variant_1.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "AAA", + "BAB" + ], + "key": { + "A": { + "item": "otemod:blood_red" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:red_wall_variant_1", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/red_wall_variant_2.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/red_wall_variant_2.json new file mode 100644 index 0000000..3a4fb90 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/red_wall_variant_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "BAB", + "AAA", + "BAB" + ], + "key": { + "A": { + "item": "otemod:blood_red" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:red_wall_variant_2", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/void.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/void.json new file mode 100644 index 0000000..93f3770 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/void.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "ABA", + "AAA" + ], + "key": { + "A": { + "item": "minecraft:black_wool" + }, + "B": { + "item": "minecraft:obsidian" + } + }, + "result": { + "item": "otemod:void", + "count": 4 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/whiteout.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/whiteout.json new file mode 100644 index 0000000..5da0d00 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/whiteout.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "ABA", + "AAA" + ], + "key": { + "A": { + "item": "minecraft:white_wool" + }, + "B": { + "item": "minecraft:obsidian" + } + }, + "result": { + "item": "otemod:whiteout", + "count": 4 + } +} From 40a3ae346e3b5d8c6cfb65b01e64898c7f2edc46 Mon Sep 17 00:00:00 2001 From: zontreck Date: Tue, 23 Jan 2024 16:23:43 -0700 Subject: [PATCH 04/22] Add cyan variant, adjust red block wall models --- gradle.properties | 2 +- .../dev/zontreck/otemod/blocks/ModBlocks.java | 27 +++++++++++++++-- .../assets/otemod/blockstates/cyan.json | 7 +++++ .../assets/otemod/blockstates/cyan_tile.json | 7 +++++ .../otemod/blockstates/cyan_tile_to_wall.json | 7 +++++ .../blockstates/cyan_wall_variant_1.json | 7 +++++ .../blockstates/cyan_wall_variant_2.json | 7 +++++ .../otemod/blockstates/red_tile_to_wall.json | 14 +-------- .../blockstates/red_wall_variant_1.json | 14 +-------- .../blockstates/red_wall_variant_2.json | 14 +-------- .../resources/assets/otemod/lang/en_us.json | 5 ++++ .../assets/otemod/models/block/cyan.json | 6 ++++ .../assets/otemod/models/block/cyan_tile.json | 7 +++++ .../models/block/cyan_tile_to_wall.json | 7 +++++ .../models/block/cyan_wall_variant_1.json | 7 +++++ .../models/block/cyan_wall_variant_2.json | 7 +++++ .../otemod/models/block/red_tile_to_wall.json | 6 ++-- .../models/block/red_wall_variant_1.json | 6 ++-- .../models/block/red_wall_variant_2.json | 6 ++-- .../assets/otemod/models/block/sided.json | 12 ++++++++ .../assets/otemod/models/item/cyan.json | 3 ++ .../assets/otemod/models/item/cyan_tile.json | 3 ++ .../otemod/models/item/cyan_tile_to_wall.json | 3 ++ .../models/item/cyan_wall_variant_1.json | 3 ++ .../models/item/cyan_wall_variant_2.json | 3 ++ .../otemod/textures/block/thresholds/cyan.png | Bin 0 -> 99 bytes .../floor/tiles/cyan_tile_w_circle.png | Bin 0 -> 262 bytes .../hallway/wall/cyan_floor_to_wall.png | Bin 0 -> 213 bytes .../thresholds/hallway/wall/cyan_wall.png | Bin 0 -> 129 bytes .../thresholds/hallway/wall/cyan_wall2.png | Bin 0 -> 165 bytes .../data/otemod/loot_tables/blocks/cyan.json | 14 +++++++++ .../otemod/loot_tables/blocks/cyan_tile.json | 14 +++++++++ .../loot_tables/blocks/cyan_tile_to_wall.json | 14 +++++++++ .../blocks/cyan_wall_variant_1.json | 14 +++++++++ .../blocks/cyan_wall_variant_2.json | 14 +++++++++ .../recipes/thresholds/decorative/cyan.json | 20 +++++++++++++ .../thresholds/decorative/cyan_tile.json | 20 +++++++++++++ .../decorative/cyan_tile_to_wall.json | 20 +++++++++++++ .../decorative/cyan_wall_variant_1.json | 20 +++++++++++++ .../decorative/cyan_wall_variant_2.json | 20 +++++++++++++ .../tinkering/enchantments_to_modifiers.json | 3 +- .../materials/definitions/eternium.json | 6 ++++ .../materials/definitions/ilusium.json | 6 ++++ .../tinkering/materials/stats/eternium.json | 28 ++++++++++++++++++ .../tinkering/materials/stats/ilusium.json | 28 ++++++++++++++++++ .../traits/{eggables.json => eternium.json} | 0 .../tinkering/materials/traits/ilusium.json | 6 ++++ .../otemod/tinkering/modifiers/eggable.json | 15 ++++++++++ .../otemod/tinkering/modifiers/eggables.json | 8 ----- .../otemod/tinkering/modifiers/flying.json | 12 ++++++++ 50 files changed, 411 insertions(+), 61 deletions(-) create mode 100644 src/main/resources/assets/otemod/blockstates/cyan.json create mode 100644 src/main/resources/assets/otemod/blockstates/cyan_tile.json create mode 100644 src/main/resources/assets/otemod/blockstates/cyan_tile_to_wall.json create mode 100644 src/main/resources/assets/otemod/blockstates/cyan_wall_variant_1.json create mode 100644 src/main/resources/assets/otemod/blockstates/cyan_wall_variant_2.json create mode 100644 src/main/resources/assets/otemod/models/block/cyan.json create mode 100644 src/main/resources/assets/otemod/models/block/cyan_tile.json create mode 100644 src/main/resources/assets/otemod/models/block/cyan_tile_to_wall.json create mode 100644 src/main/resources/assets/otemod/models/block/cyan_wall_variant_1.json create mode 100644 src/main/resources/assets/otemod/models/block/cyan_wall_variant_2.json create mode 100644 src/main/resources/assets/otemod/models/block/sided.json create mode 100644 src/main/resources/assets/otemod/models/item/cyan.json create mode 100644 src/main/resources/assets/otemod/models/item/cyan_tile.json create mode 100644 src/main/resources/assets/otemod/models/item/cyan_tile_to_wall.json create mode 100644 src/main/resources/assets/otemod/models/item/cyan_wall_variant_1.json create mode 100644 src/main/resources/assets/otemod/models/item/cyan_wall_variant_2.json create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/cyan.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/cyan_tile_w_circle.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/cyan_floor_to_wall.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/cyan_wall.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/cyan_wall2.png create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/cyan.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/cyan_tile.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/cyan_tile_to_wall.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_1.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_2.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/cyan.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile_to_wall.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_wall_variant_1.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_wall_variant_2.json create mode 100644 src/main/resources/data/otemod/tinkering/materials/definitions/eternium.json create mode 100644 src/main/resources/data/otemod/tinkering/materials/definitions/ilusium.json create mode 100644 src/main/resources/data/otemod/tinkering/materials/stats/eternium.json create mode 100644 src/main/resources/data/otemod/tinkering/materials/stats/ilusium.json rename src/main/resources/data/otemod/tinkering/materials/traits/{eggables.json => eternium.json} (100%) create mode 100644 src/main/resources/data/otemod/tinkering/materials/traits/ilusium.json create mode 100644 src/main/resources/data/otemod/tinkering/modifiers/eggable.json delete mode 100644 src/main/resources/data/otemod/tinkering/modifiers/eggables.json create mode 100644 src/main/resources/data/otemod/tinkering/modifiers/flying.json diff --git a/gradle.properties b/gradle.properties index cd05b3f..389d343 100644 --- a/gradle.properties +++ b/gradle.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.012224.2229 +mod_version=1.4.012324.1609 # 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 diff --git a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java index cc32385..fa9d287 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java +++ b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java @@ -144,19 +144,40 @@ public class ModBlocks { public static final RegistryObject 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 T_RED_TILE_WALL = BLOCKS.register("red_tile_to_wall", ()->new RotatableBlock(BlockBehaviour.Properties.copy(T_RED_TILE.get()))); + public static final RegistryObject T_RED_TILE_WALL = BLOCKS.register("red_tile_to_wall", ()->new Block(BlockBehaviour.Properties.copy(T_RED_TILE.get()))); public static final RegistryObject 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 T_RED_WALL = BLOCKS.register("red_wall_variant_1", ()->new RotatableBlock(BlockBehaviour.Properties.copy(T_RED_TILE.get()))); + public static final RegistryObject T_RED_WALL = BLOCKS.register("red_wall_variant_1", ()->new Block(BlockBehaviour.Properties.copy(T_RED_TILE.get()))); public static final RegistryObject 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 T_RED_WALL2 = BLOCKS.register("red_wall_variant_2", ()->new RotatableBlock(BlockBehaviour.Properties.copy(T_RED_TILE.get()))); + public static final RegistryObject T_RED_WALL2 = BLOCKS.register("red_wall_variant_2", ()->new Block(BlockBehaviour.Properties.copy(T_RED_TILE.get()))); public static final RegistryObject 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 T_CYAN = BLOCKS.register("cyan", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN))); + + public static final RegistryObject T_CYAN_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan", ()-> new BlockItem(T_CYAN.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); + + public static final RegistryObject T_CYAN_TILE = BLOCKS.register("cyan_tile", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN.get()))); + + public static final RegistryObject 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 RegistryObject T_CYAN_TILE_WALL = BLOCKS.register("cyan_tile_to_wall", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN_TILE.get()))); + + public static final RegistryObject 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 T_CYAN_WALL = BLOCKS.register("cyan_wall_variant_1", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN_TILE.get()))); + + public static final RegistryObject 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 T_CYAN_WALL2 = BLOCKS.register("cyan_wall_variant_2", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN_TILE.get()))); + + public static final RegistryObject 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)))); + + /* diff --git a/src/main/resources/assets/otemod/blockstates/cyan.json b/src/main/resources/assets/otemod/blockstates/cyan.json new file mode 100644 index 0000000..10c7ae0 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/cyan.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/cyan" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/cyan_tile.json b/src/main/resources/assets/otemod/blockstates/cyan_tile.json new file mode 100644 index 0000000..be93962 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/cyan_tile.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/cyan_tile" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/cyan_tile_to_wall.json b/src/main/resources/assets/otemod/blockstates/cyan_tile_to_wall.json new file mode 100644 index 0000000..58abf42 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/cyan_tile_to_wall.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/cyan_tile_to_wall" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/cyan_wall_variant_1.json b/src/main/resources/assets/otemod/blockstates/cyan_wall_variant_1.json new file mode 100644 index 0000000..20da827 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/cyan_wall_variant_1.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/cyan_wall_variant_1" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/cyan_wall_variant_2.json b/src/main/resources/assets/otemod/blockstates/cyan_wall_variant_2.json new file mode 100644 index 0000000..58b2e65 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/cyan_wall_variant_2.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/cyan_wall_variant_2" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/red_tile_to_wall.json b/src/main/resources/assets/otemod/blockstates/red_tile_to_wall.json index 75456ee..7c34b14 100644 --- a/src/main/resources/assets/otemod/blockstates/red_tile_to_wall.json +++ b/src/main/resources/assets/otemod/blockstates/red_tile_to_wall.json @@ -1,19 +1,7 @@ { "variants": { - "facing=north": { - "model": "otemod:block/red_tile_to_wall", - "y": 180 - }, - "facing=east": { - "model": "otemod:block/red_tile_to_wall", - "y": 270 - }, - "facing=south": { + "": { "model": "otemod:block/red_tile_to_wall" - }, - "facing=west": { - "model": "otemod:block/red_tile_to_wall", - "y": 90 } } } diff --git a/src/main/resources/assets/otemod/blockstates/red_wall_variant_1.json b/src/main/resources/assets/otemod/blockstates/red_wall_variant_1.json index c83e90f..2a9a367 100644 --- a/src/main/resources/assets/otemod/blockstates/red_wall_variant_1.json +++ b/src/main/resources/assets/otemod/blockstates/red_wall_variant_1.json @@ -1,19 +1,7 @@ { "variants": { - "facing=north": { - "model": "otemod:block/red_wall_variant_1", - "y": 180 - }, - "facing=east": { - "model": "otemod:block/red_wall_variant_1", - "y": 270 - }, - "facing=south": { + "": { "model": "otemod:block/red_wall_variant_1" - }, - "facing=west": { - "model": "otemod:block/red_wall_variant_1", - "y": 90 } } } diff --git a/src/main/resources/assets/otemod/blockstates/red_wall_variant_2.json b/src/main/resources/assets/otemod/blockstates/red_wall_variant_2.json index 24379da..4abb702 100644 --- a/src/main/resources/assets/otemod/blockstates/red_wall_variant_2.json +++ b/src/main/resources/assets/otemod/blockstates/red_wall_variant_2.json @@ -1,19 +1,7 @@ { "variants": { - "facing=north": { - "model": "otemod:block/red_wall_variant_2", - "y": 180 - }, - "facing=east": { - "model": "otemod:block/red_wall_variant_2", - "y": 270 - }, - "facing=south": { + "": { "model": "otemod:block/red_wall_variant_2" - }, - "facing=west": { - "model": "otemod:block/red_wall_variant_2", - "y": 90 } } } diff --git a/src/main/resources/assets/otemod/lang/en_us.json b/src/main/resources/assets/otemod/lang/en_us.json index 22e906d..bc09ca5 100644 --- a/src/main/resources/assets/otemod/lang/en_us.json +++ b/src/main/resources/assets/otemod/lang/en_us.json @@ -73,6 +73,11 @@ "block.otemod.red_tile_to_wall": "Red Floor To Wall Transition", "block.otemod.red_wall_variant_1": "Red Wall", "block.otemod.red_wall_variant_2": "Red Wall", + "block.otemod.cyan": "Cyan", + "block.otemod.cyan_tile": "Cyan Tile", + "block.otemod.cyan_tile_to_wall": "Cyan Floor To Wall Transition", + "block.otemod.cyan_wall_variant_1": "Cyan Wall", + "block.otemod.cyan_wall_variant_2": "Cyan Wall", "enchantment.otemod.mob_egging": "Mob Egging", diff --git a/src/main/resources/assets/otemod/models/block/cyan.json b/src/main/resources/assets/otemod/models/block/cyan.json new file mode 100644 index 0000000..2bb090b --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "otemod:block/thresholds/cyan" + } +} diff --git a/src/main/resources/assets/otemod/models/block/cyan_tile.json b/src/main/resources/assets/otemod/models/block/cyan_tile.json new file mode 100644 index 0000000..9511de4 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/cyan_tile.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_top", + "textures": { + "top": "otemod:block/thresholds/hallway/floor/tiles/cyan_tile_w_circle", + "side": "otemod:block/thresholds/cyan" + } +} diff --git a/src/main/resources/assets/otemod/models/block/cyan_tile_to_wall.json b/src/main/resources/assets/otemod/models/block/cyan_tile_to_wall.json new file mode 100644 index 0000000..34c1fc1 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/cyan_tile_to_wall.json @@ -0,0 +1,7 @@ +{ + "parent": "otemod:block/sided", + "textures": { + "side": "otemod:block/thresholds/hallway/wall/cyan_floor_to_wall", + "top": "otemod:block/thresholds/cyan" + } +} diff --git a/src/main/resources/assets/otemod/models/block/cyan_wall_variant_1.json b/src/main/resources/assets/otemod/models/block/cyan_wall_variant_1.json new file mode 100644 index 0000000..36347eb --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/cyan_wall_variant_1.json @@ -0,0 +1,7 @@ +{ + "parent": "otemod:block/sided", + "textures": { + "side": "otemod:block/thresholds/hallway/wall/cyan_wall", + "top": "otemod:block/thresholds/cyan" + } +} diff --git a/src/main/resources/assets/otemod/models/block/cyan_wall_variant_2.json b/src/main/resources/assets/otemod/models/block/cyan_wall_variant_2.json new file mode 100644 index 0000000..3e90f33 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/cyan_wall_variant_2.json @@ -0,0 +1,7 @@ +{ + "parent": "otemod:block/sided", + "textures": { + "side": "otemod:block/thresholds/hallway/wall/cyan_wall2", + "top": "otemod:block/thresholds/cyan" + } +} diff --git a/src/main/resources/assets/otemod/models/block/red_tile_to_wall.json b/src/main/resources/assets/otemod/models/block/red_tile_to_wall.json index f73a450..1b198bf 100644 --- a/src/main/resources/assets/otemod/models/block/red_tile_to_wall.json +++ b/src/main/resources/assets/otemod/models/block/red_tile_to_wall.json @@ -1,7 +1,7 @@ { - "parent": "otemod:block/rotatable", + "parent": "otemod:block/sided", "textures": { - "front": "otemod:block/thresholds/hallway/wall/red_floor_to_wall", - "side": "otemod:block/thresholds/blood_red" + "side": "otemod:block/thresholds/hallway/wall/red_floor_to_wall", + "top": "otemod:block/thresholds/blood_red" } } diff --git a/src/main/resources/assets/otemod/models/block/red_wall_variant_1.json b/src/main/resources/assets/otemod/models/block/red_wall_variant_1.json index 1e0c518..46f55d0 100644 --- a/src/main/resources/assets/otemod/models/block/red_wall_variant_1.json +++ b/src/main/resources/assets/otemod/models/block/red_wall_variant_1.json @@ -1,7 +1,7 @@ { - "parent": "otemod:block/rotatable", + "parent": "otemod:block/sided", "textures": { - "front": "otemod:block/thresholds/hallway/wall/red_wall", - "side": "otemod:block/thresholds/blood_red" + "side": "otemod:block/thresholds/hallway/wall/red_wall", + "top": "otemod:block/thresholds/blood_red" } } diff --git a/src/main/resources/assets/otemod/models/block/red_wall_variant_2.json b/src/main/resources/assets/otemod/models/block/red_wall_variant_2.json index 620eaa4..0f531e9 100644 --- a/src/main/resources/assets/otemod/models/block/red_wall_variant_2.json +++ b/src/main/resources/assets/otemod/models/block/red_wall_variant_2.json @@ -1,7 +1,7 @@ { - "parent": "otemod:block/rotatable", + "parent": "otemod:block/sided", "textures": { - "front": "otemod:block/thresholds/hallway/wall/red_wall2", - "side": "otemod:block/thresholds/blood_red" + "side": "otemod:block/thresholds/hallway/wall/red_wall2", + "top": "otemod:block/thresholds/blood_red" } } diff --git a/src/main/resources/assets/otemod/models/block/sided.json b/src/main/resources/assets/otemod/models/block/sided.json new file mode 100644 index 0000000..bf01ac5 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/sided.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "#side", + "down": "#top", + "up": "#top", + "north": "#side", + "east": "#side", + "south": "#side", + "west": "#side" + } +} diff --git a/src/main/resources/assets/otemod/models/item/cyan.json b/src/main/resources/assets/otemod/models/item/cyan.json new file mode 100644 index 0000000..e710154 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/cyan.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/cyan" +} diff --git a/src/main/resources/assets/otemod/models/item/cyan_tile.json b/src/main/resources/assets/otemod/models/item/cyan_tile.json new file mode 100644 index 0000000..c8b1488 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/cyan_tile.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/cyan_tile" +} diff --git a/src/main/resources/assets/otemod/models/item/cyan_tile_to_wall.json b/src/main/resources/assets/otemod/models/item/cyan_tile_to_wall.json new file mode 100644 index 0000000..825f2a9 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/cyan_tile_to_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/cyan_tile_to_wall" +} diff --git a/src/main/resources/assets/otemod/models/item/cyan_wall_variant_1.json b/src/main/resources/assets/otemod/models/item/cyan_wall_variant_1.json new file mode 100644 index 0000000..8e7ea73 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/cyan_wall_variant_1.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/cyan_wall_variant_1" +} diff --git a/src/main/resources/assets/otemod/models/item/cyan_wall_variant_2.json b/src/main/resources/assets/otemod/models/item/cyan_wall_variant_2.json new file mode 100644 index 0000000..7183dd1 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/cyan_wall_variant_2.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/cyan_wall_variant_2" +} diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/cyan.png b/src/main/resources/assets/otemod/textures/block/thresholds/cyan.png new file mode 100644 index 0000000000000000000000000000000000000000..61d4ad38c80168c80152b1ebf771bfd9c66b2c6e GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|WIbIRLo9le vQ$CdbJMX}lu*l`}3dY53JyHfUco-O_{AOGq_V(Waph5;uS3j3^P6Px#z)3_wR5*>LlQ9m1AQV6!e{Hbo>fmLXxYZl<1ihW3$8m6N3USom!HT9SU{V&y zhxg#a$MCo-{Q!V#J1l}{2B2u_5C_8C8mB6e9K0WUW-Jnf^aGNEa}wip(kOg6Fa7fs zLf`2aRn;hLPs`YkQHgOnX%b#rL?VY^SYm5RJH~LkY8FnMMAEDCO~RYPV)oQcGW-d7X zm94>DVCjSEiPsNtX|r+`9?JT}*KT2YD(Mp^o4~Qgd^K-_#|MNR@3}MIm}%hvbQ*)F LtDnm{r-UW|#Whkq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/cyan_wall.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/cyan_wall.png new file mode 100644 index 0000000000000000000000000000000000000000..ea096d3cbd1b70d0c04a0d6d6252ed98b6e5fff9 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|tUX;ELo9le zQ$CdbJMX}lu*l`}3dY530T&q@>pqooe=;^O{7_^(A+YoD7$+U^JI@Q3qPZ N;OXk;vd$@?2>>8HJX8Px literal 0 HcmV?d00001 diff --git a/src/main/resources/data/otemod/loot_tables/blocks/cyan.json b/src/main/resources/data/otemod/loot_tables/blocks/cyan.json new file mode 100644 index 0000000..a77f25a --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/cyan.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:cyan" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/cyan_tile.json b/src/main/resources/data/otemod/loot_tables/blocks/cyan_tile.json new file mode 100644 index 0000000..9cea674 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/cyan_tile.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:cyan_tile" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/cyan_tile_to_wall.json b/src/main/resources/data/otemod/loot_tables/blocks/cyan_tile_to_wall.json new file mode 100644 index 0000000..4c3421a --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/cyan_tile_to_wall.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:cyan_tile_to_wall" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_1.json b/src/main/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_1.json new file mode 100644 index 0000000..036f360 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_1.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:cyan_wall_variant_1" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_2.json b/src/main/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_2.json new file mode 100644 index 0000000..973d4e9 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_2.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:cyan_wall_variant_2" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan.json new file mode 100644 index 0000000..cf900a6 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "ABA", + "AAA" + ], + "key": { + "A": { + "item": "minecraft:cyan_wool" + }, + "B": { + "item": "minecraft:obsidian" + } + }, + "result": { + "item": "otemod:cyan", + "count": 4 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile.json new file mode 100644 index 0000000..077b80a --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ABA", + "BAB", + "ABA" + ], + "key": { + "A": { + "item": "otemod:cyan" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:cyan_tile", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile_to_wall.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile_to_wall.json new file mode 100644 index 0000000..293b67b --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile_to_wall.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "BAB", + "ABA" + ], + "key": { + "A": { + "item": "otemod:cyan" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:cyan_tile_to_wall", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_wall_variant_1.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_wall_variant_1.json new file mode 100644 index 0000000..9ecca06 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_wall_variant_1.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "AAA", + "BAB" + ], + "key": { + "A": { + "item": "otemod:cyan" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:cyan_wall_variant_1", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_wall_variant_2.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_wall_variant_2.json new file mode 100644 index 0000000..16fe7be --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_wall_variant_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "BAB", + "AAA", + "BAB" + ], + "key": { + "A": { + "item": "otemod:cyan" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:cyan_wall_variant_2", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/tinkering/enchantments_to_modifiers.json b/src/main/resources/data/otemod/tinkering/enchantments_to_modifiers.json index bde1dc6..58ecf0e 100644 --- a/src/main/resources/data/otemod/tinkering/enchantments_to_modifiers.json +++ b/src/main/resources/data/otemod/tinkering/enchantments_to_modifiers.json @@ -1,3 +1,4 @@ { - "otemod:mob_egging": "otemod:eggables" + "otemod:mob_egging": "otemod:eggable", + "otemod:flight": "otemod:flying" } \ No newline at end of file diff --git a/src/main/resources/data/otemod/tinkering/materials/definitions/eternium.json b/src/main/resources/data/otemod/tinkering/materials/definitions/eternium.json new file mode 100644 index 0000000..2667433 --- /dev/null +++ b/src/main/resources/data/otemod/tinkering/materials/definitions/eternium.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "tier": 1, + "sortOrder": 20, + "hidden": false +} \ No newline at end of file diff --git a/src/main/resources/data/otemod/tinkering/materials/definitions/ilusium.json b/src/main/resources/data/otemod/tinkering/materials/definitions/ilusium.json new file mode 100644 index 0000000..2667433 --- /dev/null +++ b/src/main/resources/data/otemod/tinkering/materials/definitions/ilusium.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "tier": 1, + "sortOrder": 20, + "hidden": false +} \ No newline at end of file diff --git a/src/main/resources/data/otemod/tinkering/materials/stats/eternium.json b/src/main/resources/data/otemod/tinkering/materials/stats/eternium.json new file mode 100644 index 0000000..75c2928 --- /dev/null +++ b/src/main/resources/data/otemod/tinkering/materials/stats/eternium.json @@ -0,0 +1,28 @@ +{ + "stats": { + "tconstruct:head": { + "durability": 1800, + "miningSpeed": 3.5, + "harvestTier": "minecraft:diamond", + "attack": 1.25 + }, + "tconstruct:extra": {}, + "tconstruct:limb": { + "durability": 800, + "drawSpeed": 0.05, + "velocity": 0.05, + "accuracy": 0.05 + }, + "tconstruct:grip": { + "durability": 1.05, + "accuracy": 0.05, + "meleeAttack": 2.25 + }, + "tconstruct:handle": { + "durability": 1.05, + "miningSpeed": 1.05, + "attackSpeed": 1.05, + "attackDamage": 1.0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/otemod/tinkering/materials/stats/ilusium.json b/src/main/resources/data/otemod/tinkering/materials/stats/ilusium.json new file mode 100644 index 0000000..75c2928 --- /dev/null +++ b/src/main/resources/data/otemod/tinkering/materials/stats/ilusium.json @@ -0,0 +1,28 @@ +{ + "stats": { + "tconstruct:head": { + "durability": 1800, + "miningSpeed": 3.5, + "harvestTier": "minecraft:diamond", + "attack": 1.25 + }, + "tconstruct:extra": {}, + "tconstruct:limb": { + "durability": 800, + "drawSpeed": 0.05, + "velocity": 0.05, + "accuracy": 0.05 + }, + "tconstruct:grip": { + "durability": 1.05, + "accuracy": 0.05, + "meleeAttack": 2.25 + }, + "tconstruct:handle": { + "durability": 1.05, + "miningSpeed": 1.05, + "attackSpeed": 1.05, + "attackDamage": 1.0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/otemod/tinkering/materials/traits/eggables.json b/src/main/resources/data/otemod/tinkering/materials/traits/eternium.json similarity index 100% rename from src/main/resources/data/otemod/tinkering/materials/traits/eggables.json rename to src/main/resources/data/otemod/tinkering/materials/traits/eternium.json diff --git a/src/main/resources/data/otemod/tinkering/materials/traits/ilusium.json b/src/main/resources/data/otemod/tinkering/materials/traits/ilusium.json new file mode 100644 index 0000000..c9df4c8 --- /dev/null +++ b/src/main/resources/data/otemod/tinkering/materials/traits/ilusium.json @@ -0,0 +1,6 @@ +{ + "default":{ + "name": "otemod:flying", + "level": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/otemod/tinkering/modifiers/eggable.json b/src/main/resources/data/otemod/tinkering/modifiers/eggable.json new file mode 100644 index 0000000..302d6de --- /dev/null +++ b/src/main/resources/data/otemod/tinkering/modifiers/eggable.json @@ -0,0 +1,15 @@ +{ + "type": "tconstruct:composable", + "level_display": { + "type": "tconstruct:unique", + "unique_until": 6 + }, + "tooltip_display": "always", + "modules": [ + { + "type": "tconstruct:harvest_enchantment", + "name": "otemod:mob_egging", + "level": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/otemod/tinkering/modifiers/eggables.json b/src/main/resources/data/otemod/tinkering/modifiers/eggables.json deleted file mode 100644 index fd9a142..0000000 --- a/src/main/resources/data/otemod/tinkering/modifiers/eggables.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "tconstruct:loot", - "level_display": "tconstruct:default", - "enchantment": { - "name": "otemod:mob_egging", - "level": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/otemod/tinkering/modifiers/flying.json b/src/main/resources/data/otemod/tinkering/modifiers/flying.json new file mode 100644 index 0000000..2538619 --- /dev/null +++ b/src/main/resources/data/otemod/tinkering/modifiers/flying.json @@ -0,0 +1,12 @@ +{ + "type": "tconstruct:composable", + "level_display": "tconstruct:no_levels", + "tooltip_display": "always", + "modules": [ + { + "type": "tconstruct:constant_enchantment", + "name": "otemod:flight", + "level": 1 + } + ] +} \ No newline at end of file From 600b3c686ae2a873de10722d5fdcc54a5e698e95 Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Sun, 28 Jan 2024 18:41:53 -0700 Subject: [PATCH 05/22] Implement Consumption Mending --- .../enchantments/ConsumptionMending.java | 158 ++++++++++++++++++ .../enchantments/EnchantmentEvents.java | 39 +++++ .../enchantments/FlightEnchantment.java | 48 ++---- .../otemod/enchantments/ModEnchantments.java | 2 + .../zontreck/otemod/items/PossBallItem.java | 2 +- .../zontreck/otemod/items/ThrownPossBall.java | 1 + .../resources/assets/otemod/lang/en_us.json | 3 + 7 files changed, 220 insertions(+), 33 deletions(-) create mode 100644 src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java create mode 100644 src/main/java/dev/zontreck/otemod/enchantments/EnchantmentEvents.java diff --git a/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java b/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java new file mode 100644 index 0000000..e1b3b18 --- /dev/null +++ b/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java @@ -0,0 +1,158 @@ +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 int getMinCost(int pLevel) { + return 25 + (pLevel-1); + } + + @Override + public int getMaxCost(int pLevel) { + return pLevel * 23; + } + + private static List append(ServerPlayer player, List items) + { + List 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 enchanted = new ArrayList<>(); + enchanted.addAll(append(player, player.getInventory().items)); + enchanted.addAll(append(player, player.getInventory().armor)); + + List 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; + + // 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 enchantments = ItemUtils.getEnchantments(item); + for(Map.Entry entry : enchantments.entrySet()) + { + Enchantment id = entry.getKey(); + if(id.isCurse()) + { + 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); + } + } + } + } +} diff --git a/src/main/java/dev/zontreck/otemod/enchantments/EnchantmentEvents.java b/src/main/java/dev/zontreck/otemod/enchantments/EnchantmentEvents.java new file mode 100644 index 0000000..704c1c4 --- /dev/null +++ b/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); + } + } + } +} diff --git a/src/main/java/dev/zontreck/otemod/enchantments/FlightEnchantment.java b/src/main/java/dev/zontreck/otemod/enchantments/FlightEnchantment.java index fd85ebc..56bbe60 100644 --- a/src/main/java/dev/zontreck/otemod/enchantments/FlightEnchantment.java +++ b/src/main/java/dev/zontreck/otemod/enchantments/FlightEnchantment.java @@ -73,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() >= (10*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(), 30*20, 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); + } + } } diff --git a/src/main/java/dev/zontreck/otemod/enchantments/ModEnchantments.java b/src/main/java/dev/zontreck/otemod/enchantments/ModEnchantments.java index 365230b..696c9bb 100644 --- a/src/main/java/dev/zontreck/otemod/enchantments/ModEnchantments.java +++ b/src/main/java/dev/zontreck/otemod/enchantments/ModEnchantments.java @@ -22,6 +22,8 @@ public class ModEnchantments { public static final RegistryObject NIGHT_VISION_ENCHANT = REGISTERS.register("night_vision", ()->new NightVisionEnchantment(EquipmentSlot.HEAD)); + public static final RegistryObject 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); } diff --git a/src/main/java/dev/zontreck/otemod/items/PossBallItem.java b/src/main/java/dev/zontreck/otemod/items/PossBallItem.java index 91d682c..e61742a 100644 --- a/src/main/java/dev/zontreck/otemod/items/PossBallItem.java +++ b/src/main/java/dev/zontreck/otemod/items/PossBallItem.java @@ -50,7 +50,7 @@ public class PossBallItem extends Item ThrownPossBall TPB = new ThrownPossBall(pLevel, pPlayer); if(pPlayer.getAbilities().instabuild) TPB.setItem(stack.copy()); else - TPB.setItem(stack); + TPB.setItem(stack.copy()); TPB.shootFromRotation(pPlayer, pPlayer.getXRot(), pPlayer.getYRot(), 0.0F, 1.5F, 1.0F); pLevel.addFreshEntity(TPB); } diff --git a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java index aa12145..afdb8b4 100644 --- a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java +++ b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java @@ -85,6 +85,7 @@ public class ThrownPossBall extends ThrowableItemProjectile le.save(tag); getItem().getTag().put("entity", tag); + getItem().setCount(1); captured=true; LoreContainer cont = new LoreContainer(getItem()); diff --git a/src/main/resources/assets/otemod/lang/en_us.json b/src/main/resources/assets/otemod/lang/en_us.json index bc09ca5..45149fd 100644 --- a/src/main/resources/assets/otemod/lang/en_us.json +++ b/src/main/resources/assets/otemod/lang/en_us.json @@ -87,6 +87,9 @@ "enchantment.otemod.borrowed_protection": "Borrowed Protection", "enchantment.otemod.borrowed_protection.desc": "Borrows protection from any nearby player.", "enchantment.otemod.night_vision": "Night Vision", + "enchantment.otemod.night_vision.desc": "See in the dark!", + "enchantment.otemod.consumption_mending": "Consumption Mending", + "enchantment.otemod.consumption_mending.desc": "Consumes items to repair durability. May consume curses.", "effect.otemod.flight": "Flight", From a8dd0954f07f13df387843f823a539b05dcb973c Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Sun, 28 Jan 2024 18:43:21 -0700 Subject: [PATCH 06/22] Adds a dice roll to absorbing a curse. --- .../dev/zontreck/otemod/enchantments/ConsumptionMending.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java b/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java index e1b3b18..f582451 100644 --- a/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java +++ b/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java @@ -137,7 +137,9 @@ public class ConsumptionMending extends Enchantment for(Map.Entry entry : enchantments.entrySet()) { Enchantment id = entry.getKey(); - if(id.isCurse()) + 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)); From 479e6dd0baa109963344b0b5af75bd0923c21a2c Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Sun, 28 Jan 2024 18:43:51 -0700 Subject: [PATCH 07/22] Make consumption into a curse --- .../dev/zontreck/otemod/enchantments/ConsumptionMending.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java b/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java index f582451..de708e3 100644 --- a/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java +++ b/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java @@ -42,6 +42,11 @@ public class ConsumptionMending extends Enchantment return false; } + @Override + public boolean isCurse() { + return true; + } + @Override public int getMinCost(int pLevel) { return 25 + (pLevel-1); From 8c76b531bb03339194945b72003a045914d8a6bb Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Sun, 28 Jan 2024 18:44:50 -0700 Subject: [PATCH 08/22] Bump version number --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 389d343..ca11f03 100644 --- a/gradle.properties +++ b/gradle.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.012324.1609 +mod_version=1.4.012824.1844 # 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 From 5b5ea9f9ea8a1dcd83f5a2d32dbdc7b169bab5ea Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Mon, 29 Jan 2024 03:29:40 -0700 Subject: [PATCH 09/22] Fix two bugs in Consumption Mending and poss ball --- .../otemod/enchantments/ConsumptionMending.java | 2 +- .../java/dev/zontreck/otemod/items/PossBallItem.java | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java b/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java index de708e3..1bbd603 100644 --- a/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java +++ b/src/main/java/dev/zontreck/otemod/enchantments/ConsumptionMending.java @@ -111,7 +111,7 @@ public class ConsumptionMending extends Enchantment int iDamage = stack.getDamageValue(); int iMax = stack.getMaxDamage(); - int iNeeds = iDamage; + int iNeeds = iDamage * 2; // The stack we are inspecting: int nDamage = item.getDamageValue(); diff --git a/src/main/java/dev/zontreck/otemod/items/PossBallItem.java b/src/main/java/dev/zontreck/otemod/items/PossBallItem.java index e61742a..38d3eba 100644 --- a/src/main/java/dev/zontreck/otemod/items/PossBallItem.java +++ b/src/main/java/dev/zontreck/otemod/items/PossBallItem.java @@ -31,16 +31,6 @@ 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 use(Level pLevel, Player pPlayer, InteractionHand pUsedHand) { ItemStack stack = pPlayer.getItemInHand(pUsedHand); From deb1fe1e46b6ba4e0f24e65645f891482c7dc04b Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Mon, 29 Jan 2024 22:42:32 -0700 Subject: [PATCH 10/22] Implement new lime variant, add stairs, add tile to stairs transition block, illumination --- gradle.properties | 4 +- .../dev/zontreck/otemod/blocks/ModBlocks.java | 110 +++++++-- .../dev/zontreck/otemod/blocks/VoidBlock.java | 12 + .../otemod/blockstates/cyan_stairs.json | 209 ++++++++++++++++++ .../otemod/blockstates/cyan_tile_br.json | 19 ++ .../assets/otemod/blockstates/lime.json | 7 + .../otemod/blockstates/lime_stairs.json | 209 ++++++++++++++++++ .../assets/otemod/blockstates/lime_tile.json | 7 + .../otemod/blockstates/lime_tile_br.json | 19 ++ .../otemod/blockstates/lime_tile_to_wall.json | 7 + .../blockstates/lime_wall_variant_1.json | 7 + .../blockstates/lime_wall_variant_2.json | 7 + .../assets/otemod/blockstates/red_stairs.json | 209 ++++++++++++++++++ .../otemod/blockstates/red_tile_br.json | 19 ++ .../resources/assets/otemod/lang/en_us.json | 11 + .../assets/otemod/models/block/blood_red.json | 2 +- .../assets/otemod/models/block/cyan.json | 2 +- .../otemod/models/block/cyan_stairs.json | 8 + .../models/block/cyan_stairs_inner.json | 8 + .../models/block/cyan_stairs_outer.json | 8 + .../assets/otemod/models/block/cyan_tile.json | 2 +- .../otemod/models/block/cyan_tile_br.json | 7 + .../models/block/cyan_tile_to_wall.json | 2 +- .../models/block/cyan_wall_variant_1.json | 2 +- .../models/block/cyan_wall_variant_2.json | 2 +- .../assets/otemod/models/block/fb/cube.json | 11 + .../otemod/models/block/fb/fullbright.json | 22 ++ .../otemod/models/block/fb/rotatable.json | 12 + .../assets/otemod/models/block/fb/sided.json | 12 + .../assets/otemod/models/block/fb/top.json | 11 + .../assets/otemod/models/block/lime.json | 6 + .../otemod/models/block/lime_stairs.json | 8 + .../models/block/lime_stairs_inner.json | 8 + .../models/block/lime_stairs_outer.json | 8 + .../assets/otemod/models/block/lime_tile.json | 7 + .../otemod/models/block/lime_tile_br.json | 7 + .../models/block/lime_tile_to_wall.json | 7 + .../models/block/lime_wall_variant_1.json | 7 + .../models/block/lime_wall_variant_2.json | 7 + .../otemod/models/block/red_stairs.json | 8 + .../otemod/models/block/red_stairs_inner.json | 8 + .../otemod/models/block/red_stairs_outer.json | 8 + .../assets/otemod/models/block/red_tile.json | 2 +- .../otemod/models/block/red_tile_br.json | 7 + .../otemod/models/block/red_tile_to_wall.json | 2 +- .../models/block/red_wall_variant_1.json | 2 +- .../models/block/red_wall_variant_2.json | 2 +- .../assets/otemod/models/block/whiteout.json | 2 +- .../otemod/models/item/cyan_stairs.json | 3 + .../otemod/models/item/cyan_tile_br.json | 3 + .../assets/otemod/models/item/lime.json | 3 + .../otemod/models/item/lime_stairs.json | 3 + .../assets/otemod/models/item/lime_tile.json | 3 + .../otemod/models/item/lime_tile_br.json | 3 + .../otemod/models/item/lime_tile_to_wall.json | 3 + .../models/item/lime_wall_variant_1.json | 3 + .../models/item/lime_wall_variant_2.json | 3 + .../assets/otemod/models/item/red_stairs.json | 3 + .../otemod/models/item/red_tile_br.json | 3 + .../floor/tiles/cyan_tile_transition.png | Bin 0 -> 231 bytes .../hallway/floor/tiles/lime_tile.png | Bin 0 -> 281 bytes .../floor/tiles/lime_tile_transition.png | Bin 0 -> 256 bytes .../floor/tiles/red_tile_stairs_inner.png | Bin 0 -> 237 bytes .../tiles/red_tile_transition_blood_red.png | Bin 0 -> 206 bytes .../hallway/wall/lime_floor_to_wall.png | Bin 0 -> 225 bytes .../thresholds/hallway/wall/lime_wall.png | Bin 0 -> 133 bytes .../thresholds/hallway/wall/lime_wall2.png | Bin 0 -> 180 bytes .../otemod/textures/block/thresholds/lime.png | Bin 0 -> 99 bytes .../loot_tables/blocks/cyan_stairs.json | 14 ++ .../loot_tables/blocks/cyan_tile_br.json | 14 ++ .../data/otemod/loot_tables/blocks/lime.json | 14 ++ .../loot_tables/blocks/lime_stairs.json | 14 ++ .../otemod/loot_tables/blocks/lime_tile.json | 14 ++ .../loot_tables/blocks/lime_tile_br.json | 14 ++ .../loot_tables/blocks/lime_tile_to_wall.json | 14 ++ .../blocks/lime_wall_variant_1.json | 14 ++ .../blocks/lime_wall_variant_2.json | 14 ++ .../otemod/loot_tables/blocks/red_stairs.json | 14 ++ .../loot_tables/blocks/red_tile_br.json | 14 ++ .../thresholds/decorative/cyan_stairs.json | 17 ++ .../thresholds/decorative/cyan_tile_br.json | 20 ++ .../recipes/thresholds/decorative/lime.json | 20 ++ .../thresholds/decorative/lime_stairs.json | 17 ++ .../thresholds/decorative/lime_tile.json | 20 ++ .../thresholds/decorative/lime_tile_br.json | 20 ++ .../decorative/lime_tile_to_wall.json | 20 ++ .../decorative/lime_wall_variant_1.json | 20 ++ .../decorative/lime_wall_variant_2.json | 20 ++ .../thresholds/decorative/red_stairs.json | 17 ++ .../thresholds/decorative/red_tile_br.json | 20 ++ .../data/otemod/tags/thresholds/cyan.json | 11 + .../data/otemod/tags/thresholds/lime.json | 11 + .../data/otemod/tags/thresholds/red.json | 11 + .../otemod/tags/thresholds_unbreakable.json | 7 + 94 files changed, 1484 insertions(+), 27 deletions(-) create mode 100644 src/main/java/dev/zontreck/otemod/blocks/VoidBlock.java create mode 100644 src/main/resources/assets/otemod/blockstates/cyan_stairs.json create mode 100644 src/main/resources/assets/otemod/blockstates/cyan_tile_br.json create mode 100644 src/main/resources/assets/otemod/blockstates/lime.json create mode 100644 src/main/resources/assets/otemod/blockstates/lime_stairs.json create mode 100644 src/main/resources/assets/otemod/blockstates/lime_tile.json create mode 100644 src/main/resources/assets/otemod/blockstates/lime_tile_br.json create mode 100644 src/main/resources/assets/otemod/blockstates/lime_tile_to_wall.json create mode 100644 src/main/resources/assets/otemod/blockstates/lime_wall_variant_1.json create mode 100644 src/main/resources/assets/otemod/blockstates/lime_wall_variant_2.json create mode 100644 src/main/resources/assets/otemod/blockstates/red_stairs.json create mode 100644 src/main/resources/assets/otemod/blockstates/red_tile_br.json create mode 100644 src/main/resources/assets/otemod/models/block/cyan_stairs.json create mode 100644 src/main/resources/assets/otemod/models/block/cyan_stairs_inner.json create mode 100644 src/main/resources/assets/otemod/models/block/cyan_stairs_outer.json create mode 100644 src/main/resources/assets/otemod/models/block/cyan_tile_br.json create mode 100644 src/main/resources/assets/otemod/models/block/fb/cube.json create mode 100644 src/main/resources/assets/otemod/models/block/fb/fullbright.json create mode 100644 src/main/resources/assets/otemod/models/block/fb/rotatable.json create mode 100644 src/main/resources/assets/otemod/models/block/fb/sided.json create mode 100644 src/main/resources/assets/otemod/models/block/fb/top.json create mode 100644 src/main/resources/assets/otemod/models/block/lime.json create mode 100644 src/main/resources/assets/otemod/models/block/lime_stairs.json create mode 100644 src/main/resources/assets/otemod/models/block/lime_stairs_inner.json create mode 100644 src/main/resources/assets/otemod/models/block/lime_stairs_outer.json create mode 100644 src/main/resources/assets/otemod/models/block/lime_tile.json create mode 100644 src/main/resources/assets/otemod/models/block/lime_tile_br.json create mode 100644 src/main/resources/assets/otemod/models/block/lime_tile_to_wall.json create mode 100644 src/main/resources/assets/otemod/models/block/lime_wall_variant_1.json create mode 100644 src/main/resources/assets/otemod/models/block/lime_wall_variant_2.json create mode 100644 src/main/resources/assets/otemod/models/block/red_stairs.json create mode 100644 src/main/resources/assets/otemod/models/block/red_stairs_inner.json create mode 100644 src/main/resources/assets/otemod/models/block/red_stairs_outer.json create mode 100644 src/main/resources/assets/otemod/models/block/red_tile_br.json create mode 100644 src/main/resources/assets/otemod/models/item/cyan_stairs.json create mode 100644 src/main/resources/assets/otemod/models/item/cyan_tile_br.json create mode 100644 src/main/resources/assets/otemod/models/item/lime.json create mode 100644 src/main/resources/assets/otemod/models/item/lime_stairs.json create mode 100644 src/main/resources/assets/otemod/models/item/lime_tile.json create mode 100644 src/main/resources/assets/otemod/models/item/lime_tile_br.json create mode 100644 src/main/resources/assets/otemod/models/item/lime_tile_to_wall.json create mode 100644 src/main/resources/assets/otemod/models/item/lime_wall_variant_1.json create mode 100644 src/main/resources/assets/otemod/models/item/lime_wall_variant_2.json create mode 100644 src/main/resources/assets/otemod/models/item/red_stairs.json create mode 100644 src/main/resources/assets/otemod/models/item/red_tile_br.json create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/cyan_tile_transition.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/lime_tile.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/lime_tile_transition.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/red_tile_stairs_inner.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/red_tile_transition_blood_red.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/lime_floor_to_wall.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/lime_wall.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/lime_wall2.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/lime.png create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/cyan_stairs.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/cyan_tile_br.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/lime.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/lime_stairs.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/lime_tile.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/lime_tile_br.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/lime_tile_to_wall.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/lime_wall_variant_1.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/lime_wall_variant_2.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/red_stairs.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/red_tile_br.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_stairs.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile_br.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/lime.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/lime_stairs.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/lime_tile.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/lime_tile_br.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/lime_tile_to_wall.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/lime_wall_variant_1.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/lime_wall_variant_2.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/red_stairs.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/red_tile_br.json create mode 100644 src/main/resources/data/otemod/tags/thresholds/cyan.json create mode 100644 src/main/resources/data/otemod/tags/thresholds/lime.json create mode 100644 src/main/resources/data/otemod/tags/thresholds/red.json create mode 100644 src/main/resources/data/otemod/tags/thresholds_unbreakable.json diff --git a/gradle.properties b/gradle.properties index ca11f03..e950575 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ minecraft_version=1.18.2 # as they do not follow standard versioning conventions. minecraft_version_range=[1.18.2,1.19) # The Forge version must agree with the Minecraft version to get a valid artifact -forge_version=40.2.17 +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=[40,) # The loader version range can only use the major version of Forge/FML as bounds @@ -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.012824.1844 +mod_version=1.4.012924.2121 # 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 diff --git a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java index fa9d287..9abfbc5 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java +++ b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java @@ -128,7 +128,9 @@ public class ModBlocks { public static final RegistryObject 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 VOID_BLOCK = BLOCKS.register("void", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN))); + public static final RegistryObject VOID_BLOCK = BLOCKS.register("void", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN).lightLevel((X)->{ + return 15; + }).noCollission())); public static final RegistryObject VOID_BLOCK_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("void", ()-> new BlockItem(VOID_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); @@ -136,56 +138,136 @@ public class ModBlocks { public static final RegistryObject WHITE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("whiteout", ()->new BlockItem(WHITE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject T_BLOOD_RED = BLOCKS.register("blood_red", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN))); + public static final RegistryObject T_BLOOD_RED = BLOCKS.register("blood_red", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN).lightLevel((X)->{ + return 15; + }))); public static final RegistryObject 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 T_RED_TILE = BLOCKS.register("red_tile", ()->new Block(BlockBehaviour.Properties.copy(T_BLOOD_RED.get()))); + public static final RegistryObject 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 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 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 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 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 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 T_RED_TILE_WALL = BLOCKS.register("red_tile_to_wall", ()->new Block(BlockBehaviour.Properties.copy(T_RED_TILE.get()))); public static final RegistryObject 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 T_RED_WALL = BLOCKS.register("red_wall_variant_1", ()->new Block(BlockBehaviour.Properties.copy(T_RED_TILE.get()))); + public static final RegistryObject 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 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 T_RED_WALL2 = BLOCKS.register("red_wall_variant_2", ()->new Block(BlockBehaviour.Properties.copy(T_RED_TILE.get()))); + public static final RegistryObject 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 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 T_CYAN = BLOCKS.register("cyan", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN))); + public static final RegistryObject T_CYAN = BLOCKS.register("cyan", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN).lightLevel((X)->{ + return 15; + }).noOcclusion())); public static final RegistryObject T_CYAN_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan", ()-> new BlockItem(T_CYAN.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); - public static final RegistryObject T_CYAN_TILE = BLOCKS.register("cyan_tile", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN.get()))); + public static final RegistryObject T_CYAN_TILE = BLOCKS.register("cyan_tile", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN.get()).lightLevel((X)->{ + return 15; + }))); public static final RegistryObject 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 RegistryObject T_CYAN_TILE_WALL = BLOCKS.register("cyan_tile_to_wall", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN_TILE.get()))); + + public static final RegistryObject 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 RegistryObject 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 RegistryObject 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 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 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 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 T_CYAN_WALL = BLOCKS.register("cyan_wall_variant_1", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN_TILE.get()))); + public static final RegistryObject 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 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 T_CYAN_WALL2 = BLOCKS.register("cyan_wall_variant_2", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN_TILE.get()))); + public static final RegistryObject 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 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 T_LIME = BLOCKS.register("lime", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN).lightLevel((X)->{ + return 15; + }).noOcclusion())); + + public static final RegistryObject T_LIME_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("lime", ()-> new BlockItem(T_LIME.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)))); + + public static final RegistryObject T_LIME_TILE = BLOCKS.register("lime_tile", ()->new Block(BlockBehaviour.Properties.copy(T_LIME.get()).lightLevel((X)->{ + return 15; + }))); + + public static final RegistryObject 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 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 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 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 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 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 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 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 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 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 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 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 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 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)))); private static boolean never(BlockState p_50806_, BlockGetter p_50807_, BlockPos p_50808_) { diff --git a/src/main/java/dev/zontreck/otemod/blocks/VoidBlock.java b/src/main/java/dev/zontreck/otemod/blocks/VoidBlock.java new file mode 100644 index 0000000..4ff1c80 --- /dev/null +++ b/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); + } + + +} diff --git a/src/main/resources/assets/otemod/blockstates/cyan_stairs.json b/src/main/resources/assets/otemod/blockstates/cyan_stairs.json new file mode 100644 index 0000000..25d5160 --- /dev/null +++ b/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 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/cyan_tile_br.json b/src/main/resources/assets/otemod/blockstates/cyan_tile_br.json new file mode 100644 index 0000000..112d34b --- /dev/null +++ b/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 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/lime.json b/src/main/resources/assets/otemod/blockstates/lime.json new file mode 100644 index 0000000..fdc68e1 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/lime.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/lime" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/lime_stairs.json b/src/main/resources/assets/otemod/blockstates/lime_stairs.json new file mode 100644 index 0000000..f350689 --- /dev/null +++ b/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 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/lime_tile.json b/src/main/resources/assets/otemod/blockstates/lime_tile.json new file mode 100644 index 0000000..cca2688 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/lime_tile.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/lime_tile" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/lime_tile_br.json b/src/main/resources/assets/otemod/blockstates/lime_tile_br.json new file mode 100644 index 0000000..316e001 --- /dev/null +++ b/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 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/lime_tile_to_wall.json b/src/main/resources/assets/otemod/blockstates/lime_tile_to_wall.json new file mode 100644 index 0000000..8e17e2a --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/lime_tile_to_wall.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/lime_tile_to_wall" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/lime_wall_variant_1.json b/src/main/resources/assets/otemod/blockstates/lime_wall_variant_1.json new file mode 100644 index 0000000..421fcc3 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/lime_wall_variant_1.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/lime_wall_variant_1" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/lime_wall_variant_2.json b/src/main/resources/assets/otemod/blockstates/lime_wall_variant_2.json new file mode 100644 index 0000000..f0e2c86 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/lime_wall_variant_2.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/lime_wall_variant_2" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/red_stairs.json b/src/main/resources/assets/otemod/blockstates/red_stairs.json new file mode 100644 index 0000000..2c2aea7 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/red_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "otemod:block/red_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "otemod:block/red_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "otemod:block/red_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "otemod:block/red_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "otemod:block/red_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "otemod:block/red_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "otemod:block/red_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "otemod:block/red_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "otemod:block/red_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "otemod:block/red_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "otemod:block/red_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "otemod:block/red_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "otemod:block/red_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "otemod:block/red_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/red_tile_br.json b/src/main/resources/assets/otemod/blockstates/red_tile_br.json new file mode 100644 index 0000000..a6dab97 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/red_tile_br.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "otemod:block/red_tile_br", + "y": 90 + }, + "facing=north": { + "model": "otemod:block/red_tile_br" + }, + "facing=south": { + "model": "otemod:block/red_tile_br", + "y": 180 + }, + "facing=west": { + "model": "otemod:block/red_tile_br", + "y": 270 + } + } +} diff --git a/src/main/resources/assets/otemod/lang/en_us.json b/src/main/resources/assets/otemod/lang/en_us.json index 45149fd..b444b99 100644 --- a/src/main/resources/assets/otemod/lang/en_us.json +++ b/src/main/resources/assets/otemod/lang/en_us.json @@ -70,14 +70,25 @@ "block.otemod.whiteout": "White", "block.otemod.blood_red": "Blood Red", "block.otemod.red_tile": "Red Tile", + "block.otemod.red_tile_br": "Blood Red Tile Transition", + "block.otemod.red_stairs": "Blood Red Stairs", "block.otemod.red_tile_to_wall": "Red Floor To Wall Transition", "block.otemod.red_wall_variant_1": "Red Wall", "block.otemod.red_wall_variant_2": "Red Wall", "block.otemod.cyan": "Cyan", "block.otemod.cyan_tile": "Cyan Tile", + "block.otemod.cyan_tile_br": "Cyan Tile Transition", + "block.otemod.cyan_stairs": "Cyan Stairs", "block.otemod.cyan_tile_to_wall": "Cyan Floor To Wall Transition", "block.otemod.cyan_wall_variant_1": "Cyan Wall", "block.otemod.cyan_wall_variant_2": "Cyan Wall", + "block.otemod.lime": "Lime", + "block.otemod.lime_tile": "Lime Tile", + "block.otemod.lime_tile_br": "Lime Tile Transition", + "block.otemod.lime_stairs": "Lime Stairs", + "block.otemod.lime_tile_to_wall": "Lime Floor To Wall Transition", + "block.otemod.lime_wall_variant_1": "Lime Wall", + "block.otemod.lime_wall_variant_2": "Lime Wall", "enchantment.otemod.mob_egging": "Mob Egging", diff --git a/src/main/resources/assets/otemod/models/block/blood_red.json b/src/main/resources/assets/otemod/models/block/blood_red.json index 37f0643..546f3c7 100644 --- a/src/main/resources/assets/otemod/models/block/blood_red.json +++ b/src/main/resources/assets/otemod/models/block/blood_red.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube_all", + "parent": "otemod:block/fb/cube", "textures": { "all": "otemod:block/thresholds/blood_red" } diff --git a/src/main/resources/assets/otemod/models/block/cyan.json b/src/main/resources/assets/otemod/models/block/cyan.json index 2bb090b..a7d7025 100644 --- a/src/main/resources/assets/otemod/models/block/cyan.json +++ b/src/main/resources/assets/otemod/models/block/cyan.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube_all", + "parent": "otemod:block/fb/cube", "textures": { "all": "otemod:block/thresholds/cyan" } diff --git a/src/main/resources/assets/otemod/models/block/cyan_stairs.json b/src/main/resources/assets/otemod/models/block/cyan_stairs.json new file mode 100644 index 0000000..c5d1d8d --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/cyan_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "otemod:block/thresholds/cyan", + "side": "otemod:block/thresholds/cyan", + "top": "otemod:block/thresholds/cyan" + } +} diff --git a/src/main/resources/assets/otemod/models/block/cyan_stairs_inner.json b/src/main/resources/assets/otemod/models/block/cyan_stairs_inner.json new file mode 100644 index 0000000..9872b7b --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/cyan_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "otemod:block/thresholds/cyan", + "side": "otemod:block/thresholds/cyan", + "top": "otemod:block/thresholds/cyan" + } +} diff --git a/src/main/resources/assets/otemod/models/block/cyan_stairs_outer.json b/src/main/resources/assets/otemod/models/block/cyan_stairs_outer.json new file mode 100644 index 0000000..d28ded0 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/cyan_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "otemod:block/thresholds/cyan", + "side": "otemod:block/thresholds/cyan", + "top": "otemod:block/thresholds/cyan" + } +} diff --git a/src/main/resources/assets/otemod/models/block/cyan_tile.json b/src/main/resources/assets/otemod/models/block/cyan_tile.json index 9511de4..f28a83d 100644 --- a/src/main/resources/assets/otemod/models/block/cyan_tile.json +++ b/src/main/resources/assets/otemod/models/block/cyan_tile.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube_top", + "parent": "otemod:block/fb/top", "textures": { "top": "otemod:block/thresholds/hallway/floor/tiles/cyan_tile_w_circle", "side": "otemod:block/thresholds/cyan" diff --git a/src/main/resources/assets/otemod/models/block/cyan_tile_br.json b/src/main/resources/assets/otemod/models/block/cyan_tile_br.json new file mode 100644 index 0000000..2d4735a --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/cyan_tile_br.json @@ -0,0 +1,7 @@ +{ + "parent": "otemod:block/fb/sided", + "textures": { + "top": "otemod:block/thresholds/hallway/floor/tiles/cyan_tile_transition", + "side": "otemod:block/thresholds/cyan" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/cyan_tile_to_wall.json b/src/main/resources/assets/otemod/models/block/cyan_tile_to_wall.json index 34c1fc1..d70bd38 100644 --- a/src/main/resources/assets/otemod/models/block/cyan_tile_to_wall.json +++ b/src/main/resources/assets/otemod/models/block/cyan_tile_to_wall.json @@ -1,5 +1,5 @@ { - "parent": "otemod:block/sided", + "parent": "otemod:block/fb/sided", "textures": { "side": "otemod:block/thresholds/hallway/wall/cyan_floor_to_wall", "top": "otemod:block/thresholds/cyan" diff --git a/src/main/resources/assets/otemod/models/block/cyan_wall_variant_1.json b/src/main/resources/assets/otemod/models/block/cyan_wall_variant_1.json index 36347eb..78e6c84 100644 --- a/src/main/resources/assets/otemod/models/block/cyan_wall_variant_1.json +++ b/src/main/resources/assets/otemod/models/block/cyan_wall_variant_1.json @@ -1,5 +1,5 @@ { - "parent": "otemod:block/sided", + "parent": "otemod:block/fb/sided", "textures": { "side": "otemod:block/thresholds/hallway/wall/cyan_wall", "top": "otemod:block/thresholds/cyan" diff --git a/src/main/resources/assets/otemod/models/block/cyan_wall_variant_2.json b/src/main/resources/assets/otemod/models/block/cyan_wall_variant_2.json index 3e90f33..4b6f8c5 100644 --- a/src/main/resources/assets/otemod/models/block/cyan_wall_variant_2.json +++ b/src/main/resources/assets/otemod/models/block/cyan_wall_variant_2.json @@ -1,5 +1,5 @@ { - "parent": "otemod:block/sided", + "parent": "otemod:block/fb/sided", "textures": { "side": "otemod:block/thresholds/hallway/wall/cyan_wall2", "top": "otemod:block/thresholds/cyan" diff --git a/src/main/resources/assets/otemod/models/block/fb/cube.json b/src/main/resources/assets/otemod/models/block/fb/cube.json new file mode 100644 index 0000000..df60ac4 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/fb/cube.json @@ -0,0 +1,11 @@ +{ + "parent": "otemod:block/fb/fullbright", + "textures": { + "north": "#all", + "south": "#all", + "west": "#all", + "east": "#all", + "up": "#all", + "down": "#all" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/fb/fullbright.json b/src/main/resources/assets/otemod/models/block/fb/fullbright.json new file mode 100644 index 0000000..a86d0c7 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/fb/fullbright.json @@ -0,0 +1,22 @@ +{ + "parent": "block/block", + "ambientocclusion" : false, + "textures": { + "particle": "#up" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "shade": false, + "faces": { + "down": { "texture": "#down", "cullface": "down" }, + "up": { "texture": "#up", "cullface": "up" }, + "north": { "texture": "#north", "cullface": "north" }, + "south": { "texture": "#south", "cullface": "south" }, + "west": { "texture": "#west", "cullface": "west" }, + "east": { "texture": "#east", "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/fb/rotatable.json b/src/main/resources/assets/otemod/models/block/fb/rotatable.json new file mode 100644 index 0000000..805f88e --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/fb/rotatable.json @@ -0,0 +1,12 @@ +{ + "parent": "otemod:block/fb/fullbright", + "textures": { + "particle": "#side", + "down": "#side", + "up": "#side", + "north": "#front", + "east": "#side", + "south": "#side", + "west": "#side" + } +} diff --git a/src/main/resources/assets/otemod/models/block/fb/sided.json b/src/main/resources/assets/otemod/models/block/fb/sided.json new file mode 100644 index 0000000..891a049 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/fb/sided.json @@ -0,0 +1,12 @@ +{ + "parent": "otemod:block/fb/cube", + "textures": { + "particle": "#side", + "down": "#top", + "up": "#top", + "north": "#side", + "east": "#side", + "south": "#side", + "west": "#side" + } +} diff --git a/src/main/resources/assets/otemod/models/block/fb/top.json b/src/main/resources/assets/otemod/models/block/fb/top.json new file mode 100644 index 0000000..7812ffc --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/fb/top.json @@ -0,0 +1,11 @@ +{ + "parent": "otemod:block/fb/fullbright", + "textures": { + "north": "#side", + "south": "#side", + "west": "#side", + "east": "#side", + "up": "#top", + "down": "#side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/lime.json b/src/main/resources/assets/otemod/models/block/lime.json new file mode 100644 index 0000000..cb36b13 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/lime.json @@ -0,0 +1,6 @@ +{ + "parent": "otemod:block/fb/cube", + "textures": { + "all": "otemod:block/thresholds/lime" + } +} diff --git a/src/main/resources/assets/otemod/models/block/lime_stairs.json b/src/main/resources/assets/otemod/models/block/lime_stairs.json new file mode 100644 index 0000000..d861db5 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/lime_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "otemod:block/thresholds/lime", + "side": "otemod:block/thresholds/lime", + "top": "otemod:block/thresholds/lime" + } +} diff --git a/src/main/resources/assets/otemod/models/block/lime_stairs_inner.json b/src/main/resources/assets/otemod/models/block/lime_stairs_inner.json new file mode 100644 index 0000000..a28e09f --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/lime_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "otemod:block/thresholds/lime", + "side": "otemod:block/thresholds/lime", + "top": "otemod:block/thresholds/lime" + } +} diff --git a/src/main/resources/assets/otemod/models/block/lime_stairs_outer.json b/src/main/resources/assets/otemod/models/block/lime_stairs_outer.json new file mode 100644 index 0000000..239636a --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/lime_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "otemod:block/thresholds/lime", + "side": "otemod:block/thresholds/lime", + "top": "otemod:block/thresholds/lime" + } +} diff --git a/src/main/resources/assets/otemod/models/block/lime_tile.json b/src/main/resources/assets/otemod/models/block/lime_tile.json new file mode 100644 index 0000000..310446c --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/lime_tile.json @@ -0,0 +1,7 @@ +{ + "parent": "otemod:block/fb/top", + "textures": { + "top": "otemod:block/thresholds/hallway/floor/tiles/lime_tile", + "side": "otemod:block/thresholds/lime" + } +} diff --git a/src/main/resources/assets/otemod/models/block/lime_tile_br.json b/src/main/resources/assets/otemod/models/block/lime_tile_br.json new file mode 100644 index 0000000..3def34b --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/lime_tile_br.json @@ -0,0 +1,7 @@ +{ + "parent": "otemod:block/fb/sided", + "textures": { + "top": "otemod:block/thresholds/hallway/floor/tiles/lime_tile_transition", + "side": "otemod:block/thresholds/lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/lime_tile_to_wall.json b/src/main/resources/assets/otemod/models/block/lime_tile_to_wall.json new file mode 100644 index 0000000..45262d1 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/lime_tile_to_wall.json @@ -0,0 +1,7 @@ +{ + "parent": "otemod:block/fb/sided", + "textures": { + "side": "otemod:block/thresholds/hallway/wall/lime_floor_to_wall", + "top": "otemod:block/thresholds/lime" + } +} diff --git a/src/main/resources/assets/otemod/models/block/lime_wall_variant_1.json b/src/main/resources/assets/otemod/models/block/lime_wall_variant_1.json new file mode 100644 index 0000000..dc434a5 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/lime_wall_variant_1.json @@ -0,0 +1,7 @@ +{ + "parent": "otemod:block/fb/sided", + "textures": { + "side": "otemod:block/thresholds/hallway/wall/lime_wall", + "top": "otemod:block/thresholds/lime" + } +} diff --git a/src/main/resources/assets/otemod/models/block/lime_wall_variant_2.json b/src/main/resources/assets/otemod/models/block/lime_wall_variant_2.json new file mode 100644 index 0000000..06f83c0 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/lime_wall_variant_2.json @@ -0,0 +1,7 @@ +{ + "parent": "otemod:block/fb/sided", + "textures": { + "side": "otemod:block/thresholds/hallway/wall/lime_wall2", + "top": "otemod:block/thresholds/lime" + } +} diff --git a/src/main/resources/assets/otemod/models/block/red_stairs.json b/src/main/resources/assets/otemod/models/block/red_stairs.json new file mode 100644 index 0000000..ec931b6 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/red_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "otemod:block/thresholds/blood_red", + "side": "otemod:block/thresholds/blood_red", + "top": "otemod:block/thresholds/blood_red" + } +} diff --git a/src/main/resources/assets/otemod/models/block/red_stairs_inner.json b/src/main/resources/assets/otemod/models/block/red_stairs_inner.json new file mode 100644 index 0000000..4a2cabf --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/red_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "otemod:block/thresholds/blood_red", + "side": "otemod:block/thresholds/blood_red", + "top": "otemod:block/thresholds/blood_red" + } +} diff --git a/src/main/resources/assets/otemod/models/block/red_stairs_outer.json b/src/main/resources/assets/otemod/models/block/red_stairs_outer.json new file mode 100644 index 0000000..89cab1e --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/red_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "otemod:block/thresholds/blood_red", + "side": "otemod:block/thresholds/blood_red", + "top": "otemod:block/thresholds/blood_red" + } +} diff --git a/src/main/resources/assets/otemod/models/block/red_tile.json b/src/main/resources/assets/otemod/models/block/red_tile.json index c1669e1..0dd7237 100644 --- a/src/main/resources/assets/otemod/models/block/red_tile.json +++ b/src/main/resources/assets/otemod/models/block/red_tile.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube_top", + "parent": "otemod:block/fb/top", "textures": { "top": "otemod:block/thresholds/hallway/floor/tiles/red_tile_w_circle", "side": "otemod:block/thresholds/blood_red" diff --git a/src/main/resources/assets/otemod/models/block/red_tile_br.json b/src/main/resources/assets/otemod/models/block/red_tile_br.json new file mode 100644 index 0000000..b327cca --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/red_tile_br.json @@ -0,0 +1,7 @@ +{ + "parent": "otemod:block/fb/sided", + "textures": { + "top": "otemod:block/thresholds/hallway/floor/tiles/red_tile_transition_blood_red", + "side": "otemod:block/thresholds/blood_red" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/red_tile_to_wall.json b/src/main/resources/assets/otemod/models/block/red_tile_to_wall.json index 1b198bf..5e48812 100644 --- a/src/main/resources/assets/otemod/models/block/red_tile_to_wall.json +++ b/src/main/resources/assets/otemod/models/block/red_tile_to_wall.json @@ -1,5 +1,5 @@ { - "parent": "otemod:block/sided", + "parent": "otemod:block/fb/sided", "textures": { "side": "otemod:block/thresholds/hallway/wall/red_floor_to_wall", "top": "otemod:block/thresholds/blood_red" diff --git a/src/main/resources/assets/otemod/models/block/red_wall_variant_1.json b/src/main/resources/assets/otemod/models/block/red_wall_variant_1.json index 46f55d0..3bde2b3 100644 --- a/src/main/resources/assets/otemod/models/block/red_wall_variant_1.json +++ b/src/main/resources/assets/otemod/models/block/red_wall_variant_1.json @@ -1,5 +1,5 @@ { - "parent": "otemod:block/sided", + "parent": "otemod:block/fb/sided", "textures": { "side": "otemod:block/thresholds/hallway/wall/red_wall", "top": "otemod:block/thresholds/blood_red" diff --git a/src/main/resources/assets/otemod/models/block/red_wall_variant_2.json b/src/main/resources/assets/otemod/models/block/red_wall_variant_2.json index 0f531e9..4e25a7d 100644 --- a/src/main/resources/assets/otemod/models/block/red_wall_variant_2.json +++ b/src/main/resources/assets/otemod/models/block/red_wall_variant_2.json @@ -1,5 +1,5 @@ { - "parent": "otemod:block/sided", + "parent": "otemod:block/fb/sided", "textures": { "side": "otemod:block/thresholds/hallway/wall/red_wall2", "top": "otemod:block/thresholds/blood_red" diff --git a/src/main/resources/assets/otemod/models/block/whiteout.json b/src/main/resources/assets/otemod/models/block/whiteout.json index 994e32c..0223382 100644 --- a/src/main/resources/assets/otemod/models/block/whiteout.json +++ b/src/main/resources/assets/otemod/models/block/whiteout.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube_all", + "parent": "minecraft:block/fb/cube", "textures": { "all": "otemod:block/thresholds/white" } diff --git a/src/main/resources/assets/otemod/models/item/cyan_stairs.json b/src/main/resources/assets/otemod/models/item/cyan_stairs.json new file mode 100644 index 0000000..0fe2214 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/cyan_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/cyan_stairs" +} diff --git a/src/main/resources/assets/otemod/models/item/cyan_tile_br.json b/src/main/resources/assets/otemod/models/item/cyan_tile_br.json new file mode 100644 index 0000000..c734dc4 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/cyan_tile_br.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/cyan_tile_br" +} diff --git a/src/main/resources/assets/otemod/models/item/lime.json b/src/main/resources/assets/otemod/models/item/lime.json new file mode 100644 index 0000000..ef953b7 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/lime.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/lime" +} diff --git a/src/main/resources/assets/otemod/models/item/lime_stairs.json b/src/main/resources/assets/otemod/models/item/lime_stairs.json new file mode 100644 index 0000000..f2ebaab --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/lime_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/lime_stairs" +} diff --git a/src/main/resources/assets/otemod/models/item/lime_tile.json b/src/main/resources/assets/otemod/models/item/lime_tile.json new file mode 100644 index 0000000..c9a2b1c --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/lime_tile.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/lime_tile" +} diff --git a/src/main/resources/assets/otemod/models/item/lime_tile_br.json b/src/main/resources/assets/otemod/models/item/lime_tile_br.json new file mode 100644 index 0000000..ea754fd --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/lime_tile_br.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/lime_tile_br" +} diff --git a/src/main/resources/assets/otemod/models/item/lime_tile_to_wall.json b/src/main/resources/assets/otemod/models/item/lime_tile_to_wall.json new file mode 100644 index 0000000..b3b2fb5 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/lime_tile_to_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/lime_tile_to_wall" +} diff --git a/src/main/resources/assets/otemod/models/item/lime_wall_variant_1.json b/src/main/resources/assets/otemod/models/item/lime_wall_variant_1.json new file mode 100644 index 0000000..fcb05ab --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/lime_wall_variant_1.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/lime_wall_variant_1" +} diff --git a/src/main/resources/assets/otemod/models/item/lime_wall_variant_2.json b/src/main/resources/assets/otemod/models/item/lime_wall_variant_2.json new file mode 100644 index 0000000..6ae47a3 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/lime_wall_variant_2.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/lime_wall_variant_2" +} diff --git a/src/main/resources/assets/otemod/models/item/red_stairs.json b/src/main/resources/assets/otemod/models/item/red_stairs.json new file mode 100644 index 0000000..9893d90 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/red_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/red_stairs" +} diff --git a/src/main/resources/assets/otemod/models/item/red_tile_br.json b/src/main/resources/assets/otemod/models/item/red_tile_br.json new file mode 100644 index 0000000..d5205f5 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/red_tile_br.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/red_tile_br" +} diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/cyan_tile_transition.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/cyan_tile_transition.png new file mode 100644 index 0000000000000000000000000000000000000000..202a74b859e9eb1c4ea9f3d7524088e812c05c16 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|7J9lkhFJ9O zow$*!*+8Jp-r3yKE1W%k*@U%rYZmLPs#%zod30w~r+Y78HK+tn#&fBbDmx=yr*OQ#o6z} z)F;e532#1&uX1V7ZPU{Eel)2=g(2p7_=l|qjD0FSuWcr_%y4OpeQvzeOGM(p1v42> dl^NR}GJZ*mEU(Coa0EJ*!PC{xWt~$(699%Px#(@8`@R5*>Lld%qhFcd{kI}i+EV03}t;14+ZGfXCY5ntp_Fi2o=#~299b1+mT zv?Z}qbK7&<_j;=?a+0aL0Z^qaAu%Hl0Lm^iI$+jjJxC8|AN)NZc@PpC!>PNWeX!3& z4bqDZzF!9b_UE0^mgOiB5gQyGa{!)oV>MBO^x}f&VKdQNV1VeDo07g6RkVrtVAoBw zbN7a!=UU+1?PuL=KD|oYPY!%0)+UC;Kf;=c_Zj~RQqd-|CCY1X*=3&`%o$&nFg12Je4K5cUg=B&=(Azu6{1-oD!M< D>2hQ) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/red_tile_stairs_inner.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/red_tile_stairs_inner.png new file mode 100644 index 0000000000000000000000000000000000000000..c8ee90b9cea40ad41fb86c7c7214a7b1b5c22a0c GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|mV3H5hFJ72 zoxGd3)quy<|BgDV@P-S?5o$?HT}GYN z=5P(ZeJwJNr&uktmb&X$enUp~Y$LmUCrj{F$vs!D?(R%TGi#21wzu`sfyU@F^FMLV jh>C98WBBlO`96laU9BF<%?=zuCo_1u`njxgN@xNA!faPg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/red_tile_transition_blood_red.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/red_tile_transition_blood_red.png new file mode 100644 index 0000000000000000000000000000000000000000..ca85fc75ba89f7b1241b0de965871c98aab37775 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Iy_w*Lo9l? zPITmJHsE1l@6N7y!TlqkQiuQX1Dgdh4x)^k0$jIFY1TcT@w6oW$Ay4vO#kCQ+?uy4 z?%=-H&*Oz;62(3Jnv`qQHCap}Ja5$}cKt9j7Wf+5^l3)$ky#HqpK!4m1ZlB_Pm=QS zlCWH?!ljm;Q{wI^VzX<#d4Lcr^NkI<8lJpz4Xj5Wdnf$x5B>sl6N9I#pUXO@geCyt CzDQ93 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/lime_floor_to_wall.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/lime_floor_to_wall.png new file mode 100644 index 0000000000000000000000000000000000000000..f53a8a70a2bab0230e43564836776d91e766fda5 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|W_!9ghFJ8z zonXz^3T-)`33Midr>mdKI;Vst0F*0MegFUf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/lime_wall.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/lime_wall.png new file mode 100644 index 0000000000000000000000000000000000000000..8477d808f440e186e24174c61f9522fb7e040792 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|>^)r^Lo9le zeJV75%x`2m;L`alklBrQ!92$E{dMZmpFc0YFF9k!RT0S(hEIN8e9v+ME7s7BQ;Ma_4Q3`tavP`6g3)`(JY#JEMIkHp)0B{A{#JbXcXmVwN=H Y@kI4M_IgY6fi^REy85}Sb4q9e08z0(y#N3J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/lime.png b/src/main/resources/assets/otemod/textures/block/thresholds/lime.png new file mode 100644 index 0000000000000000000000000000000000000000..c1af956ecea3105f598efe688e873bb4b53a7564 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|WIbIRLo9le veJV75%x`2m;L`alklBq_!Zg7^l7V4G7*k>3ku86L3K=|I{an^LB{Ts5NLLy3 literal 0 HcmV?d00001 diff --git a/src/main/resources/data/otemod/loot_tables/blocks/cyan_stairs.json b/src/main/resources/data/otemod/loot_tables/blocks/cyan_stairs.json new file mode 100644 index 0000000..6ce3609 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/cyan_stairs.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:cyan_stairs" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/cyan_tile_br.json b/src/main/resources/data/otemod/loot_tables/blocks/cyan_tile_br.json new file mode 100644 index 0000000..24e28eb --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/cyan_tile_br.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:cyan_tile_br" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/lime.json b/src/main/resources/data/otemod/loot_tables/blocks/lime.json new file mode 100644 index 0000000..5b65a73 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/lime.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:lime" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/lime_stairs.json b/src/main/resources/data/otemod/loot_tables/blocks/lime_stairs.json new file mode 100644 index 0000000..a791b39 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/lime_stairs.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:lime_stairs" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/lime_tile.json b/src/main/resources/data/otemod/loot_tables/blocks/lime_tile.json new file mode 100644 index 0000000..8a5aa85 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/lime_tile.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:lime_tile" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/lime_tile_br.json b/src/main/resources/data/otemod/loot_tables/blocks/lime_tile_br.json new file mode 100644 index 0000000..2054f98 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/lime_tile_br.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:lime_tile_br" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/lime_tile_to_wall.json b/src/main/resources/data/otemod/loot_tables/blocks/lime_tile_to_wall.json new file mode 100644 index 0000000..fa3330e --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/lime_tile_to_wall.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:lime_tile_to_wall" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/lime_wall_variant_1.json b/src/main/resources/data/otemod/loot_tables/blocks/lime_wall_variant_1.json new file mode 100644 index 0000000..89a05e8 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/lime_wall_variant_1.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:lime_wall_variant_1" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/lime_wall_variant_2.json b/src/main/resources/data/otemod/loot_tables/blocks/lime_wall_variant_2.json new file mode 100644 index 0000000..510e53c --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/lime_wall_variant_2.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:lime_wall_variant_2" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/red_stairs.json b/src/main/resources/data/otemod/loot_tables/blocks/red_stairs.json new file mode 100644 index 0000000..d93e6aa --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/red_stairs.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:red_stairs" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/loot_tables/blocks/red_tile_br.json b/src/main/resources/data/otemod/loot_tables/blocks/red_tile_br.json new file mode 100644 index 0000000..44db242 --- /dev/null +++ b/src/main/resources/data/otemod/loot_tables/blocks/red_tile_br.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "otemod:red_tile_br" + } + ] + } + ] +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_stairs.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_stairs.json new file mode 100644 index 0000000..29cac10 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_stairs.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "A ", + "AA ", + "AAA" + ], + "key": { + "A": { + "item": "otemod:cyan" + } + }, + "result": { + "item": "otemod:cyan_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile_br.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile_br.json new file mode 100644 index 0000000..df9a891 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile_br.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "BAB", + "AAA" + ], + "key": { + "A": { + "item": "otemod:cyan" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:cyan_tile_br", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/lime.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime.json new file mode 100644 index 0000000..d55b1db --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "ABA", + "AAA" + ], + "key": { + "A": { + "item": "minecraft:lime_wool" + }, + "B": { + "item": "minecraft:obsidian" + } + }, + "result": { + "item": "otemod:lime", + "count": 4 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_stairs.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_stairs.json new file mode 100644 index 0000000..57058d6 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_stairs.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "A ", + "AA ", + "AAA" + ], + "key": { + "A": { + "item": "otemod:lime" + } + }, + "result": { + "item": "otemod:lime_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_tile.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_tile.json new file mode 100644 index 0000000..6d7601a --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_tile.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ABA", + "BAB", + "ABA" + ], + "key": { + "A": { + "item": "otemod:lime" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:lime_tile", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_tile_br.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_tile_br.json new file mode 100644 index 0000000..c510dfd --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_tile_br.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "BAB", + "AAA" + ], + "key": { + "A": { + "item": "otemod:lime" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:lime_tile_br", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_tile_to_wall.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_tile_to_wall.json new file mode 100644 index 0000000..8b0a277 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_tile_to_wall.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "BAB", + "ABA" + ], + "key": { + "A": { + "item": "otemod:lime" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:lime_tile_to_wall", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_wall_variant_1.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_wall_variant_1.json new file mode 100644 index 0000000..00294d3 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_wall_variant_1.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "AAA", + "BAB" + ], + "key": { + "A": { + "item": "otemod:lime" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:lime_wall_variant_1", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_wall_variant_2.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_wall_variant_2.json new file mode 100644 index 0000000..a5669f5 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/lime_wall_variant_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "BAB", + "AAA", + "BAB" + ], + "key": { + "A": { + "item": "otemod:lime" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:lime_wall_variant_2", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/red_stairs.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/red_stairs.json new file mode 100644 index 0000000..ce3b508 --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/red_stairs.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "A ", + "AA ", + "AAA" + ], + "key": { + "A": { + "item": "otemod:blood_red" + } + }, + "result": { + "item": "otemod:red_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/red_tile_br.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/red_tile_br.json new file mode 100644 index 0000000..2222f2d --- /dev/null +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/red_tile_br.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "BAB", + "AAA" + ], + "key": { + "A": { + "item": "otemod:blood_red" + }, + "B": { + "item": "otemod:whiteout" + } + }, + "result": { + "item": "otemod:red_tile_br", + "count": 2 + } +} diff --git a/src/main/resources/data/otemod/tags/thresholds/cyan.json b/src/main/resources/data/otemod/tags/thresholds/cyan.json new file mode 100644 index 0000000..346b057 --- /dev/null +++ b/src/main/resources/data/otemod/tags/thresholds/cyan.json @@ -0,0 +1,11 @@ +{ + "values": [ + "otemod:cyan", + "otemod:cyan_tile", + "otemod:cyan_stairs", + "otemod:cyan_tile_br", + "otemod:cyan_tile_to_wall", + "otemod:cyan_wall", + "otemod:cyan_wall2" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/otemod/tags/thresholds/lime.json b/src/main/resources/data/otemod/tags/thresholds/lime.json new file mode 100644 index 0000000..fdae0c3 --- /dev/null +++ b/src/main/resources/data/otemod/tags/thresholds/lime.json @@ -0,0 +1,11 @@ +{ + "values": [ + "otemod:lime", + "otemod:lime_tile", + "otemod:lime_stairs", + "otemod:lime_tile_br", + "otemod:lime_tile_to_wall", + "otemod:lime_wall", + "otemod:lime_wall2" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/otemod/tags/thresholds/red.json b/src/main/resources/data/otemod/tags/thresholds/red.json new file mode 100644 index 0000000..de5cea3 --- /dev/null +++ b/src/main/resources/data/otemod/tags/thresholds/red.json @@ -0,0 +1,11 @@ +{ + "values": [ + "otemod:blood_red", + "otemod:red_tile", + "otemod:red_stairs", + "otemod:red_tile_br", + "otemod:red_tile_to_wall", + "otemod:red_wall", + "otemod:red_wall2" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/otemod/tags/thresholds_unbreakable.json b/src/main/resources/data/otemod/tags/thresholds_unbreakable.json new file mode 100644 index 0000000..800e225 --- /dev/null +++ b/src/main/resources/data/otemod/tags/thresholds_unbreakable.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#otemod:thresholds/red", + "#otemod:thresholds/cyan", + "#otemod:thresholds/lime" + ] +} \ No newline at end of file From 8793b373cf390d08e4c92780690d2b37411cd635 Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Tue, 30 Jan 2024 04:22:08 -0700 Subject: [PATCH 11/22] Adds pool blocks! --- gradle.properties | 2 +- .../dev/zontreck/otemod/blocks/ModBlocks.java | 72 ++++++ .../otemod/blockstates/blue_pool_light.json | 7 + .../otemod/blockstates/blue_pool_tile.json | 7 + .../blockstates/blue_pool_tile_stairs.json | 209 ++++++++++++++++++ .../otemod/blockstates/dark_pool_light.json | 7 + .../otemod/blockstates/dark_pool_tile.json | 7 + .../blockstates/dark_pool_tile_stairs.json | 209 ++++++++++++++++++ .../blockstates/dirty_blue_pool_light.json | 7 + .../blockstates/dirty_blue_pool_tile.json | 7 + .../dirty_blue_pool_tile_stairs.json | 209 ++++++++++++++++++ .../otemod/blockstates/dirty_pool_light.json | 7 + .../otemod/blockstates/dirty_pool_tile.json | 7 + .../blockstates/dirty_pool_tile_stairs.json | 209 ++++++++++++++++++ .../blockstates/dirty_red_pool_light.json | 7 + .../blockstates/dirty_red_pool_tile.json | 7 + .../dirty_red_pool_tile_stairs.json | 209 ++++++++++++++++++ .../blockstates/filthy_blue_pool_light.json | 7 + .../otemod/blockstates/filthy_pool_light.json | 7 + .../blockstates/filthy_red_pool_light.json | 7 + .../assets/otemod/blockstates/pool_light.json | 7 + .../assets/otemod/blockstates/pool_tile.json | 7 + .../otemod/blockstates/pool_tile_stairs.json | 209 ++++++++++++++++++ .../otemod/blockstates/red_pool_light.json | 7 + .../otemod/blockstates/red_pool_tile.json | 7 + .../blockstates/red_pool_tile_stairs.json | 209 ++++++++++++++++++ .../resources/assets/otemod/lang/en_us.json | 25 +++ .../models/block/thresholds/.placeholder | 0 .../pool/light/blue_pool_light.json | 6 + .../pool/light/dark_pool_light.json | 6 + .../pool/light/dirty_blue_pool_light.json | 6 + .../pool/light/dirty_pool_light.json | 6 + .../pool/light/dirty_red_pool_light.json | 6 + .../pool/light/filthy_blue_pool_light.json | 6 + .../pool/light/filthy_pool_light.json | 6 + .../pool/light/filthy_red_pool_light.json | 6 + .../thresholds/pool/light/pool_light.json | 6 + .../thresholds/pool/light/red_pool_light.json | 6 + .../pool/stairs/blue_pool_tile_stairs.json | 8 + .../stairs/blue_pool_tile_stairs_inner.json | 8 + .../stairs/blue_pool_tile_stairs_outer.json | 8 + .../pool/stairs/dark_pool_tile_stairs.json | 8 + .../stairs/dark_pool_tile_stairs_inner.json | 8 + .../stairs/dark_pool_tile_stairs_outer.json | 8 + .../stairs/dirty_blue_pool_tile_stairs.json | 8 + .../dirty_blue_pool_tile_stairs_inner.json | 8 + .../dirty_blue_pool_tile_stairs_outer.json | 8 + .../pool/stairs/dirty_pool_tile_stairs.json | 8 + .../stairs/dirty_pool_tile_stairs_inner.json | 8 + .../stairs/dirty_pool_tile_stairs_outer.json | 8 + .../stairs/dirty_red_pool_tile_stairs.json | 8 + .../dirty_red_pool_tile_stairs_inner.json | 8 + .../dirty_red_pool_tile_stairs_outer.json | 8 + .../pool/stairs/pool_tile_stairs.json | 8 + .../pool/stairs/pool_tile_stairs_inner.json | 8 + .../pool/stairs/pool_tile_stairs_outer.json | 8 + .../pool/stairs/red_pool_tile_stairs.json | 8 + .../stairs/red_pool_tile_stairs_inner.json | 8 + .../stairs/red_pool_tile_stairs_outer.json | 8 + .../thresholds/pool/tiles/blue_pool_tile.json | 6 + .../thresholds/pool/tiles/dark_pool_tile.json | 6 + .../pool/tiles/dirty_blue_pool_tile.json | 6 + .../pool/tiles/dirty_pool_tile.json | 6 + .../pool/tiles/dirty_red_pool_tile.json | 6 + .../thresholds/pool/tiles/pool_tile.json | 6 + .../thresholds/pool/tiles/red_pool_tile.json | 6 + .../otemod/models/item/blue_pool_light.json | 3 + .../otemod/models/item/blue_pool_tile.json | 3 + .../models/item/blue_pool_tile_stairs.json | 3 + .../otemod/models/item/dark_pool_light.json | 3 + .../otemod/models/item/dark_pool_tile.json | 3 + .../models/item/dark_pool_tile_stairs.json | 3 + .../models/item/dirty_blue_pool_light.json | 3 + .../models/item/dirty_blue_pool_tile.json | 3 + .../item/dirty_blue_pool_tile_stairs.json | 3 + .../otemod/models/item/dirty_pool_light.json | 3 + .../otemod/models/item/dirty_pool_tile.json | 3 + .../models/item/dirty_pool_tile_stairs.json | 3 + .../models/item/dirty_red_pool_light.json | 3 + .../models/item/dirty_red_pool_tile.json | 3 + .../item/dirty_red_pool_tile_stairs.json | 3 + .../models/item/filthy_blue_pool_light.json | 3 + .../otemod/models/item/filthy_pool_light.json | 3 + .../models/item/filthy_red_pool_light.json | 3 + .../assets/otemod/models/item/pool_light.json | 3 + .../assets/otemod/models/item/pool_tile.json | 3 + .../otemod/models/item/pool_tile_stairs.json | 3 + .../otemod/models/item/red_pool_light.json | 3 + .../otemod/models/item/red_pool_tile.json | 3 + .../models/item/red_pool_tile_stairs.json | 3 + .../hallway/tiles/blue_pool_light.png | Bin 0 -> 1355 bytes .../hallway/tiles/blue_pool_tile.png | Bin 0 -> 1396 bytes .../hallway/tiles/dark_pool_light.png | Bin 0 -> 1387 bytes .../hallway/tiles/dark_pool_tile.png | Bin 0 -> 1511 bytes .../hallway/tiles/dirty_blue_pool_light.png | Bin 0 -> 1350 bytes .../tiles/dirty_blue_pool_light_dirty.png | Bin 0 -> 1397 bytes .../hallway/tiles/dirty_blue_pool_tile.png | Bin 0 -> 1190 bytes .../hallway/tiles/dirty_pool_light.png | Bin 0 -> 1335 bytes .../hallway/tiles/dirty_pool_light_dirty.png | Bin 0 -> 1307 bytes .../hallway/tiles/dirty_pool_tile.png | Bin 0 -> 756 bytes .../hallway/tiles/dirty_red_pool_light.png | Bin 0 -> 1302 bytes .../tiles/dirty_red_pool_light_dirty.png | Bin 0 -> 1332 bytes .../hallway/tiles/dirty_red_pool_tile.png | Bin 0 -> 1072 bytes .../thresholds/hallway/tiles/pool_light.png | Bin 0 -> 1272 bytes .../thresholds/hallway/tiles/pool_tile.png | Bin 0 -> 736 bytes .../hallway/tiles/red_pool_light.png | Bin 0 -> 1303 bytes .../hallway/tiles/red_pool_tile.png | Bin 0 -> 1138 bytes .../{ => thresholds/hallways/cyan}/cyan.json | 0 .../hallways/cyan}/cyan_stairs.json | 0 .../hallways/cyan}/cyan_tile.json | 0 .../hallways/cyan}/cyan_tile_br.json | 0 .../hallways/cyan}/cyan_tile_to_wall.json | 0 .../hallways/cyan}/cyan_wall_variant_1.json | 0 .../hallways/cyan}/cyan_wall_variant_2.json | 0 .../{ => thresholds/hallways/lime}/lime.json | 0 .../hallways/lime}/lime_stairs.json | 0 .../hallways/lime}/lime_tile.json | 0 .../hallways/lime}/lime_tile_br.json | 0 .../hallways/lime}/lime_tile_to_wall.json | 0 .../hallways/lime}/lime_wall_variant_1.json | 0 .../hallways/lime}/lime_wall_variant_2.json | 0 .../hallways/red}/blood_red.json | 0 .../hallways/red}/red_stairs.json | 0 .../hallways/red}/red_tile.json | 0 .../hallways/red}/red_tile_br.json | 0 .../hallways/red}/red_tile_to_wall.json | 0 .../hallways/red}/red_wall_variant_1.json | 0 .../hallways/red}/red_wall_variant_2.json | 0 .../pool/light/blue_pool_light.json | 14 ++ .../pool/light/dark_pool_light.json | 14 ++ .../pool/light/dirty_blue_pool_light.json | 14 ++ .../pool/light/dirty_pool_light.json | 14 ++ .../pool/light/dirty_red_pool_light.json | 14 ++ .../pool/light/filthy_blue_pool_light.json | 14 ++ .../pool/light/filthy_pool_light.json | 14 ++ .../pool/light/filthy_red_pool_light.json | 14 ++ .../thresholds/pool/light/pool_light.json | 14 ++ .../thresholds/pool/light/red_pool_light.json | 14 ++ .../pool/stairs/blue_pool_tile_stairs.json | 14 ++ .../pool/stairs/dark_pool_tile_stairs.json | 14 ++ .../stairs/dirty_blue_pool_tile_stairs.json | 14 ++ .../pool/stairs/dirty_pool_tile_stairs.json | 14 ++ .../stairs/dirty_red_pool_tile_stairs.json | 14 ++ .../pool/stairs/pool_tile_stairs.json | 14 ++ .../pool/stairs/red_pool_tile_stairs.json | 14 ++ .../thresholds/pool/tiles/blue_pool_tile.json | 14 ++ .../thresholds/pool/tiles/dark_pool_tile.json | 14 ++ .../pool/tiles/dirty_blue_pool_tile.json | 14 ++ .../pool/tiles/dirty_pool_tile.json | 14 ++ .../pool/tiles/dirty_red_pool_tile.json | 14 ++ .../thresholds/pool/tiles/pool_tile.json | 14 ++ .../thresholds/pool/tiles/red_pool_tile.json | 14 ++ .../decorative/{ => cyan}/cyan.json | 0 .../decorative/{ => cyan}/cyan_stairs.json | 0 .../decorative/{ => cyan}/cyan_tile.json | 0 .../decorative/{ => cyan}/cyan_tile_br.json | 0 .../{ => cyan}/cyan_tile_to_wall.json | 0 .../{ => cyan}/cyan_wall_variant_1.json | 0 .../{ => cyan}/cyan_wall_variant_2.json | 0 .../decorative/{ => lime}/lime.json | 0 .../decorative/{ => lime}/lime_stairs.json | 0 .../decorative/{ => lime}/lime_tile.json | 0 .../decorative/{ => lime}/lime_tile_br.json | 0 .../{ => lime}/lime_tile_to_wall.json | 0 .../{ => lime}/lime_wall_variant_1.json | 0 .../{ => lime}/lime_wall_variant_2.json | 0 .../decorative/pool/blue/blue_pool_light.json | 20 ++ .../pool/blue/blue_pool_tile_stairs.json | 17 ++ .../decorative/pool/blue/blue_pool_tiles.json | 23 ++ .../pool/blue/dark_pool_tile_stairs.json | 17 ++ .../decorative/pool/blue/dark_pool_tiles.json | 19 ++ .../pool/blue/dirty_blue_pool_light.json | 15 ++ .../blue/dirty_blue_pool_tile_stairs.json | 17 ++ .../pool/blue/dirty_blue_pool_tiles.json | 15 ++ .../pool/blue/filthy_blue_pool_light.json | 15 ++ .../pool/clean/clean_pool_tiles.json | 19 ++ .../pool/clean/dirty_pool_light.json | 15 ++ .../pool/clean/dirty_pool_tile_stairs.json | 17 ++ .../pool/clean/dirty_pool_tiles.json | 15 ++ .../pool/clean/filthy_pool_light.json | 15 ++ .../decorative/pool/clean/pool_light.json | 20 ++ .../pool/clean/pool_tile_stairs.json | 17 ++ .../pool/red/dirty_red_pool_light.json | 15 ++ .../pool/red/dirty_red_pool_tile_stairs.json | 17 ++ .../pool/red/dirty_red_pool_tiles.json | 19 ++ .../pool/red/filthy_red_pool_light.json | 15 ++ .../decorative/pool/red/red_pool_light.json | 20 ++ .../pool/red/red_pool_tile_stairs.json | 17 ++ .../decorative/pool/red/red_pool_tiles.json | 23 ++ .../decorative/{ => red}/blood_red.json | 0 .../decorative/{ => red}/red_stairs.json | 0 .../decorative/{ => red}/red_tile.json | 0 .../decorative/{ => red}/red_tile_br.json | 0 .../{ => red}/red_tile_to_wall.json | 0 .../{ => red}/red_wall_variant_1.json | 0 .../{ => red}/red_wall_variant_2.json | 0 .../data/otemod/tags/thresholds/pool.json | 28 +++ .../otemod/tags/thresholds_unbreakable.json | 3 +- 198 files changed, 2790 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/otemod/blockstates/blue_pool_light.json create mode 100644 src/main/resources/assets/otemod/blockstates/blue_pool_tile.json create mode 100644 src/main/resources/assets/otemod/blockstates/blue_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/blockstates/dark_pool_light.json create mode 100644 src/main/resources/assets/otemod/blockstates/dark_pool_tile.json create mode 100644 src/main/resources/assets/otemod/blockstates/dark_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/blockstates/dirty_blue_pool_light.json create mode 100644 src/main/resources/assets/otemod/blockstates/dirty_blue_pool_tile.json create mode 100644 src/main/resources/assets/otemod/blockstates/dirty_blue_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/blockstates/dirty_pool_light.json create mode 100644 src/main/resources/assets/otemod/blockstates/dirty_pool_tile.json create mode 100644 src/main/resources/assets/otemod/blockstates/dirty_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/blockstates/dirty_red_pool_light.json create mode 100644 src/main/resources/assets/otemod/blockstates/dirty_red_pool_tile.json create mode 100644 src/main/resources/assets/otemod/blockstates/dirty_red_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/blockstates/filthy_blue_pool_light.json create mode 100644 src/main/resources/assets/otemod/blockstates/filthy_pool_light.json create mode 100644 src/main/resources/assets/otemod/blockstates/filthy_red_pool_light.json create mode 100644 src/main/resources/assets/otemod/blockstates/pool_light.json create mode 100644 src/main/resources/assets/otemod/blockstates/pool_tile.json create mode 100644 src/main/resources/assets/otemod/blockstates/pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/blockstates/red_pool_light.json create mode 100644 src/main/resources/assets/otemod/blockstates/red_pool_tile.json create mode 100644 src/main/resources/assets/otemod/blockstates/red_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/.placeholder create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/light/blue_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/light/dark_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/light/dirty_blue_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/light/dirty_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/light/dirty_red_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/light/filthy_blue_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/light/filthy_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/light/filthy_red_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/light/pool_light.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/light/red_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/blue_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/blue_pool_tile_stairs_inner.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/blue_pool_tile_stairs_outer.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dark_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dark_pool_tile_stairs_inner.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dark_pool_tile_stairs_outer.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_red_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/pool_tile_stairs_inner.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/pool_tile_stairs_outer.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/red_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/red_pool_tile_stairs_inner.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/red_pool_tile_stairs_outer.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/blue_pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dark_pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dirty_blue_pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dirty_pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dirty_red_pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/red_pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/item/blue_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/item/blue_pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/item/blue_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/item/dark_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/item/dark_pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/item/dark_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/item/dirty_blue_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/item/dirty_blue_pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/item/dirty_blue_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/item/dirty_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/item/dirty_pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/item/dirty_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/item/dirty_red_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/item/dirty_red_pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/item/dirty_red_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/item/filthy_blue_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/item/filthy_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/item/filthy_red_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/item/pool_light.json create mode 100644 src/main/resources/assets/otemod/models/item/pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/item/pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/models/item/red_pool_light.json create mode 100644 src/main/resources/assets/otemod/models/item/red_pool_tile.json create mode 100644 src/main/resources/assets/otemod/models/item/red_pool_tile_stairs.json create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/blue_pool_light.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/blue_pool_tile.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dark_pool_light.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dark_pool_tile.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_blue_pool_light.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_blue_pool_light_dirty.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_blue_pool_tile.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_pool_light.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_pool_light_dirty.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_pool_tile.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_red_pool_light.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_red_pool_light_dirty.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_red_pool_tile.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/pool_light.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/pool_tile.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/red_pool_light.png create mode 100644 src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/red_pool_tile.png rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/cyan}/cyan.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/cyan}/cyan_stairs.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/cyan}/cyan_tile.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/cyan}/cyan_tile_br.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/cyan}/cyan_tile_to_wall.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/cyan}/cyan_wall_variant_1.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/cyan}/cyan_wall_variant_2.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/lime}/lime.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/lime}/lime_stairs.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/lime}/lime_tile.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/lime}/lime_tile_br.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/lime}/lime_tile_to_wall.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/lime}/lime_wall_variant_1.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/lime}/lime_wall_variant_2.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/red}/blood_red.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/red}/red_stairs.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/red}/red_tile.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/red}/red_tile_br.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/red}/red_tile_to_wall.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/red}/red_wall_variant_1.json (100%) rename src/main/resources/data/otemod/loot_tables/blocks/{ => thresholds/hallways/red}/red_wall_variant_2.json (100%) create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/light/blue_pool_light.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/light/dark_pool_light.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/light/dirty_blue_pool_light.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/light/dirty_pool_light.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/light/dirty_red_pool_light.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/light/filthy_blue_pool_light.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/light/filthy_pool_light.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/light/filthy_red_pool_light.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/light/pool_light.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/light/red_pool_light.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/stairs/blue_pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/stairs/dark_pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/stairs/dirty_blue_pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/stairs/dirty_pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/stairs/dirty_red_pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/stairs/pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/stairs/red_pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/tiles/blue_pool_tile.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/tiles/dark_pool_tile.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/tiles/dirty_blue_pool_tile.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/tiles/dirty_pool_tile.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/tiles/dirty_red_pool_tile.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/tiles/pool_tile.json create mode 100644 src/main/resources/data/otemod/loot_tables/blocks/thresholds/pool/tiles/red_pool_tile.json rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => cyan}/cyan.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => cyan}/cyan_stairs.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => cyan}/cyan_tile.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => cyan}/cyan_tile_br.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => cyan}/cyan_tile_to_wall.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => cyan}/cyan_wall_variant_1.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => cyan}/cyan_wall_variant_2.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => lime}/lime.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => lime}/lime_stairs.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => lime}/lime_tile.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => lime}/lime_tile_br.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => lime}/lime_tile_to_wall.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => lime}/lime_wall_variant_1.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => lime}/lime_wall_variant_2.json (100%) create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_light.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_tiles.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dark_pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dark_pool_tiles.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dirty_blue_pool_light.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dirty_blue_pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dirty_blue_pool_tiles.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/filthy_blue_pool_light.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/clean_pool_tiles.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_light.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tiles.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/filthy_pool_light.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/pool_light.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/dirty_red_pool_light.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/dirty_red_pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/dirty_red_pool_tiles.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/filthy_red_pool_light.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_light.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_tile_stairs.json create mode 100644 src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_tiles.json rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => red}/blood_red.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => red}/red_stairs.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => red}/red_tile.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => red}/red_tile_br.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => red}/red_tile_to_wall.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => red}/red_wall_variant_1.json (100%) rename src/main/resources/data/otemod/recipes/thresholds/decorative/{ => red}/red_wall_variant_2.json (100%) create mode 100644 src/main/resources/data/otemod/tags/thresholds/pool.json diff --git a/gradle.properties b/gradle.properties index e950575..500a540 100644 --- a/gradle.properties +++ b/gradle.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.012924.2121 +mod_version=1.4.013024.0303 # 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 diff --git a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java index 9abfbc5..7df800e 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java +++ b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java @@ -270,6 +270,78 @@ public class ModBlocks { public static final RegistryObject 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 T_POOL_TILE = BLOCKS.register("pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE))); + public static final RegistryObject 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 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 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 T_POOL_LIGHT = BLOCKS.register("pool_light", ()->new Block(BlockBehaviour.Properties.copy(Blocks.STONE).lightLevel((X)->15).sound(SoundType.GLASS))); + public static final RegistryObject 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 T_DIRTY_POOL_TILE = BLOCKS.register("dirty_pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE))); + public static final RegistryObject 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 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 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 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 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 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 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 T_DARK_POOL_TILE = BLOCKS.register("dark_pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE))); + public static final RegistryObject 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 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 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 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 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 T_BLUE_POOL_TILE = BLOCKS.register("blue_pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE))); + public static final RegistryObject 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 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 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 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 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 T_RED_POOL_TILE = BLOCKS.register("red_pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE))); + public static final RegistryObject 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 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 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 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 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 T_DIRTY_RED_POOL_TILE = BLOCKS.register("dirty_red_pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE))); + public static final RegistryObject 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 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 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 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 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 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 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 T_DIRTY_BLUE_POOL_TILE = BLOCKS.register("dirty_blue_pool_tile", ()->new Block(BlockBehaviour.Properties.copy(Blocks.COBBLESTONE))); + public static final RegistryObject 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 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 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 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 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 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 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_) { return false; } diff --git a/src/main/resources/assets/otemod/blockstates/blue_pool_light.json b/src/main/resources/assets/otemod/blockstates/blue_pool_light.json new file mode 100644 index 0000000..db61a52 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/blue_pool_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/thresholds/pool/light/blue_pool_light" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/blue_pool_tile.json b/src/main/resources/assets/otemod/blockstates/blue_pool_tile.json new file mode 100644 index 0000000..27d6894 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/blue_pool_tile.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/thresholds/pool/tiles/blue_pool_tile" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/blue_pool_tile_stairs.json b/src/main/resources/assets/otemod/blockstates/blue_pool_tile_stairs.json new file mode 100644 index 0000000..eb707f9 --- /dev/null +++ b/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 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/dark_pool_light.json b/src/main/resources/assets/otemod/blockstates/dark_pool_light.json new file mode 100644 index 0000000..7670fda --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/dark_pool_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/thresholds/pool/light/dark_pool_light" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/dark_pool_tile.json b/src/main/resources/assets/otemod/blockstates/dark_pool_tile.json new file mode 100644 index 0000000..19dbba8 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/dark_pool_tile.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/thresholds/pool/tiles/dark_pool_tile" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/dark_pool_tile_stairs.json b/src/main/resources/assets/otemod/blockstates/dark_pool_tile_stairs.json new file mode 100644 index 0000000..3c39d69 --- /dev/null +++ b/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 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/dirty_blue_pool_light.json b/src/main/resources/assets/otemod/blockstates/dirty_blue_pool_light.json new file mode 100644 index 0000000..847eaea --- /dev/null +++ b/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" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/dirty_blue_pool_tile.json b/src/main/resources/assets/otemod/blockstates/dirty_blue_pool_tile.json new file mode 100644 index 0000000..b457b2b --- /dev/null +++ b/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" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/dirty_blue_pool_tile_stairs.json b/src/main/resources/assets/otemod/blockstates/dirty_blue_pool_tile_stairs.json new file mode 100644 index 0000000..0703cc1 --- /dev/null +++ b/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 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/dirty_pool_light.json b/src/main/resources/assets/otemod/blockstates/dirty_pool_light.json new file mode 100644 index 0000000..6c245cc --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/dirty_pool_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/thresholds/pool/light/dirty_pool_light" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/dirty_pool_tile.json b/src/main/resources/assets/otemod/blockstates/dirty_pool_tile.json new file mode 100644 index 0000000..fa7311a --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/dirty_pool_tile.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/thresholds/pool/tiles/dirty_pool_tile" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/dirty_pool_tile_stairs.json b/src/main/resources/assets/otemod/blockstates/dirty_pool_tile_stairs.json new file mode 100644 index 0000000..50a3069 --- /dev/null +++ b/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 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/dirty_red_pool_light.json b/src/main/resources/assets/otemod/blockstates/dirty_red_pool_light.json new file mode 100644 index 0000000..b73b705 --- /dev/null +++ b/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" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/dirty_red_pool_tile.json b/src/main/resources/assets/otemod/blockstates/dirty_red_pool_tile.json new file mode 100644 index 0000000..ebfaecf --- /dev/null +++ b/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" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/dirty_red_pool_tile_stairs.json b/src/main/resources/assets/otemod/blockstates/dirty_red_pool_tile_stairs.json new file mode 100644 index 0000000..4562cbd --- /dev/null +++ b/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 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/filthy_blue_pool_light.json b/src/main/resources/assets/otemod/blockstates/filthy_blue_pool_light.json new file mode 100644 index 0000000..342e823 --- /dev/null +++ b/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" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/filthy_pool_light.json b/src/main/resources/assets/otemod/blockstates/filthy_pool_light.json new file mode 100644 index 0000000..92b3ec3 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/filthy_pool_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/thresholds/pool/light/filthy_pool_light" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/filthy_red_pool_light.json b/src/main/resources/assets/otemod/blockstates/filthy_red_pool_light.json new file mode 100644 index 0000000..9125c9a --- /dev/null +++ b/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" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/pool_light.json b/src/main/resources/assets/otemod/blockstates/pool_light.json new file mode 100644 index 0000000..d1fc85e --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/pool_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/thresholds/pool/light/pool_light" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/pool_tile.json b/src/main/resources/assets/otemod/blockstates/pool_tile.json new file mode 100644 index 0000000..180098b --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/pool_tile.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/thresholds/pool/tiles/pool_tile" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/pool_tile_stairs.json b/src/main/resources/assets/otemod/blockstates/pool_tile_stairs.json new file mode 100644 index 0000000..09b3a3e --- /dev/null +++ b/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 + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/red_pool_light.json b/src/main/resources/assets/otemod/blockstates/red_pool_light.json new file mode 100644 index 0000000..60e29bf --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/red_pool_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/thresholds/pool/light/red_pool_light" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/red_pool_tile.json b/src/main/resources/assets/otemod/blockstates/red_pool_tile.json new file mode 100644 index 0000000..86eb868 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/red_pool_tile.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "otemod:block/thresholds/pool/tiles/red_pool_tile" + } + } +} diff --git a/src/main/resources/assets/otemod/blockstates/red_pool_tile_stairs.json b/src/main/resources/assets/otemod/blockstates/red_pool_tile_stairs.json new file mode 100644 index 0000000..fa3a444 --- /dev/null +++ b/src/main/resources/assets/otemod/blockstates/red_pool_tile_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=top,shape=outer_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=top,shape=straight": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs", + "y": 90, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs", + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs", + "x": 180, + "y": 180, + "uvlock": true + } + } +} diff --git a/src/main/resources/assets/otemod/lang/en_us.json b/src/main/resources/assets/otemod/lang/en_us.json index b444b99..c6b804e 100644 --- a/src/main/resources/assets/otemod/lang/en_us.json +++ b/src/main/resources/assets/otemod/lang/en_us.json @@ -89,6 +89,31 @@ "block.otemod.lime_tile_to_wall": "Lime Floor To Wall Transition", "block.otemod.lime_wall_variant_1": "Lime Wall", "block.otemod.lime_wall_variant_2": "Lime Wall", + "block.otemod.pool_light": "Pool Light", + "block.otemod.dirty_pool_light": "Dirty Pool Light", + "block.otemod.filthy_pool_light": "Filthy Pool Light", + "block.otemod.dark_pool_light": "Dark Pool Light", + "block.otemod.blue_pool_light": "Blue Pool Light", + "block.otemod.red_pool_light": "Red Pool Light", + "block.otemod.dirty_red_pool_light": "Dirty Red Pool Light", + "block.otemod.filthy_red_pool_light": "Filthy Red Pool Light", + "block.otemod.filthy_blue_pool_light": "Filthy Blue Pool Light", + "block.otemod.pool_tile": "Pool Tiles", + "block.otemod.pool_tile_stairs": "Pool Tile Stairs", + "block.otemod.dirty_pool_tile": "Dirty Pool Tiles", + "block.otemod.dirty_pool_tile_stairs": "Dirty Pool Tile Stairs", + "block.otemod.dark_pool_tile": "Dark Pool Tiles", + "block.otemod.dark_pool_tile_stairs": "Dark Pool Tile Stairs", + "block.otemod.blue_pool_tile": "Blue Pool Tiles", + "block.otemod.blue_pool_tile_stairs": "Blue Pool Tile Stairs", + "block.otemod.dirty_blue_pool_tile": "Dirty Blue Pool Tiles", + "block.otemod.dirty_blue_pool_tile_stairs": "Dirty Blue Pool Tile Stairs", + "block.otemod.dirty_blue_pool_light": "Dirty Blue Pool Light", + "block.otemod.red_pool_tile": "Red Pool Tiles", + "block.otemod.red_pool_tile_stairs": "Red Pool Tile Stairs", + "block.otemod.red_pool_tile_light": "Red Pool Light", + "block.otemod.dirty_red_pool_tile": "Dirty Red Pool Tile", + "block.otemod.dirty_red_pool_tile_stairs": "Dirty Red Pool Tile Stairs", "enchantment.otemod.mob_egging": "Mob Egging", diff --git a/src/main/resources/assets/otemod/models/block/thresholds/.placeholder b/src/main/resources/assets/otemod/models/block/thresholds/.placeholder new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/light/blue_pool_light.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/blue_pool_light.json new file mode 100644 index 0000000..1a2ed00 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/blue_pool_light.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/blue_pool_light" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/light/dark_pool_light.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/dark_pool_light.json new file mode 100644 index 0000000..a02b8d6 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/dark_pool_light.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/dark_pool_light" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/light/dirty_blue_pool_light.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/dirty_blue_pool_light.json new file mode 100644 index 0000000..0226303 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/dirty_blue_pool_light.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/dirty_blue_pool_light" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/light/dirty_pool_light.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/dirty_pool_light.json new file mode 100644 index 0000000..174ce42 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/dirty_pool_light.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/dirty_pool_light" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/light/dirty_red_pool_light.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/dirty_red_pool_light.json new file mode 100644 index 0000000..b260ba7 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/dirty_red_pool_light.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/dirty_red_pool_light" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/light/filthy_blue_pool_light.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/filthy_blue_pool_light.json new file mode 100644 index 0000000..3134cf7 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/filthy_blue_pool_light.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/dirty_blue_pool_light_dirty" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/light/filthy_pool_light.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/filthy_pool_light.json new file mode 100644 index 0000000..28bb76c --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/filthy_pool_light.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/dirty_pool_light_dirty" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/light/filthy_red_pool_light.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/filthy_red_pool_light.json new file mode 100644 index 0000000..c0a59b1 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/filthy_red_pool_light.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/dirty_red_pool_light_dirty" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/light/pool_light.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/pool_light.json new file mode 100644 index 0000000..8dfbec0 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/pool_light.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/pool_light" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/light/red_pool_light.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/red_pool_light.json new file mode 100644 index 0000000..2c524c9 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/light/red_pool_light.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/red_pool_light" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/blue_pool_tile_stairs.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/blue_pool_tile_stairs.json new file mode 100644 index 0000000..885cda2 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/blue_pool_tile_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/blue_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/blue_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/blue_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/blue_pool_tile_stairs_inner.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/blue_pool_tile_stairs_inner.json new file mode 100644 index 0000000..7a1dc32 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/blue_pool_tile_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/blue_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/blue_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/blue_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/blue_pool_tile_stairs_outer.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/blue_pool_tile_stairs_outer.json new file mode 100644 index 0000000..712b698 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/blue_pool_tile_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/blue_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/blue_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/blue_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dark_pool_tile_stairs.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dark_pool_tile_stairs.json new file mode 100644 index 0000000..eb4f592 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dark_pool_tile_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/dark_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/dark_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/dark_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dark_pool_tile_stairs_inner.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dark_pool_tile_stairs_inner.json new file mode 100644 index 0000000..d814019 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dark_pool_tile_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/dark_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/dark_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/dark_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dark_pool_tile_stairs_outer.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dark_pool_tile_stairs_outer.json new file mode 100644 index 0000000..8b7593c --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dark_pool_tile_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/dark_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/dark_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/dark_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs.json new file mode 100644 index 0000000..d334bdf --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/dirty_blue_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/dirty_blue_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/dirty_blue_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner.json new file mode 100644 index 0000000..901f57e --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/dirty_blue_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/dirty_blue_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/dirty_blue_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer.json new file mode 100644 index 0000000..e4fdf05 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/dirty_blue_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/dirty_blue_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/dirty_blue_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_pool_tile_stairs.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_pool_tile_stairs.json new file mode 100644 index 0000000..cfd6454 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_pool_tile_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/dirty_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/dirty_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/dirty_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner.json new file mode 100644 index 0000000..e783841 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_pool_tile_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/dirty_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/dirty_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/dirty_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer.json new file mode 100644 index 0000000..5bc7b82 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_pool_tile_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/dirty_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/dirty_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/dirty_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_red_pool_tile_stairs.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_red_pool_tile_stairs.json new file mode 100644 index 0000000..45926f2 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_red_pool_tile_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/dirty_red_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/dirty_red_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/dirty_red_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner.json new file mode 100644 index 0000000..4d1181e --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/dirty_red_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/dirty_red_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/dirty_red_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer.json new file mode 100644 index 0000000..7edb734 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/dirty_red_pool_tile_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/dirty_red_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/dirty_red_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/dirty_red_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/pool_tile_stairs.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/pool_tile_stairs.json new file mode 100644 index 0000000..0ec4e76 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/pool_tile_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/pool_tile_stairs_inner.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/pool_tile_stairs_inner.json new file mode 100644 index 0000000..e295e73 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/pool_tile_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/pool_tile_stairs_outer.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/pool_tile_stairs_outer.json new file mode 100644 index 0000000..de52e69 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/pool_tile_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/red_pool_tile_stairs.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/red_pool_tile_stairs.json new file mode 100644 index 0000000..89f7954 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/red_pool_tile_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/red_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/red_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/red_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/red_pool_tile_stairs_inner.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/red_pool_tile_stairs_inner.json new file mode 100644 index 0000000..4f50f70 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/red_pool_tile_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/red_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/red_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/red_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/red_pool_tile_stairs_outer.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/red_pool_tile_stairs_outer.json new file mode 100644 index 0000000..afea149 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/stairs/red_pool_tile_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "otemod:block/thresholds/hallway/tiles/red_pool_tile", + "top": "otemod:block/thresholds/hallway/tiles/red_pool_tile", + "bottom": "otemod:block/thresholds/hallway/tiles/red_pool_tile" + } +} diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/blue_pool_tile.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/blue_pool_tile.json new file mode 100644 index 0000000..1d23751 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/blue_pool_tile.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/blue_pool_tile" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dark_pool_tile.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dark_pool_tile.json new file mode 100644 index 0000000..7a5e49d --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dark_pool_tile.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/dark_pool_tile" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dirty_blue_pool_tile.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dirty_blue_pool_tile.json new file mode 100644 index 0000000..56e52ae --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dirty_blue_pool_tile.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/dirty_blue_pool_tile" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dirty_pool_tile.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dirty_pool_tile.json new file mode 100644 index 0000000..63284fc --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dirty_pool_tile.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/dirty_pool_tile" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dirty_red_pool_tile.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dirty_red_pool_tile.json new file mode 100644 index 0000000..72d52cd --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/dirty_red_pool_tile.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/dirty_red_pool_tile" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/pool_tile.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/pool_tile.json new file mode 100644 index 0000000..c88b3e7 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/pool_tile.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/pool_tile" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/red_pool_tile.json b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/red_pool_tile.json new file mode 100644 index 0000000..37e07bc --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/thresholds/pool/tiles/red_pool_tile.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "otemod:block/thresholds/hallway/tiles/red_pool_tile" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/item/blue_pool_light.json b/src/main/resources/assets/otemod/models/item/blue_pool_light.json new file mode 100644 index 0000000..b6f1754 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/blue_pool_light.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/light/blue_pool_light" +} diff --git a/src/main/resources/assets/otemod/models/item/blue_pool_tile.json b/src/main/resources/assets/otemod/models/item/blue_pool_tile.json new file mode 100644 index 0000000..571be29 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/blue_pool_tile.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/tiles/blue_pool_tile" +} diff --git a/src/main/resources/assets/otemod/models/item/blue_pool_tile_stairs.json b/src/main/resources/assets/otemod/models/item/blue_pool_tile_stairs.json new file mode 100644 index 0000000..afb5349 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/blue_pool_tile_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/stairs/blue_pool_tile_stairs" +} diff --git a/src/main/resources/assets/otemod/models/item/dark_pool_light.json b/src/main/resources/assets/otemod/models/item/dark_pool_light.json new file mode 100644 index 0000000..d962b94 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/dark_pool_light.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/light/dark_pool_light" +} diff --git a/src/main/resources/assets/otemod/models/item/dark_pool_tile.json b/src/main/resources/assets/otemod/models/item/dark_pool_tile.json new file mode 100644 index 0000000..ef56452 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/dark_pool_tile.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/tiles/dark_pool_tile" +} diff --git a/src/main/resources/assets/otemod/models/item/dark_pool_tile_stairs.json b/src/main/resources/assets/otemod/models/item/dark_pool_tile_stairs.json new file mode 100644 index 0000000..3ca969b --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/dark_pool_tile_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/stairs/dark_pool_tile_stairs" +} diff --git a/src/main/resources/assets/otemod/models/item/dirty_blue_pool_light.json b/src/main/resources/assets/otemod/models/item/dirty_blue_pool_light.json new file mode 100644 index 0000000..3ad5805 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/dirty_blue_pool_light.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/light/dirty_blue_pool_light" +} diff --git a/src/main/resources/assets/otemod/models/item/dirty_blue_pool_tile.json b/src/main/resources/assets/otemod/models/item/dirty_blue_pool_tile.json new file mode 100644 index 0000000..1d1cd57 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/dirty_blue_pool_tile.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/tiles/dirty_blue_pool_tile" +} diff --git a/src/main/resources/assets/otemod/models/item/dirty_blue_pool_tile_stairs.json b/src/main/resources/assets/otemod/models/item/dirty_blue_pool_tile_stairs.json new file mode 100644 index 0000000..3379eb3 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/dirty_blue_pool_tile_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/stairs/dirty_blue_pool_tile_stairs" +} diff --git a/src/main/resources/assets/otemod/models/item/dirty_pool_light.json b/src/main/resources/assets/otemod/models/item/dirty_pool_light.json new file mode 100644 index 0000000..91d353d --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/dirty_pool_light.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/light/dirty_pool_light" +} diff --git a/src/main/resources/assets/otemod/models/item/dirty_pool_tile.json b/src/main/resources/assets/otemod/models/item/dirty_pool_tile.json new file mode 100644 index 0000000..597d5de --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/dirty_pool_tile.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/tiles/dirty_pool_tile" +} diff --git a/src/main/resources/assets/otemod/models/item/dirty_pool_tile_stairs.json b/src/main/resources/assets/otemod/models/item/dirty_pool_tile_stairs.json new file mode 100644 index 0000000..ccf57bd --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/dirty_pool_tile_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/stairs/dirty_pool_tile_stairs" +} diff --git a/src/main/resources/assets/otemod/models/item/dirty_red_pool_light.json b/src/main/resources/assets/otemod/models/item/dirty_red_pool_light.json new file mode 100644 index 0000000..a039472 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/dirty_red_pool_light.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/light/dirty_red_pool_light" +} diff --git a/src/main/resources/assets/otemod/models/item/dirty_red_pool_tile.json b/src/main/resources/assets/otemod/models/item/dirty_red_pool_tile.json new file mode 100644 index 0000000..9d48f17 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/dirty_red_pool_tile.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/tiles/dirty_red_pool_tile" +} diff --git a/src/main/resources/assets/otemod/models/item/dirty_red_pool_tile_stairs.json b/src/main/resources/assets/otemod/models/item/dirty_red_pool_tile_stairs.json new file mode 100644 index 0000000..2173809 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/dirty_red_pool_tile_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/stairs/dirty_red_pool_tile_stairs" +} diff --git a/src/main/resources/assets/otemod/models/item/filthy_blue_pool_light.json b/src/main/resources/assets/otemod/models/item/filthy_blue_pool_light.json new file mode 100644 index 0000000..5e5ec04 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/filthy_blue_pool_light.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/light/filthy_blue_pool_light" +} diff --git a/src/main/resources/assets/otemod/models/item/filthy_pool_light.json b/src/main/resources/assets/otemod/models/item/filthy_pool_light.json new file mode 100644 index 0000000..bec34f7 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/filthy_pool_light.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/light/filthy_pool_light" +} diff --git a/src/main/resources/assets/otemod/models/item/filthy_red_pool_light.json b/src/main/resources/assets/otemod/models/item/filthy_red_pool_light.json new file mode 100644 index 0000000..b2be50c --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/filthy_red_pool_light.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/light/filthy_red_pool_light" +} diff --git a/src/main/resources/assets/otemod/models/item/pool_light.json b/src/main/resources/assets/otemod/models/item/pool_light.json new file mode 100644 index 0000000..8270f27 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/pool_light.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/light/pool_light" +} diff --git a/src/main/resources/assets/otemod/models/item/pool_tile.json b/src/main/resources/assets/otemod/models/item/pool_tile.json new file mode 100644 index 0000000..afb4abb --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/pool_tile.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/tiles/pool_tile" +} diff --git a/src/main/resources/assets/otemod/models/item/pool_tile_stairs.json b/src/main/resources/assets/otemod/models/item/pool_tile_stairs.json new file mode 100644 index 0000000..2000b96 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/pool_tile_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/stairs/pool_tile_stairs" +} diff --git a/src/main/resources/assets/otemod/models/item/red_pool_light.json b/src/main/resources/assets/otemod/models/item/red_pool_light.json new file mode 100644 index 0000000..b94a945 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/red_pool_light.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/light/red_pool_light" +} diff --git a/src/main/resources/assets/otemod/models/item/red_pool_tile.json b/src/main/resources/assets/otemod/models/item/red_pool_tile.json new file mode 100644 index 0000000..3470c8b --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/red_pool_tile.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/tiles/red_pool_tile" +} diff --git a/src/main/resources/assets/otemod/models/item/red_pool_tile_stairs.json b/src/main/resources/assets/otemod/models/item/red_pool_tile_stairs.json new file mode 100644 index 0000000..470acd4 --- /dev/null +++ b/src/main/resources/assets/otemod/models/item/red_pool_tile_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "otemod:block/thresholds/pool/stairs/red_pool_tile_stairs" +} diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/blue_pool_light.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/blue_pool_light.png new file mode 100644 index 0000000000000000000000000000000000000000..eccc64a6246ff7105b9a9f98f76badacc8c14093 GIT binary patch literal 1355 zcmV-R1+@B!P)Px)1xZ9fR9J<*m(Po3#TCat=TzPMe)OB3jI`|-1~Y~@C`dpN6EClz8xJ$A~ zmPyt@$iLt+Sp`C}6bZx_@yCE5h`JDU62>7;kJ_evZBNgQGo-t9ZDr!(Uu z1&4FrtE%t!TXpKkDe1j+(QH2;eZ^)8J&^-~CF9)(HhJ{rf01?zr0=m=iMwM^)kotG zk8kqJpS?=h-^2Mnv7FK0xE&NMMBe<}llu*f_vEGll9=<+& z66u}Yva~bhH`zJXdOe0&#vsq>XBoM3cvYNpI8_ut1feR8x3)JU0Wl?FjFc%+#K}RRv&}Wk}zlB6t$me!*Zpr{_KWEMu5g--{U#sb-)N&?RpXH$IsW%_w7B3<4mf z#30YHSPjG*kS<-Ne>x+t1@ydMgrVuIs>|3PC7>osW|VF6T2MdB09f}9`S40%#{}Lx z_aUcFoM6=NGw6h%nSO1DpdE%5aYNLEp&f#02wa)X*xKFY^yzy!J<8FipZN=qJ@rSt zD!wLM_|CU$d8djKsjO4Cs&5y2dusGV&}JXI)@pBJ-jHY$hPJ65v=#M@xN9(-UMVtHHR<*K~|K38qeJ(L78^wnKX z>rQW7uivJ0@fH>;uaXI(QXL?NOjldjk%S$hRrQ!510_boTY@;Ak;tx5o6OMqTL2R| zG8|1>*5IT@P#d>yILZ~pApK*1k-;=RrF4xLYuk$1IgB)QuwzO9%s_pcM@ zTgwJbMw3!?bk_dB@p{Niw25Pzw1pXC*JL&~osy+QQI-qr5FMN%4KWL{%893s{0Xdz%)6wJ$Vkvcc(eT=s(EuV$Jyeyd(1!l&yD3|Yo zNeE0rsL1PB{jVM-lMqnXBa~_RF1R|Fb75!a|MoP)jL9@C-vuxDQ;<2tRnQiVkDk4U z3s)j%znYSJB^QwTR5F9-?;3IMD_az=T!P#qeLbLR>$eZ^=yQK%eC`cIb5!#>bXAxy zZeK>;zdW;kGMozIdE~z1J!a8(>5D5of7dz+B&$aEXOWM$C;aKc z9^W5jJh(CBzT0{XGRH>W@!AJpFqFvVi8a1==W#-eh`_u^eCJq?{{SQi%YlkEIZXfn N002ovPDHLkV1l+0mxBNR literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/blue_pool_tile.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/blue_pool_tile.png new file mode 100644 index 0000000000000000000000000000000000000000..2119b59ca53fcd17a9f356df8e21077fa4e4f279 GIT binary patch literal 1396 zcmV-)1&jKLP)Px)E=fc|R9JT2a?uYFenGr~*V0E5wE^ z|3Lqiid7etkWd$}sAxB>q6&mkkbqWzC`uHk)NxZc$=KKT`rf%`=A4(sI4)9jk0Y`i zJ#(I!Idh(mSBgLEsE!+?G-w?$t2rQORQ~ey4Zi)m{}A^*QaZG5v1fZ79+Y3bw85*t zc#md0!n%^s)|Bf{f&py;zkmIEJoRzKBL2_6bqZ`ACMYCP{dh4@UsJAY%s?J#uoUdCB<()`zI0KpOZle3jS*xHBua6;jNNGSo znFEkJ12Hl`*hWl_F*%5E{AUp(r1+PeMgBSQx+Ksuf{)4{?@hTf$T7h4t3Cc&%@|EQ z085$S&NQ&zv)r!(-@m-fziw6B+^N{wT;}X*9|g8=A21x`Jh!#RyOV~?PAH7vM7UPX z`06mHw8G_Kj(g>2?<~~u2XDO0cdza)^nu%#me}j}&@1P-ZD4y2Yq^E<>r@IZw-nxU z{V0$d@Da}EIg>k(os^QvOJv(5gEYqU*s;sbHyk<1b+Pjh{Qe}9ic z1S?Sa$YHBkfrBP+Ytr!NYEDp+cvNsH9Si0mABf}T#0R1(AoQIuutHRrw2Er?msLsP zM!=+WoMk5I1G82ErFX3NNvrs%#wo>rcXH(9oa(0lhwUX1sZv8wc ztEJ(nQKEJSY95r;!q6)0Od75%7X*#O&d>OK8rbYx4B%DiTR{eI-q1xl|Hlu{^R>4Z z_kr6#xya_9?kvpvN9hwTmG`T!TuAl-^W%%jynm!Vk;?nhJ?sPji`xgu_85J_q;xJq z(g%L|_q!)A0RLZ~a4DV7TTS|ah(T<4tUlpVI*+PJA27!|^f-OOrF1Uc#X@{3Gs(Pv zls+NXzL@IG`%|7?F4-J76y?VLoaNl{+*--iyHhSXL*Wcg;Dfy>&peS+I?LtdoZX;2 zPM?s}T=2<@oBZvInsF0P@_a3~AP^M3vr+QoZ?_lf{Q8eB@X}A;Uf4H2{Phno4|E(4 z8?Zt=YzVs(+K=uL+jwf8r}{!{0;#@{S;0N58IW5mq zI?sPx)B}qg<#WcCLHZW#!@2KE3Fh4g**}1Os(tx&D(!a81)PpD!>XU@S00Q^1YAbVY*iHl@2RZic@eC&SP=xkELRF(fENHQzZF2045XY%De?Go znKmUBAuw-SW+5nVbjLbsdz0rsi6aT$+8;3C{%Fz20s~>p36i~>m2*#Mz$}wv)3Nb}Q z%9*T6%$ZOuAR+(^y~l_p<%|PGQ(&vAsGVcrJ;U<7vVbv53v>e3$$P|In^j4w#FSQx z0LVGBRaKy1Fu1z1q$VzXUIf(6t=!N}7LjA$pCzCWWmRIIya*b2&!Ber%Hw|g{ja0( zJ}PVRy}H^1A}jMt-vxa)^oTnm6(Qxk65F}MTT5jvPdxqu?)}mwfkmQ$NOl8pe|;qN=2Jb_daE z5$|rwI^MA`gE4{(YC&|;m$*sxIhaq!*%~;UbGU0)zscTcXY*>$L;NW)3~>F)N4fmP zi^v~deVaeM{=sJ_y36wF8@IXnQHylD8sbAU*R1E-RnN5~mC z#=v0U5ip3Yjw2Z5PVZf>pQWthbrrP41XIF78MG0g2XrRk9YlBbFD+qE3=T4>osl=F z&8kTGHk9~&hKMdL>u_=>sEn71uWjH}eSQ}0sx z+|u$z2sAM=Z(As1oGEc&76P*nmgL1(|F4J1ECh_PXjYu+G7e0ehWAFJJDz6ljHg*g zylU5;W-)JmnxPP5#8u8^qH8#mdz^%e$2#I0Oc*N&zQn4kXgC5`PN28by!9Bz?P z=HTFnuYL6aCUZk<#-tQE8c(@+VF$6xO!xAo9S+8@H~N6l$9vS?vvXmG?d>7nId*q1 t^6#4ya(h5MsMs0|=t6(a%I@V0{14r4j^N>vkJbPH002ovPDHLkV1lfapDO?W literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dark_pool_tile.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dark_pool_tile.png new file mode 100644 index 0000000000000000000000000000000000000000..1da9ed2179c9affd80c338e5f1aa27cae09563a7 GIT binary patch literal 1511 zcmVPx)p-DtRR9JkOLT!AaY?TArVAz;)soR+3B7>R(-kXX1pfTTzGG0MtZxdt840c-?!zZAHQkU zssI!t;#>w8-Yd6neVcdhd_uWAMbr^PB+2F=ka*#h?>^1@AALqyoMI*j;L|yxLY^sa zy!sr!diO4?;uKMj04|wrfI3F8c_vtzzPc;PC8EhlTnrxWpR$U1a&D* z_XVLXa8!h5m%3@F%H>*b`*T8Du+o~?-=J+fRu^=dj?fk)TGQ1x@BpF?M8N>-!6Krt zJ*>95CE`7%Zp?d%Fu%by&F> zv9F1t8x{;8!^dXb`0}DndgufHzW+HM5e&mZ2Nu_pf}pCy&R~ST!a_evg5ZYhrgU*c zGZ5LVt0TmSXS}&tT(4NhZ^M8{Xjho^7$BnShxg7+>KK@TnN8|~;Iq^bntt3e#VjBq zWJyAdMw$p}#c(cUcxo{r%RK5FS)xcRP>HB|5Wx)c+#>>MA~-97h^WKN5K+?1lcWj$ zweNom>#rdy#1J@NmZVvVs&cSD=ha(JQ!RJE3{|BM0d>Pf2m3qRzV#Hv*^E3($+Hv# zs=C2>$KGPjD=$8YJim`~iWwBE6X2?@@zPmW{BTHwIoX& zKl;HDzHXXFIES9l7I>*?t7|k(`v~W>OF~;vYfazWq-i>urn%rFJr+9pCeT)=G)>E@ zyfA+|&aX9na}CcF#~P6FTugCnaX7e}d<3&mpO~Kj7>coxQ+r6`X3ousBRQLV1Rm;B z^LK5Bw~>jja;mrym1!TaXlq>m-$!(C!3m!r3d^FzPjbq@uzd~ZUDvN~{#755@z>;d zhQ;|jQ&v_GLXTIEpeQoY#JIv=Z67M;@vf$@_cQ*F&c+g z7Hn-F61qbG`aZC|JtKt3>Df7lhkN|wwFA25I-&1bE=v}RInF5|My?#};@|q+UoYf& zjZY2H<(TLD-1+$4WS;-@^+VqI;4c*Cr>HujMUr&r3*N!*!7=au=@Y6|iHHo|?~7rF z636$R-x_@2ar3;dZ&25da^AEG*KGu*5k&NlO`T@iogBRkmp&RjCn3p zRfE5n=Pw-KoPa@5KFsqcuI_X72&_B4&?i=;X@WZC;9$YaFQ!z*d_$>y3FI+A}WGCqi>`XvI@`9b-U{$-E!_&r9?Pi|E(o zwOJfb_GXT|uH!O&BE*QF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_blue_pool_light.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_blue_pool_light.png new file mode 100644 index 0000000000000000000000000000000000000000..876eeba3116b0e00ec18e90a174988820f921f98 GIT binary patch literal 1350 zcmV-M1-bf(P)Px)07*naR9J<*m(7bDMHt3^_0c^ayD_dzqQ+I!gE#R%h!DxqQ42V&2;B_7Fd+P%&T7&@j5b)lUhd|~%1LsJxjJ|X9 z(v)M@X4(J!5iEde8Kz8w$2uL_QAER9Vrz+v!B*rYv8o9eF9L`N0t69!2;|=5yeG?Z z(mbc{99I_>z{BjWU07v6P_(0H)$E&5R0t@^jn*ioMl)AqGD>1f5k3Th2zdy&(gRv+ z0NPQ6Y8p^r2_VZEt$Sh`*3yh3+Hvtb^ng-@2Py&M$>b)XgZvoal zAywZBV;r~ik~J2stSP$IezR2*tJ`MejKWmeq;`~|p&@6JLb7ZBM`1E4>Opm4k4@&BXyhLo%Kk=7`6|gR2#5|&Y!@x zGQ59t)S=2~s`I?8S8cEBc%n}1>!dYI?>&bHCt1in_S60EAJ$m z^qr&cirpcUvHGtrCVl77rh(RKbT8<&Qm!s6{BKt?L@>sT?ghu}EJOxn3TW}d!HaM6 z{0C>aa3dkMnplA0yj!N2kLdf6mir-Gg^M6pERdd+FX>L`1OGkfs^!=^2`l zu(Q)4Ne8T~^jPWj@!pd;$3qW4PO{P^%QE`?WVnuu(PYl?4`MsAR{wc>nE(I)07*qo IM6N<$g2d~N0{{R3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_blue_pool_light_dirty.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_blue_pool_light_dirty.png new file mode 100644 index 0000000000000000000000000000000000000000..906f9d6237cd50a06c1394ef9febcc10daf504f2 GIT binary patch literal 1397 zcmV-*1&aEKP)Px)FG)l}R9J<*m*0gGl>6w9b%%HfgJZPd1g!mso!0aPWU^JQ_Q65%! z;K2tIqXe^2BQG0*j}S1%B_W3Jy1_&gC6PbC1V~6+*yt=n?+nvD-F@$^b9kt__jdQr z&MvT_lFIE=SDo+o{HUsL$>1OFnH|)~n!{#_+bRLU)cDEyU-8Gge}P`9khOr#8vK`s z>Hlav_U1WW`pxRZQlkCtd5+%{V%-m!{2Z%`#*T@X9Psh{R*i(G7RWP zHFi*;J5x5+48##XoZ~hXw^^X0inu#NFHV{0Wt{iSrz1kKK`7Umk499}J?eu?jMqQl zIQ#SIJ~DXyebe13k6(O+K?s!IQv^@p1HlPS94>!_)Y|WAvxTpkqH3rqjT&`qsGCR? zBlD)=TzQ)B{r%?z02z7)A+WumopofSD&+BH*G!Bmz)+j|2|_ z0R=m#C_?hQ@SZYwip2;Zh%ETN3cf(1O@Wz1F}xZvJCUX+MetbSLNGutO(;$Tf=iwk z&J&y?c#q4AWw8d1$Ik>br9rG)XC73Q!Uu>Dn}~m;*m?5Kix)Wgjc>7D4pveiDGfOi zUK~!O@6M$nMV7|flu1Wk5-C8tKlLN#^9uLk>9aid z?I%7v&?js!-TySF?)WCIz3-1~b_DfL+OA=v`r8hZgUdJ^xXt4D1)qkJvh)Bu#!C2>~&P5j#&}cHCGNNJoEDH-1Egh_wRxxtJkQSG#mgP z6GgKm)3$&*jdiu>U7ove8%>P8ZA~)$$~$i`yKAqP<@I4hqcN-3-cT<}`z!UvL}^Yz zcC6M&9V3lK>ezI0ttZeV-QG%P^We?!`dMT-oh+|oCJ>dniI^EqeE%+}a*oL1Q`MD+ zNxW$flPX4>AK;wy?}B;Lusa@qZcj7J@ZR_Df^*?C1dsRxVU_Xl8^7eczdg_Em#37$ zQA!*BziAw6~>pgx0%jo zjK>qklS5*RRCUc)zxH*e;}KO=adDM$q+^NF3tj;00000NkvXXu0mjf D?I5du literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_blue_pool_tile.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_blue_pool_tile.png new file mode 100644 index 0000000000000000000000000000000000000000..4b7ef9a064ba7775e530c4414cd59b236a96e29f GIT binary patch literal 1190 zcmV;X1X=ruP)Px(U`a$lR9Jn%1f9d3CDlRh@J0 zm4)wqQytex*PunftR#S-K{<2v0-v9Fhp<&4U56G8_Mu*jd*%H1AMy1Mo7CeG)^+hs zL3eE(3~23n>gY8tpL(BJ{4ad^CJqt8s6r}>^c-QkM#mN5cFtl~K@9$0iCGGmr4C_G z;qMlNUvnnmPmHyc`2g2h#3g;o!GJ0sQjc$v_U{nmFY^%wKzc0*ie@zg1qpv-y!XWTLH9NQpjm?!0Xhae42L5KAbkfw7}roV z$bv;{+M(c*-tOX|DKIucRoNM{_>XUF;KYI==(s{_Ma*lLnDe3i{NKAeevbLku|rsL|+DCz@6HpB`H zszBcfi&hxco~>I2qV6c|+jXvys!jD`@!z4y47jx~g+5A=II0`SYEA#sL8cJ97CWyiTFu0fGk z&OE2xj`HBz8hKferW4XhhWDPTt~vI|W8~?8s;bDcynUR2wT7y$SzUdYve+hsK$3Jw z(+SoZ*4Ng!^~Y@%ddv8Fvg!-Svr65#(P|O@)Q)9pJ^A1L!tH1FrBCtOVD-utKzv`^`udEZ3qiNDX!wsOqAc^|=#Z*1&t0RCS+ z;i5V>Ch7w~Jnz}Ro-i?;i^P3k=MUYN_wK*d6E2?j8ubC+_-NkGQ%}h2=TGZF@_cc5 zm4nn166*_I`s^*9x%5di&#!D=oT>BYuV3KCt&=nRh9_3Pi1!8aPx(@kvBMR9J<*m&=PBRTRd5b?a7jO?R8ggwe&A2#Lgv`Y*U}efdpIy7p?=wjhF-ylgT_Y)7|yBFBkRfPEXG;j$XLjZcf$t z&OPVUcfU)#x#X5^U2|(ozq_Sd*PK(zIj5Xbn{HuY-c7Qf`S9I|_7f+LO|;L?zviTr z5i5)L=uWTD=|08!;&oOQ|3XTSPUM(m?{7YsXzy(-O|+-+Lp&94y2abS@ZFyQomPu> z5HJ;nL_t94`$!@1eIH*41c2w^k&kk9&DA+9V64R$gSM8;7!sw3vy6dK^wX62!x?8j z{RRop>dw(=ZE$#YmUa-(l9EtL0^diL;03VP2w-$Lz&VEltaBJ^(Z-;RA=8>vYX(Yj zb9ou96AsSJA*GCvNZLU#wEHLs@&F2OUkE(Ut9R~=gi!!f1YxYjI)}CvRb)U20YEzl zh&pZXKx#A(S8g&D&e4*RC{?BA_S;05IAhPn|kRI@sWq_s9#ZeJ0b2eq!MAF_W+q(uZ0TdvFQBzW`Vvv{0FBRVXk*Q}9XNHF$~n%C z=Mi<^mBUy zyaOK|@bPEglBQYB1J?($%XTP=7ao*?@ou4L3b0#Hh!cO3a@mJ2W@oOF^9vbVQ;b>dH5ukB)oFnSA@q}0NfE^R9Eq@m;4cWJvIZE~4j=l$2 zavspy)Ox@OTgfQv9JV+}TtThYxnW|ObQq0*mfFBHR(!x&3Yy4vO7%naRv2b!92SAwJzr43COD@89!xU;s# z%g-O>`0+PuJ&=hbs6sq6HC*Xv*OJUyGOa7$$`~?ZxO?L&$zZ+K1Iel)(>hnL4H>l; zqEs0}TKFz8WLw~Q)OsMkACqcbN#`je!mIBE{WRj{^78+7HPhPS`+m&>uOCW~EsK;2$k00Blg}@6@zVF)zWy^( z3S=upN(o4`PB{PN4}9^}r7i7e&tK&7m7j8ZM<5TB_7JTT+EY__3n!1cG}*vfOBe?9 zdVPFf@c8U3_wFy!n%aj^eLOs7X7;nXwvKZSDSgs3qure$3LH<&&Jw2yy;vci8GjJ^wS#kgX002ovPDHLkV1grQea8R* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_pool_light_dirty.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_pool_light_dirty.png new file mode 100644 index 0000000000000000000000000000000000000000..e8b6fb1e7c262aa0b3d91fb9b14b3ddefb37c74e GIT binary patch literal 1307 zcmV+$1?2jPP)Px()k#D_R9J<*m&Knb8=CUBp_SxbDs#a^x#ygpi*xVXndxMbKInnV9p-n= z@B4e7@1?!9DyuiI$;RsMvU>BHNS296CRw&63k!2HPJZH(kH*U9=Z}n)&&?eYYi*Ua zm1P=JYt$PD*j%~J+R8sztEg9naq{NY-LdlY!RlCfr+pulwYOyD)=!*S{F@1DsTf0I z4T-T>t94Q=6OCCW>`i7G z4JyW9jmBz&(S6`50;?V23vfXIkZRU>%P8Yd1)2^gJqYjDm1V8P*B$a5Y&Pqe{mjWq_HA6ES}FdjcQ zAjC8%>75e;Aw(uUL{(b4R9`N?TcbTr$nMjhD3S%%u5#|M;hx1>$HSl*pKp;pg zLLY?8=LMK$Y_yszUHy@EyNzmZtxCG~2Uo8B#dN(!)h4kEMx|hU{S8DyLaTw9^JzyTwhXu>_#+Cj(drA3-scVini zrYhqPJdPo|=&@GQYPHKb&`%~1c`D8i;PzeD0=>c?m;-}1`jC>sxZS{Z*;imx>ot^C zB_HTNSo{tMN>rTf0_w0m#ZWM$A>Gb7obx3g2*v#^0TGQz05QFpF62fONMkOe z!b_2OAaVm4z=#_HW^?_{sb79uVruqPs!1dz<;|EAL4kNPjSBX|K_9q|i~cWoLGZM@ z8Q*{V9ci;!@_|cN|9qx|GNO{(?TwUIf+zD1Ya>qYyC8G_;(X{) zXE9(zFyTpPIXzmQ`P={>$ehQyfL5mbF6ibtA`f2(Vd%reKeZ2&uJ=^yHFWQqBhuM^KnQ_KB_U0l7^8V{W`^ZED@;s2kI$MY6w}i$u)eX0h+wUu z)9F%cOjAvSeKRw(JKLmbleF2wdrvpZcWD{{yo%s0m4j RKxqH~002ovPDHLkV1hG^aA*Jk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_pool_tile.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/dirty_pool_tile.png new file mode 100644 index 0000000000000000000000000000000000000000..33dbfd88fd50a5e03e6c72cb151c5dcf79bfe02c GIT binary patch literal 756 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL`2bFs<`+aSVxQ zT{_LXU)Wv5&A&9>{+QY0GYJ7nOiq6^7cEfel}KIWsPmBhldw{%bc8~qq1>Mr(|50a zon|=sP0d}euiw5*^;)&-ez``ucWhnF`uo%CUw(RAeRWyjRkzt`%dcM-&-z%Ne}BfG zSFe_y)YqH0x`QWD*Uot6Itl-I8{+<)%=&1q)b}x9W5vGTS)X!toBZ5&M}c8-=KPOO zIOY8J{bbQl(%h|c{E=(mtUbBWlba_o@Te6td^)RM^GuSD^*!_JuWa4_fB%jD_qnF8 zgGaFC>?7u>`GPVGhd**KbniYg)5cS1@?!^^d1qfS%efv=oaCTY@t$$Rj_+$v&Mj7B z7x+*iFW@=hAcG(y%X@7V-;EYheFdhKucPl=y~=%8JlZLv(Bj;=x&>>r0&e7Nzf=E# zLp)D@_V;;p^$w4vt1dmhopto@O&QOuu1!h%*B9~~TP)c7Jtgv3|L5gzu6a9gtkAlA zIk;=n0$#7kX$fy%K7HD~xH{+D{$E$mb>6SvT)beN*)zHDqqm+Me|GxMv2%^Lt!>WS zecNnjQ~&+2;=1ES4)6I2I@I+{E33*IoMVDE79ZG|T%Gs1K*fF8&NdEDbCDk35kQDgXIOT=v_P_RW${_bHt&+O%guZuF~V4=+AWpK_D8 zG&Wd7_1(L;%O(r+q|TkMPm0gwRJ`#1`-x3+OnfU0W`F#7y6NCa&D_cVryH8zzrNz0 z-J!qxwiPe%o`3vT%S`6Ezih6lud#i5>ABeZN5W}*B`=G+%Rh1&vs-UP)Px(&`Cr=R9J<*m&J~>;A}nZ<02x4h+9@@63F^-}%jN zW`3hC9UjQK(lGVGlho$Uc=JIpRn@vSENQ^;+TOK z5C{r5eVSuGp51o*)rFH-Be0xk`h_s?!m2Z@B$}HY&7do2VBIM?9=btTw}y4ASazEJ z`W-YdGKwTX5`?in-5&%aI9l{y}Ezoyv z%j~<(l>#EU(Hf=HWag?RBN7uu_z(yp6d{mD4`{7{lFLa6WCggNXnILP$6C71(U0G? z2b3y3Pzh+0H;5}6MDQXM-q(`=2qDl*l3J_{!1aOUMdwJOfR45GGE{@L)|0j0O+X|H zA{0&XD5&ck0KV|ppBLUC9j$TP7+j;)F`#wre%)Mx<}x&hDh|tZnPtG_27Yqf}X2ZPUiKvCmxiiNXGPY_*R~BigGquShEQ zZ`lD;g0S*}0HPFxP=-ug2>ZwuuuG zq!i$!Jn`yTHb|@A75R1n*z|-{eJhMMZuF8h7Oep#@DuDOC6tJ9_ro?Ho_rSb6js(H__ul1sC(~!U7vcxNP{5zB zERe3OqMtp#$dii~AD!qS%L~6==E%|K${<{Ksy@ZG6q)+(!<8u*0$kmnFf8*4q2qTU z-HVV1z!{CkXi#*5OinQ3o!+=!AEmVMs#+CohyfToO$BHG?Mk=}QL`NpoPg4*ypD%f z5vHgOBIx+7i0At*BC52k!U>h2CT{Fk6uwMIZgx$b!BjTHi$vnl8l<&Vce;#Pq@jiF zLx^Jn_Qt6XIH)tc_md7)MpNDA(QY|jxA8=i*f&WVnBIGOZ!a*scMtv6;#p2yyg(5X z$St<@?HksIP!d$2tv=i0M4Ntdj!yr;Q_A$cm!I&b=q|p1=E+ z+0iN%gnl7x<~dnWl-X+|jd~nOY3@B~#I87045Rv8u##n@MNy~Dm3r&_V@u07^PIFO z7-ty*Xk{kvf>E9`%JY&uuGN3_Fd5}JRzPbtc^3@Rl{3^X)e&^aghY4kS zv-EpC)MuZ5BPx(?ny*JR9J<*m&=P>MHI$=r>buEOwWunVFA7Y7LJC(z`>zG1cNAW;p8cfpZ%I{a0G?Y!F(A(Av(DI-utY5@i~1j_-r#1 z4GdI()2DgjyR*C6UtK;)@CK_5N2@euqOo3h)*6m$O~=fX;egFTXhxV)V>5U*gRojS zTAMd2~Hd? zKZVq)=VY_mQ%zAd)Ra<*<^QakO3Z#g=S@P`!UU`)pH*ewen{Uxe zmq*p^MRMWQcYxrl_j(snpBVRwBbI$foVZjc zSRzoE5E@crgh7*huG^K&=@ zdO@}@q_%G#MiXJn@}-4=7-J%^+VB&zck*yQsC$o@8X>;@7S9y6ee(SR@8n|#_rJZk zOn+@1_tg0n9$mTk;6VSeJ^RyTjvaqG72#&F&)NDQZ5JO`=Nfd9o-mqmAA|cLasWTw zZVv}SQ*Dcw!0e#}zXjJOFmiLgc1YMx)lxG$2&et#RTzbVI7z?bPLM5z)w^PdNjlpt zop1*skfKdl)Jh>u_%@&{^Eq&B%4Y>rDH+2|!N5i$!}8MPKH;nyufWM;$t?M-W26a6 z_~+C+9Cm||fHd=owSk(A4sH<{pV>LeU9*shD~4Jv6E&SU{l+q#J9lueubkz?#S3Er zX_m=YP1zc;darjQ^@;Iln(T8>)qAXs^}jktv$Zh37nE7OM%AR@0PvV7nkAX$)XKPO zw?#f$=TW+iGRCoQO)~xOR$#HaP5`4-8tbv7)R@)l*wI*&j(5w!L}^}v9N17J!x$+w zGK?kp|1`cA49le3E9q=LYdC!nSd}GY2?EX-nIU{4OEpzqoCdH;JxGU z(h}FM-=I1D2yxg!5Ed5~SY2Dk%m~5L?+<9rE;3aZk1Z|H>))f@?$GXZi7_%54mtYx qll0oF3}@ds0000Px&>PbXFR9JJMOh}Xn1X9E$hzOp8H4+PW z01z=jQ3M-a1St|?gJdAic&^hhprw*Q=}uIm2I{~!6~a!)6TAq`L% z*eg6Jc!388H+bdl_hioC0+a@}OAi6Of#X}BaPsXpEUaMbnx0os2m;)^$(4I|8|#02 z^8jZR2C1Q2Dm||Z6U#|zIBFSsZN&hSL}+p@#LMJEy zQzsNgs>Oiea0CdgTFZYYp#E3e;;R2jKWE3C!H4lKYEU|45V7Wo?3O*qQFtxl6b{EqoV-@2C2n{N?)A>Ks8$LOOM>X z{hlteF(G&aVQ1%g^7$MTM&mJi7cV2B`q;{{Bu!f^%O#0RIDY(?z5YJV6lD3F#iBq2 zdfhI|vSd1)^1}YBOoopLA)u;kZ*7s~89pd^o+BS`r`p7^zkZ$9@864Z{KbPG7$(s2 zu&{8cWTk)g*1O!f|6Qa0_0{)rF^(_IM^TRF*$}I6oIp?DLV$sV<2L-+f?__3>iKMd zgQq!Om{X2X)TRLC}RY~mc-8q<^Hls9{XY3(&U89sI?M3h zQ!JNUe)%=>>42gr$g&)f>Nc!36w4*MyDzesj|m}=rU}#O3~LP+`+bi7`kPi~3%{JL zdd%Qth^pe8t@_57{kAr7{`)&O&h_(azy8c7dBVjwFV^t${~=E_`}I10zG_Tcad57m zU-{{Px(vPnciR9J<*m)~j|M-;|?dvxd@@X=za1GrBBn> zDHM89u#?6~D6SE~F^VdTFvd8_TH2jC(~I3%tzU~~cg zpu0nqk29a0?(_5Z0oPkCI!VH{G^L#+q;ZT9A&z5WkuvZoBBC5&_083L6mY6I=dh~e z&M__u&hnhBD0n}a@YCiRueP6J08Dz5>#Y`F-nvC6NoW~EY79vnV*+_a95o!6A0F`D z;{o*^r;2rs!Z~tlnOI9!6udb)LejIHG?&lyc7^pB7E{@ZWLJ|JSqMg!vbi~6*On#UsL zb(Q`Z2NoQ{+5x~v5vbOgn8A!=PKUb;x;y1#n6{UQ-%W3*Yu<=jqG+ZEoEr^?qAKNK zzciktdKCjO?E}KQX_O7p@H>!SbO4)~@ZsKoF^>zVT2PQ!41$yd3&5l1yo{V_nZjIT zCyFp>hqNt-Lm6kob3`9=;67%|%^RLCxUWNE0 zFd|@gdy72xnDveO=;|?BhvR=w_6g(ucTYI%zebEn$wq^^i_Hwb@ZV1x3otxzI^3nd z_Y@Hk()QAaNw4C_B{(7mRbOfhlir+mFs7~aGsJ%mFU<3Opt@-xKm+Jf!a1TvcD$eJ zf%oH#JR734&UvfeBh__8)!#31BFM6UqrssjE==`+szo)&X;RB5^&YKWB))2`>iz7a z`k|N69BI%7uCYQ~>Vd=F3r+_;-0i#58-k(<@AGP%X|ES#V*Yi!2-7)7_xT^Ff>~L+ z%gV|+Zx2qem5Q~_VH+CIUqz4vQ5t3wTa|kcAD4Onglse*cP)xaJTx_20J^dyQzf^y z#x9&AcdqIKJDAW1#>FYQwWWG($f(aDN(<+hRM<6#w19>lILnWiSX)cy;JtC~v&r&t zQ81~bnW{wqV@!&*LRJ)HMNyJhwfe632%;${!ssw_nW$)P*n~$Dwa`*y~^qjr>e2aSz=k0NA-`#%7=A*})4qqYCM$FR8ej^dl z-m72yN&jt~M%6N&G>sXL9n0&hob>wDe?p#X9lxq)d3}}9;BQPSpkS?Ht*`BOzS`ip i_Xbt4)>9p^+WrsxguiV9Uls`f0000Px%nn^@KR9J%J2fb0B^t>7V#F!hDa$gXIIPE zhf+q2F`hl~L%X1`oD>iC>#zRrihINju&UtYaSAi)H;j8&2XKyBKH_z+Wiy5Qy33%|Nekp>z@Rc-)7L@|RfuRA!HS@?Vab;kfy zRz`-@*lYqDYHgdLW`; z?Rx!Xp0c>d_P0gEfhcCX%QLK%o7H?T3#xz~A*fd{%qm12qJ2aJ5X?L(2_Y^dnE5E4 z%&*?po8^+HpL2ruyNBm}&1shMu)f{h4Fi#(M-%uxD;JxjAnqXElnoig(zhJh@g+Fs(=kt{9>b7~|p0dEX9%cE+ zFdMU7u9}RgD*H>H6#2G}@%cEN60;{%)kXFB`FI+&Cpz~)XP?LJiJ*@U=<^UiWKRTh z;E+C#-4hzy=dpW2WBWXIPb7Px((Md!>R9J<*mrIXSMHI(>^|<$T_sj?kER2#E6F2xEh8TzsG#X-b;YwM!@FTcj zr5ithF>ztyS8#=fjfselxG`X&AwB?!Knz5X3^PE_^mN}_Rma7x>b`Snm;pyCsZ@2> zJ^%lybLyV^FZKC@Gt$pAd4N*G_R@oZSMbQUKXLfkCmC3c4d66vaUKGA4X=HDf)AhH z%g889w3+b&0ztu{<0m+IOS$H9p}Bu)5e@V+Md6_n zguXTOtzt3Lyea_=42&WVkOyH^D+X3^(`uA9ceEEkeepm~u5>IHKl+53qM(;$bn~1} zmXRBS)f!_AMr$;HQYh+{Mrn>B1i*)Y_Z}AlrS}Z0iq*1YP*tpqMx1~9P2T(JBo-9i zAj}j65AWDPFUu&bCAXH$7;GYs#H!&yy9pp72oOZ@A>h2H@}AN;M$R#)DlRN60C3~# z6|6zf0=+C-v-?h#)eb~*qcuvY$<9^FjYv#%!iPW*!G%B-BcQbgYOYM`%~%0$wU%jm`VI08!55l9ZS$s5FJ3?g_DocH5R0E7_e=K0uJ8-NQlmfcxK9vvvG9j74~ zYpo}_U(bO^6hv@M^5{?}%K*^UqW<{(jG#2XEHATj+csu99lEU)r10xz3YuwX5GSIP zhGq&@tBU2}kV{KT>?#WKP6zw`-rbCh;@~$Yu#s>)#<_{%zwH5RL_`1`9Y~Q9ks8zc zF?RXFV-!D}N2mALG){ZUxzW0wr!+LX)@%EebrUge!8C^Nw!||4kOw9YHgn$CwN`3P z4Y*SjR7^v%*DY+*I8PQJ6G2DAHfj2u$ZvN5Cpi!#J)1DvxJ+t>)_{_F2h+e+v#&?a zq)??kZ5^fP2)L?53$SX{Ekt*!cz4sD4iQ)SKd>4&!0V8i&7AJP8e1drE|49}B537n%JPQIi=O*`pK~*uRs+v6J>c6^}45|t%Ai+=W1uLTw7Zw)& zx2qXI<=o_6kiYvDBY_gQE+7hC|MYu?&+X#N?NB%VJJuL@S7B^6&a+Yq z?;NXxW%}0^uth<4W|q9$tD|NtSO5MCAB0|ShPnIh!}}1^>?w+Ze*n!Th4ILfHH82G N002ovPDHLkV1kM+TZ{kz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/red_pool_tile.png b/src/main/resources/assets/otemod/textures/block/thresholds/hallway/tiles/red_pool_tile.png new file mode 100644 index 0000000000000000000000000000000000000000..b55d0c5128c01ed912ad9cb75b50ab02a385ab57 GIT binary patch literal 1138 zcmV-&1daQNP)Px(EJ;K`R9J=TzNCch4k~2O_xB;6gz~G=gIGf^K|#1V4a+-yti% zhY-+>OA%Z|6Hp{1Gh+~S5tA5ZdV0Ehx@WrYt>dC@_YC5#4s>t2x&JVl@lkp#->*r7zBaO ze)^Sf-hI8*{*znVcxTYhm2PG9YGaT&4szvDp*(xgM}bi$6g8B=7s%2t}h$oiJDMp|OsS$t?ajQK1%a@fHw~r2XNO$9RXK1_!xP z3AkqMqFLNw2r%+O5KtCQ!H8EN1`{s?PIYfkRdv!{L{I|`b8Vc(w|8N=IRbFxWpP}n zo$gT8#bZ6AOY4xJ87;U zY41Jq`)|93D58P|V>%v^6(uw=aC|goKA$xX9d$Lwc~4zcY;Ij-aL{Kk=(DkTj!w4+ zW(0W+MQ z9`o5eQZDjHLa*kth-@3jA*4C3>lyC||@#Na%-H0xtoJceTJ`;1|+(cW(~?L<4rAv{IBPjDU+S$n@xRaJT}P?eSSJjM9}z4m^iUNsl2uIDMvLkP*a zVO~|~xgdmkWj$ZTd8*$SkA}$ooo!omFQKZ)J6+5IM}q@4FJ9*C=l|+?T~$mcV@CUX z_@bcG+aT|Ban9kK=gB`0se{q&_Sigkj=B!Z%@sw#zwB?k2xH=-oB#j-07*qoM6N<$ Ef+R2 Date: Tue, 30 Jan 2024 04:22:43 -0700 Subject: [PATCH 12/22] Bump the mod version number --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 500a540..090c26e 100644 --- a/gradle.properties +++ b/gradle.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.013024.0303 +mod_version=1.4.013024.0420 # 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 From 9ffe62627305757e04f933ee4e29398772c964b2 Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Tue, 30 Jan 2024 15:02:53 -0700 Subject: [PATCH 13/22] Fix a null variable from crashing the server --- src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java index afdb8b4..e8c0881 100644 --- a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java +++ b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java @@ -113,6 +113,7 @@ public class ThrownPossBall extends ThrowableItemProjectile ItemStack item = getItem(); CompoundTag tag = item.getTag(); + if(tag == null)tag=new CompoundTag(); if(tag.contains("entity")) { if(captured) From 1e92e698b09e988eccae470aeb920e0185dd46ea Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Tue, 30 Jan 2024 15:07:29 -0700 Subject: [PATCH 14/22] Migration added to remove damage tag from existing poss balls to allow stacking again --- src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java index e8c0881..10bcb4d 100644 --- a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java +++ b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java @@ -114,6 +114,12 @@ public class ThrownPossBall extends ThrowableItemProjectile ItemStack item = getItem(); 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) From 22e9af386801d612d158e27283f86b235e545f96 Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Tue, 30 Jan 2024 15:12:49 -0700 Subject: [PATCH 15/22] Fix the whiteout block not having an Item icon --- src/main/resources/assets/otemod/models/block/void.json | 2 +- src/main/resources/assets/otemod/models/block/whiteout.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/otemod/models/block/void.json b/src/main/resources/assets/otemod/models/block/void.json index a11d30b..dc6123c 100644 --- a/src/main/resources/assets/otemod/models/block/void.json +++ b/src/main/resources/assets/otemod/models/block/void.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube_all", + "parent": "otemod:block/fb/cube", "textures": { "all": "otemod:block/thresholds/void" } diff --git a/src/main/resources/assets/otemod/models/block/whiteout.json b/src/main/resources/assets/otemod/models/block/whiteout.json index 0223382..9536f88 100644 --- a/src/main/resources/assets/otemod/models/block/whiteout.json +++ b/src/main/resources/assets/otemod/models/block/whiteout.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/fb/cube", + "parent": "otemod:block/fb/cube", "textures": { "all": "otemod:block/thresholds/white" } From b7a7459a3c44009cb246c3b27d18633dd0eba2b5 Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Tue, 30 Jan 2024 15:30:39 -0700 Subject: [PATCH 16/22] Fix invalid recipes --- .../thresholds/decorative/pool/blue/blue_pool_light.json | 2 +- .../decorative/pool/blue/blue_pool_tile_stairs.json | 2 +- .../thresholds/decorative/pool/blue/blue_pool_tiles.json | 2 +- .../decorative/pool/blue/dark_pool_tile_stairs.json | 2 +- .../thresholds/decorative/pool/blue/dark_pool_tiles.json | 2 +- .../decorative/pool/blue/dirty_blue_pool_tile_stairs.json | 2 +- .../decorative/pool/blue/dirty_blue_pool_tiles.json | 4 ++-- .../decorative/pool/clean/dirty_pool_tile_stairs.json | 2 +- .../thresholds/decorative/pool/clean/dirty_pool_tiles.json | 2 +- .../recipes/thresholds/decorative/pool/clean/pool_light.json | 2 +- .../thresholds/decorative/pool/clean/pool_tile_stairs.json | 2 +- .../pool/clean/{clean_pool_tiles.json => pool_tiles.json} | 2 +- .../decorative/pool/red/dirty_red_pool_tile_stairs.json | 2 +- .../thresholds/decorative/pool/red/dirty_red_pool_tiles.json | 4 ++-- .../thresholds/decorative/pool/red/red_pool_light.json | 2 +- .../thresholds/decorative/pool/red/red_pool_tile_stairs.json | 2 +- .../thresholds/decorative/pool/red/red_pool_tiles.json | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) rename src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/{clean_pool_tiles.json => pool_tiles.json} (88%) diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_light.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_light.json index 822785e..de586f0 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_light.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_light.json @@ -7,7 +7,7 @@ ], "key": { "A": { - "item": "otemod:blue_pool_tiles" + "item": "otemod:blue_pool_tile" }, "B": { "item": "minecraft:glowstone" diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_tile_stairs.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_tile_stairs.json index 82d10a4..70d56ad 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_tile_stairs.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_tile_stairs.json @@ -7,7 +7,7 @@ ], "key": { "A": { - "item": "otemod:blue_pool_tiles" + "item": "otemod:blue_pool_tile" } }, "result": { diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_tiles.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_tiles.json index f23a382..1175b2e 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_tiles.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/blue_pool_tiles.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "otemod:blue_pool_tiles", + "item": "otemod:blue_pool_tile", "count": 4 } } diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dark_pool_tile_stairs.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dark_pool_tile_stairs.json index 1f9b77c..b164bd4 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dark_pool_tile_stairs.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dark_pool_tile_stairs.json @@ -7,7 +7,7 @@ ], "key": { "A": { - "item": "otemod:dark_pool_tiles" + "item": "otemod:dark_pool_tile" } }, "result": { diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dark_pool_tiles.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dark_pool_tiles.json index 28e0725..d73b76a 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dark_pool_tiles.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dark_pool_tiles.json @@ -13,7 +13,7 @@ } }, "result": { - "item": "otemod:dark_pool_tiles", + "item": "otemod:dark_pool_tile", "count": 4 } } diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dirty_blue_pool_tile_stairs.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dirty_blue_pool_tile_stairs.json index be57954..84900e1 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dirty_blue_pool_tile_stairs.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dirty_blue_pool_tile_stairs.json @@ -7,7 +7,7 @@ ], "key": { "A": { - "item": "otemod:dirty_blue_pool_tiles" + "item": "otemod:dirty_blue_pool_tile" } }, "result": { diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dirty_blue_pool_tiles.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dirty_blue_pool_tiles.json index c7d2fcf..4102593 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dirty_blue_pool_tiles.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/blue/dirty_blue_pool_tiles.json @@ -5,11 +5,11 @@ "item": "minecraft:slime_ball" }, { - "item": "otemod:blue_pool_tiles" + "item": "otemod:blue_pool_tile" } ], "result": { - "item": "otemod:dirty_blue_pool_tiles", + "item": "otemod:dirty_blue_pool_tile", "count": 4 } } diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tile_stairs.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tile_stairs.json index 1e0d54b..9c4f4b2 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tile_stairs.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tile_stairs.json @@ -7,7 +7,7 @@ ], "key": { "A": { - "item": "otemod:dirty_pool_tiles" + "item": "otemod:dirty_pool_tile" } }, "result": { diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tiles.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tiles.json index 02d9ecf..3e8f6f4 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tiles.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tiles.json @@ -5,7 +5,7 @@ "item": "minecraft:slime_ball" }, { - "item": "otemod:pool_tiles" + "item": "otemod:pool_tile" } ], "result": { diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/pool_light.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/pool_light.json index 9360335..74009c0 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/pool_light.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/pool_light.json @@ -7,7 +7,7 @@ ], "key": { "A": { - "item": "otemod:pool_tiles" + "item": "otemod:pool_tile" }, "B": { "item": "minecraft:glowstone" diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/pool_tile_stairs.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/pool_tile_stairs.json index 0a751dd..58e36df 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/pool_tile_stairs.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/pool_tile_stairs.json @@ -7,7 +7,7 @@ ], "key": { "A": { - "item": "otemod:pool_tiles" + "item": "otemod:pool_tile" } }, "result": { diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/clean_pool_tiles.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/pool_tiles.json similarity index 88% rename from src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/clean_pool_tiles.json rename to src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/pool_tiles.json index deec031..efa5fe0 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/clean_pool_tiles.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/pool_tiles.json @@ -13,7 +13,7 @@ } }, "result": { - "item": "otemod:pool_tiles", + "item": "otemod:pool_tile", "count": 4 } } diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/dirty_red_pool_tile_stairs.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/dirty_red_pool_tile_stairs.json index 6bd4426..fb478dd 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/dirty_red_pool_tile_stairs.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/dirty_red_pool_tile_stairs.json @@ -7,7 +7,7 @@ ], "key": { "A": { - "item": "otemod:dirty_red_pool_tiles" + "item": "otemod:dirty_red_pool_tile" } }, "result": { diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/dirty_red_pool_tiles.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/dirty_red_pool_tiles.json index 38b882b..9d46f0b 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/dirty_red_pool_tiles.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/dirty_red_pool_tiles.json @@ -6,14 +6,14 @@ ], "key": { "A": { - "item": "otemod:red_pool_tiles" + "item": "otemod:red_pool_tile" }, "B": { "item": "minecraft:slime_ball" } }, "result": { - "item": "otemod:dirty_red_pool_tiles", + "item": "otemod:dirty_red_pool_tile", "count": 4 } } diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_light.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_light.json index 93d6b7f..11aa8d5 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_light.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_light.json @@ -7,7 +7,7 @@ ], "key": { "A": { - "item": "otemod:red_pool_tiles" + "item": "otemod:red_pool_tile" }, "B": { "item": "minecraft:glowstone" diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_tile_stairs.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_tile_stairs.json index a58bae0..6ecb17d 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_tile_stairs.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_tile_stairs.json @@ -7,7 +7,7 @@ ], "key": { "A": { - "item": "otemod:red_pool_tiles" + "item": "otemod:red_pool_tile" } }, "result": { diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_tiles.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_tiles.json index a374415..3665a2f 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_tiles.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/red/red_pool_tiles.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "otemod:red_pool_tiles", + "item": "otemod:red_pool_tile", "count": 4 } } From f30011740923ddcd0ecb43ce503b0e6f45518144 Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Tue, 30 Jan 2024 15:38:08 -0700 Subject: [PATCH 17/22] Bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 090c26e..d634d91 100644 --- a/gradle.properties +++ b/gradle.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.013024.0420 +mod_version=1.4.013024.1537 # 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 From 4ed87fcae9a1e4b52536660e94299be6e301c0d4 Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Tue, 30 Jan 2024 16:01:13 -0700 Subject: [PATCH 18/22] Fix poss ball again --- src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java index 10bcb4d..2884a30 100644 --- a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java +++ b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java @@ -170,6 +170,12 @@ public class ThrownPossBall extends ThrowableItemProjectile // Ensure no entity tag! tag.remove("entity"); + if(tag.size()==0) + { + tag=null; + item.setTag(null); + } + //if(item.getDamageValue() >= item.getMaxDamage()) // return; From bc1e6e9dcacdb347b5cbf81a5a2d04b36506976f Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Tue, 30 Jan 2024 17:31:34 -0700 Subject: [PATCH 19/22] Fix poss ball again --- gradle.properties | 2 +- .../dev/zontreck/otemod/items/ThrownPossBall.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index d634d91..568de0f 100644 --- a/gradle.properties +++ b/gradle.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.013024.1537 +mod_version=1.4.013024.1601 # 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 diff --git a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java index 2884a30..bc5658f 100644 --- a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java +++ b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java @@ -69,13 +69,10 @@ public class ThrownPossBall extends ThrowableItemProjectile @Override protected void onHitEntity(EntityHitResult pResult) { - super.onHitEntity(pResult); - if(getItem().getTag().contains("entity")) + //super.onHitEntity(pResult); + if(getItem().getTag() == null || !getItem().getTag().contains("entity")) { - // Don't capture the entity - pResult.getEntity().hurt(this.shooter.getLastDamageSource().thrown(this, this.getOwner()), 0.1F); - } else { if(pResult.getEntity() instanceof LivingEntity le && !(le instanceof Player)) { // We don't want to capture players @@ -97,12 +94,17 @@ public class ThrownPossBall extends ThrowableItemProjectile le.remove(RemovalReason.DISCARDED); } + } else { + + // Don't capture the entity + + pResult.getEntity().hurt(this.shooter.getLastDamageSource().thrown(this, this.getOwner()), 0.1F); } } @Override protected void onHit(HitResult pResult) { - super.onHit(pResult); + //super.onHit(pResult); if(ServerUtilities.isServer()) { // We do two things here From db4627dc97d31c48eba4acaa1f5862d77137f99e Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Tue, 30 Jan 2024 17:32:21 -0700 Subject: [PATCH 20/22] Bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 568de0f..5320c0c 100644 --- a/gradle.properties +++ b/gradle.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.013024.1601 +mod_version=1.4.013024.1731 # 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 From 83728faa6820c2d634a55cce6880d27daea4cca5 Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Tue, 30 Jan 2024 17:46:06 -0700 Subject: [PATCH 21/22] Ugh --- gradle.properties | 2 +- src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5320c0c..64e864b 100644 --- a/gradle.properties +++ b/gradle.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.013024.1731 +mod_version=1.4.013024.1744 # 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 diff --git a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java index bc5658f..2a1687a 100644 --- a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java +++ b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java @@ -69,7 +69,7 @@ public class ThrownPossBall extends ThrowableItemProjectile @Override protected void onHitEntity(EntityHitResult pResult) { - //super.onHitEntity(pResult); + super.onHitEntity(pResult); if(getItem().getTag() == null || !getItem().getTag().contains("entity")) { @@ -104,7 +104,7 @@ public class ThrownPossBall extends ThrowableItemProjectile @Override protected void onHit(HitResult pResult) { - //super.onHit(pResult); + super.onHit(pResult); if(ServerUtilities.isServer()) { // We do two things here From 1e9da88ba488e2c6da2b2eb531f02a8d85c42788 Mon Sep 17 00:00:00 2001 From: Tara Piccari Date: Tue, 30 Jan 2024 21:01:47 -0700 Subject: [PATCH 22/22] Rewrite poss ball --- gradle.properties | 2 +- .../zontreck/otemod/items/PossBallItem.java | 22 ++- .../zontreck/otemod/items/ThrownPossBall.java | 130 ++++++++++-------- .../pool/clean/dirty_pool_tiles.json | 2 +- 4 files changed, 80 insertions(+), 76 deletions(-) diff --git a/gradle.properties b/gradle.properties index 64e864b..34879ef 100644 --- a/gradle.properties +++ b/gradle.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.013024.1744 +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 diff --git a/src/main/java/dev/zontreck/otemod/items/PossBallItem.java b/src/main/java/dev/zontreck/otemod/items/PossBallItem.java index 38d3eba..62c8c97 100644 --- a/src/main/java/dev/zontreck/otemod/items/PossBallItem.java +++ b/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()); } @@ -37,21 +35,17 @@ public class PossBallItem extends Item 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.copy()); + 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); } } diff --git a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java index 2a1687a..b8b2185 100644 --- a/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java +++ b/src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java @@ -1,17 +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; @@ -21,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; @@ -32,28 +26,40 @@ public class ThrownPossBall extends ThrowableItemProjectile { boolean captured = false; LivingEntity shooter; + ItemStack self; public ThrownPossBall(EntityType 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) @@ -70,41 +76,60 @@ public class ThrownPossBall extends ThrowableItemProjectile @Override protected void onHitEntity(EntityHitResult pResult) { super.onHitEntity(pResult); - if(getItem().getTag() == null || !getItem().getTag().contains("entity")) + if(ServerUtilities.isServer()) { - - 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); - - getItem().getTag().put("entity", tag); - getItem().setCount(1); - 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); - - cont.commitLore(); - - le.remove(RemovalReason.DISCARDED); + tag.remove(ItemStack.TAG_DAMAGE); } - } else { - // Don't capture the entity - pResult.getEntity().hurt(this.shooter.getLastDamageSource().thrown(this, this.getOwner()), 0.1F); + if(self.getTag() == null || !self.getTag().contains("entity")) + { + /* + + Ensure the tag is not null + + */ + + 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); + } } } @Override protected void onHit(HitResult pResult) { super.onHit(pResult); + if(ServerUtilities.isServer()) { // We do two things here @@ -113,9 +138,10 @@ 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==null)tag=new CompoundTag(); if(tag.contains(ItemStack.TAG_DAMAGE)) { @@ -127,12 +153,7 @@ public class ThrownPossBall extends ThrowableItemProjectile if(captured) { // Spawn poss ball item with the entity NBT - ItemEntity entity; - if(shooter != null) - entity = new ItemEntity(getLevel(), shooter.position().x, shooter.position().y, shooter.position().z, item, 0, 0, 0); - else - entity = new ItemEntity(getLevel(), shooter.position().x, shooter.position().y, shooter.position().z, item, 0, 0, 0); - getLevel().addFreshEntity(entity); + returnBall(); } else { // Spawn the real entity Optional entity = EntityType.create(tag.getCompound("entity"), getLevel()); @@ -155,13 +176,8 @@ public class ThrownPossBall extends ThrowableItemProjectile tag.remove("entity"); } - ItemEntity x; - if(shooter!=null) - x = new ItemEntity(getLevel(), shooter.position().x, shooter.position().y, shooter.position().z, item, 0, 0, 0); - else - x = new ItemEntity(getLevel(), position().x, position().y, position().z, item, 0, 0, 0); - getLevel().addFreshEntity(x); + returnBall(); } } else { // No capture @@ -175,21 +191,15 @@ public class ThrownPossBall extends ThrowableItemProjectile if(tag.size()==0) { tag=null; - item.setTag(null); + item.setTag(new CompoundTag()); } //if(item.getDamageValue() >= item.getMaxDamage()) // return; - ItemEntity entity; - if(shooter!= null) - entity = new ItemEntity(getLevel(),shooter.position().x, shooter.position().y, shooter.position().z, item, 0, 0, 0); - else - - entity = new ItemEntity(getLevel(), position().x, position().y, position().z, item, 0, 0, 0); - getLevel().addFreshEntity(entity); + returnBall(); } this.getLevel().broadcastEntityEvent(this, (byte)3); diff --git a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tiles.json b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tiles.json index 3e8f6f4..286fb4a 100644 --- a/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tiles.json +++ b/src/main/resources/data/otemod/recipes/thresholds/decorative/pool/clean/dirty_pool_tiles.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "otemod:dirty_pool_tiles", + "item": "otemod:dirty_pool_tile", "count": 4 } }