diff --git a/build.gradle b/build.gradle index bca206be..bb26615d 100644 --- a/build.gradle +++ b/build.gradle @@ -22,14 +22,14 @@ repositories { processResources { inputs.property "version", project.version - archivesBaseName = "zenith" + archivesBaseName = "voxy" filesMatching("fabric.mod.json") { expand "version": project.version } } loom { - accessWidenerPath = file("src/main/resources/zenith.accesswidener") + accessWidenerPath = file("src/main/resources/voxy.accesswidener") } dependencies { diff --git a/gradle.properties b/gradle.properties index 1b3adb35..ff2dcb1a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,6 +10,6 @@ loader_version=0.15.0 # Mod Properties mod_version = 0.0.3-alpha maven_group = me.cortex -archives_base_name = zenith +archives_base_name = voxy fabric_version=0.91.1+1.20.4 diff --git a/src/main/java/me/cortex/zenith/client/IGetVoxelCore.java b/src/main/java/me/cortex/voxy/client/IGetVoxelCore.java similarity index 54% rename from src/main/java/me/cortex/zenith/client/IGetVoxelCore.java rename to src/main/java/me/cortex/voxy/client/IGetVoxelCore.java index 8b1552f1..db3fbaaf 100644 --- a/src/main/java/me/cortex/zenith/client/IGetVoxelCore.java +++ b/src/main/java/me/cortex/voxy/client/IGetVoxelCore.java @@ -1,6 +1,6 @@ -package me.cortex.zenith.client; +package me.cortex.voxy.client; -import me.cortex.zenith.client.core.VoxelCore; +import me.cortex.voxy.client.core.VoxelCore; public interface IGetVoxelCore { VoxelCore getVoxelCore(); diff --git a/src/main/java/me/cortex/zenith/client/Test.java b/src/main/java/me/cortex/voxy/client/Test.java similarity index 87% rename from src/main/java/me/cortex/zenith/client/Test.java rename to src/main/java/me/cortex/voxy/client/Test.java index 5ee1b56e..32d8709b 100644 --- a/src/main/java/me/cortex/zenith/client/Test.java +++ b/src/main/java/me/cortex/voxy/client/Test.java @@ -1,9 +1,8 @@ -package me.cortex.zenith.client; +package me.cortex.voxy.client; -import me.cortex.zenith.common.world.storage.lmdb.LMDBInterface; -import me.cortex.zenith.common.world.storage.StorageBackend; -import me.cortex.zenith.client.importers.WorldImporter; -import me.cortex.zenith.common.world.storage.lmdb.LMDBStorageBackend; +import me.cortex.voxy.common.world.storage.lmdb.LMDBInterface; +import me.cortex.voxy.client.importers.WorldImporter; +import me.cortex.voxy.common.world.storage.lmdb.LMDBStorageBackend; import org.lwjgl.system.MemoryUtil; import java.io.File; diff --git a/src/main/java/me/cortex/zenith/client/Zenith.java b/src/main/java/me/cortex/voxy/client/Voxy.java similarity index 71% rename from src/main/java/me/cortex/zenith/client/Zenith.java rename to src/main/java/me/cortex/voxy/client/Voxy.java index ac7af2c5..273cb004 100644 --- a/src/main/java/me/cortex/zenith/client/Zenith.java +++ b/src/main/java/me/cortex/voxy/client/Voxy.java @@ -1,10 +1,10 @@ -package me.cortex.zenith.client; +package me.cortex.voxy.client; -import me.cortex.zenith.client.terrain.WorldImportCommand; +import me.cortex.voxy.client.terrain.WorldImportCommand; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; -public class Zenith implements ClientModInitializer { +public class Voxy implements ClientModInitializer { @Override public void onInitializeClient() { ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> { diff --git a/src/main/java/me/cortex/zenith/client/config/ZenithConfig.java b/src/main/java/me/cortex/voxy/client/config/VoxyConfig.java similarity index 85% rename from src/main/java/me/cortex/zenith/client/config/ZenithConfig.java rename to src/main/java/me/cortex/voxy/client/config/VoxyConfig.java index 6e964a51..0f9f28f3 100644 --- a/src/main/java/me/cortex/zenith/client/config/ZenithConfig.java +++ b/src/main/java/me/cortex/voxy/client/config/VoxyConfig.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.config; +package me.cortex.voxy.client.config; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; @@ -11,13 +11,13 @@ import java.lang.reflect.Modifier; import java.nio.file.Files; import java.nio.file.Path; -public class ZenithConfig { +public class VoxyConfig { private static final Gson GSON = new GsonBuilder() .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES) .setPrettyPrinting() .excludeFieldsWithModifiers(Modifier.PRIVATE) .create(); - public static ZenithConfig CONFIG = loadOrCreate(); + public static VoxyConfig CONFIG = loadOrCreate(); public boolean enabled = true; public int qualityScale = 20; @@ -27,7 +27,7 @@ public class ZenithConfig { public int savingThreads = 10; public int renderThreads = 5; public int savingCompressionLevel = 7; - public String storagePath = "zenith_db"; + public String storagePath = "voxy_db"; transient StorageConfig storageConfig; public static abstract class StorageConfig { } @@ -38,17 +38,17 @@ public class ZenithConfig { - public static ZenithConfig loadOrCreate() { + public static VoxyConfig loadOrCreate() { var path = getConfigPath(); if (Files.exists(path)) { try (FileReader reader = new FileReader(path.toFile())) { - return GSON.fromJson(reader, ZenithConfig.class); + return GSON.fromJson(reader, VoxyConfig.class); } catch (IOException e) { System.err.println("Could not parse config"); e.printStackTrace(); } } - return new ZenithConfig(); + return new VoxyConfig(); } public void save() { //Unsafe, todo: fixme! needs to be atomic! diff --git a/src/main/java/me/cortex/zenith/client/config/ZenithConfigScreenFactory.java b/src/main/java/me/cortex/voxy/client/config/VoxyConfigScreenFactory.java similarity index 58% rename from src/main/java/me/cortex/zenith/client/config/ZenithConfigScreenFactory.java rename to src/main/java/me/cortex/voxy/client/config/VoxyConfigScreenFactory.java index a8924262..ce55ddc7 100644 --- a/src/main/java/me/cortex/zenith/client/config/ZenithConfigScreenFactory.java +++ b/src/main/java/me/cortex/voxy/client/config/VoxyConfigScreenFactory.java @@ -1,31 +1,26 @@ -package me.cortex.zenith.client.config; +package me.cortex.voxy.client.config; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; -import me.cortex.zenith.client.IGetVoxelCore; +import me.cortex.voxy.client.IGetVoxelCore; import me.shedaniel.clothconfig2.api.ConfigBuilder; import me.shedaniel.clothconfig2.api.ConfigCategory; import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; -import me.shedaniel.clothconfig2.api.Requirement; -import me.shedaniel.clothconfig2.gui.entries.BooleanListEntry; -import me.shedaniel.clothconfig2.gui.entries.IntegerListEntry; -import me.shedaniel.clothconfig2.gui.entries.IntegerSliderEntry; -import me.shedaniel.clothconfig2.impl.builders.DropdownMenuBuilder; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.text.Text; -public class ZenithConfigScreenFactory implements ModMenuApi { - private static final ZenithConfig DEFAULT = new ZenithConfig(); +public class VoxyConfigScreenFactory implements ModMenuApi { + private static final VoxyConfig DEFAULT = new VoxyConfig(); @Override public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> buildConfigScreen(parent, ZenithConfig.CONFIG); + return parent -> buildConfigScreen(parent, VoxyConfig.CONFIG); } - private static Screen buildConfigScreen(Screen parent, ZenithConfig config) { + private static Screen buildConfigScreen(Screen parent, VoxyConfig config) { ConfigBuilder builder = ConfigBuilder.create() .setParentScreen(parent) - .setTitle(Text.translatable("zenith.config.title")); + .setTitle(Text.translatable("voxy.config.title")); addGeneralCategory(builder, config); @@ -38,78 +33,78 @@ public class ZenithConfigScreenFactory implements ModMenuApi { if (world != null) { world.reloadVoxelCore(); } - ZenithConfig.CONFIG.save(); + VoxyConfig.CONFIG.save(); }); return builder.build(); } - private static void addGeneralCategory(ConfigBuilder builder, ZenithConfig config) { - ConfigCategory category = builder.getOrCreateCategory(Text.translatable("zenith.config.general")); + private static void addGeneralCategory(ConfigBuilder builder, VoxyConfig config) { + ConfigCategory category = builder.getOrCreateCategory(Text.translatable("voxy.config.general")); ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - category.addEntry(entryBuilder.startBooleanToggle(Text.translatable("zenith.config.general.enabled"), config.enabled) - .setTooltip(Text.translatable("zenith.config.general.enabled.tooltip")) + category.addEntry(entryBuilder.startBooleanToggle(Text.translatable("voxy.config.general.enabled"), config.enabled) + .setTooltip(Text.translatable("voxy.config.general.enabled.tooltip")) .setSaveConsumer(val -> config.enabled = val) .setDefaultValue(DEFAULT.enabled) .build()); - category.addEntry(entryBuilder.startIntSlider(Text.translatable("zenith.config.general.quality"), config.qualityScale, 8, 50) - .setTooltip(Text.translatable("zenith.config.general.quality.tooltip")) + category.addEntry(entryBuilder.startIntSlider(Text.translatable("voxy.config.general.quality"), config.qualityScale, 8, 50) + .setTooltip(Text.translatable("voxy.config.general.quality.tooltip")) .setSaveConsumer(val -> config.qualityScale = val) .setDefaultValue(DEFAULT.qualityScale) .build()); - category.addEntry(entryBuilder.startIntSlider(Text.translatable("zenith.config.general.geometryBuffer"), config.geometryBufferSize, (1<<27)/8, ((1<<31)-1)/8) - .setTooltip(Text.translatable("zenith.config.general.geometryBuffer.tooltip")) + category.addEntry(entryBuilder.startIntSlider(Text.translatable("voxy.config.general.geometryBuffer"), config.geometryBufferSize, (1<<27)/8, ((1<<31)-1)/8) + .setTooltip(Text.translatable("voxy.config.general.geometryBuffer.tooltip")) .setSaveConsumer(val -> config.geometryBufferSize = val) .setDefaultValue(DEFAULT.geometryBufferSize) .build()); - category.addEntry(entryBuilder.startIntSlider(Text.translatable("zenith.config.general.maxSections"), config.maxSections, 100_000, 400_000) - .setTooltip(Text.translatable("zenith.config.general.maxSections.tooltip")) + category.addEntry(entryBuilder.startIntSlider(Text.translatable("voxy.config.general.maxSections"), config.maxSections, 100_000, 400_000) + .setTooltip(Text.translatable("voxy.config.general.maxSections.tooltip")) .setSaveConsumer(val -> config.maxSections = val) .setDefaultValue(DEFAULT.maxSections) .build()); - category.addEntry(entryBuilder.startIntSlider(Text.translatable("zenith.config.general.compression"), config.savingCompressionLevel, 1, 21) - .setTooltip(Text.translatable("zenith.config.general.compression.tooltip")) + category.addEntry(entryBuilder.startIntSlider(Text.translatable("voxy.config.general.compression"), config.savingCompressionLevel, 1, 21) + .setTooltip(Text.translatable("voxy.config.general.compression.tooltip")) .setSaveConsumer(val -> config.savingCompressionLevel = val) .setDefaultValue(DEFAULT.savingCompressionLevel) .build()); } - private static void addThreadsCategory(ConfigBuilder builder, ZenithConfig config) { - ConfigCategory category = builder.getOrCreateCategory(Text.translatable("zenith.config.threads")); + private static void addThreadsCategory(ConfigBuilder builder, VoxyConfig config) { + ConfigCategory category = builder.getOrCreateCategory(Text.translatable("voxy.config.threads")); ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - category.addEntry(entryBuilder.startIntSlider(Text.translatable("zenith.config.threads.ingest"), config.ingestThreads, 1, Runtime.getRuntime().availableProcessors()) - .setTooltip(Text.translatable("zenith.config.general.ingest.tooltip")) + category.addEntry(entryBuilder.startIntSlider(Text.translatable("voxy.config.threads.ingest"), config.ingestThreads, 1, Runtime.getRuntime().availableProcessors()) + .setTooltip(Text.translatable("voxy.config.general.ingest.tooltip")) .setSaveConsumer(val -> config.ingestThreads = val) .setDefaultValue(DEFAULT.ingestThreads) .build()); - category.addEntry(entryBuilder.startIntSlider(Text.translatable("zenith.config.threads.saving"), config.savingThreads, 1, Runtime.getRuntime().availableProcessors()) - .setTooltip(Text.translatable("zenith.config.general.saving.tooltip")) + category.addEntry(entryBuilder.startIntSlider(Text.translatable("voxy.config.threads.saving"), config.savingThreads, 1, Runtime.getRuntime().availableProcessors()) + .setTooltip(Text.translatable("voxy.config.general.saving.tooltip")) .setSaveConsumer(val -> config.savingThreads = val) .setDefaultValue(DEFAULT.savingThreads) .build()); - category.addEntry(entryBuilder.startIntSlider(Text.translatable("zenith.config.threads.render"), config.renderThreads, 1, Runtime.getRuntime().availableProcessors()) - .setTooltip(Text.translatable("zenith.config.general.render.tooltip")) + category.addEntry(entryBuilder.startIntSlider(Text.translatable("voxy.config.threads.render"), config.renderThreads, 1, Runtime.getRuntime().availableProcessors()) + .setTooltip(Text.translatable("voxy.config.general.render.tooltip")) .setSaveConsumer(val -> config.renderThreads = val) .setDefaultValue(DEFAULT.renderThreads) .build()); } - private static void addStorageCategory(ConfigBuilder builder, ZenithConfig config) { - ConfigCategory category = builder.getOrCreateCategory(Text.translatable("zenith.config.storage")); + private static void addStorageCategory(ConfigBuilder builder, VoxyConfig config) { + ConfigCategory category = builder.getOrCreateCategory(Text.translatable("voxy.config.storage")); ConfigEntryBuilder entryBuilder = builder.entryBuilder(); //Temporary until i figure out how to do more complex multi layer configuration for storage - category.addEntry(entryBuilder.startStrField(Text.translatable("zenith.config.storage.path"), config.storagePath) - .setTooltip(Text.translatable("zenith.config.storage.path.tooltip")) + category.addEntry(entryBuilder.startStrField(Text.translatable("voxy.config.storage.path"), config.storagePath) + .setTooltip(Text.translatable("voxy.config.storage.path.tooltip")) .setSaveConsumer(val -> config.storagePath = val) .setDefaultValue(DEFAULT.storagePath) .build()); diff --git a/src/main/java/me/cortex/zenith/client/core/DistanceTracker.java b/src/main/java/me/cortex/voxy/client/core/DistanceTracker.java similarity index 98% rename from src/main/java/me/cortex/zenith/client/core/DistanceTracker.java rename to src/main/java/me/cortex/voxy/client/core/DistanceTracker.java index 9d1dad9e..bb447436 100644 --- a/src/main/java/me/cortex/zenith/client/core/DistanceTracker.java +++ b/src/main/java/me/cortex/voxy/client/core/DistanceTracker.java @@ -1,11 +1,11 @@ -package me.cortex.zenith.client.core; +package me.cortex.voxy.client.core; //Contains the logic to determine what is loaded and at what LoD level, dispatches render changes // also determines what faces are built etc import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; -import me.cortex.zenith.client.core.rendering.RenderTracker; -import me.cortex.zenith.client.core.util.RingUtil; +import me.cortex.voxy.client.core.rendering.RenderTracker; +import me.cortex.voxy.client.core.util.RingUtil; import net.minecraft.client.MinecraftClient; //Can use ring logic diff --git a/src/main/java/me/cortex/zenith/client/core/VoxelCore.java b/src/main/java/me/cortex/voxy/client/core/VoxelCore.java similarity index 86% rename from src/main/java/me/cortex/zenith/client/core/VoxelCore.java rename to src/main/java/me/cortex/voxy/client/core/VoxelCore.java index 57509479..c7afd015 100644 --- a/src/main/java/me/cortex/zenith/client/core/VoxelCore.java +++ b/src/main/java/me/cortex/voxy/client/core/VoxelCore.java @@ -1,19 +1,18 @@ -package me.cortex.zenith.client.core; +package me.cortex.voxy.client.core; import com.mojang.blaze3d.platform.GlStateManager; -import me.cortex.zenith.client.config.ZenithConfig; -import me.cortex.zenith.client.core.rendering.*; -import me.cortex.zenith.client.core.rendering.building.RenderGenerationService; -import me.cortex.zenith.client.core.rendering.post.PostProcessing; -import me.cortex.zenith.client.core.util.DebugUtil; -import me.cortex.zenith.common.world.WorldEngine; -import me.cortex.zenith.client.importers.WorldImporter; -import me.cortex.zenith.common.world.storage.FragmentedStorageBackendAdaptor; +import me.cortex.voxy.client.config.VoxyConfig; +import me.cortex.voxy.client.core.rendering.*; +import me.cortex.voxy.client.core.rendering.building.RenderGenerationService; +import me.cortex.voxy.client.core.rendering.post.PostProcessing; +import me.cortex.voxy.client.core.util.DebugUtil; +import me.cortex.voxy.common.world.WorldEngine; +import me.cortex.voxy.client.importers.WorldImporter; +import me.cortex.voxy.common.world.storage.FragmentedStorageBackendAdaptor; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.Camera; import net.minecraft.client.render.Frustum; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; import net.minecraft.world.World; @@ -48,23 +47,23 @@ public class VoxelCore { //private final Thread shutdownThread = new Thread(this::shutdown); public VoxelCore() { - System.out.println("Initializing voxel core"); + System.out.println("Initializing voxy core"); //Trigger the shared index buffer loading SharedIndexBuffer.INSTANCE.id(); - this.renderer = new Gl46FarWorldRenderer(ZenithConfig.CONFIG.geometryBufferSize, ZenithConfig.CONFIG.maxSections); + this.renderer = new Gl46FarWorldRenderer(VoxyConfig.CONFIG.geometryBufferSize, VoxyConfig.CONFIG.maxSections); System.out.println("Renderer initialized"); - this.world = new WorldEngine(new FragmentedStorageBackendAdaptor(new File(ZenithConfig.CONFIG.storagePath)), ZenithConfig.CONFIG.ingestThreads, ZenithConfig.CONFIG.savingThreads, ZenithConfig.CONFIG.savingCompressionLevel, 5);//"storagefile.db"//"ethoslab.db" + this.world = new WorldEngine(new FragmentedStorageBackendAdaptor(new File(VoxyConfig.CONFIG.storagePath)), VoxyConfig.CONFIG.ingestThreads, VoxyConfig.CONFIG.savingThreads, VoxyConfig.CONFIG.savingCompressionLevel, 5);//"storagefile.db"//"ethoslab.db" System.out.println("World engine"); this.renderTracker = new RenderTracker(this.world, this.renderer); - this.renderGen = new RenderGenerationService(this.world, this.renderer.getModelManager(), ZenithConfig.CONFIG.renderThreads, this.renderTracker::processBuildResult); + this.renderGen = new RenderGenerationService(this.world, this.renderer.getModelManager(), VoxyConfig.CONFIG.renderThreads, this.renderTracker::processBuildResult); this.world.setDirtyCallback(this.renderTracker::sectionUpdated); this.renderTracker.setRenderGen(this.renderGen); System.out.println("Render tracker and generator initialized"); //To get to chunk scale multiply the scale by 2, the scale is after how many chunks does the lods halve - this.distanceTracker = new DistanceTracker(this.renderTracker, 5, ZenithConfig.CONFIG.qualityScale); + this.distanceTracker = new DistanceTracker(this.renderTracker, 5, VoxyConfig.CONFIG.qualityScale); System.out.println("Distance tracker initialized"); this.postProcessing = new PostProcessing(); @@ -85,7 +84,7 @@ public class VoxelCore { } //this.renderer.getModelManager().updateEntry(0, Blocks.GRASS_BLOCK.getDefaultState()); - System.out.println("Voxel core initialized"); + System.out.println("Voxy core initialized"); } @@ -142,7 +141,7 @@ public class VoxelCore { public void addDebugInfo(List debug) { debug.add(""); debug.add(""); - debug.add("VoxelCore"); + debug.add("Voxy Core"); debug.add("Ingest service tasks: " + this.world.ingestService.getTaskCount()); debug.add("Saving service tasks: " + this.world.savingService.getTaskCount()); debug.add("Render service tasks: " + this.renderGen.getTaskCount()); diff --git a/src/main/java/me/cortex/zenith/client/core/gl/GlBuffer.java b/src/main/java/me/cortex/voxy/client/core/gl/GlBuffer.java similarity index 88% rename from src/main/java/me/cortex/zenith/client/core/gl/GlBuffer.java rename to src/main/java/me/cortex/voxy/client/core/gl/GlBuffer.java index 83535e71..482405ac 100644 --- a/src/main/java/me/cortex/zenith/client/core/gl/GlBuffer.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/GlBuffer.java @@ -1,6 +1,6 @@ -package me.cortex.zenith.client.core.gl; +package me.cortex.voxy.client.core.gl; -import me.cortex.zenith.common.util.TrackedObject; +import me.cortex.voxy.common.util.TrackedObject; import static org.lwjgl.opengl.GL15.glDeleteBuffers; import static org.lwjgl.opengl.GL44C.glBufferStorage; diff --git a/src/main/java/me/cortex/zenith/client/core/gl/GlFence.java b/src/main/java/me/cortex/voxy/client/core/gl/GlFence.java similarity index 89% rename from src/main/java/me/cortex/zenith/client/core/gl/GlFence.java rename to src/main/java/me/cortex/voxy/client/core/gl/GlFence.java index 433553dc..4477e33e 100644 --- a/src/main/java/me/cortex/zenith/client/core/gl/GlFence.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/GlFence.java @@ -1,6 +1,6 @@ -package me.cortex.zenith.client.core.gl; +package me.cortex.voxy.client.core.gl; -import me.cortex.zenith.common.util.TrackedObject; +import me.cortex.voxy.common.util.TrackedObject; import static org.lwjgl.opengl.GL32.*; diff --git a/src/main/java/me/cortex/zenith/client/core/gl/GlFramebuffer.java b/src/main/java/me/cortex/voxy/client/core/gl/GlFramebuffer.java similarity index 89% rename from src/main/java/me/cortex/zenith/client/core/gl/GlFramebuffer.java rename to src/main/java/me/cortex/voxy/client/core/gl/GlFramebuffer.java index 5adf2f37..b9d428bd 100644 --- a/src/main/java/me/cortex/zenith/client/core/gl/GlFramebuffer.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/GlFramebuffer.java @@ -1,6 +1,6 @@ -package me.cortex.zenith.client.core.gl; +package me.cortex.voxy.client.core.gl; -import me.cortex.zenith.common.util.TrackedObject; +import me.cortex.voxy.common.util.TrackedObject; import static org.lwjgl.opengl.GL45C.*; diff --git a/src/main/java/me/cortex/zenith/client/core/gl/GlPersistentMappedBuffer.java b/src/main/java/me/cortex/voxy/client/core/gl/GlPersistentMappedBuffer.java similarity index 90% rename from src/main/java/me/cortex/zenith/client/core/gl/GlPersistentMappedBuffer.java rename to src/main/java/me/cortex/voxy/client/core/gl/GlPersistentMappedBuffer.java index 8f5fdfe4..c67093f9 100644 --- a/src/main/java/me/cortex/zenith/client/core/gl/GlPersistentMappedBuffer.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/GlPersistentMappedBuffer.java @@ -1,6 +1,6 @@ -package me.cortex.zenith.client.core.gl; +package me.cortex.voxy.client.core.gl; -import me.cortex.zenith.common.util.TrackedObject; +import me.cortex.voxy.common.util.TrackedObject; import static org.lwjgl.opengl.ARBMapBufferRange.GL_MAP_WRITE_BIT; import static org.lwjgl.opengl.GL15.glDeleteBuffers; diff --git a/src/main/java/me/cortex/zenith/client/core/gl/GlTexture.java b/src/main/java/me/cortex/voxy/client/core/gl/GlTexture.java similarity index 91% rename from src/main/java/me/cortex/zenith/client/core/gl/GlTexture.java rename to src/main/java/me/cortex/voxy/client/core/gl/GlTexture.java index e56fd041..5c1b4cd9 100644 --- a/src/main/java/me/cortex/zenith/client/core/gl/GlTexture.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/GlTexture.java @@ -1,6 +1,6 @@ -package me.cortex.zenith.client.core.gl; +package me.cortex.voxy.client.core.gl; -import me.cortex.zenith.common.util.TrackedObject; +import me.cortex.voxy.common.util.TrackedObject; import static org.lwjgl.opengl.ARBFramebufferObject.glDeleteFramebuffers; import static org.lwjgl.opengl.ARBFramebufferObject.glGenFramebuffers; diff --git a/src/main/java/me/cortex/zenith/client/core/gl/shader/IShaderProcessor.java b/src/main/java/me/cortex/voxy/client/core/gl/shader/IShaderProcessor.java similarity index 65% rename from src/main/java/me/cortex/zenith/client/core/gl/shader/IShaderProcessor.java rename to src/main/java/me/cortex/voxy/client/core/gl/shader/IShaderProcessor.java index 1a60d5b2..7e0115a6 100644 --- a/src/main/java/me/cortex/zenith/client/core/gl/shader/IShaderProcessor.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/shader/IShaderProcessor.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.core.gl.shader; +package me.cortex.voxy.client.core.gl.shader; public interface IShaderProcessor { String process(ShaderType type, String source); diff --git a/src/main/java/me/cortex/zenith/client/core/gl/shader/Shader.java b/src/main/java/me/cortex/voxy/client/core/gl/shader/Shader.java similarity index 96% rename from src/main/java/me/cortex/zenith/client/core/gl/shader/Shader.java rename to src/main/java/me/cortex/voxy/client/core/gl/shader/Shader.java index 2111a720..3cb79d96 100644 --- a/src/main/java/me/cortex/zenith/client/core/gl/shader/Shader.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/shader/Shader.java @@ -1,6 +1,6 @@ -package me.cortex.zenith.client.core.gl.shader; +package me.cortex.voxy.client.core.gl.shader; -import me.cortex.zenith.common.util.TrackedObject; +import me.cortex.voxy.common.util.TrackedObject; import org.lwjgl.opengl.GL20C; import java.util.HashMap; diff --git a/src/main/java/me/cortex/zenith/client/core/gl/shader/ShaderLoader.java b/src/main/java/me/cortex/voxy/client/core/gl/shader/ShaderLoader.java similarity index 89% rename from src/main/java/me/cortex/zenith/client/core/gl/shader/ShaderLoader.java rename to src/main/java/me/cortex/voxy/client/core/gl/shader/ShaderLoader.java index 61df8a94..15e57c12 100644 --- a/src/main/java/me/cortex/zenith/client/core/gl/shader/ShaderLoader.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/shader/ShaderLoader.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.core.gl.shader; +package me.cortex.voxy.client.core.gl.shader; import me.jellysquid.mods.sodium.client.gl.shader.ShaderConstants; import me.jellysquid.mods.sodium.client.gl.shader.ShaderParser; diff --git a/src/main/java/me/cortex/zenith/client/core/gl/shader/ShaderType.java b/src/main/java/me/cortex/voxy/client/core/gl/shader/ShaderType.java similarity index 92% rename from src/main/java/me/cortex/zenith/client/core/gl/shader/ShaderType.java rename to src/main/java/me/cortex/voxy/client/core/gl/shader/ShaderType.java index dca5ad4c..e3fd383a 100644 --- a/src/main/java/me/cortex/zenith/client/core/gl/shader/ShaderType.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/shader/ShaderType.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.core.gl.shader; +package me.cortex.voxy.client.core.gl.shader; import static org.lwjgl.opengl.GL20.GL_FRAGMENT_SHADER; diff --git a/src/main/java/me/cortex/zenith/client/core/model/ColourDepthTextureData.java b/src/main/java/me/cortex/voxy/client/core/model/ColourDepthTextureData.java similarity index 94% rename from src/main/java/me/cortex/zenith/client/core/model/ColourDepthTextureData.java rename to src/main/java/me/cortex/voxy/client/core/model/ColourDepthTextureData.java index 5b07d55c..c3dd1a46 100644 --- a/src/main/java/me/cortex/zenith/client/core/model/ColourDepthTextureData.java +++ b/src/main/java/me/cortex/voxy/client/core/model/ColourDepthTextureData.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.core.model; +package me.cortex.voxy.client.core.model; import java.util.Arrays; diff --git a/src/main/java/me/cortex/zenith/client/core/model/ModelManager.java b/src/main/java/me/cortex/voxy/client/core/model/ModelManager.java similarity index 98% rename from src/main/java/me/cortex/zenith/client/core/model/ModelManager.java rename to src/main/java/me/cortex/voxy/client/core/model/ModelManager.java index 93a4fe02..6c3e1cfb 100644 --- a/src/main/java/me/cortex/zenith/client/core/model/ModelManager.java +++ b/src/main/java/me/cortex/voxy/client/core/model/ModelManager.java @@ -1,11 +1,11 @@ -package me.cortex.zenith.client.core.model; +package me.cortex.voxy.client.core.model; import com.mojang.blaze3d.platform.GlConst; import com.mojang.blaze3d.platform.GlStateManager; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import me.cortex.zenith.client.core.gl.GlBuffer; -import me.cortex.zenith.client.core.gl.GlTexture; -import me.cortex.zenith.client.core.rendering.util.UploadStream; +import me.cortex.voxy.client.core.gl.GlBuffer; +import me.cortex.voxy.client.core.gl.GlTexture; +import me.cortex.voxy.client.core.rendering.util.UploadStream; import net.minecraft.block.BlockState; import net.minecraft.block.FluidBlock; import net.minecraft.block.entity.BlockEntity; @@ -41,7 +41,6 @@ import static org.lwjgl.opengl.GL12C.GL_TEXTURE_MIN_LOD; import static org.lwjgl.opengl.GL33.glDeleteSamplers; import static org.lwjgl.opengl.GL33.glGenSamplers; import static org.lwjgl.opengl.GL33C.glSamplerParameteri; -import static org.lwjgl.opengl.GL45C.glGenerateTextureMipmap; import static org.lwjgl.opengl.GL45C.glTextureSubImage2D; //Manages the storage and updating of model states, textures and colours diff --git a/src/main/java/me/cortex/zenith/client/core/model/ModelTextureBakery.java b/src/main/java/me/cortex/voxy/client/core/model/ModelTextureBakery.java similarity index 93% rename from src/main/java/me/cortex/zenith/client/core/model/ModelTextureBakery.java rename to src/main/java/me/cortex/voxy/client/core/model/ModelTextureBakery.java index afe4bf7a..0f54c1a5 100644 --- a/src/main/java/me/cortex/zenith/client/core/model/ModelTextureBakery.java +++ b/src/main/java/me/cortex/voxy/client/core/model/ModelTextureBakery.java @@ -1,15 +1,13 @@ -package me.cortex.zenith.client.core.model; +package me.cortex.voxy.client.core.model; import com.mojang.blaze3d.platform.GlConst; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.VertexSorter; -import me.cortex.zenith.client.core.gl.GlFramebuffer; -import me.cortex.zenith.client.core.gl.GlTexture; -import me.cortex.zenith.client.core.gl.shader.Shader; -import me.cortex.zenith.client.core.gl.shader.ShaderLoader; -import me.cortex.zenith.client.core.gl.shader.ShaderType; -import me.jellysquid.mods.sodium.client.gl.shader.GlShader; +import me.cortex.voxy.client.core.gl.GlFramebuffer; +import me.cortex.voxy.client.core.gl.GlTexture; +import me.cortex.voxy.client.core.gl.shader.Shader; +import me.cortex.voxy.client.core.gl.shader.ShaderType; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.MinecraftClient; @@ -18,7 +16,6 @@ import net.minecraft.client.render.*; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.fluid.FluidState; -import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.RotationAxis; @@ -40,8 +37,6 @@ import static org.lwjgl.opengl.ARBShaderImageLoadStore.glMemoryBarrier; import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL14C.glBlendFuncSeparate; import static org.lwjgl.opengl.GL20C.glUniformMatrix4fv; -import static org.lwjgl.opengl.GL20C.glUseProgram; -import static org.lwjgl.opengl.GL45C.glBlitNamedFramebuffer; import static org.lwjgl.opengl.GL45C.glGetTextureImage; //Builds a texture for each face of a model @@ -52,8 +47,8 @@ public class ModelTextureBakery { private final GlTexture depthTex; private final GlFramebuffer framebuffer; private final Shader rasterShader = Shader.make() - .add(ShaderType.VERTEX, "zenith:bakery/position_tex.vsh") - .add(ShaderType.FRAGMENT, "zenith:bakery/position_tex.fsh") + .add(ShaderType.VERTEX, "voxy:bakery/position_tex.vsh") + .add(ShaderType.FRAGMENT, "voxy:bakery/position_tex.fsh") .compile(); private static final List FACE_VIEWS = new ArrayList<>(); @@ -151,6 +146,7 @@ public class ModelTextureBakery { renderLayer.endDrawing(); glDisable(GL_STENCIL_TEST); + glDisable(GL_BLEND); RenderSystem.setProjectionMatrix(oldProjection, VertexSorter.BY_DISTANCE); glBindFramebuffer(GL_FRAMEBUFFER, oldFB); diff --git a/src/main/java/me/cortex/zenith/client/core/model/TextureUtils.java b/src/main/java/me/cortex/voxy/client/core/model/TextureUtils.java similarity index 98% rename from src/main/java/me/cortex/zenith/client/core/model/TextureUtils.java rename to src/main/java/me/cortex/voxy/client/core/model/TextureUtils.java index 1be8948e..b3bd36fb 100644 --- a/src/main/java/me/cortex/zenith/client/core/model/TextureUtils.java +++ b/src/main/java/me/cortex/voxy/client/core/model/TextureUtils.java @@ -1,11 +1,7 @@ -package me.cortex.zenith.client.core.model; +package me.cortex.voxy.client.core.model; import me.jellysquid.mods.sodium.client.util.color.ColorSRGB; import net.minecraft.util.math.ColorHelper; -import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.Unique; - -import java.util.Map; //Texturing utils to manipulate data from the model bakery public class TextureUtils { diff --git a/src/main/java/me/cortex/zenith/client/core/rendering/AbstractFarWorldRenderer.java b/src/main/java/me/cortex/voxy/client/core/rendering/AbstractFarWorldRenderer.java similarity index 91% rename from src/main/java/me/cortex/zenith/client/core/rendering/AbstractFarWorldRenderer.java rename to src/main/java/me/cortex/voxy/client/core/rendering/AbstractFarWorldRenderer.java index a409529a..5da5becf 100644 --- a/src/main/java/me/cortex/zenith/client/core/rendering/AbstractFarWorldRenderer.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/AbstractFarWorldRenderer.java @@ -1,14 +1,13 @@ -package me.cortex.zenith.client.core.rendering; +package me.cortex.voxy.client.core.rendering; //NOTE: an idea on how to do it is so that any render section, we _keep_ aquired (yes this will be very memory intensive) // could maybe tosomething else -import me.cortex.zenith.client.core.gl.GlBuffer; -import me.cortex.zenith.client.core.model.ModelManager; -import me.cortex.zenith.client.core.rendering.building.BuiltSection; -import me.cortex.zenith.client.core.rendering.util.UploadStream; -import me.cortex.zenith.common.world.other.Mapper; -import net.minecraft.block.BlockState; +import me.cortex.voxy.client.core.gl.GlBuffer; +import me.cortex.voxy.client.core.model.ModelManager; +import me.cortex.voxy.client.core.rendering.building.BuiltSection; +import me.cortex.voxy.client.core.rendering.util.UploadStream; +import me.cortex.voxy.common.world.other.Mapper; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.Camera; import net.minecraft.client.render.Frustum; @@ -17,7 +16,6 @@ import org.joml.FrustumIntersection; import org.lwjgl.system.MemoryUtil; import java.util.List; -import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; import static org.lwjgl.opengl.ARBMultiDrawIndirect.glMultiDrawElementsIndirect; diff --git a/src/main/java/me/cortex/zenith/client/core/rendering/GeometryManager.java b/src/main/java/me/cortex/voxy/client/core/rendering/GeometryManager.java similarity index 96% rename from src/main/java/me/cortex/zenith/client/core/rendering/GeometryManager.java rename to src/main/java/me/cortex/voxy/client/core/rendering/GeometryManager.java index 956296b6..31d89bed 100644 --- a/src/main/java/me/cortex/zenith/client/core/rendering/GeometryManager.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/GeometryManager.java @@ -1,12 +1,12 @@ -package me.cortex.zenith.client.core.rendering; +package me.cortex.voxy.client.core.rendering; import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; import it.unimi.dsi.fastutil.longs.LongArrayList; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import me.cortex.zenith.client.core.gl.GlBuffer; -import me.cortex.zenith.client.core.rendering.building.BuiltSection; -import me.cortex.zenith.client.core.rendering.util.BufferArena; -import me.cortex.zenith.client.core.rendering.util.UploadStream; +import me.cortex.voxy.client.core.gl.GlBuffer; +import me.cortex.voxy.client.core.rendering.building.BuiltSection; +import me.cortex.voxy.client.core.rendering.util.BufferArena; +import me.cortex.voxy.client.core.rendering.util.UploadStream; import org.lwjgl.system.MemoryUtil; import java.util.concurrent.ConcurrentLinkedDeque; diff --git a/src/main/java/me/cortex/zenith/client/core/rendering/Gl46FarWorldRenderer.java b/src/main/java/me/cortex/voxy/client/core/rendering/Gl46FarWorldRenderer.java similarity index 90% rename from src/main/java/me/cortex/zenith/client/core/rendering/Gl46FarWorldRenderer.java rename to src/main/java/me/cortex/voxy/client/core/rendering/Gl46FarWorldRenderer.java index 70f85764..0269f741 100644 --- a/src/main/java/me/cortex/zenith/client/core/rendering/Gl46FarWorldRenderer.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/Gl46FarWorldRenderer.java @@ -1,21 +1,16 @@ -package me.cortex.zenith.client.core.rendering; +package me.cortex.voxy.client.core.rendering; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import me.cortex.zenith.client.core.gl.GlBuffer; -import me.cortex.zenith.client.core.gl.shader.Shader; -import me.cortex.zenith.client.core.gl.shader.ShaderType; -import me.cortex.zenith.client.core.rendering.util.UploadStream; -import me.cortex.zenith.client.mixin.joml.AccessFrustumIntersection; -import net.minecraft.block.Blocks; -import net.minecraft.block.WallMountedBlock; -import net.minecraft.block.enums.BlockFace; +import me.cortex.voxy.client.core.gl.GlBuffer; +import me.cortex.voxy.client.core.gl.shader.Shader; +import me.cortex.voxy.client.core.gl.shader.ShaderType; +import me.cortex.voxy.client.core.rendering.util.UploadStream; +import me.cortex.voxy.client.mixin.joml.AccessFrustumIntersection; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.math.Direction; import org.joml.Matrix4f; import org.joml.Vector3f; -import org.lwjgl.opengl.ARBIndirectParameters; import org.lwjgl.opengl.GL11C; import org.lwjgl.system.MemoryUtil; @@ -39,19 +34,19 @@ import static org.lwjgl.opengl.GL45C.glClearNamedBufferData; public class Gl46FarWorldRenderer extends AbstractFarWorldRenderer { private final Shader commandGen = Shader.make() - .add(ShaderType.COMPUTE, "zenith:lod/gl46/cmdgen.comp") + .add(ShaderType.COMPUTE, "voxy:lod/gl46/cmdgen.comp") .compile(); private final Shader lodShader = Shader.make() - .add(ShaderType.VERTEX, "zenith:lod/gl46/quads.vert") - .add(ShaderType.FRAGMENT, "zenith:lod/gl46/quads.frag") + .add(ShaderType.VERTEX, "voxy:lod/gl46/quads.vert") + .add(ShaderType.FRAGMENT, "voxy:lod/gl46/quads.frag") .compile(); //TODO: Note the cull shader needs a different element array since its rastering cubes not quads private final Shader cullShader = Shader.make() - .add(ShaderType.VERTEX, "zenith:lod/gl46/cull/raster.vert") - .add(ShaderType.FRAGMENT, "zenith:lod/gl46/cull/raster.frag") + .add(ShaderType.VERTEX, "voxy:lod/gl46/cull/raster.vert") + .add(ShaderType.FRAGMENT, "voxy:lod/gl46/cull/raster.frag") .compile(); private final GlBuffer glCommandBuffer; diff --git a/src/main/java/me/cortex/zenith/client/core/rendering/RenderTracker.java b/src/main/java/me/cortex/voxy/client/core/rendering/RenderTracker.java similarity index 97% rename from src/main/java/me/cortex/zenith/client/core/rendering/RenderTracker.java rename to src/main/java/me/cortex/voxy/client/core/rendering/RenderTracker.java index fa7fbb76..140ccf9c 100644 --- a/src/main/java/me/cortex/zenith/client/core/rendering/RenderTracker.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/RenderTracker.java @@ -1,9 +1,9 @@ -package me.cortex.zenith.client.core.rendering; +package me.cortex.voxy.client.core.rendering; -import me.cortex.zenith.client.core.rendering.building.BuiltSection; -import me.cortex.zenith.client.core.rendering.building.RenderGenerationService; -import me.cortex.zenith.common.world.WorldEngine; -import me.cortex.zenith.common.world.WorldSection; +import me.cortex.voxy.client.core.rendering.building.BuiltSection; +import me.cortex.voxy.client.core.rendering.building.RenderGenerationService; +import me.cortex.voxy.common.world.WorldEngine; +import me.cortex.voxy.common.world.WorldSection; import net.minecraft.client.MinecraftClient; import net.minecraft.util.math.Direction; diff --git a/src/main/java/me/cortex/zenith/client/core/rendering/SharedIndexBuffer.java b/src/main/java/me/cortex/voxy/client/core/rendering/SharedIndexBuffer.java similarity index 91% rename from src/main/java/me/cortex/zenith/client/core/rendering/SharedIndexBuffer.java rename to src/main/java/me/cortex/voxy/client/core/rendering/SharedIndexBuffer.java index 201b0d2c..8dcab04d 100644 --- a/src/main/java/me/cortex/zenith/client/core/rendering/SharedIndexBuffer.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/SharedIndexBuffer.java @@ -1,9 +1,9 @@ -package me.cortex.zenith.client.core.rendering; +package me.cortex.voxy.client.core.rendering; -import me.cortex.zenith.client.core.gl.GlBuffer; -import me.cortex.zenith.client.core.rendering.util.UploadStream; -import me.cortex.zenith.client.core.util.IndexUtil; -import me.cortex.zenith.common.util.MemoryBuffer; +import me.cortex.voxy.client.core.gl.GlBuffer; +import me.cortex.voxy.client.core.rendering.util.UploadStream; +import me.cortex.voxy.client.core.util.IndexUtil; +import me.cortex.voxy.common.util.MemoryBuffer; import org.lwjgl.system.MemoryUtil; diff --git a/src/main/java/me/cortex/zenith/client/core/rendering/building/BuiltSection.java b/src/main/java/me/cortex/voxy/client/core/rendering/building/BuiltSection.java similarity index 90% rename from src/main/java/me/cortex/zenith/client/core/rendering/building/BuiltSection.java rename to src/main/java/me/cortex/voxy/client/core/rendering/building/BuiltSection.java index 03c01a59..bbac07ef 100644 --- a/src/main/java/me/cortex/zenith/client/core/rendering/building/BuiltSection.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/building/BuiltSection.java @@ -1,9 +1,8 @@ -package me.cortex.zenith.client.core.rendering.building; +package me.cortex.voxy.client.core.rendering.building; -import me.cortex.zenith.common.util.MemoryBuffer; +import me.cortex.voxy.common.util.MemoryBuffer; import java.util.Arrays; -import java.util.Objects; //TODO: also have an AABB size stored public final class BuiltSection { diff --git a/src/main/java/me/cortex/zenith/client/core/rendering/building/QuadEncoder.java b/src/main/java/me/cortex/voxy/client/core/rendering/building/QuadEncoder.java similarity index 79% rename from src/main/java/me/cortex/zenith/client/core/rendering/building/QuadEncoder.java rename to src/main/java/me/cortex/voxy/client/core/rendering/building/QuadEncoder.java index f283307e..4ed44e14 100644 --- a/src/main/java/me/cortex/zenith/client/core/rendering/building/QuadEncoder.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/building/QuadEncoder.java @@ -1,13 +1,7 @@ -package me.cortex.zenith.client.core.rendering.building; +package me.cortex.voxy.client.core.rendering.building; -import me.cortex.zenith.client.core.model.ModelManager; -import me.cortex.zenith.client.core.rendering.GeometryManager; -import me.cortex.zenith.client.core.util.Mesher2D; -import me.cortex.zenith.common.world.other.Mapper; -import net.minecraft.client.color.block.BlockColors; -import net.minecraft.client.world.ClientWorld; -import net.minecraft.util.math.BlockPos; +import me.cortex.voxy.client.core.util.Mesher2D; public class QuadEncoder { diff --git a/src/main/java/me/cortex/zenith/client/core/rendering/building/RenderDataFactory.java b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory.java similarity index 98% rename from src/main/java/me/cortex/zenith/client/core/rendering/building/RenderDataFactory.java rename to src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory.java index c1d28867..96304e57 100644 --- a/src/main/java/me/cortex/zenith/client/core/rendering/building/RenderDataFactory.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory.java @@ -1,14 +1,13 @@ -package me.cortex.zenith.client.core.rendering.building; +package me.cortex.voxy.client.core.rendering.building; import it.unimi.dsi.fastutil.longs.LongArrayList; -import me.cortex.zenith.client.core.model.ModelManager; -import me.cortex.zenith.client.core.util.Mesher2D; -import me.cortex.zenith.common.util.MemoryBuffer; -import me.cortex.zenith.common.world.WorldEngine; -import me.cortex.zenith.common.world.WorldSection; -import me.cortex.zenith.common.world.other.Mapper; +import me.cortex.voxy.client.core.model.ModelManager; +import me.cortex.voxy.client.core.util.Mesher2D; +import me.cortex.voxy.common.util.MemoryBuffer; +import me.cortex.voxy.common.world.WorldEngine; +import me.cortex.voxy.common.world.WorldSection; +import me.cortex.voxy.common.world.other.Mapper; import net.minecraft.block.FluidBlock; -import net.minecraft.client.MinecraftClient; import org.lwjgl.system.MemoryUtil; diff --git a/src/main/java/me/cortex/zenith/client/core/rendering/building/RenderGenerationService.java b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderGenerationService.java similarity index 96% rename from src/main/java/me/cortex/zenith/client/core/rendering/building/RenderGenerationService.java rename to src/main/java/me/cortex/voxy/client/core/rendering/building/RenderGenerationService.java index 2ebf190c..5128efab 100644 --- a/src/main/java/me/cortex/zenith/client/core/rendering/building/RenderGenerationService.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderGenerationService.java @@ -1,9 +1,9 @@ -package me.cortex.zenith.client.core.rendering.building; +package me.cortex.voxy.client.core.rendering.building; import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap; -import me.cortex.zenith.client.core.model.ModelManager; -import me.cortex.zenith.common.world.WorldEngine; -import me.cortex.zenith.common.world.WorldSection; +import me.cortex.voxy.client.core.model.ModelManager; +import me.cortex.voxy.common.world.WorldEngine; +import me.cortex.voxy.common.world.WorldSection; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Semaphore; diff --git a/src/main/java/me/cortex/zenith/client/core/rendering/post/FullscreenBlit.java b/src/main/java/me/cortex/voxy/client/core/rendering/post/FullscreenBlit.java similarity index 73% rename from src/main/java/me/cortex/zenith/client/core/rendering/post/FullscreenBlit.java rename to src/main/java/me/cortex/voxy/client/core/rendering/post/FullscreenBlit.java index 5b9b2264..278bdb48 100644 --- a/src/main/java/me/cortex/zenith/client/core/rendering/post/FullscreenBlit.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/post/FullscreenBlit.java @@ -1,8 +1,7 @@ -package me.cortex.zenith.client.core.rendering.post; +package me.cortex.voxy.client.core.rendering.post; -import me.cortex.zenith.client.core.gl.shader.Shader; -import me.cortex.zenith.client.core.gl.shader.ShaderType; -import net.minecraft.util.Identifier; +import me.cortex.voxy.client.core.gl.shader.Shader; +import me.cortex.voxy.client.core.gl.shader.ShaderType; import static org.lwjgl.opengl.GL11C.GL_TRIANGLES; import static org.lwjgl.opengl.GL11C.glDrawArrays; @@ -15,7 +14,7 @@ public class FullscreenBlit { private final Shader shader; public FullscreenBlit(String fragId) { this.shader = Shader.make() - .add(ShaderType.VERTEX, "zenith:post/fullscreen.vert") + .add(ShaderType.VERTEX, "voxy:post/fullscreen.vert") .add(ShaderType.FRAGMENT, fragId) .compile(); } diff --git a/src/main/java/me/cortex/zenith/client/core/rendering/post/PostProcessing.java b/src/main/java/me/cortex/voxy/client/core/rendering/post/PostProcessing.java similarity index 83% rename from src/main/java/me/cortex/zenith/client/core/rendering/post/PostProcessing.java rename to src/main/java/me/cortex/voxy/client/core/rendering/post/PostProcessing.java index 71485cba..69fd118d 100644 --- a/src/main/java/me/cortex/zenith/client/core/rendering/post/PostProcessing.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/post/PostProcessing.java @@ -1,20 +1,15 @@ -package me.cortex.zenith.client.core.rendering.post; +package me.cortex.voxy.client.core.rendering.post; -import me.cortex.zenith.client.core.gl.GlFramebuffer; -import me.cortex.zenith.client.core.gl.GlTexture; -import me.cortex.zenith.client.core.gl.shader.Shader; -import me.cortex.zenith.client.core.gl.shader.ShaderType; -import org.lwjgl.opengl.GL11C; +import me.cortex.voxy.client.core.gl.GlFramebuffer; +import me.cortex.voxy.client.core.gl.GlTexture; +import me.cortex.voxy.client.core.gl.shader.Shader; +import me.cortex.voxy.client.core.gl.shader.ShaderType; import static org.lwjgl.opengl.ARBFramebufferObject.*; -import static org.lwjgl.opengl.ARBShaderImageLoadStore.glBindImageTexture; import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL13.*; -import static org.lwjgl.opengl.GL15C.GL_READ_WRITE; -import static org.lwjgl.opengl.GL20C.glStencilFuncSeparate; import static org.lwjgl.opengl.GL44C.glBindImageTextures; import static org.lwjgl.opengl.GL45C.glBlitNamedFramebuffer; -import static org.lwjgl.opengl.GL45C.glTextureBarrier; public class PostProcessing { private final GlFramebuffer framebuffer; @@ -23,12 +18,8 @@ public class PostProcessing { private GlTexture colour; private GlTexture depthStencil; - private final Shader ssao = Shader.make() - .add(ShaderType.COMPUTE, "zenith:lod/ssao/ssao.comp") - .compile(); - - private final FullscreenBlit emptyBlit = new FullscreenBlit("zenith:post/noop.frag"); - private final FullscreenBlit blitTexture = new FullscreenBlit("zenith:post/blit_texture_cutout.frag"); + private final FullscreenBlit emptyBlit = new FullscreenBlit("voxy:post/noop.frag"); + private final FullscreenBlit blitTexture = new FullscreenBlit("voxy:post/blit_texture_cutout.frag"); public PostProcessing() { this.framebuffer = new GlFramebuffer(); @@ -58,7 +49,6 @@ public class PostProcessing { this.framebuffer.free(); if (this.colour != null) this.colour.free(); if (this.depthStencil != null) this.depthStencil.free(); - this.ssao.free(); this.emptyBlit.delete(); this.blitTexture.delete(); } @@ -70,7 +60,7 @@ public class PostProcessing { glBlitNamedFramebuffer(sourceFB, this.framebuffer.id, 0,0, width, height, 0,0, width, height, GL_DEPTH_BUFFER_BIT, GL_NEAREST); //TODO: need to blit a fullscreen quad to generate a stencil mask of where the vanilla terrain is/isnt - // then when rastering zenith terrain, only render to non masked areas + // then when rastering voxy terrain, only render to non masked areas //Hell once the stencil mask is computed, could clear the depth buffer and use a different near/far plane @@ -92,7 +82,7 @@ public class PostProcessing { glClear(GL_DEPTH_BUFFER_BIT); - //Make zenith terrain render only where there isnt mc terrain + //Make voxy terrain render only where there isnt mc terrain glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); glStencilFunc(GL_EQUAL, 1, 0xFF); diff --git a/src/main/java/me/cortex/zenith/client/core/rendering/util/BufferArena.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/BufferArena.java similarity index 88% rename from src/main/java/me/cortex/zenith/client/core/rendering/util/BufferArena.java rename to src/main/java/me/cortex/voxy/client/core/rendering/util/BufferArena.java index d03c1c71..40b3199c 100644 --- a/src/main/java/me/cortex/zenith/client/core/rendering/util/BufferArena.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/BufferArena.java @@ -1,8 +1,8 @@ -package me.cortex.zenith.client.core.rendering.util; +package me.cortex.voxy.client.core.rendering.util; -import me.cortex.zenith.client.core.gl.GlBuffer; -import me.cortex.zenith.client.core.util.AllocationArena; -import me.cortex.zenith.common.util.MemoryBuffer; +import me.cortex.voxy.client.core.gl.GlBuffer; +import me.cortex.voxy.client.core.util.AllocationArena; +import me.cortex.voxy.common.util.MemoryBuffer; import org.lwjgl.system.MemoryUtil; public class BufferArena { diff --git a/src/main/java/me/cortex/zenith/client/core/rendering/util/UploadStream.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java similarity index 93% rename from src/main/java/me/cortex/zenith/client/core/rendering/util/UploadStream.java rename to src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java index 4a0f536d..e7e2c2c0 100644 --- a/src/main/java/me/cortex/zenith/client/core/rendering/util/UploadStream.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java @@ -1,15 +1,15 @@ -package me.cortex.zenith.client.core.rendering.util; +package me.cortex.voxy.client.core.rendering.util; import it.unimi.dsi.fastutil.longs.LongArrayList; -import me.cortex.zenith.client.core.gl.GlBuffer; -import me.cortex.zenith.client.core.gl.GlFence; -import me.cortex.zenith.client.core.gl.GlPersistentMappedBuffer; -import me.cortex.zenith.client.core.util.AllocationArena; +import me.cortex.voxy.client.core.gl.GlBuffer; +import me.cortex.voxy.client.core.gl.GlFence; +import me.cortex.voxy.client.core.gl.GlPersistentMappedBuffer; +import me.cortex.voxy.client.core.util.AllocationArena; import java.util.ArrayDeque; import java.util.Deque; -import static me.cortex.zenith.client.core.util.AllocationArena.SIZE_LIMIT; +import static me.cortex.voxy.client.core.util.AllocationArena.SIZE_LIMIT; import static org.lwjgl.opengl.ARBDirectStateAccess.glCopyNamedBufferSubData; import static org.lwjgl.opengl.ARBDirectStateAccess.glFlushMappedNamedBufferRange; import static org.lwjgl.opengl.ARBMapBufferRange.*; diff --git a/src/main/java/me/cortex/zenith/client/core/util/AllocationArena.java b/src/main/java/me/cortex/voxy/client/core/util/AllocationArena.java similarity index 99% rename from src/main/java/me/cortex/zenith/client/core/util/AllocationArena.java rename to src/main/java/me/cortex/voxy/client/core/util/AllocationArena.java index f6bcd56b..4b8a98e8 100644 --- a/src/main/java/me/cortex/zenith/client/core/util/AllocationArena.java +++ b/src/main/java/me/cortex/voxy/client/core/util/AllocationArena.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.core.util; +package me.cortex.voxy.client.core.util; import it.unimi.dsi.fastutil.longs.LongRBTreeSet; diff --git a/src/main/java/me/cortex/zenith/client/core/util/ByteBufferBackedInputStream.java b/src/main/java/me/cortex/voxy/client/core/util/ByteBufferBackedInputStream.java similarity index 94% rename from src/main/java/me/cortex/zenith/client/core/util/ByteBufferBackedInputStream.java rename to src/main/java/me/cortex/voxy/client/core/util/ByteBufferBackedInputStream.java index 8848f973..9502f9cc 100644 --- a/src/main/java/me/cortex/zenith/client/core/util/ByteBufferBackedInputStream.java +++ b/src/main/java/me/cortex/voxy/client/core/util/ByteBufferBackedInputStream.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.core.util; +package me.cortex.voxy.client.core.util; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/me/cortex/zenith/client/core/util/DebugUtil.java b/src/main/java/me/cortex/voxy/client/core/util/DebugUtil.java similarity index 98% rename from src/main/java/me/cortex/zenith/client/core/util/DebugUtil.java rename to src/main/java/me/cortex/voxy/client/core/util/DebugUtil.java index 751c0554..c1377049 100644 --- a/src/main/java/me/cortex/zenith/client/core/util/DebugUtil.java +++ b/src/main/java/me/cortex/voxy/client/core/util/DebugUtil.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.core.util; +package me.cortex.voxy.client.core.util; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.render.*; diff --git a/src/main/java/me/cortex/zenith/client/core/util/IndexUtil.java b/src/main/java/me/cortex/voxy/client/core/util/IndexUtil.java similarity index 94% rename from src/main/java/me/cortex/zenith/client/core/util/IndexUtil.java rename to src/main/java/me/cortex/voxy/client/core/util/IndexUtil.java index d24158a3..57754cab 100644 --- a/src/main/java/me/cortex/zenith/client/core/util/IndexUtil.java +++ b/src/main/java/me/cortex/voxy/client/core/util/IndexUtil.java @@ -1,6 +1,6 @@ -package me.cortex.zenith.client.core.util; +package me.cortex.voxy.client.core.util; -import me.cortex.zenith.common.util.MemoryBuffer; +import me.cortex.voxy.common.util.MemoryBuffer; import org.lwjgl.system.MemoryUtil; public class IndexUtil { diff --git a/src/main/java/me/cortex/zenith/client/core/util/Mesher2D.java b/src/main/java/me/cortex/voxy/client/core/util/Mesher2D.java similarity index 99% rename from src/main/java/me/cortex/zenith/client/core/util/Mesher2D.java rename to src/main/java/me/cortex/voxy/client/core/util/Mesher2D.java index 08461b3b..b62598d2 100644 --- a/src/main/java/me/cortex/zenith/client/core/util/Mesher2D.java +++ b/src/main/java/me/cortex/voxy/client/core/util/Mesher2D.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.core.util; +package me.cortex.voxy.client.core.util; import java.util.Arrays; import java.util.BitSet; diff --git a/src/main/java/me/cortex/zenith/client/core/util/RingUtil.java b/src/main/java/me/cortex/voxy/client/core/util/RingUtil.java similarity index 98% rename from src/main/java/me/cortex/zenith/client/core/util/RingUtil.java rename to src/main/java/me/cortex/voxy/client/core/util/RingUtil.java index 94b0e512..087ae147 100644 --- a/src/main/java/me/cortex/zenith/client/core/util/RingUtil.java +++ b/src/main/java/me/cortex/voxy/client/core/util/RingUtil.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.core.util; +package me.cortex.voxy.client.core.util; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; diff --git a/src/main/java/me/cortex/zenith/client/importers/WorldImporter.java b/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java similarity index 97% rename from src/main/java/me/cortex/zenith/client/importers/WorldImporter.java rename to src/main/java/me/cortex/voxy/client/importers/WorldImporter.java index 1330a6f8..6592fbfc 100644 --- a/src/main/java/me/cortex/zenith/client/importers/WorldImporter.java +++ b/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java @@ -1,10 +1,10 @@ -package me.cortex.zenith.client.importers; +package me.cortex.voxy.client.importers; import com.mojang.serialization.Codec; -import me.cortex.zenith.client.core.util.ByteBufferBackedInputStream; -import me.cortex.zenith.common.voxelization.VoxelizedSection; -import me.cortex.zenith.common.voxelization.WorldConversionFactory; -import me.cortex.zenith.common.world.WorldEngine; +import me.cortex.voxy.client.core.util.ByteBufferBackedInputStream; +import me.cortex.voxy.common.voxelization.VoxelizedSection; +import me.cortex.voxy.common.voxelization.WorldConversionFactory; +import me.cortex.voxy.common.world.WorldEngine; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/me/cortex/zenith/client/mixin/joml/AccessFrustumIntersection.java b/src/main/java/me/cortex/voxy/client/mixin/joml/AccessFrustumIntersection.java similarity index 87% rename from src/main/java/me/cortex/zenith/client/mixin/joml/AccessFrustumIntersection.java rename to src/main/java/me/cortex/voxy/client/mixin/joml/AccessFrustumIntersection.java index 542466dd..cc7d4692 100644 --- a/src/main/java/me/cortex/zenith/client/mixin/joml/AccessFrustumIntersection.java +++ b/src/main/java/me/cortex/voxy/client/mixin/joml/AccessFrustumIntersection.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.mixin.joml; +package me.cortex.voxy.client.mixin.joml; import org.joml.FrustumIntersection; import org.joml.Vector4f; diff --git a/src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinBackgroundRenderer.java b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinBackgroundRenderer.java similarity index 90% rename from src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinBackgroundRenderer.java rename to src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinBackgroundRenderer.java index c7b378d3..ac816a80 100644 --- a/src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinBackgroundRenderer.java +++ b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinBackgroundRenderer.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.mixin.minecraft; +package me.cortex.voxy.client.mixin.minecraft; import net.minecraft.client.render.BackgroundRenderer; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinClientChunkManager.java b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinClientChunkManager.java similarity index 92% rename from src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinClientChunkManager.java rename to src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinClientChunkManager.java index fa064896..4e5c9e0c 100644 --- a/src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinClientChunkManager.java +++ b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinClientChunkManager.java @@ -1,6 +1,6 @@ -package me.cortex.zenith.client.mixin.minecraft; +package me.cortex.voxy.client.mixin.minecraft; -import me.cortex.zenith.client.IGetVoxelCore; +import me.cortex.voxy.client.IGetVoxelCore; import net.minecraft.client.MinecraftClient; import net.minecraft.client.world.ClientChunkManager; import net.minecraft.util.math.ChunkPos; diff --git a/src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinDebugHud.java b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinDebugHud.java similarity index 88% rename from src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinDebugHud.java rename to src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinDebugHud.java index ff1c4ce4..ac803c3c 100644 --- a/src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinDebugHud.java +++ b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinDebugHud.java @@ -1,6 +1,6 @@ -package me.cortex.zenith.client.mixin.minecraft; +package me.cortex.voxy.client.mixin.minecraft; -import me.cortex.zenith.client.IGetVoxelCore; +import me.cortex.voxy.client.IGetVoxelCore; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.hud.DebugHud; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinGameRenderer.java b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinGameRenderer.java similarity index 91% rename from src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinGameRenderer.java rename to src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinGameRenderer.java index b768f60c..33eb33b3 100644 --- a/src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinGameRenderer.java +++ b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinGameRenderer.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.mixin.minecraft; +package me.cortex.voxy.client.mixin.minecraft; import net.minecraft.client.render.GameRenderer; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinMinecraftClient.java b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinMinecraftClient.java similarity index 93% rename from src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinMinecraftClient.java rename to src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinMinecraftClient.java index 02f6df3b..8c3f0159 100644 --- a/src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinMinecraftClient.java +++ b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinMinecraftClient.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.mixin.minecraft; +package me.cortex.voxy.client.mixin.minecraft; import net.minecraft.client.MinecraftClient; import net.minecraft.client.RunArgs; diff --git a/src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinWorldRenderer.java b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java similarity index 93% rename from src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinWorldRenderer.java rename to src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java index d0a124a5..225de17c 100644 --- a/src/main/java/me/cortex/zenith/client/mixin/minecraft/MixinWorldRenderer.java +++ b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java @@ -1,8 +1,8 @@ -package me.cortex.zenith.client.mixin.minecraft; +package me.cortex.voxy.client.mixin.minecraft; -import me.cortex.zenith.client.IGetVoxelCore; -import me.cortex.zenith.client.config.ZenithConfig; -import me.cortex.zenith.client.core.VoxelCore; +import me.cortex.voxy.client.IGetVoxelCore; +import me.cortex.voxy.client.config.VoxyConfig; +import me.cortex.voxy.client.core.VoxelCore; import net.minecraft.client.render.*; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.world.ClientWorld; @@ -68,7 +68,7 @@ public abstract class MixinWorldRenderer implements IGetVoxelCore { this.core.shutdown(); this.core = null; } - if (ZenithConfig.CONFIG.enabled) { + if (VoxyConfig.CONFIG.enabled) { this.core = new VoxelCore(); } } @@ -79,7 +79,7 @@ public abstract class MixinWorldRenderer implements IGetVoxelCore { this.core.shutdown(); this.core = null; } - if (this.world != null && ZenithConfig.CONFIG.enabled) { + if (this.world != null && VoxyConfig.CONFIG.enabled) { this.core = new VoxelCore(); } } diff --git a/src/main/java/me/cortex/zenith/client/mixin/sodium/MixinOcclusionCuller.java b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinOcclusionCuller.java similarity index 91% rename from src/main/java/me/cortex/zenith/client/mixin/sodium/MixinOcclusionCuller.java rename to src/main/java/me/cortex/voxy/client/mixin/sodium/MixinOcclusionCuller.java index fc3172f6..b842b753 100644 --- a/src/main/java/me/cortex/zenith/client/mixin/sodium/MixinOcclusionCuller.java +++ b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinOcclusionCuller.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.mixin.sodium; +package me.cortex.voxy.client.mixin.sodium; import me.jellysquid.mods.sodium.client.render.chunk.occlusion.OcclusionCuller; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/me/cortex/zenith/client/mixin/sodium/MixinSodiumWorldRender.java b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinSodiumWorldRender.java similarity index 79% rename from src/main/java/me/cortex/zenith/client/mixin/sodium/MixinSodiumWorldRender.java rename to src/main/java/me/cortex/voxy/client/mixin/sodium/MixinSodiumWorldRender.java index 503371cb..e6c97b6c 100644 --- a/src/main/java/me/cortex/zenith/client/mixin/sodium/MixinSodiumWorldRender.java +++ b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinSodiumWorldRender.java @@ -1,13 +1,11 @@ -package me.cortex.zenith.client.mixin.sodium; +package me.cortex.voxy.client.mixin.sodium; import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer; -import me.jellysquid.mods.sodium.client.render.chunk.occlusion.OcclusionCuller; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.util.math.MatrixStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(value = SodiumWorldRenderer.class, remap = false) diff --git a/src/main/java/me/cortex/zenith/client/terrain/SparseTerrainGenerator.java b/src/main/java/me/cortex/voxy/client/terrain/SparseTerrainGenerator.java similarity index 98% rename from src/main/java/me/cortex/zenith/client/terrain/SparseTerrainGenerator.java rename to src/main/java/me/cortex/voxy/client/terrain/SparseTerrainGenerator.java index 815486bb..d536deff 100644 --- a/src/main/java/me/cortex/zenith/client/terrain/SparseTerrainGenerator.java +++ b/src/main/java/me/cortex/voxy/client/terrain/SparseTerrainGenerator.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.terrain; +package me.cortex.voxy.client.terrain; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/me/cortex/zenith/client/terrain/TestSparseGenCommand.java b/src/main/java/me/cortex/voxy/client/terrain/TestSparseGenCommand.java similarity index 96% rename from src/main/java/me/cortex/zenith/client/terrain/TestSparseGenCommand.java rename to src/main/java/me/cortex/voxy/client/terrain/TestSparseGenCommand.java index ec42d53c..f5c70ac0 100644 --- a/src/main/java/me/cortex/zenith/client/terrain/TestSparseGenCommand.java +++ b/src/main/java/me/cortex/voxy/client/terrain/TestSparseGenCommand.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.client.terrain; +package me.cortex.voxy.client.terrain; import com.mojang.brigadier.CommandDispatcher; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/me/cortex/zenith/client/terrain/WorldImportCommand.java b/src/main/java/me/cortex/voxy/client/terrain/WorldImportCommand.java similarity index 89% rename from src/main/java/me/cortex/zenith/client/terrain/WorldImportCommand.java rename to src/main/java/me/cortex/voxy/client/terrain/WorldImportCommand.java index af2ddacd..a30189c2 100644 --- a/src/main/java/me/cortex/zenith/client/terrain/WorldImportCommand.java +++ b/src/main/java/me/cortex/voxy/client/terrain/WorldImportCommand.java @@ -1,10 +1,10 @@ -package me.cortex.zenith.client.terrain; +package me.cortex.voxy.client.terrain; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.context.CommandContext; -import me.cortex.zenith.client.IGetVoxelCore; -import me.cortex.zenith.client.importers.WorldImporter; +import me.cortex.voxy.client.IGetVoxelCore; +import me.cortex.voxy.client.importers.WorldImporter; import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/me/cortex/zenith/common/util/MemoryBuffer.java b/src/main/java/me/cortex/voxy/common/util/MemoryBuffer.java similarity index 94% rename from src/main/java/me/cortex/zenith/common/util/MemoryBuffer.java rename to src/main/java/me/cortex/voxy/common/util/MemoryBuffer.java index 7376403c..3b8377c4 100644 --- a/src/main/java/me/cortex/zenith/common/util/MemoryBuffer.java +++ b/src/main/java/me/cortex/voxy/common/util/MemoryBuffer.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.common.util; +package me.cortex.voxy.common.util; import org.lwjgl.system.MemoryUtil; diff --git a/src/main/java/me/cortex/zenith/common/util/TrackedObject.java b/src/main/java/me/cortex/voxy/common/util/TrackedObject.java similarity index 97% rename from src/main/java/me/cortex/zenith/common/util/TrackedObject.java rename to src/main/java/me/cortex/voxy/common/util/TrackedObject.java index 4d8a84b3..feb4fc7d 100644 --- a/src/main/java/me/cortex/zenith/common/util/TrackedObject.java +++ b/src/main/java/me/cortex/voxy/common/util/TrackedObject.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.common.util; +package me.cortex.voxy.common.util; import java.lang.ref.Cleaner; diff --git a/src/main/java/me/cortex/zenith/common/util/VolatileHolder.java b/src/main/java/me/cortex/voxy/common/util/VolatileHolder.java similarity index 62% rename from src/main/java/me/cortex/zenith/common/util/VolatileHolder.java rename to src/main/java/me/cortex/voxy/common/util/VolatileHolder.java index 4acf4bb1..faaf0014 100644 --- a/src/main/java/me/cortex/zenith/common/util/VolatileHolder.java +++ b/src/main/java/me/cortex/voxy/common/util/VolatileHolder.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.common.util; +package me.cortex.voxy.common.util; public class VolatileHolder { public volatile T obj; diff --git a/src/main/java/me/cortex/zenith/common/voxelization/I3dSupplier.java b/src/main/java/me/cortex/voxy/common/voxelization/I3dSupplier.java similarity index 61% rename from src/main/java/me/cortex/zenith/common/voxelization/I3dSupplier.java rename to src/main/java/me/cortex/voxy/common/voxelization/I3dSupplier.java index ed6b3a4a..9ed0213a 100644 --- a/src/main/java/me/cortex/zenith/common/voxelization/I3dSupplier.java +++ b/src/main/java/me/cortex/voxy/common/voxelization/I3dSupplier.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.common.voxelization; +package me.cortex.voxy.common.voxelization; public interface I3dSupplier { T supply(int x, int y, int z); diff --git a/src/main/java/me/cortex/zenith/common/voxelization/ILightingSupplier.java b/src/main/java/me/cortex/voxy/common/voxelization/ILightingSupplier.java similarity index 74% rename from src/main/java/me/cortex/zenith/common/voxelization/ILightingSupplier.java rename to src/main/java/me/cortex/voxy/common/voxelization/ILightingSupplier.java index 598290e3..b02badf6 100644 --- a/src/main/java/me/cortex/zenith/common/voxelization/ILightingSupplier.java +++ b/src/main/java/me/cortex/voxy/common/voxelization/ILightingSupplier.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.common.voxelization; +package me.cortex.voxy.common.voxelization; import net.minecraft.block.BlockState; diff --git a/src/main/java/me/cortex/zenith/common/voxelization/VoxelizedSection.java b/src/main/java/me/cortex/voxy/common/voxelization/VoxelizedSection.java similarity index 94% rename from src/main/java/me/cortex/zenith/common/voxelization/VoxelizedSection.java rename to src/main/java/me/cortex/voxy/common/voxelization/VoxelizedSection.java index 66a5f265..20fe5e90 100644 --- a/src/main/java/me/cortex/zenith/common/voxelization/VoxelizedSection.java +++ b/src/main/java/me/cortex/voxy/common/voxelization/VoxelizedSection.java @@ -1,7 +1,7 @@ -package me.cortex.zenith.common.voxelization; +package me.cortex.voxy.common.voxelization; -import me.cortex.zenith.common.world.other.Mapper; +import me.cortex.voxy.common.world.other.Mapper; //16x16x16 block section public class VoxelizedSection { diff --git a/src/main/java/me/cortex/zenith/common/voxelization/WorldConversionFactory.java b/src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java similarity index 97% rename from src/main/java/me/cortex/zenith/common/voxelization/WorldConversionFactory.java rename to src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java index b6959d8c..eb977c76 100644 --- a/src/main/java/me/cortex/zenith/common/voxelization/WorldConversionFactory.java +++ b/src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java @@ -1,7 +1,7 @@ -package me.cortex.zenith.common.voxelization; +package me.cortex.voxy.common.voxelization; -import me.cortex.zenith.common.world.other.Mipper; -import me.cortex.zenith.common.world.other.Mapper; +import me.cortex.voxy.common.world.other.Mipper; +import me.cortex.voxy.common.world.other.Mapper; import net.minecraft.block.BlockState; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/me/cortex/zenith/common/world/ActiveSectionTracker.java b/src/main/java/me/cortex/voxy/common/world/ActiveSectionTracker.java similarity index 97% rename from src/main/java/me/cortex/zenith/common/world/ActiveSectionTracker.java rename to src/main/java/me/cortex/voxy/common/world/ActiveSectionTracker.java index 91dbceba..a54d3781 100644 --- a/src/main/java/me/cortex/zenith/common/world/ActiveSectionTracker.java +++ b/src/main/java/me/cortex/voxy/common/world/ActiveSectionTracker.java @@ -1,7 +1,7 @@ -package me.cortex.zenith.common.world; +package me.cortex.voxy.common.world; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; -import me.cortex.zenith.common.util.VolatileHolder; +import me.cortex.voxy.common.util.VolatileHolder; public class ActiveSectionTracker { //Deserialize into the supplied section, returns true on success, false on failure diff --git a/src/main/java/me/cortex/zenith/common/world/SaveLoadSystem.java b/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem.java similarity index 98% rename from src/main/java/me/cortex/zenith/common/world/SaveLoadSystem.java rename to src/main/java/me/cortex/voxy/common/world/SaveLoadSystem.java index 06f7c184..d74dba13 100644 --- a/src/main/java/me/cortex/zenith/common/world/SaveLoadSystem.java +++ b/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.common.world; +package me.cortex.voxy.common.world; import it.unimi.dsi.fastutil.longs.Long2ShortOpenHashMap; import it.unimi.dsi.fastutil.longs.LongArrayList; diff --git a/src/main/java/me/cortex/zenith/common/world/WorldEngine.java b/src/main/java/me/cortex/voxy/common/world/WorldEngine.java similarity index 94% rename from src/main/java/me/cortex/zenith/common/world/WorldEngine.java rename to src/main/java/me/cortex/voxy/common/world/WorldEngine.java index 34184fb8..a75a7fe4 100644 --- a/src/main/java/me/cortex/zenith/common/world/WorldEngine.java +++ b/src/main/java/me/cortex/voxy/common/world/WorldEngine.java @@ -1,10 +1,10 @@ -package me.cortex.zenith.common.world; +package me.cortex.voxy.common.world; -import me.cortex.zenith.common.voxelization.VoxelizedSection; -import me.cortex.zenith.common.world.other.Mapper; -import me.cortex.zenith.common.world.service.SectionSavingService; -import me.cortex.zenith.common.world.service.VoxelIngestService; -import me.cortex.zenith.common.world.storage.StorageBackend; +import me.cortex.voxy.common.voxelization.VoxelizedSection; +import me.cortex.voxy.common.world.other.Mapper; +import me.cortex.voxy.common.world.service.SectionSavingService; +import me.cortex.voxy.common.world.service.VoxelIngestService; +import me.cortex.voxy.common.world.storage.StorageBackend; import org.lwjgl.system.MemoryUtil; import java.util.Arrays; diff --git a/src/main/java/me/cortex/zenith/common/world/WorldSection.java b/src/main/java/me/cortex/voxy/common/world/WorldSection.java similarity index 98% rename from src/main/java/me/cortex/zenith/common/world/WorldSection.java rename to src/main/java/me/cortex/voxy/common/world/WorldSection.java index 6f871cc2..1fd3aaf5 100644 --- a/src/main/java/me/cortex/zenith/common/world/WorldSection.java +++ b/src/main/java/me/cortex/voxy/common/world/WorldSection.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.common.world; +package me.cortex.voxy.common.world; import java.util.Arrays; diff --git a/src/main/java/me/cortex/zenith/common/world/other/Mapper.java b/src/main/java/me/cortex/voxy/common/world/other/Mapper.java similarity index 99% rename from src/main/java/me/cortex/zenith/common/world/other/Mapper.java rename to src/main/java/me/cortex/voxy/common/world/other/Mapper.java index f2be2103..78a63ff3 100644 --- a/src/main/java/me/cortex/zenith/common/world/other/Mapper.java +++ b/src/main/java/me/cortex/voxy/common/world/other/Mapper.java @@ -1,7 +1,7 @@ -package me.cortex.zenith.common.world.other; +package me.cortex.voxy.common.world.other; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import me.cortex.zenith.common.world.storage.StorageBackend; +import me.cortex.voxy.common.world.storage.StorageBackend; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/me/cortex/zenith/common/world/other/Mipper.java b/src/main/java/me/cortex/voxy/common/world/other/Mipper.java similarity index 94% rename from src/main/java/me/cortex/zenith/common/world/other/Mipper.java rename to src/main/java/me/cortex/voxy/common/world/other/Mipper.java index fbb28b41..9e1da49c 100644 --- a/src/main/java/me/cortex/zenith/common/world/other/Mipper.java +++ b/src/main/java/me/cortex/voxy/common/world/other/Mipper.java @@ -1,6 +1,6 @@ -package me.cortex.zenith.common.world.other; +package me.cortex.voxy.common.world.other; -import static me.cortex.zenith.common.world.other.Mapper.withLight; +import static me.cortex.voxy.common.world.other.Mapper.withLight; //Mipper for data public class Mipper { diff --git a/src/main/java/me/cortex/zenith/common/world/service/SectionSavingService.java b/src/main/java/me/cortex/voxy/common/world/service/SectionSavingService.java similarity index 94% rename from src/main/java/me/cortex/zenith/common/world/service/SectionSavingService.java rename to src/main/java/me/cortex/voxy/common/world/service/SectionSavingService.java index 35dd5379..71a1f14e 100644 --- a/src/main/java/me/cortex/zenith/common/world/service/SectionSavingService.java +++ b/src/main/java/me/cortex/voxy/common/world/service/SectionSavingService.java @@ -1,8 +1,8 @@ -package me.cortex.zenith.common.world.service; +package me.cortex.voxy.common.world.service; -import me.cortex.zenith.common.world.SaveLoadSystem; -import me.cortex.zenith.common.world.WorldEngine; -import me.cortex.zenith.common.world.WorldSection; +import me.cortex.voxy.common.world.SaveLoadSystem; +import me.cortex.voxy.common.world.WorldEngine; +import me.cortex.voxy.common.world.WorldSection; import org.lwjgl.system.MemoryUtil; import java.util.concurrent.ConcurrentLinkedDeque; diff --git a/src/main/java/me/cortex/zenith/common/world/service/VoxelIngestService.java b/src/main/java/me/cortex/voxy/common/world/service/VoxelIngestService.java similarity index 96% rename from src/main/java/me/cortex/zenith/common/world/service/VoxelIngestService.java rename to src/main/java/me/cortex/voxy/common/world/service/VoxelIngestService.java index 124bb86d..90cfee05 100644 --- a/src/main/java/me/cortex/zenith/common/world/service/VoxelIngestService.java +++ b/src/main/java/me/cortex/voxy/common/world/service/VoxelIngestService.java @@ -1,9 +1,9 @@ -package me.cortex.zenith.common.world.service; +package me.cortex.voxy.common.world.service; import it.unimi.dsi.fastutil.Pair; -import me.cortex.zenith.common.voxelization.VoxelizedSection; -import me.cortex.zenith.common.voxelization.WorldConversionFactory; -import me.cortex.zenith.common.world.WorldEngine; +import me.cortex.voxy.common.voxelization.VoxelizedSection; +import me.cortex.voxy.common.voxelization.WorldConversionFactory; +import me.cortex.voxy.common.world.WorldEngine; import net.minecraft.util.math.ChunkSectionPos; import net.minecraft.world.LightType; import net.minecraft.world.chunk.ChunkNibbleArray; diff --git a/src/main/java/me/cortex/zenith/common/world/storage/FragmentedStorageBackendAdaptor.java b/src/main/java/me/cortex/voxy/common/world/storage/FragmentedStorageBackendAdaptor.java similarity index 96% rename from src/main/java/me/cortex/zenith/common/world/storage/FragmentedStorageBackendAdaptor.java rename to src/main/java/me/cortex/voxy/common/world/storage/FragmentedStorageBackendAdaptor.java index dca4c3cb..3a2d993c 100644 --- a/src/main/java/me/cortex/zenith/common/world/storage/FragmentedStorageBackendAdaptor.java +++ b/src/main/java/me/cortex/voxy/common/world/storage/FragmentedStorageBackendAdaptor.java @@ -1,10 +1,9 @@ -package me.cortex.zenith.common.world.storage; +package me.cortex.voxy.common.world.storage; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import it.unimi.dsi.fastutil.ints.Int2ShortOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import me.cortex.zenith.common.world.storage.lmdb.LMDBStorageBackend; +import me.cortex.voxy.common.world.storage.lmdb.LMDBStorageBackend; import net.minecraft.util.math.random.RandomSeed; import java.io.File; diff --git a/src/main/java/me/cortex/zenith/common/world/storage/StorageBackend.java b/src/main/java/me/cortex/voxy/common/world/storage/StorageBackend.java similarity index 91% rename from src/main/java/me/cortex/zenith/common/world/storage/StorageBackend.java rename to src/main/java/me/cortex/voxy/common/world/storage/StorageBackend.java index 7bf1ca4f..08461098 100644 --- a/src/main/java/me/cortex/zenith/common/world/storage/StorageBackend.java +++ b/src/main/java/me/cortex/voxy/common/world/storage/StorageBackend.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.common.world.storage; +package me.cortex.voxy.common.world.storage; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/src/main/java/me/cortex/zenith/common/world/storage/lmdb/Cursor.java b/src/main/java/me/cortex/voxy/common/world/storage/lmdb/Cursor.java similarity index 80% rename from src/main/java/me/cortex/zenith/common/world/storage/lmdb/Cursor.java rename to src/main/java/me/cortex/voxy/common/world/storage/lmdb/Cursor.java index 89c58b6b..9a902778 100644 --- a/src/main/java/me/cortex/zenith/common/world/storage/lmdb/Cursor.java +++ b/src/main/java/me/cortex/voxy/common/world/storage/lmdb/Cursor.java @@ -1,8 +1,8 @@ -package me.cortex.zenith.common.world.storage.lmdb; +package me.cortex.voxy.common.world.storage.lmdb; import org.lwjgl.util.lmdb.MDBVal; -import static me.cortex.zenith.common.world.storage.lmdb.LMDBInterface.E; +import static me.cortex.voxy.common.world.storage.lmdb.LMDBInterface.E; import static org.lwjgl.util.lmdb.LMDB.*; public class Cursor implements AutoCloseable { diff --git a/src/main/java/me/cortex/zenith/common/world/storage/lmdb/LMDBInterface.java b/src/main/java/me/cortex/voxy/common/world/storage/lmdb/LMDBInterface.java similarity index 98% rename from src/main/java/me/cortex/zenith/common/world/storage/lmdb/LMDBInterface.java rename to src/main/java/me/cortex/voxy/common/world/storage/lmdb/LMDBInterface.java index de080f92..d85c67a9 100644 --- a/src/main/java/me/cortex/zenith/common/world/storage/lmdb/LMDBInterface.java +++ b/src/main/java/me/cortex/voxy/common/world/storage/lmdb/LMDBInterface.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.common.world.storage.lmdb; +package me.cortex.voxy.common.world.storage.lmdb; import org.lwjgl.PointerBuffer; import org.lwjgl.system.MemoryStack; diff --git a/src/main/java/me/cortex/zenith/common/world/storage/lmdb/LMDBStorageBackend.java b/src/main/java/me/cortex/voxy/common/world/storage/lmdb/LMDBStorageBackend.java similarity index 98% rename from src/main/java/me/cortex/zenith/common/world/storage/lmdb/LMDBStorageBackend.java rename to src/main/java/me/cortex/voxy/common/world/storage/lmdb/LMDBStorageBackend.java index e20f5f57..24ccd07f 100644 --- a/src/main/java/me/cortex/zenith/common/world/storage/lmdb/LMDBStorageBackend.java +++ b/src/main/java/me/cortex/voxy/common/world/storage/lmdb/LMDBStorageBackend.java @@ -1,7 +1,7 @@ -package me.cortex.zenith.common.world.storage.lmdb; +package me.cortex.voxy.common.world.storage.lmdb; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import me.cortex.zenith.common.world.storage.StorageBackend; +import me.cortex.voxy.common.world.storage.StorageBackend; import org.lwjgl.system.MemoryUtil; import org.lwjgl.util.lmdb.MDBVal; diff --git a/src/main/java/me/cortex/zenith/common/world/storage/lmdb/TransactionCallback.java b/src/main/java/me/cortex/voxy/common/world/storage/lmdb/TransactionCallback.java similarity index 71% rename from src/main/java/me/cortex/zenith/common/world/storage/lmdb/TransactionCallback.java rename to src/main/java/me/cortex/voxy/common/world/storage/lmdb/TransactionCallback.java index a01f6345..e90e265e 100644 --- a/src/main/java/me/cortex/zenith/common/world/storage/lmdb/TransactionCallback.java +++ b/src/main/java/me/cortex/voxy/common/world/storage/lmdb/TransactionCallback.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.common.world.storage.lmdb; +package me.cortex.voxy.common.world.storage.lmdb; import org.lwjgl.system.MemoryStack; diff --git a/src/main/java/me/cortex/zenith/common/world/storage/lmdb/TransactionWrappedCallback.java b/src/main/java/me/cortex/voxy/common/world/storage/lmdb/TransactionWrappedCallback.java similarity index 63% rename from src/main/java/me/cortex/zenith/common/world/storage/lmdb/TransactionWrappedCallback.java rename to src/main/java/me/cortex/voxy/common/world/storage/lmdb/TransactionWrappedCallback.java index a8831b8a..d5a6bff9 100644 --- a/src/main/java/me/cortex/zenith/common/world/storage/lmdb/TransactionWrappedCallback.java +++ b/src/main/java/me/cortex/voxy/common/world/storage/lmdb/TransactionWrappedCallback.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.common.world.storage.lmdb; +package me.cortex.voxy.common.world.storage.lmdb; public interface TransactionWrappedCallback { T exec(TransactionWrapper wrapper); diff --git a/src/main/java/me/cortex/zenith/common/world/storage/lmdb/TransactionWrapper.java b/src/main/java/me/cortex/voxy/common/world/storage/lmdb/TransactionWrapper.java similarity index 95% rename from src/main/java/me/cortex/zenith/common/world/storage/lmdb/TransactionWrapper.java rename to src/main/java/me/cortex/voxy/common/world/storage/lmdb/TransactionWrapper.java index 717b0bbb..225b9bba 100644 --- a/src/main/java/me/cortex/zenith/common/world/storage/lmdb/TransactionWrapper.java +++ b/src/main/java/me/cortex/voxy/common/world/storage/lmdb/TransactionWrapper.java @@ -1,4 +1,4 @@ -package me.cortex.zenith.common.world.storage.lmdb; +package me.cortex.voxy.common.world.storage.lmdb; import org.lwjgl.PointerBuffer; import org.lwjgl.system.MemoryStack; @@ -6,7 +6,7 @@ import org.lwjgl.util.lmdb.MDBVal; import java.nio.ByteBuffer; -import static me.cortex.zenith.common.world.storage.lmdb.LMDBInterface.E; +import static me.cortex.voxy.common.world.storage.lmdb.LMDBInterface.E; import static org.lwjgl.system.MemoryStack.stackPush; import static org.lwjgl.util.lmdb.LMDB.*; diff --git a/src/main/resources/assets/zenith/shaders/bakery/position_tex.fsh b/src/main/resources/assets/voxy/shaders/bakery/position_tex.fsh similarity index 100% rename from src/main/resources/assets/zenith/shaders/bakery/position_tex.fsh rename to src/main/resources/assets/voxy/shaders/bakery/position_tex.fsh diff --git a/src/main/resources/assets/zenith/shaders/bakery/position_tex.vsh b/src/main/resources/assets/voxy/shaders/bakery/position_tex.vsh similarity index 100% rename from src/main/resources/assets/zenith/shaders/bakery/position_tex.vsh rename to src/main/resources/assets/voxy/shaders/bakery/position_tex.vsh diff --git a/src/main/resources/assets/zenith/shaders/lod/gl46/bindings.glsl b/src/main/resources/assets/voxy/shaders/lod/gl46/bindings.glsl similarity index 100% rename from src/main/resources/assets/zenith/shaders/lod/gl46/bindings.glsl rename to src/main/resources/assets/voxy/shaders/lod/gl46/bindings.glsl diff --git a/src/main/resources/assets/zenith/shaders/lod/gl46/block_model.glsl b/src/main/resources/assets/voxy/shaders/lod/gl46/block_model.glsl similarity index 100% rename from src/main/resources/assets/zenith/shaders/lod/gl46/block_model.glsl rename to src/main/resources/assets/voxy/shaders/lod/gl46/block_model.glsl diff --git a/src/main/resources/assets/zenith/shaders/lod/gl46/cmdgen.comp b/src/main/resources/assets/voxy/shaders/lod/gl46/cmdgen.comp similarity index 96% rename from src/main/resources/assets/zenith/shaders/lod/gl46/cmdgen.comp rename to src/main/resources/assets/voxy/shaders/lod/gl46/cmdgen.comp index 2224fe4e..65c2132a 100644 --- a/src/main/resources/assets/zenith/shaders/lod/gl46/cmdgen.comp +++ b/src/main/resources/assets/voxy/shaders/lod/gl46/cmdgen.comp @@ -3,10 +3,10 @@ layout(local_size_x = 128, local_size_y = 1, local_size_x = 1) in; -#import -#import -#import -#import +#import +#import +#import +#import #line 11 //https://github.com/KhronosGroup/GLSL/blob/master/extensions/ext/GL_EXT_shader_16bit_storage.txt diff --git a/src/main/resources/assets/zenith/shaders/lod/gl46/cull/raster.frag b/src/main/resources/assets/voxy/shaders/lod/gl46/cull/raster.frag similarity index 88% rename from src/main/resources/assets/zenith/shaders/lod/gl46/cull/raster.frag rename to src/main/resources/assets/voxy/shaders/lod/gl46/cull/raster.frag index 69de1293..7d3d4745 100644 --- a/src/main/resources/assets/zenith/shaders/lod/gl46/cull/raster.frag +++ b/src/main/resources/assets/voxy/shaders/lod/gl46/cull/raster.frag @@ -1,7 +1,7 @@ #version 460 core #extension GL_ARB_gpu_shader_int64 : enable #define VISIBILITY_ACCESS writeonly -#import +#import layout(early_fragment_tests) in; flat in uint id; diff --git a/src/main/resources/assets/zenith/shaders/lod/gl46/cull/raster.vert b/src/main/resources/assets/voxy/shaders/lod/gl46/cull/raster.vert similarity index 90% rename from src/main/resources/assets/zenith/shaders/lod/gl46/cull/raster.vert rename to src/main/resources/assets/voxy/shaders/lod/gl46/cull/raster.vert index d0e62e03..8c8936b5 100644 --- a/src/main/resources/assets/zenith/shaders/lod/gl46/cull/raster.vert +++ b/src/main/resources/assets/voxy/shaders/lod/gl46/cull/raster.vert @@ -1,8 +1,8 @@ #version 460 core #extension GL_ARB_gpu_shader_int64 : enable #define VISIBILITY_ACCESS writeonly -#import -#import +#import +#import flat out uint id; flat out uint value; diff --git a/src/main/resources/assets/zenith/shaders/lod/gl46/frustum.glsl b/src/main/resources/assets/voxy/shaders/lod/gl46/frustum.glsl similarity index 100% rename from src/main/resources/assets/zenith/shaders/lod/gl46/frustum.glsl rename to src/main/resources/assets/voxy/shaders/lod/gl46/frustum.glsl diff --git a/src/main/resources/assets/zenith/shaders/lod/gl46/quad_format.glsl b/src/main/resources/assets/voxy/shaders/lod/gl46/quad_format.glsl similarity index 100% rename from src/main/resources/assets/zenith/shaders/lod/gl46/quad_format.glsl rename to src/main/resources/assets/voxy/shaders/lod/gl46/quad_format.glsl diff --git a/src/main/resources/assets/zenith/shaders/lod/gl46/quads.frag b/src/main/resources/assets/voxy/shaders/lod/gl46/quads.frag similarity index 100% rename from src/main/resources/assets/zenith/shaders/lod/gl46/quads.frag rename to src/main/resources/assets/voxy/shaders/lod/gl46/quads.frag diff --git a/src/main/resources/assets/zenith/shaders/lod/gl46/quads.vert b/src/main/resources/assets/voxy/shaders/lod/gl46/quads.vert similarity index 96% rename from src/main/resources/assets/zenith/shaders/lod/gl46/quads.vert rename to src/main/resources/assets/voxy/shaders/lod/gl46/quads.vert index be14a59d..f3270163 100644 --- a/src/main/resources/assets/zenith/shaders/lod/gl46/quads.vert +++ b/src/main/resources/assets/voxy/shaders/lod/gl46/quads.vert @@ -1,9 +1,9 @@ #version 460 core #extension GL_ARB_gpu_shader_int64 : enable -#import -#import -#import +#import +#import +#import #line 8 layout(location = 0) out vec2 uv; diff --git a/src/main/resources/assets/zenith/shaders/lod/gl46/section.glsl b/src/main/resources/assets/voxy/shaders/lod/gl46/section.glsl similarity index 100% rename from src/main/resources/assets/zenith/shaders/lod/gl46/section.glsl rename to src/main/resources/assets/voxy/shaders/lod/gl46/section.glsl diff --git a/src/main/resources/assets/voxy/shaders/lod/nvmesh/primary.frag b/src/main/resources/assets/voxy/shaders/lod/nvmesh/primary.frag new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/src/main/resources/assets/voxy/shaders/lod/nvmesh/primary.frag @@ -0,0 +1 @@ + diff --git a/src/main/resources/assets/zenith/shaders/lod/nvmesh/primary.mesh b/src/main/resources/assets/voxy/shaders/lod/nvmesh/primary.mesh similarity index 100% rename from src/main/resources/assets/zenith/shaders/lod/nvmesh/primary.mesh rename to src/main/resources/assets/voxy/shaders/lod/nvmesh/primary.mesh diff --git a/src/main/resources/assets/zenith/shaders/lod/nvmesh/primary.task b/src/main/resources/assets/voxy/shaders/lod/nvmesh/primary.task similarity index 100% rename from src/main/resources/assets/zenith/shaders/lod/nvmesh/primary.task rename to src/main/resources/assets/voxy/shaders/lod/nvmesh/primary.task diff --git a/src/main/resources/assets/zenith/shaders/post/blit_texture_cutout.frag b/src/main/resources/assets/voxy/shaders/post/blit_texture_cutout.frag similarity index 100% rename from src/main/resources/assets/zenith/shaders/post/blit_texture_cutout.frag rename to src/main/resources/assets/voxy/shaders/post/blit_texture_cutout.frag diff --git a/src/main/resources/assets/zenith/shaders/post/fullscreen.vert b/src/main/resources/assets/voxy/shaders/post/fullscreen.vert similarity index 100% rename from src/main/resources/assets/zenith/shaders/post/fullscreen.vert rename to src/main/resources/assets/voxy/shaders/post/fullscreen.vert diff --git a/src/main/resources/assets/zenith/shaders/post/noop.frag b/src/main/resources/assets/voxy/shaders/post/noop.frag similarity index 100% rename from src/main/resources/assets/zenith/shaders/post/noop.frag rename to src/main/resources/assets/voxy/shaders/post/noop.frag diff --git a/src/main/resources/assets/zenith/shaders/post/ssao.comp b/src/main/resources/assets/voxy/shaders/post/ssao.comp similarity index 100% rename from src/main/resources/assets/zenith/shaders/post/ssao.comp rename to src/main/resources/assets/voxy/shaders/post/ssao.comp diff --git a/src/main/resources/assets/zenith/shaders/lod/blit_nodepth/quad.frag b/src/main/resources/assets/zenith/shaders/lod/blit_nodepth/quad.frag deleted file mode 100644 index d08ad6b9..00000000 --- a/src/main/resources/assets/zenith/shaders/lod/blit_nodepth/quad.frag +++ /dev/null @@ -1,5 +0,0 @@ -layout(binding=0) uniform sampler2D colourTexture; -in vec2 uv; -void main() { - gl_Colour = texture(colourTexture, uv); -} \ No newline at end of file diff --git a/src/main/resources/assets/zenith/shaders/lod/blit_nodepth/quad.vert b/src/main/resources/assets/zenith/shaders/lod/blit_nodepth/quad.vert deleted file mode 100644 index 2e5fda98..00000000 --- a/src/main/resources/assets/zenith/shaders/lod/blit_nodepth/quad.vert +++ /dev/null @@ -1,4 +0,0 @@ - -void main() { - gl_Position = -} \ No newline at end of file diff --git a/src/main/resources/assets/zenith/shaders/lod/nvmesh/primary.frag b/src/main/resources/assets/zenith/shaders/lod/nvmesh/primary.frag deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/resources/assets/zenith/shaders/lod/ssao/ssao.comp b/src/main/resources/assets/zenith/shaders/lod/ssao/ssao.comp deleted file mode 100644 index 19e758ef..00000000 --- a/src/main/resources/assets/zenith/shaders/lod/ssao/ssao.comp +++ /dev/null @@ -1,11 +0,0 @@ -#version 460 -layout(local_size_x = 32, local_size_y = 32, local_size_x = 1) in; - -layout(binding=0,rgba8) restrict uniform image2D colourTexture; -layout(binding=1) uniform sampler2D depthTexture; -void main() { - float d = texture2D(depthTexture, vec2(gl_GlobalInvocationID.xy)/vec2(1024)).x; - d = 1/d; - d = d/2; - imageStore(colourTexture, ivec2(gl_GlobalInvocationID.xy), vec4(d,d,d,1)); -} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index eebba883..557a628b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,8 +1,8 @@ { "schemaVersion": 1, - "id": "zenith", + "id": "voxy", "version": "${version}", - "name": "zenith", + "name": "voxy", "description": "", "authors": [ "Cortex" @@ -10,21 +10,21 @@ "contact": { }, "license": "All-Rights-Reserved", - "icon": "assets/zenith/icon.png", + "icon": "assets/voxy/icon.png", "environment": "client", "entrypoints": { "client": [ - "me.cortex.zenith.client.Zenith" + "me.cortex.voxy.client.Voxy" ], "modmenu": [ - "me.cortex.zenith.client.config.ZenithConfigScreenFactory" + "me.cortex.voxy.client.config.VoxyConfigScreenFactory" ] }, "mixins": [ - "zenith.mixins.json" + "voxy.mixins.json" ], "depends": { "fabricloader": ">=0.14.22" }, - "accessWidener": "zenith.accesswidener" + "accessWidener": "voxy.accesswidener" } diff --git a/src/main/resources/zenith.accesswidener b/src/main/resources/voxy.accesswidener similarity index 100% rename from src/main/resources/zenith.accesswidener rename to src/main/resources/voxy.accesswidener diff --git a/src/main/resources/zenith.mixins.json b/src/main/resources/voxy.mixins.json similarity index 91% rename from src/main/resources/zenith.mixins.json rename to src/main/resources/voxy.mixins.json index 11b2dd81..053a44a7 100644 --- a/src/main/resources/zenith.mixins.json +++ b/src/main/resources/voxy.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "me.cortex.zenith.client.mixin", + "package": "me.cortex.voxy.client.mixin", "compatibilityLevel": "JAVA_17", "client": [ "joml.AccessFrustumIntersection",