diff --git a/build.gradle b/build.gradle index aa2a888..68fb06f 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,6 @@ buildscript { repositories { maven { url = 'https://maven.minecraftforge.net' } mavenCentral() - jcenter() maven { url = 'https://repo.spongepowered.org/repository/maven-public' } maven { url = 'https://maven.parchmentmc.org' } } @@ -30,7 +29,9 @@ ext.buildNumber = System.getenv('BUILD_NUMBER') version = mod_version group = 'nl.requios.effortlessbuilding' -archivesBaseName = "effortlessbuilding-${artifact_minecraft_version}" +base { + archivesName = "effortlessbuilding-${artifact_minecraft_version}" +} java.toolchain.languageVersion = JavaLanguageVersion.of(17) @@ -121,7 +122,7 @@ dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" jarJar("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}") { - jarJar.ranged(it, '[0.6.9,0.7)') + jarJar.ranged(it, '[0.6.10,0.7)') } if (flywheelInWorkspace) { @@ -155,7 +156,7 @@ jar { "Specification-Title": "effortlessbuilding", "Specification-Vendor": "requios", "Specification-Version": "1", - "Implementation-Title": project.jar.baseName, + "Implementation-Title": project.name, "Implementation-Version": project.jar.archiveVersion, "Implementation-Vendor" :"requios", "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") @@ -184,7 +185,7 @@ tasks.jarJar.finalizedBy('reobfJarJar') publishing { publications { mavenJava(MavenPublication) { - artifactId = archivesBaseName + artifactId = base.archivesName.get() from components.java fg.component(it) diff --git a/gradle.properties b/gradle.properties index cb9093b..5c965dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,17 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false mod_version = 3.5 -artifact_minecraft_version = 1.19.2 +artifact_minecraft_version = 1.20.1 -minecraft_version = 1.19.2 -forge_version = 43.1.47 +minecraft_version = 1.20.1 +forge_version = 47.1.3 -forgegradle_version = 5.1.53 +forgegradle_version = 6.0.7 mixingradle_version = 0.7-SNAPSHOT mixin_version = 0.8.5 librarian_version = 1.+ cursegradle_version = 1.4.0 -parchment_version = 2022.11.27 +parchment_version = 2023.09.03 -flywheel_minecraft_version = 1.19.2 -flywheel_version = 0.6.10-20 \ No newline at end of file +flywheel_minecraft_version = 1.20.1 +flywheel_version = 0.6.10-7 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..943f0cb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefa..65dcd68 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -205,6 +209,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle index 3703f36..5ebcbb5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,4 +3,8 @@ pluginManagement { gradlePluginPortal() maven { url = 'https://maven.minecraftforge.net/' } } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' } \ No newline at end of file diff --git a/src/main/java/nl/requios/effortlessbuilding/AllGuiTextures.java b/src/main/java/nl/requios/effortlessbuilding/AllGuiTextures.java index 4430fce..2134d4d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/AllGuiTextures.java +++ b/src/main/java/nl/requios/effortlessbuilding/AllGuiTextures.java @@ -1,8 +1,7 @@ package nl.requios.effortlessbuilding; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -50,19 +49,12 @@ public enum AllGuiTextures implements ScreenElement { @OnlyIn(Dist.CLIENT) @Override - public void render(PoseStack ms, int x, int y) { - bind(); - GuiComponent.blit(ms, x, y, 0, startX, startY, width, height, 256, 256); + public void render(GuiGraphics ms, int x, int y) { + ms.blit(location, x, y, 0, startX, startY, width, height, 256, 256); } @OnlyIn(Dist.CLIENT) - public void render(PoseStack ms, int x, int y, GuiComponent component) { - bind(); - component.blit(ms, x, y, startX, startY, width, height); - } - - @OnlyIn(Dist.CLIENT) - public void render(PoseStack ms, int x, int y, Color c) { + public void render(GuiGraphics ms, int x, int y, Color c) { bind(); UIRenderHelper.drawColoredTexture(ms, c, x, y, startX, startY, width, height); } diff --git a/src/main/java/nl/requios/effortlessbuilding/AllIcons.java b/src/main/java/nl/requios/effortlessbuilding/AllIcons.java index fffc87e..e6b6ac6 100644 --- a/src/main/java/nl/requios/effortlessbuilding/AllIcons.java +++ b/src/main/java/nl/requios/effortlessbuilding/AllIcons.java @@ -1,10 +1,8 @@ package nl.requios.effortlessbuilding; -import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.mojang.math.Matrix4f; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -16,6 +14,7 @@ import nl.requios.effortlessbuilding.create.Create; import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement; import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement; import nl.requios.effortlessbuilding.create.foundation.utility.Color; +import org.joml.Matrix4f; public class AllIcons implements ScreenElement { @@ -100,25 +99,13 @@ public class AllIcons implements ScreenElement { private static AllIcons newRow() { return new AllIcons(x = 0, ++y); } - - @OnlyIn(Dist.CLIENT) - public void bind() { - RenderSystem.setShaderTexture(0, ICON_ATLAS); - } - + @OnlyIn(Dist.CLIENT) @Override - public void render(PoseStack matrixStack, int x, int y) { - bind(); - GuiComponent.blit(matrixStack, x, y, 0, iconX, iconY, 16, 16, 256, 256); + public void render(GuiGraphics guiGraphics, int x, int y) { + guiGraphics.blit(ICON_ATLAS, x, y, 0, iconX, iconY, 16, 16, 256, 256); } - - @OnlyIn(Dist.CLIENT) - public void render(PoseStack matrixStack, int x, int y, GuiComponent component) { - bind(); - component.blit(matrixStack, x, y, iconX, iconY, 16, 16); - } - + @OnlyIn(Dist.CLIENT) public void render(PoseStack ms, MultiBufferSource buffer, int color) { VertexConsumer builder = buffer.getBuffer(RenderType.textSeeThrough(ICON_ATLAS)); diff --git a/src/main/java/nl/requios/effortlessbuilding/ClientEvents.java b/src/main/java/nl/requios/effortlessbuilding/ClientEvents.java index 4da00d4..89a9ee5 100644 --- a/src/main/java/nl/requios/effortlessbuilding/ClientEvents.java +++ b/src/main/java/nl/requios/effortlessbuilding/ClientEvents.java @@ -20,7 +20,6 @@ import nl.requios.effortlessbuilding.buildmode.ModeOptions; import nl.requios.effortlessbuilding.gui.buildmode.PlayerSettingsGui; import nl.requios.effortlessbuilding.gui.buildmode.RadialMenu; import nl.requios.effortlessbuilding.gui.buildmodifier.ModifiersScreen; -import nl.requios.effortlessbuilding.systems.PowerLevel; import org.lwjgl.glfw.GLFW; @EventBusSubscriber(Dist.CLIENT) diff --git a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java index e5d4992..1ecdd9e 100644 --- a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java +++ b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java @@ -3,12 +3,16 @@ package nl.requios.effortlessbuilding; import com.mojang.serialization.Codec; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.loot.IGlobalLootModifier; +import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.ModLoadingContext; @@ -36,6 +40,8 @@ import nl.requios.effortlessbuilding.systems.UndoRedo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.List; + @Mod(EffortlessBuilding.MODID) public class EffortlessBuilding { @@ -78,6 +84,7 @@ public class EffortlessBuilding { IEventBus forgeEventBus = MinecraftForge.EVENT_BUS; modEventBus.addListener(EffortlessBuilding::setup); + modEventBus.addListener(EffortlessBuilding::addTabContents); DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> EffortlessBuildingClient.onConstructorClient(modEventBus, forgeEventBus)); @@ -88,9 +95,9 @@ public class EffortlessBuilding { LOOT_MODIFIERS.register(FMLJavaModLoadingContext.get().getModEventBus()); //Register config - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, CommonConfig.spec); - ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ClientConfig.spec); - ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, ServerConfig.spec); + modLoadingContext.registerConfig(ModConfig.Type.COMMON, CommonConfig.spec); + modLoadingContext.registerConfig(ModConfig.Type.CLIENT, ClientConfig.spec); + modLoadingContext.registerConfig(ModConfig.Type.SERVER, ServerConfig.spec); } public static void setup(final FMLCommonSetupEvent event) { @@ -99,8 +106,15 @@ public class EffortlessBuilding { CompatHelper.setup(); } + public static void addTabContents(final BuildCreativeModeTabContentsEvent event) { + if (event.getTabKey() == CreativeModeTabs.TOOLS_AND_UTILITIES) { + List stacks = ITEMS.getEntries().stream().map(reg -> new ItemStack(reg.get())).toList(); + event.acceptAll(stacks); + } + } + public static MenuType registerContainer(IContainerFactory fact){ - MenuType type = new MenuType(fact); + MenuType type = new MenuType(fact, FeatureFlags.REGISTRY.allFlags()); return type; } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModeCategoryEnum.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModeCategoryEnum.java index f94a55f..5215938 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModeCategoryEnum.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModeCategoryEnum.java @@ -1,16 +1,16 @@ package nl.requios.effortlessbuilding.buildmode; -import com.mojang.math.Vector4f; +import nl.requios.effortlessbuilding.create.foundation.utility.Color; public enum BuildModeCategoryEnum { - BASIC(new Vector4f(0f, .5f, 1f, .8f)), - DIAGONAL(new Vector4f(0.56f, 0.28f, 0.87f, .8f)), - CIRCULAR(new Vector4f(0.29f, 0.76f, 0.3f, 1f)), - ROOF(new Vector4f(0.83f, 0.87f, 0.23f, .8f)); + BASIC(new Color(0f, .5f, 1f, .8f)), + DIAGONAL(new Color(0.56f, 0.28f, 0.87f, .8f)), + CIRCULAR(new Color(0.29f, 0.76f, 0.3f, 1f)), + ROOF(new Color(0.83f, 0.87f, 0.23f, .8f)); - public final Vector4f color; + public final Color color; - BuildModeCategoryEnum(Vector4f color) { + BuildModeCategoryEnum(Color color) { this.color = color; } } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java index ba4a60f..e232392 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java @@ -109,7 +109,7 @@ public class BuildModes { if (!skipRaytrace) { //collision within a 1 block radius to selected is fine ClipContext rayTraceContext = new ClipContext(start, lineBound, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, player); - HitResult rayTraceResult = player.level.clip(rayTraceContext); + HitResult rayTraceResult = player.level().clip(rayTraceContext); intersects = rayTraceResult != null && rayTraceResult.getType() == HitResult.Type.BLOCK && planeBound.subtract(rayTraceResult.getLocation()).lengthSqr() > 4; } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java index 3f4849c..c322bd5 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java @@ -103,7 +103,7 @@ public class ModeOptions { case CIRCLE_START_CORNER -> circleStart = ActionEnum.CIRCLE_START_CORNER; } - if (player.level.isClientSide && + if (player.level().isClientSide && action != ActionEnum.OPEN_MODIFIER_SETTINGS && action != ActionEnum.OPEN_PLAYER_SETTINGS && action != ActionEnum.PREVIOUS_BUILD_MODE && diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/ThreeClicksBuildMode.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/ThreeClicksBuildMode.java index 72c30d4..26ba194 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/ThreeClicksBuildMode.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/ThreeClicksBuildMode.java @@ -164,7 +164,7 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode { } } } - return new BlockPos(selected.lineBound); + return BlockPos.containing(selected.lineBound); } // protected abstract BlockEntry findSecondPos(List blocks); @@ -197,7 +197,7 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode { //Make it from a plane into a line, on y axis only private Vec3 toLongestLine(Vec3 boundVec, BlockPos secondPos) { - BlockPos bound = new BlockPos(boundVec); + BlockPos bound = BlockPos.containing(boundVec); return new Vec3(secondPos.getX(), bound.getY(), secondPos.getZ()); } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/TwoClicksBuildMode.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/TwoClicksBuildMode.java index fca58d1..c30a0c4 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/TwoClicksBuildMode.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/TwoClicksBuildMode.java @@ -6,7 +6,6 @@ import net.minecraft.world.entity.player.Player; import nl.requios.effortlessbuilding.EffortlessBuildingClient; import nl.requios.effortlessbuilding.utilities.BlockEntry; import nl.requios.effortlessbuilding.utilities.BlockSet; -import nl.requios.effortlessbuilding.systems.PowerLevel; import java.util.List; diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalLine.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalLine.java index 25365f4..8951b4a 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalLine.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalLine.java @@ -20,7 +20,7 @@ public class DiagonalLine extends ThreeClicksBuildMode { int iterations = (int) Math.ceil(first.distanceTo(second) * sampleMultiplier); for (double t = 0; t <= 1.0; t += 1.0 / iterations) { Vec3 lerp = first.add(second.subtract(first).scale(t)); - BlockPos candidate = new BlockPos(lerp); + BlockPos candidate = BlockPos.containing(lerp); //Only add if not equal to the last in the list if (list.isEmpty() || !list.get(list.size() - 1).equals(candidate)) list.add(candidate); diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Floor.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Floor.java index fe60e46..fef0063 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Floor.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Floor.java @@ -7,7 +7,6 @@ import nl.requios.effortlessbuilding.EffortlessBuildingClient; import nl.requios.effortlessbuilding.buildmode.BuildModes; import nl.requios.effortlessbuilding.buildmode.ModeOptions; import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode; -import nl.requios.effortlessbuilding.systems.PowerLevel; import java.util.ArrayList; import java.util.List; @@ -34,7 +33,7 @@ public class Floor extends TwoClicksBuildMode { //Then only 1 can be valid, return that one Criteria selected = criteriaList.get(0); - return new BlockPos(selected.planeBound); + return BlockPos.containing(selected.planeBound); } public static List getFloorBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Line.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Line.java index 1703bab..b36dd68 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Line.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Line.java @@ -1,12 +1,11 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes; -import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.phys.Vec3; import nl.requios.effortlessbuilding.EffortlessBuildingClient; import nl.requios.effortlessbuilding.buildmode.BuildModes; import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode; -import nl.requios.effortlessbuilding.systems.PowerLevel; import java.util.ArrayList; import java.util.List; @@ -59,7 +58,7 @@ public class Line extends TwoClicksBuildMode { } - return new BlockPos(selected.lineBound); + return BlockPos.containing(selected.lineBound); } public static List getLineBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { @@ -90,7 +89,7 @@ public class Line extends TwoClicksBuildMode { public static void addZLineBlocks(List list, int z1, int z2, int x, int y) { for (int z = z1; z1 < z2 ? z <= z2 : z >= z2; z += z1 < z2 ? 1 : -1) { - list.add(new BlockPos(x, y, z)); + list.add(BlockPos.containing(x, y, z)); } } @@ -120,7 +119,7 @@ public class Line extends TwoClicksBuildMode { //Make it from a plane into a line //Select the axis that is longest private Vec3 toLongestLine(Vec3 boundVec, BlockPos firstPos) { - BlockPos bound = new BlockPos(boundVec); + BlockPos bound = BlockPos.containing(boundVec); BlockPos firstToSecond = bound.subtract(firstPos); firstToSecond = new BlockPos(Math.abs(firstToSecond.getX()), Math.abs(firstToSecond.getY()), Math.abs(firstToSecond.getZ())); diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/SlopeFloor.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/SlopeFloor.java index 52738c3..5d0a317 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/SlopeFloor.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/SlopeFloor.java @@ -5,7 +5,6 @@ import net.minecraft.core.BlockPos; import nl.requios.effortlessbuilding.EffortlessBuildingClient; import nl.requios.effortlessbuilding.buildmode.ModeOptions; import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode; -import nl.requios.effortlessbuilding.systems.PowerLevel; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Wall.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Wall.java index 075ef67..8152bbe 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Wall.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Wall.java @@ -7,7 +7,6 @@ import nl.requios.effortlessbuilding.EffortlessBuildingClient; import nl.requios.effortlessbuilding.buildmode.BuildModes; import nl.requios.effortlessbuilding.buildmode.ModeOptions; import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode; -import nl.requios.effortlessbuilding.systems.PowerLevel; import java.util.ArrayList; import java.util.List; @@ -49,7 +48,7 @@ public class Wall extends TwoClicksBuildMode { } } - return new BlockPos(selected.planeBound); + return BlockPos.containing(selected.planeBound); } public static List getWallBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java index 4048beb..5d77b18 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java @@ -1,24 +1,12 @@ package nl.requios.effortlessbuilding.buildmodifier; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.NbtUtils; -import net.minecraft.nbt.Tag; -import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.core.Direction; -import net.minecraft.world.InteractionHand; import net.minecraft.core.BlockPos; -import net.minecraft.world.phys.Vec3; import net.minecraft.core.Vec3i; -import net.minecraftforge.items.IItemHandler; -import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem; import nl.requios.effortlessbuilding.utilities.BlockEntry; import nl.requios.effortlessbuilding.utilities.BlockSet; -import java.util.ArrayList; -import java.util.List; - public class Array extends BaseModifier { public Vec3i offset = BlockPos.ZERO; diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BaseModifier.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BaseModifier.java index a321e38..927c20a 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BaseModifier.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BaseModifier.java @@ -1,7 +1,6 @@ package nl.requios.effortlessbuilding.buildmodifier; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.Tag; import net.minecraft.world.entity.player.Player; import nl.requios.effortlessbuilding.utilities.BlockSet; diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java index 305d376..330a8ca 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java @@ -2,8 +2,6 @@ package nl.requios.effortlessbuilding.buildmodifier; import net.minecraft.client.Minecraft; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.NbtUtils; -import net.minecraft.nbt.Tag; import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; import net.minecraft.world.phys.Vec3; @@ -50,7 +48,7 @@ public class Mirror extends BaseModifier { private void performMirrorX(BlockSet blocks, BlockEntry blockEntry) { //find mirror position double x = position.x + (position.x - blockEntry.blockPos.getX() - 0.5); - BlockPos newBlockPos = new BlockPos(x, blockEntry.blockPos.getY(), blockEntry.blockPos.getZ()); + BlockPos newBlockPos = BlockPos.containing(x, blockEntry.blockPos.getY(), blockEntry.blockPos.getZ()); if (blocks.containsKey(newBlockPos)) return; @@ -66,7 +64,7 @@ public class Mirror extends BaseModifier { private void performMirrorY(BlockSet blocks, BlockEntry blockEntry) { //find mirror position double y = position.y + (position.y - blockEntry.blockPos.getY() - 0.5); - BlockPos newBlockPos = new BlockPos(blockEntry.blockPos.getX(), y, blockEntry.blockPos.getZ()); + BlockPos newBlockPos = BlockPos.containing(blockEntry.blockPos.getX(), y, blockEntry.blockPos.getZ()); if (blocks.containsKey(newBlockPos)) return; @@ -81,7 +79,7 @@ public class Mirror extends BaseModifier { private void performMirrorZ(BlockSet blocks, BlockEntry blockEntry) { //find mirror position double z = position.z + (position.z - blockEntry.blockPos.getZ() - 0.5); - BlockPos newBlockPos = new BlockPos(blockEntry.blockPos.getX(), blockEntry.blockPos.getY(), z); + BlockPos newBlockPos = BlockPos.containing(blockEntry.blockPos.getX(), blockEntry.blockPos.getY(), z); if (blocks.containsKey(newBlockPos)) return; diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java index e2d4687..11afa09 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java @@ -4,23 +4,15 @@ import net.minecraft.client.Minecraft; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.core.Direction; -import net.minecraft.world.InteractionHand; import net.minecraft.world.level.block.Mirror; import net.minecraft.world.level.block.Rotation; import net.minecraft.core.BlockPos; import net.minecraft.util.Mth; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.items.IItemHandler; import nl.requios.effortlessbuilding.EffortlessBuildingClient; -import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem; import nl.requios.effortlessbuilding.utilities.BlockEntry; import nl.requios.effortlessbuilding.utilities.BlockSet; -import java.util.ArrayList; -import java.util.List; - public class RadialMirror extends BaseModifier { public Vec3 position = new Vec3(0.5, 64.5, 0.5); @@ -77,7 +69,7 @@ public class RadialMirror extends BaseModifier { } Vec3 relNewVec = relStartVec.yRot((float) curAngle); - BlockPos newBlockPos = new BlockPos(position.add(relNewVec)); + BlockPos newBlockPos = BlockPos.containing(position.add(relNewVec)); if (blocks.containsKey(newBlockPos)) continue; @@ -120,11 +112,11 @@ public class RadialMirror extends BaseModifier { BlockState newBlockState = blockState; if (startAngleToCenter < -0.751 * Math.PI || startAngleToCenter > 0.749 * Math.PI) { - newBlockState = blockState.rotate(player.level, startPos, Rotation.CLOCKWISE_180); + newBlockState = blockState.rotate(player.level(), startPos, Rotation.CLOCKWISE_180); } else if (startAngleToCenter < -0.251 * Math.PI) { - newBlockState = blockState.rotate(player.level, startPos, Rotation.COUNTERCLOCKWISE_90); + newBlockState = blockState.rotate(player.level(), startPos, Rotation.COUNTERCLOCKWISE_90); } else if (startAngleToCenter > 0.249 * Math.PI) { - newBlockState = blockState.rotate(player.level, startPos, Rotation.CLOCKWISE_90); + newBlockState = blockState.rotate(player.level(), startPos, Rotation.CLOCKWISE_90); } return newBlockState; @@ -135,17 +127,17 @@ public class RadialMirror extends BaseModifier { double angleToCenter = Mth.atan2(relVec.x, relVec.z); //between -PI and PI if (angleToCenter < -0.751 * Math.PI || angleToCenter > 0.749 * Math.PI) { - newBlockState = blockState.rotate(player.level, startPos, Rotation.CLOCKWISE_180); + newBlockState = blockState.rotate(player.level(), startPos, Rotation.CLOCKWISE_180); if (alternate) { newBlockState = newBlockState.mirror(Mirror.FRONT_BACK); } } else if (angleToCenter < -0.251 * Math.PI) { - newBlockState = blockState.rotate(player.level, startPos, Rotation.CLOCKWISE_90); + newBlockState = blockState.rotate(player.level(), startPos, Rotation.CLOCKWISE_90); if (alternate) { newBlockState = newBlockState.mirror(Mirror.LEFT_RIGHT); } } else if (angleToCenter > 0.249 * Math.PI) { - newBlockState = blockState.rotate(player.level, startPos, Rotation.COUNTERCLOCKWISE_90); + newBlockState = blockState.rotate(player.level(), startPos, Rotation.COUNTERCLOCKWISE_90); if (alternate) { newBlockState = newBlockState.mirror(Mirror.LEFT_RIGHT); } diff --git a/src/main/java/nl/requios/effortlessbuilding/compatibility/CompatHelper.java b/src/main/java/nl/requios/effortlessbuilding/compatibility/CompatHelper.java index 8e032d6..fc7c5af 100644 --- a/src/main/java/nl/requios/effortlessbuilding/compatibility/CompatHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/compatibility/CompatHelper.java @@ -7,7 +7,6 @@ import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.ItemHandlerHelper; import nl.requios.effortlessbuilding.create.foundation.item.ItemHelper; import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem; diff --git a/src/main/java/nl/requios/effortlessbuilding/create/AllKeys.java b/src/main/java/nl/requios/effortlessbuilding/create/AllKeys.java index 80c6b91..e27b7a5 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/AllKeys.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/AllKeys.java @@ -1,13 +1,8 @@ package nl.requios.effortlessbuilding.create; import com.mojang.blaze3d.platform.InputConstants; -import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.RegisterKeyMappingsEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import org.lwjgl.glfw.GLFW; public class AllKeys { diff --git a/src/main/java/nl/requios/effortlessbuilding/create/CreateClientTest.java b/src/main/java/nl/requios/effortlessbuilding/create/CreateClientTest.java index c19bd0b..aa1d47b 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/CreateClientTest.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/CreateClientTest.java @@ -1,12 +1,7 @@ package nl.requios.effortlessbuilding.create; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.phys.AABB; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import nl.requios.effortlessbuilding.create.foundation.utility.Color; @Mod.EventBusSubscriber(Dist.CLIENT) public class CreateClientTest { diff --git a/src/main/java/nl/requios/effortlessbuilding/create/events/ClientEvents.java b/src/main/java/nl/requios/effortlessbuilding/create/events/ClientEvents.java index 3b19e20..5ccc8bf 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/events/ClientEvents.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/events/ClientEvents.java @@ -4,11 +4,10 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.RenderLevelLastEvent; +import net.minecraftforge.client.event.RenderLevelStageEvent; import net.minecraftforge.client.event.ViewportEvent; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.TickEvent.ClientTickEvent; @@ -58,7 +57,9 @@ public class ClientEvents { } @SubscribeEvent - public static void onRenderWorld(RenderLevelLastEvent event) { + public static void onRenderWorld(RenderLevelStageEvent event) { + if(event.getStage() != RenderLevelStageEvent.Stage.AFTER_CUTOUT_BLOCKS) return; + Vec3 cameraPos = Minecraft.getInstance().gameRenderer.getMainCamera() .getPosition(); float pt = AnimationTickHolder.getPartialTicks(); diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/ModFilePackResources.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/ModFilePackResources.java index e3715db..4f0aa47 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/ModFilePackResources.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/ModFilePackResources.java @@ -10,7 +10,7 @@ public class ModFilePackResources extends PathPackResources { protected final String sourcePath; public ModFilePackResources(String name, IModFile modFile, String sourcePath) { - super(name, modFile.findResource(sourcePath)); + super(name, true, modFile.findResource(sourcePath)); this.modFile = modFile; this.sourcePath = sourcePath; } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java index 26d1b8f..21f870e 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java @@ -2,17 +2,18 @@ package nl.requios.effortlessbuilding.create.foundation.gui; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.vertex.PoseStack; -import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget; -import nl.requios.effortlessbuilding.create.foundation.utility.Components; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.components.Widget; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import nl.requios.effortlessbuilding.gui.buildmodifier.ModifiersScreenList; +import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget; +import nl.requios.effortlessbuilding.create.foundation.utility.Components; import java.util.Collection; import java.util.List; @@ -65,19 +66,26 @@ public abstract class AbstractSimiScreen extends Screen { } } + @Override + public boolean mouseClicked(double pMouseX, double pMouseY, int pButton) { + if (getFocused() != null && !getFocused().isMouseOver(pMouseX, pMouseY)) + setFocused(null); + return super.mouseClicked(pMouseX, pMouseY, pButton); + } + @Override public boolean isPauseScreen() { return false; } @SuppressWarnings("unchecked") - protected void addRenderableWidgets(W... widgets) { + protected void addRenderableWidgets(W... widgets) { for (W widget : widgets) { addRenderableWidget(widget); } } - protected void addRenderableWidgets(Collection widgets) { + protected void addRenderableWidgets(Collection widgets) { for (W widget : widgets) { addRenderableWidget(widget); } @@ -96,17 +104,18 @@ public abstract class AbstractSimiScreen extends Screen { } @Override - public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) { + public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { partialTicks = minecraft.getFrameTime(); - + PoseStack ms = graphics.pose(); + ms.pushPose(); prepareFrame(); - renderWindowBackground(ms, mouseX, mouseY, partialTicks); - renderWindow(ms, mouseX, mouseY, partialTicks); - super.render(ms, mouseX, mouseY, partialTicks); - renderWindowForeground(ms, mouseX, mouseY, partialTicks); + renderWindowBackground(graphics, mouseX, mouseY, partialTicks); + renderWindow(graphics, mouseX, mouseY, partialTicks); + super.render(graphics, mouseX, mouseY, partialTicks); + renderWindowForeground(graphics, mouseX, mouseY, partialTicks); endFrame(); @@ -116,7 +125,7 @@ public abstract class AbstractSimiScreen extends Screen { @Override public boolean keyPressed(int keyCode, int scanCode, int modifiers) { boolean keyPressed = super.keyPressed(keyCode, scanCode, modifiers); - if (keyPressed || getFocused() != null) + if (keyPressed || getFocused() instanceof EditBox) return keyPressed; InputConstants.Key mouseKey = InputConstants.getKey(keyCode, scanCode); @@ -130,37 +139,31 @@ public abstract class AbstractSimiScreen extends Screen { protected void prepareFrame() {} - protected void renderWindowBackground(PoseStack ms, int mouseX, int mouseY, float partialTicks) { - renderBackground(ms); + protected void renderWindowBackground(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + renderBackground(graphics); } - protected abstract void renderWindow(PoseStack ms, int mouseX, int mouseY, float partialTicks); + protected abstract void renderWindow(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks); - protected void renderWindowForeground(PoseStack ms, int mouseX, int mouseY, float partialTicks) { - for (Widget widget : renderables) { - if (widget instanceof AbstractSimiWidget simiWidget && simiWidget.isHoveredOrFocused() + protected void renderWindowForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + for (Renderable widget : renderables) { + if (widget instanceof AbstractSimiWidget simiWidget && simiWidget.isMouseOver(mouseX, mouseY) && simiWidget.visible) { List tooltip = simiWidget.getToolTip(); if (tooltip.isEmpty()) continue; - int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.x; - int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.y; - renderComponentTooltip(ms, tooltip, ttx, tty); - } - - //Added - if (widget instanceof ModifiersScreenList list) { - list.renderWindowForeground(ms, mouseX, mouseY, partialTicks); + int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.getX(); + int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.getY(); + graphics.renderComponentTooltip(font, tooltip, ttx, tty); } } - } protected void endFrame() {} @Deprecated - protected void debugWindowArea(PoseStack matrixStack) { - fill(matrixStack, guiLeft + windowWidth, guiTop + windowHeight, guiLeft, guiTop, 0xD3D3D3D3); + protected void debugWindowArea(GuiGraphics graphics) { + graphics.fill(guiLeft + windowWidth, guiTop + windowHeight, guiLeft, guiTop, 0xD3D3D3D3); } @Override diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AllGuiTextures.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AllGuiTextures.java index 85d6b01..4fb5be8 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AllGuiTextures.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AllGuiTextures.java @@ -1,14 +1,13 @@ package nl.requios.effortlessbuilding.create.foundation.gui; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import nl.requios.effortlessbuilding.create.Create; -import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement; -import nl.requios.effortlessbuilding.create.foundation.utility.Color; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import nl.requios.effortlessbuilding.create.Create; +import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement; +import nl.requios.effortlessbuilding.create.foundation.utility.Color; public enum AllGuiTextures implements ScreenElement { @@ -29,7 +28,7 @@ public enum AllGuiTextures implements ScreenElement { SPEECH_TOOLTIP_BACKGROUND("widgets", 0, 24, 8, 8), SPEECH_TOOLTIP_COLOR("widgets", 8, 24, 8, 8), - + TRAIN_HUD_SPEED_BG("widgets", 0, 190, 182, 5), TRAIN_HUD_SPEED("widgets", 0, 185, 182, 5), TRAIN_HUD_THROTTLE("widgets", 0, 195, 182, 5), @@ -74,22 +73,14 @@ public enum AllGuiTextures implements ScreenElement { } @OnlyIn(Dist.CLIENT) - @Override - public void render(PoseStack ms, int x, int y) { - bind(); - GuiComponent.blit(ms, x, y, 0, startX, startY, width, height, 256, 256); + public void render(GuiGraphics graphics, int x, int y) { + graphics.blit(location, x, y, startX, startY, width, height); } @OnlyIn(Dist.CLIENT) - public void render(PoseStack ms, int x, int y, GuiComponent component) { + public void render(GuiGraphics graphics, int x, int y, Color c) { bind(); - component.blit(ms, x, y, startX, startY, width, height); - } - - @OnlyIn(Dist.CLIENT) - public void render(PoseStack ms, int x, int y, Color c) { - bind(); - UIRenderHelper.drawColoredTexture(ms, c, x, y, startX, startY, width, height); + UIRenderHelper.drawColoredTexture(graphics, c, x, y, startX, startY, width, height); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AllIcons.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AllIcons.java index 3b14501..23d80ac 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AllIcons.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AllIcons.java @@ -3,12 +3,7 @@ package nl.requios.effortlessbuilding.create.foundation.gui; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.mojang.math.Matrix4f; -import nl.requios.effortlessbuilding.create.Create; -import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement; -import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement; -import nl.requios.effortlessbuilding.create.foundation.utility.Color; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -16,6 +11,11 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import nl.requios.effortlessbuilding.create.Create; +import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement; +import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement; +import nl.requios.effortlessbuilding.create.foundation.utility.Color; +import org.joml.Matrix4f; public class AllIcons implements ScreenElement { @@ -81,7 +81,7 @@ public class AllIcons implements ScreenElement { public static final AllIcons I_TOOL_DEPLOY = newRow(), I_SKIP_MISSING = next(), - I_SKIP_TILES = next(), + I_SKIP_BLOCK_ENTITIES = next(), I_DICE = next(), I_TUNNEL_SPLIT = next(), I_TUNNEL_FORCED_SPLIT = next(), @@ -173,20 +173,13 @@ public class AllIcons implements ScreenElement { @OnlyIn(Dist.CLIENT) @Override - public void render(PoseStack matrixStack, int x, int y) { - bind(); - GuiComponent.blit(matrixStack, x, y, 0, iconX, iconY, 16, 16, 256, 256); - } - - @OnlyIn(Dist.CLIENT) - public void render(PoseStack matrixStack, int x, int y, GuiComponent component) { - bind(); - component.blit(matrixStack, x, y, iconX, iconY, 16, 16); + public void render(GuiGraphics graphics, int x, int y) { + graphics.blit(ICON_ATLAS, x, y, 0, iconX, iconY, 16, 16, 256, 256); } @OnlyIn(Dist.CLIENT) public void render(PoseStack ms, MultiBufferSource buffer, int color) { - VertexConsumer builder = buffer.getBuffer(RenderType.textSeeThrough(ICON_ATLAS)); + VertexConsumer builder = buffer.getBuffer(RenderType.text(ICON_ATLAS)); Matrix4f matrix = ms.last().pose(); Color rgb = new Color(color); int light = LightTexture.FULL_BRIGHT; diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/ConfirmationScreen.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/ConfirmationScreen.java index 0175434..bc48353 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/ConfirmationScreen.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/ConfirmationScreen.java @@ -2,13 +2,14 @@ package nl.requios.effortlessbuilding.create.foundation.gui; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; -import nl.requios.effortlessbuilding.create.foundation.gui.element.BoxElement; -import nl.requios.effortlessbuilding.create.foundation.gui.element.TextStencilElement; -import nl.requios.effortlessbuilding.create.foundation.gui.widget.BoxWidget; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.FormattedText; import net.minecraft.network.chat.Style; +import nl.requios.effortlessbuilding.create.foundation.gui.element.BoxElement; +import nl.requios.effortlessbuilding.create.foundation.gui.element.TextStencilElement; +import nl.requios.effortlessbuilding.create.foundation.gui.widget.BoxWidget; import org.lwjgl.opengl.GL30; import javax.annotation.Nonnull; @@ -173,11 +174,12 @@ public class ConfirmationScreen extends AbstractSimiScreen { } @Override - protected void renderWindow(PoseStack ms, int mouseX, int mouseY, float partialTicks) { - textBackground.render(ms); + protected void renderWindow(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + textBackground.render(graphics); int offset = font.lineHeight + 1; int lineY = y - offset; + PoseStack ms = graphics.pose(); ms.pushPose(); ms.translate(0, 0, 200); @@ -185,21 +187,21 @@ public class ConfirmationScreen extends AbstractSimiScreen { lineY += offset; if (line == null) continue; - font.draw(ms, line.getString(), x, lineY, 0xeaeaea); + graphics.drawString(font, line.getString(), x, lineY, 0xeaeaea, false); } ms.popPose(); } @Override - protected void renderWindowBackground(PoseStack ms, int mouseX, int mouseY, float partialTicks) { + protected void renderWindowBackground(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { endFrame(); - source.render(ms, 0, 0, 10); // zero mouse coords to prevent further tooltips + source.render(graphics, 0, 0, 10); // zero mouse coords to prevent further tooltips prepareFrame(); - this.fillGradient(ms, 0, 0, this.width, this.height, 0x70101010, 0x80101010); + graphics.fillGradient(0, 0, this.width, this.height, 0x70101010, 0x80101010); } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/CustomLightingSettings.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/CustomLightingSettings.java index 7bd3e7d..5e1bfad 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/CustomLightingSettings.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/CustomLightingSettings.java @@ -1,8 +1,10 @@ package nl.requios.effortlessbuilding.create.foundation.gui; +import org.joml.Matrix4f; +import org.joml.Vector3f; + import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.math.Matrix4f; -import com.mojang.math.Vector3f; +import com.mojang.math.Axis; public class CustomLightingSettings implements ILightingSettings { @@ -19,20 +21,20 @@ public class CustomLightingSettings implements ILightingSettings { } protected void init(float yRot1, float xRot1, float yRot2, float xRot2, boolean doubleLight) { - light1 = Vector3f.ZP.copy(); - light1.transform(Vector3f.YP.rotationDegrees(yRot1)); - light1.transform(Vector3f.XN.rotationDegrees(xRot1)); + light1 = new Vector3f(0, 0, 1); + light1.rotate(Axis.YP.rotationDegrees(yRot1)); + light1.rotate(Axis.XN.rotationDegrees(xRot1)); if (doubleLight) { - light2 = Vector3f.ZP.copy(); - light2.transform(Vector3f.YP.rotationDegrees(yRot2)); - light2.transform(Vector3f.XN.rotationDegrees(xRot2)); + light2 = new Vector3f(0, 0, 1); + light2.rotate(Axis.YP.rotationDegrees(yRot2)); + light2.rotate(Axis.XN.rotationDegrees(xRot2)); } else { - light2 = Vector3f.ZERO; + light2 = new Vector3f(); } lightMatrix = new Matrix4f(); - lightMatrix.setIdentity(); + lightMatrix.identity(); } @Override diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/RemovedGuiUtils.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/RemovedGuiUtils.java index 63da8af..deba030 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/RemovedGuiUtils.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/RemovedGuiUtils.java @@ -1,10 +1,18 @@ package nl.requios.effortlessbuilding.create.foundation.gui; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + +import org.joml.Matrix4f; + import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; -import com.mojang.math.Matrix4f; + import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.network.chat.FormattedText; @@ -12,13 +20,9 @@ import net.minecraft.network.chat.Style; import net.minecraft.world.item.ItemStack; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.event.RenderTooltipEvent; -import net.minecraftforge.client.gui.ScreenUtils; +import net.minecraftforge.client.extensions.IForgeGuiGraphics; import net.minecraftforge.common.MinecraftForge; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class RemovedGuiUtils { @Nonnull private static ItemStack cachedTooltipStack = ItemStack.EMPTY; @@ -31,41 +35,43 @@ public class RemovedGuiUtils { cachedTooltipStack = ItemStack.EMPTY; } - public static void drawHoveringText(PoseStack mStack, List textLines, int mouseX, + public static void drawHoveringText(GuiGraphics graphics, List textLines, int mouseX, int mouseY, int screenWidth, int screenHeight, int maxTextWidth, Font font) { - drawHoveringText(mStack, textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth, - ScreenUtils.DEFAULT_BACKGROUND_COLOR, ScreenUtils.DEFAULT_BORDER_COLOR_START, ScreenUtils.DEFAULT_BORDER_COLOR_END, + drawHoveringText(graphics, textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth, + IForgeGuiGraphics.DEFAULT_BACKGROUND_COLOR, IForgeGuiGraphics.DEFAULT_BORDER_COLOR_START, IForgeGuiGraphics.DEFAULT_BORDER_COLOR_END, font); } - public static void drawHoveringText(PoseStack mStack, List textLines, int mouseX, + public static void drawHoveringText(GuiGraphics graphics, List textLines, int mouseX, int mouseY, int screenWidth, int screenHeight, int maxTextWidth, int backgroundColor, int borderColorStart, int borderColorEnd, Font font) { - drawHoveringText(cachedTooltipStack, mStack, textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth, + drawHoveringText(cachedTooltipStack, graphics, textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth, backgroundColor, borderColorStart, borderColorEnd, font); } - public static void drawHoveringText(@Nonnull final ItemStack stack, PoseStack mStack, + public static void drawHoveringText(@Nonnull final ItemStack stack, GuiGraphics graphics, List textLines, int mouseX, int mouseY, int screenWidth, int screenHeight, int maxTextWidth, Font font) { - drawHoveringText(stack, mStack, textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth, - ScreenUtils.DEFAULT_BACKGROUND_COLOR, ScreenUtils.DEFAULT_BORDER_COLOR_START, ScreenUtils.DEFAULT_BORDER_COLOR_END, + drawHoveringText(stack, graphics, textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth, + IForgeGuiGraphics.DEFAULT_BACKGROUND_COLOR, IForgeGuiGraphics.DEFAULT_BORDER_COLOR_START, IForgeGuiGraphics.DEFAULT_BORDER_COLOR_END, font); } - public static void drawHoveringText(@Nonnull final ItemStack stack, PoseStack pStack, + public static void drawHoveringText(@Nonnull final ItemStack stack, GuiGraphics graphics, List textLines, int mouseX, int mouseY, int screenWidth, int screenHeight, int maxTextWidth, int backgroundColor, int borderColorStart, int borderColorEnd, Font font) { if (textLines.isEmpty()) return; List list = ForgeHooksClient.gatherTooltipComponents(stack, textLines, - stack.getTooltipImage(), mouseX, screenWidth, screenHeight, font, font); + stack.getTooltipImage(), mouseX, screenWidth, screenHeight, font); RenderTooltipEvent.Pre event = - new RenderTooltipEvent.Pre(stack, pStack, mouseX, mouseY, screenWidth, screenHeight, font, list); + new RenderTooltipEvent.Pre(stack, graphics, mouseX, mouseY, screenWidth, screenHeight, font, list, null); if (MinecraftForge.EVENT_BUS.post(event)) return; + PoseStack pStack = graphics.pose(); + mouseX = event.getX(); mouseY = event.getY(); screenWidth = event.getScreenWidth(); @@ -144,7 +150,7 @@ public class RemovedGuiUtils { tooltipY = screenHeight - tooltipHeight - 4; final int zLevel = 400; - RenderTooltipEvent.Color colorEvent = new RenderTooltipEvent.Color(stack, pStack, tooltipX, tooltipY, + RenderTooltipEvent.Color colorEvent = new RenderTooltipEvent.Color(stack, graphics, tooltipX, tooltipY, font, backgroundColor, borderColorStart, borderColorEnd, list); MinecraftForge.EVENT_BUS.post(colorEvent); backgroundColor = colorEvent.getBackgroundStart(); @@ -154,24 +160,24 @@ public class RemovedGuiUtils { pStack.pushPose(); Matrix4f mat = pStack.last() .pose(); - ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 3, tooltipY - 4, tooltipX + tooltipTextWidth + 3, - tooltipY - 3, backgroundColor, backgroundColor); - ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 3, tooltipY + tooltipHeight + 3, - tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 4, backgroundColor, backgroundColor); - ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 3, tooltipY - 3, tooltipX + tooltipTextWidth + 3, - tooltipY + tooltipHeight + 3, backgroundColor, backgroundColor); - ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 4, tooltipY - 3, tooltipX - 3, tooltipY + tooltipHeight + 3, - backgroundColor, backgroundColor); - ScreenUtils.drawGradientRect(mat, zLevel, tooltipX + tooltipTextWidth + 3, tooltipY - 3, - tooltipX + tooltipTextWidth + 4, tooltipY + tooltipHeight + 3, backgroundColor, backgroundColor); - ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 3, tooltipY - 3 + 1, tooltipX - 3 + 1, - tooltipY + tooltipHeight + 3 - 1, borderColorStart, borderColorEnd); - ScreenUtils.drawGradientRect(mat, zLevel, tooltipX + tooltipTextWidth + 2, tooltipY - 3 + 1, - tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 3 - 1, borderColorStart, borderColorEnd); - ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 3, tooltipY - 3, tooltipX + tooltipTextWidth + 3, - tooltipY - 3 + 1, borderColorStart, borderColorStart); - ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 3, tooltipY + tooltipHeight + 2, - tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 3, borderColorEnd, borderColorEnd); + graphics.fillGradient(tooltipX - 3, tooltipY - 4, tooltipX + tooltipTextWidth + 3, + tooltipY - 3, zLevel, backgroundColor, backgroundColor); + graphics.fillGradient(tooltipX - 3, tooltipY + tooltipHeight + 3, + tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 4, zLevel, backgroundColor, backgroundColor); + graphics.fillGradient(tooltipX - 3, tooltipY - 3, tooltipX + tooltipTextWidth + 3, + tooltipY + tooltipHeight + 3, zLevel, backgroundColor, backgroundColor); + graphics.fillGradient(tooltipX - 4, tooltipY - 3, tooltipX - 3, tooltipY + tooltipHeight + 3, + zLevel, backgroundColor, backgroundColor); + graphics.fillGradient(tooltipX + tooltipTextWidth + 3, tooltipY - 3, + tooltipX + tooltipTextWidth + 4, tooltipY + tooltipHeight + 3, zLevel, backgroundColor, backgroundColor); + graphics.fillGradient(tooltipX - 3, tooltipY - 3 + 1, tooltipX - 3 + 1, + tooltipY + tooltipHeight + 3 - 1, zLevel, borderColorStart, borderColorEnd); + graphics.fillGradient(tooltipX + tooltipTextWidth + 2, tooltipY - 3 + 1, + tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 3 - 1, zLevel, borderColorStart, borderColorEnd); + graphics.fillGradient(tooltipX - 3, tooltipY - 3, tooltipX + tooltipTextWidth + 3, + tooltipY - 3 + 1, zLevel, borderColorStart, borderColorStart); + graphics.fillGradient(tooltipX - 3, tooltipY + tooltipHeight + 2, + tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 3, zLevel, borderColorEnd, borderColorEnd); MultiBufferSource.BufferSource renderType = MultiBufferSource.immediate(Tesselator.getInstance() .getBuilder()); diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/UIRenderHelper.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/UIRenderHelper.java index 773b680..091d5c4 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/UIRenderHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/UIRenderHelper.java @@ -5,19 +5,21 @@ import com.mojang.blaze3d.platform.GlConst; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.*; -import com.mojang.math.Matrix4f; -import com.mojang.math.Vector3f; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.Tesselator; +import com.mojang.blaze3d.vertex.VertexFormat; +import com.mojang.math.Axis; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.renderer.GameRenderer; import nl.requios.effortlessbuilding.create.foundation.utility.Color; import nl.requios.effortlessbuilding.create.foundation.utility.Couple; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraftforge.client.gui.ScreenUtils; +import org.joml.Matrix4f; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; -import javax.annotation.Nonnull; - public class UIRenderHelper { /** @@ -53,14 +55,14 @@ public class UIRenderHelper { GlStateManager._glBindFramebuffer(GlConst.GL_FRAMEBUFFER, dst.frameBufferId); } - public static void streak(PoseStack ms, float angle, int x, int y, int breadth, int length) { - streak(ms, angle, x, y, breadth, length, Theme.i(Theme.Key.STREAK)); + public static void streak(GuiGraphics graphics, float angle, int x, int y, int breadth, int length) { + streak(graphics, angle, x, y, breadth, length, Theme.i(Theme.Key.STREAK)); } // angle in degrees; 0° -> fading to the right // x and y specify the middle point of the starting edge // breadth is the total width of the streak - public static void streak(PoseStack ms, float angle, int x, int y, int breadth, int length, int color) { + public static void streak(GuiGraphics graphics, float angle, int x, int y, int breadth, int length, int color) { int a1 = 0xa0 << 24; int a2 = 0x80 << 24; int a3 = 0x10 << 24; @@ -72,59 +74,60 @@ public class UIRenderHelper { int c3 = a3 | color; int c4 = a4 | color; + PoseStack ms = graphics.pose(); ms.pushPose(); ms.translate(x, y, 0); - ms.mulPose(Vector3f.ZP.rotationDegrees(angle - 90)); + ms.mulPose(Axis.ZP.rotationDegrees(angle - 90)); - streak(ms, breadth / 2, length, c1, c2, c3, c4); + streak(graphics, breadth / 2, length, c1, c2, c3, c4); ms.popPose(); } - public static void streak(PoseStack ms, float angle, int x, int y, int breadth, int length, Color c) { + public static void streak(GuiGraphics graphics, float angle, int x, int y, int breadth, int length, Color c) { Color color = c.copy().setImmutable(); int c1 = color.scaleAlpha(0.625f).getRGB(); int c2 = color.scaleAlpha(0.5f).getRGB(); int c3 = color.scaleAlpha(0.0625f).getRGB(); int c4 = color.scaleAlpha(0f).getRGB(); + PoseStack ms = graphics.pose(); ms.pushPose(); ms.translate(x, y, 0); - ms.mulPose(Vector3f.ZP.rotationDegrees(angle - 90)); + ms.mulPose(Axis.ZP.rotationDegrees(angle - 90)); - streak(ms, breadth / 2, length, c1, c2, c3, c4); + streak(graphics, breadth / 2, length, c1, c2, c3, c4); ms.popPose(); } - private static void streak(PoseStack ms, int width, int height, int c1, int c2, int c3, int c4) { + private static void streak(GuiGraphics graphics, int width, int height, int c1, int c2, int c3, int c4) { double split1 = .5; double split2 = .75; - Matrix4f model = ms.last().pose(); - ScreenUtils.drawGradientRect(model, 0, -width, 0, width, (int) (split1 * height), c1, c2); - ScreenUtils.drawGradientRect(model, 0, -width, (int) (split1 * height), width, (int) (split2 * height), c2, c3); - ScreenUtils.drawGradientRect(model, 0, -width, (int) (split2 * height), width, height, c3, c4); + graphics.fillGradient(-width, 0, width, (int) (split1 * height), 0, c1, c2); + graphics.fillGradient(-width, (int) (split1 * height), width, (int) (split2 * height), 0, c2, c3); + graphics.fillGradient(-width, (int) (split2 * height), width, height, 0, c3, c4); } /** - * @see #angledGradient(MatrixStack, float, int, int, int, int, int, Color, Color) + * @see #angledGradient(GuiGraphics, float, int, int, int, int, int, Color, Color) */ - public static void angledGradient(@Nonnull PoseStack ms, float angle, int x, int y, int breadth, int length, Couple c) { - angledGradient(ms, angle, x, y, 0, breadth, length, c); + public static void angledGradient(GuiGraphics graphics, float angle, int x, int y, int breadth, int length, Couple c) { + angledGradient(graphics, angle, x, y, 0, breadth, length, c); } /** - * @see #angledGradient(MatrixStack, float, int, int, int, int, int, Color, Color) + * @see #angledGradient(GuiGraphics, float, int, int, int, int, int, Color, Color) */ - public static void angledGradient(@Nonnull PoseStack ms, float angle, int x, int y, int z, int breadth, int length, Couple c) { - angledGradient(ms, angle, x, y, z, breadth, length, c.getFirst(), c.getSecond()); + public static void angledGradient(GuiGraphics graphics, float angle, int x, int y, int z, int breadth, int length, Couple c) { + angledGradient(graphics, angle, x, y, z, breadth, length, c.getFirst(), c.getSecond()); } /** - * @see #angledGradient(MatrixStack, float, int, int, int, int, int, Color, Color) + * @see #angledGradient(GuiGraphics, float, int, int, int, int, int, Color, Color) */ - public static void angledGradient(@Nonnull PoseStack ms, float angle, int x, int y, int breadth, int length, Color color1, Color color2) { - angledGradient(ms, angle, x, y, 0, breadth, length, color1, color2); + public static void angledGradient(GuiGraphics graphics, float angle, int x, int y, int breadth, int length, Color color1, Color color2) { + angledGradient(graphics, angle, x, y, 0, breadth, length, color1, color2); } /** @@ -135,31 +138,32 @@ public class UIRenderHelper { * @param color2 the color at the ending edge * @param breadth the total width of the gradient */ - public static void angledGradient(@Nonnull PoseStack ms, float angle, int x, int y, int z, int breadth, int length, Color color1, Color color2) { + public static void angledGradient(GuiGraphics graphics, float angle, int x, int y, int z, int breadth, int length, Color color1, Color color2) { + PoseStack ms = graphics.pose(); ms.pushPose(); ms.translate(x, y, z); - ms.mulPose(Vector3f.ZP.rotationDegrees(angle - 90)); + ms.mulPose(Axis.ZP.rotationDegrees(angle - 90)); - Matrix4f model = ms.last().pose(); int w = breadth / 2; - ScreenUtils.drawGradientRect(model, 0, -w, 0, w, length, color1.getRGB(), color2.getRGB()); + graphics.fillGradient(-w, 0, w, length, 0, color1.getRGB(), color2.getRGB()); ms.popPose(); } - public static void breadcrumbArrow(PoseStack matrixStack, int x, int y, int z, int width, int height, int indent, Couple colors) {breadcrumbArrow(matrixStack, x, y, z, width, height, indent, colors.getFirst(), colors.getSecond());} + public static void breadcrumbArrow(GuiGraphics graphics, int x, int y, int z, int width, int height, int indent, Couple colors) {breadcrumbArrow(graphics, x, y, z, width, height, indent, colors.getFirst(), colors.getSecond());} // draws a wide chevron-style breadcrumb arrow pointing left - public static void breadcrumbArrow(PoseStack matrixStack, int x, int y, int z, int width, int height, int indent, Color startColor, Color endColor) { + public static void breadcrumbArrow(GuiGraphics graphics, int x, int y, int z, int width, int height, int indent, Color startColor, Color endColor) { + PoseStack matrixStack = graphics.pose(); matrixStack.pushPose(); matrixStack.translate(x - indent, y, z); - breadcrumbArrow(matrixStack, width, height, indent, startColor, endColor); + breadcrumbArrow(graphics, width, height, indent, startColor, endColor); matrixStack.popPose(); } - private static void breadcrumbArrow(PoseStack ms, int width, int height, int indent, Color c1, Color c2) { + private static void breadcrumbArrow(GuiGraphics graphics, int width, int height, int indent, Color c1, Color c2) { /* * 0,0 x1,y1 ********************* x4,y4 ***** x7,y7 @@ -189,7 +193,7 @@ public class UIRenderHelper { Color fc3 = Color.mixColors(c1, c2, (indent + width) / (width + 2f * indent)); Color fc4 = Color.mixColors(c1, c2, 1); - RenderSystem.disableTexture(); +// RenderSystem.disableTexture(); RenderSystem.enableBlend(); RenderSystem.disableCull(); RenderSystem.defaultBlendFunc(); @@ -197,7 +201,7 @@ public class UIRenderHelper { Tesselator tessellator = Tesselator.getInstance(); BufferBuilder bufferbuilder = tessellator.getBuilder(); - Matrix4f model = ms.last().pose(); + Matrix4f model = graphics.pose().last().pose(); bufferbuilder.begin(VertexFormat.Mode.TRIANGLES, DefaultVertexFormat.POSITION_COLOR); bufferbuilder.vertex(model, x0, y0, 0).color(fc1.getRed(), fc1.getGreen(), fc1.getBlue(), fc1.getAlpha()).endVertex(); @@ -227,27 +231,34 @@ public class UIRenderHelper { tessellator.end(); RenderSystem.enableCull(); RenderSystem.disableBlend(); - RenderSystem.enableTexture(); +// RenderSystem.enableTexture(); } //just like AbstractGui#drawTexture, but with a color at every vertex - public static void drawColoredTexture(PoseStack ms, Color c, int x, int y, int tex_left, int tex_top, int width, int height) { - drawColoredTexture(ms, c, x, y, 0, (float) tex_left, (float) tex_top, width, height, 256, 256); + public static void drawColoredTexture(GuiGraphics graphics, Color c, int x, int y, int tex_left, int tex_top, int width, int height) { + drawColoredTexture(graphics, c, x, y, 0, (float) tex_left, (float) tex_top, width, height, 256, 256); } - public static void drawColoredTexture(PoseStack ms, Color c, int x, int y, int z, float tex_left, float tex_top, int width, int height, int sheet_width, int sheet_height) { - drawColoredTexture(ms, c, x, x + width, y, y + height, z, width, height, tex_left, tex_top, sheet_width, sheet_height); + public static void drawColoredTexture(GuiGraphics graphics, Color c, int x, int y, int z, float tex_left, float tex_top, int width, int height, int sheet_width, int sheet_height) { + drawColoredTexture(graphics, c, x, x + width, y, y + height, z, width, height, tex_left, tex_top, sheet_width, sheet_height); } - public static void drawStretched(PoseStack ms, int left, int top, int w, int h, int z, AllGuiTextures tex) { + public static void drawStretched(GuiGraphics graphics, int left, int top, int w, int h, int z, AllGuiTextures tex) { tex.bind(); - drawTexturedQuad(ms.last() + drawTexturedQuad(graphics.pose().last() .pose(), Color.WHITE, left, left + w, top, top + h, z, tex.startX / 256f, (tex.startX + tex.width) / 256f, tex.startY / 256f, (tex.startY + tex.height) / 256f); } - private static void drawColoredTexture(PoseStack ms, Color c, int left, int right, int top, int bot, int z, int tex_width, int tex_height, float tex_left, float tex_top, int sheet_width, int sheet_height) { - drawTexturedQuad(ms.last().pose(), c, left, right, top, bot, z, (tex_left + 0.0F) / (float) sheet_width, (tex_left + (float) tex_width) / (float) sheet_width, (tex_top + 0.0F) / (float) sheet_height, (tex_top + (float) tex_height) / (float) sheet_height); + public static void drawCropped(GuiGraphics graphics, int left, int top, int w, int h, int z, AllGuiTextures tex) { + tex.bind(); + drawTexturedQuad(graphics.pose().last() + .pose(), Color.WHITE, left, left + w, top, top + h, z, tex.startX / 256f, (tex.startX + w) / 256f, + tex.startY / 256f, (tex.startY + h) / 256f); + } + + private static void drawColoredTexture(GuiGraphics graphics, Color c, int left, int right, int top, int bot, int z, int tex_width, int tex_height, float tex_left, float tex_top, int sheet_width, int sheet_height) { + drawTexturedQuad(graphics.pose().last().pose(), c, left, right, top, bot, z, (tex_left + 0.0F) / (float) sheet_width, (tex_left + (float) tex_width) / (float) sheet_width, (tex_top + 0.0F) / (float) sheet_height, (tex_top + (float) tex_height) / (float) sheet_height); } private static void drawTexturedQuad(Matrix4f m, Color c, int left, int right, int top, int bot, int z, float u1, float u2, float v1, float v2) { @@ -266,7 +277,7 @@ public class UIRenderHelper { } public static void flipForGuiRender(PoseStack poseStack) { - poseStack.mulPoseMatrix(Matrix4f.createScaleMatrix(1, -1, 1)); + poseStack.mulPoseMatrix(new Matrix4f().scaling(1, -1, 1)); } public static class CustomRenderTarget extends RenderTarget { @@ -291,7 +302,7 @@ public class UIRenderHelper { float tx = (float) viewWidth / (float) width; float ty = (float) viewHeight / (float) height; - RenderSystem.enableTexture(); +// RenderSystem.enableTexture(); RenderSystem.enableDepthTest(); RenderSystem.setShader(() -> Minecraft.getInstance().gameRenderer.blitShader); RenderSystem.getShader().setSampler("DiffuseSampler", colorTextureId); diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/AbstractSimiContainerScreen.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/AbstractSimiContainerScreen.java index da48a96..69eaebe 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/AbstractSimiContainerScreen.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/AbstractSimiContainerScreen.java @@ -1,12 +1,10 @@ package nl.requios.effortlessbuilding.create.foundation.gui.container; import com.mojang.blaze3d.platform.InputConstants; -import com.mojang.blaze3d.vertex.PoseStack; -import nl.requios.effortlessbuilding.create.foundation.gui.AllGuiTextures; -import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener; -import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.components.Widget; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; @@ -17,6 +15,9 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import nl.requios.effortlessbuilding.create.foundation.gui.AllGuiTextures; +import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener; +import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Collection; @@ -66,13 +67,13 @@ public abstract class AbstractSimiContainerScreen void addRenderableWidgets(W... widgets) { + protected void addRenderableWidgets(W... widgets) { for (W widget : widgets) { addRenderableWidget(widget); } } - protected void addRenderableWidgets(Collection widgets) { + protected void addRenderableWidgets(Collection widgets) { for (W widget : widgets) { addRenderableWidget(widget); } @@ -91,34 +92,34 @@ public abstract class AbstractSimiContainerScreen tooltip = simiWidget.getToolTip(); if (tooltip.isEmpty()) continue; - int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.x; - int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.y; - renderComponentTooltip(ms, tooltip, ttx, tty); + int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.getX(); + int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.getY(); + graphics.renderComponentTooltip(font, tooltip, ttx, tty); } } } @@ -127,19 +128,26 @@ public abstract class AbstractSimiContainerScreen context) { - context.get() - .enqueueWork(() -> { - ServerPlayer player = context.get() - .getSender(); - if (player == null) - return; - if (!(player.containerMenu instanceof IClearableContainer)) - return; - ((IClearableContainer) player.containerMenu).clearContents(); - }); - context.get() - .setPacketHandled(true); - } - -} diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/ClearMenuPacket.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/ClearMenuPacket.java new file mode 100644 index 0000000..87585d9 --- /dev/null +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/ClearMenuPacket.java @@ -0,0 +1,30 @@ +package nl.requios.effortlessbuilding.create.foundation.gui.container; + +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.server.level.ServerPlayer; +import net.minecraftforge.network.NetworkEvent.Context; +import nl.requios.effortlessbuilding.create.foundation.networking.SimplePacketBase; + +public class ClearMenuPacket extends SimplePacketBase { + + public ClearMenuPacket() {} + + public ClearMenuPacket(FriendlyByteBuf buffer) {} + + @Override + public void write(FriendlyByteBuf buffer) {} + + @Override + public boolean handle(Context context) { + context.enqueueWork(() -> { + ServerPlayer player = context.getSender(); + if (player == null) + return; + if (!(player.containerMenu instanceof IClearableMenu)) + return; + ((IClearableMenu) player.containerMenu).clearContents(); + }); + return true; + } + +} diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/GhostItemContainer.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/GhostItemMenu.java similarity index 90% rename from src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/GhostItemContainer.java rename to src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/GhostItemMenu.java index 8e55be9..b2a06b8 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/GhostItemContainer.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/GhostItemMenu.java @@ -10,15 +10,15 @@ import net.minecraft.world.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; -public abstract class GhostItemContainer extends ContainerBase implements IClearableContainer { +public abstract class GhostItemMenu extends MenuBase implements IClearableMenu { public ItemStackHandler ghostInventory; - protected GhostItemContainer(MenuType type, int id, Inventory inv, FriendlyByteBuf extraData) { + protected GhostItemMenu(MenuType type, int id, Inventory inv, FriendlyByteBuf extraData) { super(type, id, inv, extraData); } - protected GhostItemContainer(MenuType type, int id, Inventory inv, T contentHolder) { + protected GhostItemMenu(MenuType type, int id, Inventory inv, T contentHolder) { super(type, id, inv, contentHolder); } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/GhostItemSubmitPacket.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/GhostItemSubmitPacket.java index 001cab0..b212f55 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/GhostItemSubmitPacket.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/GhostItemSubmitPacket.java @@ -1,12 +1,10 @@ package nl.requios.effortlessbuilding.create.foundation.gui.container; -import nl.requios.effortlessbuilding.create.foundation.networking.SimplePacketBase; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; import net.minecraftforge.network.NetworkEvent.Context; - -import java.util.function.Supplier; +import nl.requios.effortlessbuilding.create.foundation.networking.SimplePacketBase; public class GhostItemSubmitPacket extends SimplePacketBase { @@ -30,23 +28,18 @@ public class GhostItemSubmitPacket extends SimplePacketBase { } @Override - public void handle(Supplier context) { - context.get() - .enqueueWork(() -> { - ServerPlayer player = context.get() - .getSender(); - if (player == null) - return; + public boolean handle(Context context) { + context.enqueueWork(() -> { + ServerPlayer player = context.getSender(); + if (player == null) + return; - if (player.containerMenu instanceof GhostItemContainer) { - GhostItemContainer c = (GhostItemContainer) player.containerMenu; - c.ghostInventory.setStackInSlot(slot, item); - c.getSlot(36 + slot).setChanged(); - } - - }); - context.get() - .setPacketHandled(true); + if (player.containerMenu instanceof GhostItemMenu menu) { + menu.ghostInventory.setStackInSlot(slot, item); + menu.getSlot(36 + slot).setChanged(); + } + }); + return true; } } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/IClearableContainer.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/IClearableContainer.java deleted file mode 100644 index 101d505..0000000 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/IClearableContainer.java +++ /dev/null @@ -1,14 +0,0 @@ -package nl.requios.effortlessbuilding.create.foundation.gui.container; - -//import nl.requios.effortlessbuilding.create.foundation.networking.AllPackets; - -public interface IClearableContainer { - - default void sendClearPacket() { -// AllPackets.channel.sendToServer(new ClearContainerPacket()); - } - - @Deprecated //warning: does not work - public void clearContents(); - -} diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/IClearableMenu.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/IClearableMenu.java new file mode 100644 index 0000000..7ac69bc --- /dev/null +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/IClearableMenu.java @@ -0,0 +1,11 @@ +package nl.requios.effortlessbuilding.create.foundation.gui.container; + +public interface IClearableMenu { + + default void sendClearPacket() { +// PacketHandler.INSTANCE.sendToServer(new ClearMenuPacket()); + } + + public void clearContents(); + +} diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/ContainerBase.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/MenuBase.java similarity index 88% rename from src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/ContainerBase.java rename to src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/MenuBase.java index 7ebd776..ef91980 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/ContainerBase.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/MenuBase.java @@ -1,6 +1,5 @@ package nl.requios.effortlessbuilding.create.foundation.gui.container; -import nl.requios.effortlessbuilding.create.foundation.utility.IInteractionChecker; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -9,19 +8,20 @@ import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.Slot; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import nl.requios.effortlessbuilding.create.foundation.utility.IInteractionChecker; -public abstract class ContainerBase extends AbstractContainerMenu { +public abstract class MenuBase extends AbstractContainerMenu { public Player player; public Inventory playerInventory; public T contentHolder; - protected ContainerBase(MenuType type, int id, Inventory inv, FriendlyByteBuf extraData) { + protected MenuBase(MenuType type, int id, Inventory inv, FriendlyByteBuf extraData) { super(type, id); init(inv, createOnClient(extraData)); } - protected ContainerBase(MenuType type, int id, Inventory inv, T contentHolder) { + protected MenuBase(MenuType type, int id, Inventory inv, T contentHolder) { super(type, id); init(inv, contentHolder); } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/BoxElement.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/BoxElement.java index e8af30a..93aac3d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/BoxElement.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/BoxElement.java @@ -1,11 +1,16 @@ package nl.requios.effortlessbuilding.create.foundation.gui.element; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.*; -import com.mojang.math.Matrix4f; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.Tesselator; +import com.mojang.blaze3d.vertex.VertexFormat; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.renderer.GameRenderer; import nl.requios.effortlessbuilding.create.foundation.utility.Color; import nl.requios.effortlessbuilding.create.foundation.utility.Couple; -import net.minecraft.client.renderer.GameRenderer; +import org.joml.Matrix4f; public class BoxElement extends RenderElement { @@ -60,8 +65,8 @@ public class BoxElement extends RenderElement { } @Override - public void render(PoseStack ms) { - renderBox(ms); + public void render(GuiGraphics graphics) { + renderBox(graphics.pose()); } //total box width = 1 * 2 (outer border) + 1 * 2 (inner color border) + 2 * borderOffset + width @@ -83,7 +88,7 @@ public class BoxElement extends RenderElement { * |_____________| * * */ - RenderSystem.disableTexture(); +// RenderSystem.disableTexture(); RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); RenderSystem.setShader(GameRenderer::getPositionColorShader); @@ -148,6 +153,6 @@ public class BoxElement extends RenderElement { tessellator.end(); RenderSystem.disableBlend(); - RenderSystem.enableTexture(); +// RenderSystem.enableTexture(); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/CombinedStencilElement.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/CombinedStencilElement.java index 3f5183c..57315ce 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/CombinedStencilElement.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/CombinedStencilElement.java @@ -1,8 +1,10 @@ package nl.requios.effortlessbuilding.create.foundation.gui.element; +import javax.annotation.Nonnull; + import com.mojang.blaze3d.vertex.PoseStack; -import javax.annotation.Nonnull; +import net.minecraft.client.gui.GuiGraphics; public class CombinedStencilElement extends StencilElement { @@ -43,26 +45,27 @@ public class CombinedStencilElement extends StencilElement { } @Override - protected void renderStencil(PoseStack ms) { + protected void renderStencil(GuiGraphics graphics) { + PoseStack ms = graphics.pose(); ms.pushPose(); element1.transform(ms); element1.withBounds(width, height); - element1.renderStencil(ms); + element1.renderStencil(graphics); ms.popPose(); ms.pushPose(); element2.transform(ms); element2.withBounds(width, height); - element2.renderStencil(ms); + element2.renderStencil(graphics); ms.popPose(); } @Override - protected void renderElement(PoseStack ms) { + protected void renderElement(GuiGraphics graphics) { if (mode.rendersFirst()) - element1.withBounds(width, height).renderElement(ms); + element1.withBounds(width, height).renderElement(graphics); if (mode.rendersSecond()) - element2.withBounds(width, height).renderElement(ms); + element2.withBounds(width, height).renderElement(graphics); } public enum ElementMode { diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/DelegatedStencilElement.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/DelegatedStencilElement.java index ba17d24..2fecfa3 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/DelegatedStencilElement.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/DelegatedStencilElement.java @@ -1,13 +1,13 @@ package nl.requios.effortlessbuilding.create.foundation.gui.element; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper; import nl.requios.effortlessbuilding.create.foundation.utility.Color; public class DelegatedStencilElement extends StencilElement { - protected static final ElementRenderer EMPTY_RENDERER = (ms, width, height, alpha) -> {}; - protected static final ElementRenderer DEFAULT_ELEMENT = (ms, width, height, alpha) -> UIRenderHelper.angledGradient(ms, 0, -3, 5, height+4, width+6, new Color(0xff_10dd10).scaleAlpha(alpha), new Color(0xff_1010dd).scaleAlpha(alpha)); + protected static final ElementRenderer EMPTY_RENDERER = (graphics, width, height, alpha) -> {}; + protected static final ElementRenderer DEFAULT_ELEMENT = (graphics, width, height, alpha) -> UIRenderHelper.angledGradient(graphics, 0, -3, 5, height+4, width+6, new Color(0xff_10dd10).scaleAlpha(alpha), new Color(0xff_1010dd).scaleAlpha(alpha)); protected ElementRenderer stencil; protected ElementRenderer element; @@ -35,18 +35,18 @@ public class DelegatedStencilElement extends StencilElement { } @Override - protected void renderStencil(PoseStack ms) { - stencil.render(ms, width, height, 1); + protected void renderStencil(GuiGraphics graphics) { + stencil.render(graphics, width, height, 1); } @Override - protected void renderElement(PoseStack ms) { - element.render(ms, width, height, alpha); + protected void renderElement(GuiGraphics graphics) { + element.render(graphics, width, height, alpha); } @FunctionalInterface public interface ElementRenderer { - void render(PoseStack ms, int width, int height, float alpha); + void render(GuiGraphics graphics, int width, int height, float alpha); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/GuiGameElement.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/GuiGameElement.java index d7d0fdb..60aa3c3 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/GuiGameElement.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/GuiGameElement.java @@ -7,25 +7,21 @@ import com.mojang.blaze3d.platform.GlStateManager.SourceFactor; import com.mojang.blaze3d.platform.Lighting; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.math.Vector3f; -//import nl.requios.effortlessbuilding.create.foundation.fluid.FluidRenderer; -import nl.requios.effortlessbuilding.create.foundation.gui.ILightingSettings; -import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper; -import nl.requios.effortlessbuilding.create.foundation.utility.Color; -import nl.requios.effortlessbuilding.create.foundation.utility.VecHelper; +import com.mojang.math.Axis; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.Sheets; import net.minecraft.client.renderer.block.BlockRenderDispatcher; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; import net.minecraft.world.inventory.InventoryMenu; +import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.BaseFireBlock; @@ -35,7 +31,10 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.Vec3; import net.minecraftforge.client.RenderTypeHelper; -import net.minecraftforge.fluids.FluidStack; +import nl.requios.effortlessbuilding.create.foundation.gui.ILightingSettings; +import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper; +import nl.requios.effortlessbuilding.create.foundation.utility.Color; +import nl.requios.effortlessbuilding.create.foundation.utility.VecHelper; import javax.annotation.Nullable; @@ -125,9 +124,9 @@ public class GuiGameElement { matrixStack.translate(xLocal, yLocal, zLocal); UIRenderHelper.flipForGuiRender(matrixStack); matrixStack.translate(rotationOffset.x, rotationOffset.y, rotationOffset.z); - matrixStack.mulPose(Vector3f.ZP.rotationDegrees((float) zRot)); - matrixStack.mulPose(Vector3f.XP.rotationDegrees((float) xRot)); - matrixStack.mulPose(Vector3f.YP.rotationDegrees((float) yRot)); + matrixStack.mulPose(Axis.ZP.rotationDegrees((float) zRot)); + matrixStack.mulPose(Axis.XP.rotationDegrees((float) xRot)); + matrixStack.mulPose(Axis.YP.rotationDegrees((float) yRot)); matrixStack.translate(-rotationOffset.x, -rotationOffset.y, -rotationOffset.z); } @@ -162,7 +161,8 @@ public class GuiGameElement { } @Override - public void render(PoseStack matrixStack) { + public void render(GuiGraphics graphics) { + PoseStack matrixStack = graphics.pose(); prepareMatrix(matrixStack); Minecraft mc = Minecraft.getInstance(); @@ -256,7 +256,8 @@ public class GuiGameElement { } @Override - public void render(PoseStack matrixStack) { + public void render(GuiGraphics graphics) { + PoseStack matrixStack = graphics.pose(); prepareMatrix(matrixStack); transformMatrix(matrixStack); renderItemIntoGUI(matrixStack, stack, customLighting == null); @@ -270,10 +271,11 @@ public class GuiGameElement { renderer.textureManager.getTexture(InventoryMenu.BLOCK_ATLAS).setFilter(false, false); RenderSystem.setShaderTexture(0, InventoryMenu.BLOCK_ATLAS); RenderSystem.enableBlend(); + RenderSystem.enableCull(); RenderSystem.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); matrixStack.pushPose(); - matrixStack.translate(0, 0, 100.0F + renderer.blitOffset); + matrixStack.translate(0, 0, 100.0F); matrixStack.translate(8.0F, -8.0F, 0.0F); matrixStack.scale(16.0F, 16.0F, 16.0F); MultiBufferSource.BufferSource buffer = Minecraft.getInstance().renderBuffers().bufferSource(); @@ -282,8 +284,10 @@ public class GuiGameElement { Lighting.setupForFlatItems(); } - renderer.render(stack, ItemTransforms.TransformType.GUI, false, matrixStack, buffer, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, bakedModel); + renderer.render(stack, ItemDisplayContext.GUI, false, matrixStack, buffer, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, bakedModel); + RenderSystem.disableDepthTest(); buffer.endBatch(); + RenderSystem.enableDepthTest(); if (useDefaultLighting && flatLighting) { Lighting.setupFor3DItems(); diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/RenderElement.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/RenderElement.java index f5e1e86..16a7519 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/RenderElement.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/RenderElement.java @@ -1,12 +1,12 @@ package nl.requios.effortlessbuilding.create.foundation.gui.element; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; public abstract class RenderElement implements ScreenElement { public static final RenderElement EMPTY = new RenderElement() { @Override - public void render(PoseStack ms) { + public void render(GuiGraphics graphics) { } }; @@ -66,11 +66,11 @@ public abstract class RenderElement implements ScreenElement { return z; } - public abstract void render(PoseStack ms); + public abstract void render(GuiGraphics graphics); @Override - public void render(PoseStack ms, int x, int y) { - this.at(x, y).render(ms); + public void render(GuiGraphics graphics, int x, int y) { + this.at(x, y).render(graphics); } public static class SimpleRenderElement extends RenderElement { @@ -82,8 +82,8 @@ public abstract class RenderElement implements ScreenElement { } @Override - public void render(PoseStack ms) { - renderable.render(ms, (int) x, (int) y); + public void render(GuiGraphics graphics) { + renderable.render(graphics, (int) x, (int) y); } } } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/ScreenElement.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/ScreenElement.java index 453e38b..86c2700 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/ScreenElement.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/ScreenElement.java @@ -1,12 +1,12 @@ package nl.requios.effortlessbuilding.create.foundation.gui.element; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; public interface ScreenElement { @OnlyIn(Dist.CLIENT) - void render(PoseStack ms, int x, int y); + void render(GuiGraphics graphics, int x, int y); } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/StencilElement.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/StencilElement.java index ce71a8e..968ab5d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/StencilElement.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/StencilElement.java @@ -1,27 +1,31 @@ package nl.requios.effortlessbuilding.create.foundation.gui.element; +import org.lwjgl.opengl.GL11; + import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; + import net.minecraft.client.Minecraft; -import org.lwjgl.opengl.GL11; +import net.minecraft.client.gui.GuiGraphics; public abstract class StencilElement extends RenderElement { @Override - public void render(PoseStack ms) { + public void render(GuiGraphics graphics) { + PoseStack ms = graphics.pose(); ms.pushPose(); transform(ms); prepareStencil(ms); - renderStencil(ms); + renderStencil(graphics); prepareElement(ms); - renderElement(ms); + renderElement(graphics); cleanUp(ms); ms.popPose(); } - protected abstract void renderStencil(PoseStack ms); + protected abstract void renderStencil(GuiGraphics graphics); - protected abstract void renderElement(PoseStack ms); + protected abstract void renderElement(GuiGraphics graphics); protected void transform(PoseStack ms) { ms.translate(x, y, z); diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/TextStencilElement.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/TextStencilElement.java index 5ffd067..82c554e 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/TextStencilElement.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/TextStencilElement.java @@ -1,9 +1,10 @@ package nl.requios.effortlessbuilding.create.foundation.gui.element; import com.mojang.blaze3d.vertex.PoseStack; -import nl.requios.effortlessbuilding.create.foundation.utility.Components; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.MutableComponent; +import nl.requios.effortlessbuilding.create.foundation.utility.Components; public class TextStencilElement extends DelegatedStencilElement { @@ -45,8 +46,7 @@ public class TextStencilElement extends DelegatedStencilElement { } @Override - protected void renderStencil(PoseStack ms) { - + protected void renderStencil(GuiGraphics graphics) { float x = 0, y = 0; if (centerHorizontally) x = width / 2f - font.width(component) / 2f; @@ -54,11 +54,11 @@ public class TextStencilElement extends DelegatedStencilElement { if (centerVertically) y = height / 2f - (font.lineHeight - 1) / 2f; - font.draw(ms, component, x, y, 0xff_000000); + graphics.drawString(font, component, Math.round(x), Math.round(y), 0xff_000000, false); } @Override - protected void renderElement(PoseStack ms) { + protected void renderElement(GuiGraphics graphics) { float x = 0, y = 0; if (centerHorizontally) x = width / 2f - font.width(component) / 2f; @@ -66,9 +66,10 @@ public class TextStencilElement extends DelegatedStencilElement { if (centerVertically) y = height / 2f - (font.lineHeight - 1) / 2f; + PoseStack ms = graphics.pose(); ms.pushPose(); ms.translate(x, y, 0); - element.render(ms, font.width(component), font.lineHeight + 2, alpha); + element.render(graphics, font.width(component), font.lineHeight + 2, alpha); ms.popPose(); } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/AbstractSimiWidget.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/AbstractSimiWidget.java index 237559b..2851206 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/AbstractSimiWidget.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/AbstractSimiWidget.java @@ -1,11 +1,13 @@ package nl.requios.effortlessbuilding.create.foundation.gui.widget; -import com.mojang.blaze3d.vertex.PoseStack; -import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener; -import nl.requios.effortlessbuilding.create.foundation.utility.Components; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.narration.NarrationElementOutput; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipPositioner; +import net.minecraft.client.gui.screens.inventory.tooltip.DefaultTooltipPositioner; import net.minecraft.network.chat.Component; +import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener; +import nl.requios.effortlessbuilding.create.foundation.utility.Components; import javax.annotation.Nonnull; import java.util.LinkedList; @@ -15,12 +17,13 @@ import java.util.function.BiConsumer; public abstract class AbstractSimiWidget extends AbstractWidget implements TickableGuiEventListener { public static final int HEADER_RGB = 0x5391E1; - + public static final int HINT_RGB = 0x96B7E0; + protected float z; protected boolean wasHovered = false; protected List toolTip = new LinkedList<>(); protected BiConsumer onClick = (_$, _$$) -> {}; - + public int lockedTooltipX = -1; public int lockedTooltipY = -1; @@ -36,6 +39,11 @@ public abstract class AbstractSimiWidget extends AbstractWidget implements Ticka super(x, y, width, height, message); } + @Override + protected ClientTooltipPositioner createTooltipPositioner() { + return DefaultTooltipPositioner.INSTANCE; + } + public T withCallback(BiConsumer cb) { this.onClick = cb; //noinspection unchecked @@ -60,26 +68,22 @@ public abstract class AbstractSimiWidget extends AbstractWidget implements Ticka public void tick() {} @Override - public void render(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) { - if (visible) { - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - beforeRender(ms, mouseX, mouseY, partialTicks); - renderButton(ms, mouseX, mouseY, partialTicks); - afterRender(ms, mouseX, mouseY, partialTicks); - wasHovered = isHoveredOrFocused(); - } + public void renderWidget(@Nonnull GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + beforeRender(graphics, mouseX, mouseY, partialTicks); + doRender(graphics, mouseX, mouseY, partialTicks); + afterRender(graphics, mouseX, mouseY, partialTicks); + wasHovered = isHoveredOrFocused(); } - protected void beforeRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) { - ms.pushPose(); + protected void beforeRender(@Nonnull GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + graphics.pose().pushPose(); } - @Override - public void renderButton(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) { + protected void doRender(@Nonnull GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { } - protected void afterRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) { - ms.popPose(); + protected void afterRender(@Nonnull GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + graphics.pose().popPose(); } public void runCallback(double mouseX, double mouseY) { @@ -92,7 +96,7 @@ public abstract class AbstractSimiWidget extends AbstractWidget implements Ticka } @Override - public void updateNarration(NarrationElementOutput pNarrationElementOutput) { + public void updateWidgetNarration(NarrationElementOutput pNarrationElementOutput) { defaultButtonNarrationText(pNarrationElementOutput); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/BoxWidget.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/BoxWidget.java index 1456d10..5818c7c 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/BoxWidget.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/BoxWidget.java @@ -1,8 +1,7 @@ package nl.requios.effortlessbuilding.create.foundation.gui.widget; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import nl.requios.effortlessbuilding.create.foundation.gui.Theme; -import nl.requios.effortlessbuilding.create.foundation.gui.Theme.Key; import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper; import nl.requios.effortlessbuilding.create.foundation.gui.element.BoxElement; import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement; @@ -10,7 +9,6 @@ import nl.requios.effortlessbuilding.create.foundation.utility.Color; import nl.requios.effortlessbuilding.create.foundation.utility.Couple; import nl.requios.effortlessbuilding.create.foundation.utility.animation.LerpedFloat; -import javax.annotation.Nonnull; import java.util.function.Function; public class BoxWidget extends ElementWidget { @@ -98,8 +96,8 @@ public class BoxWidget extends ElementWidget { } @Override - protected void beforeRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) { - super.beforeRender(ms, mouseX, mouseY, partialTicks); + protected void beforeRender(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + super.beforeRender(graphics, mouseX, mouseY, partialTicks); if (isHovered != wasHovered) { startGradientAnimation( @@ -121,7 +119,7 @@ public class BoxWidget extends ElementWidget { } @Override - public void renderButton(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) { + public void doRender(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { float fadeValue = fade.getValue(partialTicks); if (fadeValue < .1f) return; @@ -129,11 +127,11 @@ public class BoxWidget extends ElementWidget { box.withAlpha(fadeValue); box.withBackground(customBackground != null ? customBackground : Theme.c(Theme.Key.PONDER_BACKGROUND_TRANSPARENT)) .gradientBorder(gradientColor1, gradientColor2) - .at(x, y, z) + .at(getX(), getY(), z) .withBounds(width, height) - .render(ms); + .render(graphics); - super.renderButton(ms, mouseX, mouseY, partialTicks); + super.doRender(graphics, mouseX, mouseY, partialTicks); wasHovered = isHovered; } @@ -146,9 +144,9 @@ public class BoxWidget extends ElementWidget { float padX = 2 + paddingX; float padY = 2 + paddingY; - return x - padX <= mX && y - padY <= mY && mX < x + padX + width && mY < y + padY + height; + return getX() - padX <= mX && getY() - padY <= mY && mX < getX() + padX + width && mY < getY() + padY + height; } - + @Override protected boolean clicked(double pMouseX, double pMouseY) { if (!active || !visible) @@ -209,19 +207,19 @@ public class BoxWidget extends ElementWidget { return customBorderBot != null ? customBorderBot : Theme.c(getIdleTheme(), false); } - public Key getDisabledTheme() { + public Theme.Key getDisabledTheme() { return Theme.Key.BUTTON_DISABLE; } - public Key getIdleTheme() { + public Theme.Key getIdleTheme() { return Theme.Key.BUTTON_IDLE; } - public Key getHoverTheme() { + public Theme.Key getHoverTheme() { return Theme.Key.BUTTON_HOVER; } - public Key getClickTheme() { + public Theme.Key getClickTheme() { return Theme.Key.BUTTON_CLICK; } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ElementWidget.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ElementWidget.java index 597f5da..9cffb11 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ElementWidget.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ElementWidget.java @@ -1,11 +1,11 @@ package nl.requios.effortlessbuilding.create.foundation.gui.widget; import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import nl.requios.effortlessbuilding.create.foundation.gui.element.RenderElement; import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement; import nl.requios.effortlessbuilding.create.foundation.utility.animation.LerpedFloat; -import javax.annotation.Nonnull; import java.util.function.Consumer; import java.util.function.UnaryOperator; @@ -117,21 +117,22 @@ public class ElementWidget extends AbstractSimiWidget { } @Override - protected void beforeRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) { - super.beforeRender(ms, mouseX, mouseY, partialTicks); + protected void beforeRender(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + super.beforeRender(graphics, mouseX, mouseY, partialTicks); isHovered = isMouseOver(mouseX, mouseY); float fadeValue = fade.getValue(partialTicks); element.withAlpha(fadeValue); if (fadeValue < 1) { - ms.translate((1 - fadeValue) * fadeModX, (1 - fadeValue) * fadeModY, 0); + graphics.pose().translate((1 - fadeValue) * fadeModX, (1 - fadeValue) * fadeModY, 0); } } @Override - public void renderButton(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) { + public void doRender(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + PoseStack ms = graphics.pose(); ms.pushPose(); - ms.translate(x + paddingX, y + paddingY, z); + ms.translate(getX() + paddingX, getY() + paddingY, z); float innerWidth = width - 2 * paddingX; float innerHeight = height - 2 * paddingY; float eX = element.getX(), eY = element.getY(); @@ -143,7 +144,7 @@ public class ElementWidget extends AbstractSimiWidget { innerWidth /= xScale; innerHeight /= yScale; } - element.withBounds((int) innerWidth, (int) innerHeight).render(ms); + element.withBounds((int) innerWidth, (int) innerHeight).render(graphics); ms.popPose(); if (rescaleElement) { element.at(eX, eY); diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/IconButton.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/IconButton.java index 86e3d98..6554942 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/IconButton.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/IconButton.java @@ -1,12 +1,10 @@ package nl.requios.effortlessbuilding.create.foundation.gui.widget; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; import nl.requios.effortlessbuilding.create.foundation.gui.AllGuiTextures; import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement; -import net.minecraft.network.chat.Component; - -import javax.annotation.Nonnull; public class IconButton extends AbstractSimiWidget { @@ -15,29 +13,28 @@ public class IconButton extends AbstractSimiWidget { public IconButton(int x, int y, ScreenElement icon) { this(x, y, 18, 18, icon); } - + public IconButton(int x, int y, int w, int h, ScreenElement icon) { super(x, y, w, h); this.icon = icon; } @Override - public void renderButton(@Nonnull PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) { + public void doRender(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { if (visible) { - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; + isHovered = mouseX >= getX() && mouseY >= getY() && mouseX < getX() + width && mouseY < getY() + height; AllGuiTextures button = !active ? AllGuiTextures.BUTTON_DOWN - : isHoveredOrFocused() ? AllGuiTextures.BUTTON_HOVER : AllGuiTextures.BUTTON; + : isMouseOver(mouseX, mouseY) ? AllGuiTextures.BUTTON_HOVER : AllGuiTextures.BUTTON; RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - drawBg(matrixStack, button); - icon.render(matrixStack, x + 1, y + 1); + drawBg(graphics, button); + icon.render(graphics, getX() + 1, getY() + 1); } } - protected void drawBg(PoseStack matrixStack, AllGuiTextures button) { - AllGuiTextures.BUTTON.bind(); - blit(matrixStack, x, y, button.startX, button.startY, button.width, button.height); + protected void drawBg(GuiGraphics graphics, AllGuiTextures button) { + graphics.blit(button.location, getX(), getY(), button.startX, button.startY, button.width, button.height); } public void setToolTip(Component text) { diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/Indicator.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/Indicator.java index c564910..314457b 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/Indicator.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/Indicator.java @@ -1,11 +1,9 @@ package nl.requios.effortlessbuilding.create.foundation.gui.widget; import com.google.common.collect.ImmutableList; -import com.mojang.blaze3d.vertex.PoseStack; -import nl.requios.effortlessbuilding.create.foundation.gui.AllGuiTextures; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; - -import javax.annotation.Nonnull; +import nl.requios.effortlessbuilding.create.foundation.gui.AllGuiTextures; public class Indicator extends AbstractSimiWidget { @@ -13,12 +11,12 @@ public class Indicator extends AbstractSimiWidget { public Indicator(int x, int y, Component tooltip) { super(x, y, AllGuiTextures.INDICATOR.width, AllGuiTextures.INDICATOR.height); - this.toolTip = ImmutableList.of(tooltip); + this.toolTip = toolTip.isEmpty() ? ImmutableList.of() : ImmutableList.of(tooltip); this.state = State.OFF; } @Override - public void render(@Nonnull PoseStack matrixStack, int mouseX, int mouseY, float partialTicks ) { + public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks ) { if (!visible) return; AllGuiTextures toDraw; @@ -30,7 +28,7 @@ public class Indicator extends AbstractSimiWidget { case GREEN: toDraw = AllGuiTextures.INDICATOR_GREEN; break; default: toDraw = AllGuiTextures.INDICATOR; break; } - toDraw.render(matrixStack, x, y, this); + toDraw.render(graphics, getX(), getY()); } public enum State { diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/Label.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/Label.java index f220dfd..8b72474 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/Label.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/Label.java @@ -1,12 +1,12 @@ package nl.requios.effortlessbuilding.create.foundation.gui.widget; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import nl.requios.effortlessbuilding.create.foundation.utility.Components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; +import nl.requios.effortlessbuilding.create.foundation.utility.Components; import javax.annotation.Nonnull; @@ -44,12 +44,12 @@ public class Label extends AbstractSimiWidget { public void setTextAndTrim(Component newText, boolean trimFront, int maxWidthPx) { Font fontRenderer = Minecraft.getInstance().font; - + if (fontRenderer.width(newText) <= maxWidthPx) { text = newText; return; } - + String trim = "..."; int trimWidth = fontRenderer.width(trim); @@ -70,7 +70,7 @@ public class Label extends AbstractSimiWidget { } @Override - public void renderButton(@Nonnull PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) { + protected void doRender(@Nonnull GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { if (text == null || text.getString().isEmpty()) return; @@ -78,11 +78,8 @@ public class Label extends AbstractSimiWidget { MutableComponent copy = text.plainCopy(); if (suffix != null && !suffix.isEmpty()) copy.append(suffix); - - if (hasShadow) - font.drawShadow(matrixStack, copy, x, y, color); - else - font.draw(matrixStack, copy, x, y, color); + + graphics.drawString(font, copy, getX(), getY(), color, hasShadow); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java index bb7e674..8c198f3 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java @@ -1,14 +1,11 @@ package nl.requios.effortlessbuilding.create.foundation.gui.widget; -import nl.requios.effortlessbuilding.create.AllKeys; -//import nl.requios.effortlessbuilding.create.AllSoundEvents; -import nl.requios.effortlessbuilding.create.foundation.utility.Components; -import nl.requios.effortlessbuilding.create.foundation.utility.Lang; import net.minecraft.ChatFormatting; -import net.minecraft.client.Minecraft; -//import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; +import nl.requios.effortlessbuilding.create.AllKeys; +import nl.requios.effortlessbuilding.create.foundation.utility.Components; +import nl.requios.effortlessbuilding.create.foundation.utility.Lang; import java.util.function.Consumer; import java.util.function.Function; @@ -20,8 +17,10 @@ public class ScrollInput extends AbstractSimiWidget { protected Component title = Lang.translateDirect("gui.scrollInput.defaultTitle"); protected final Component scrollToModify = Lang.translateDirect("gui.scrollInput.scrollToModify"); protected final Component shiftScrollsFaster = Lang.translateDirect("gui.scrollInput.shiftScrollsFaster"); + protected Component hint = null; protected Label displayLabel; protected boolean inverted; + protected boolean soundPlayed; protected Function formatter; protected int min, max; @@ -36,6 +35,7 @@ public class ScrollInput extends AbstractSimiWidget { shiftStep = 5; step = standardStep(); formatter = i -> Components.literal(String.valueOf(i)); + soundPlayed = false; } public Function standardStep() { @@ -74,6 +74,12 @@ public class ScrollInput extends AbstractSimiWidget { return this; } + public ScrollInput addHint(MutableComponent hint) { + this.hint = hint; + updateTooltip(); + return this; + } + public ScrollInput withStepFunction(Function step) { this.step = step; return this; @@ -85,6 +91,12 @@ public class ScrollInput extends AbstractSimiWidget { writeToLabel(); return this; } + + @Override + public void tick() { + super.tick(); + soundPlayed = false; + } public int getState() { return state; @@ -106,8 +118,6 @@ public class ScrollInput extends AbstractSimiWidget { @Override public boolean mouseScrolled(double mouseX, double mouseY, double delta) { - if (!this.visible || !this.isHovered) return false; //Added - if (inverted) delta *= -1; @@ -128,12 +138,16 @@ public class ScrollInput extends AbstractSimiWidget { clampState(); if (priorState != state) { -// Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(AllSoundEvents.SCROLL_VALUE.getMainEvent(), 1.5f + 0.1f * (state-min)/(max-min))); +// if (!soundPlayed) +// Minecraft.getInstance() +// .getSoundManager() +// .play(SimpleSoundInstance.forUI(AllSoundEvents.SCROLL_VALUE.getMainEvent(), +// 1.5f + 0.1f * (state - min) / (max - min))); +// soundPlayed = true; onChanged(); } -// return priorState != state; - return true; //Changed + return priorState != state; } protected void clampState() { @@ -161,6 +175,9 @@ public class ScrollInput extends AbstractSimiWidget { return; toolTip.add(title.plainCopy() .withStyle(s -> s.withColor(HEADER_RGB))); + if (hint != null) + toolTip.add(hint.plainCopy() + .withStyle(s -> s.withColor(HINT_RGB))); toolTip.add(scrollToModify.plainCopy() .withStyle(ChatFormatting.ITALIC, ChatFormatting.DARK_GRAY)); toolTip.add(shiftScrollsFaster.plainCopy() diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/SelectionScrollInput.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/SelectionScrollInput.java index b495563..f4d58fa 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/SelectionScrollInput.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/SelectionScrollInput.java @@ -1,10 +1,10 @@ package nl.requios.effortlessbuilding.create.foundation.gui.widget; -import nl.requios.effortlessbuilding.create.foundation.utility.Components; -import nl.requios.effortlessbuilding.create.foundation.utility.Lang; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; +import nl.requios.effortlessbuilding.create.foundation.utility.Components; +import nl.requios.effortlessbuilding.create.foundation.utility.Lang; import java.util.ArrayList; import java.util.List; @@ -42,7 +42,8 @@ public class SelectionScrollInput extends ScrollInput { if (this.min + 1 == min) min--; if (min > this.min) - toolTip.add(Components.literal("> ...").withStyle(ChatFormatting.GRAY)); + toolTip.add(Components.literal("> ...") + .withStyle(ChatFormatting.GRAY)); if (this.max - 1 == max) max++; for (int i = min; i < max; i++) { @@ -58,8 +59,12 @@ public class SelectionScrollInput extends ScrollInput { .withStyle(ChatFormatting.GRAY)); } if (max < this.max) - toolTip.add(Components.literal("> ...").withStyle(ChatFormatting.GRAY)); + toolTip.add(Components.literal("> ...") + .withStyle(ChatFormatting.GRAY)); + if (hint != null) + toolTip.add(hint.plainCopy() + .withStyle(s -> s.withColor(HINT_RGB))); toolTip.add(scrollToSelect.plainCopy() .withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/TooltipArea.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/TooltipArea.java index 7bcdf26..e3dcd78 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/TooltipArea.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/TooltipArea.java @@ -1,10 +1,10 @@ package nl.requios.effortlessbuilding.create.foundation.gui.widget; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.network.chat.Component; - import java.util.List; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; + public class TooltipArea extends AbstractSimiWidget { public TooltipArea(int x, int y, int width, int height) { @@ -12,9 +12,9 @@ public class TooltipArea extends AbstractSimiWidget { } @Override - public void renderButton(PoseStack ms, int mouseX, int mouseY, float partialTicks) { + public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { if (visible) - isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; + isHovered = mouseX >= getX() && mouseY >= getY() && mouseX < getX() + width && mouseY < getY() + height; } public TooltipArea withTooltip(List tooltip) { diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/ItemHelper.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/ItemHelper.java index 74f3d58..4153a84 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/ItemHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/ItemHelper.java @@ -122,7 +122,7 @@ public class ItemHelper { return true; if (stacks1.length == stacks2.length) { for (int i = 0; i < stacks1.length; i++) - if (!ItemStack.isSame(stacks1[i], stacks2[i])) + if (!ItemStack.isSameItem(stacks1[i], stacks2[i])) return false; return true; } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/TagDependentIngredientItem.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/TagDependentIngredientItem.java index 0e92452..c6e7327 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/TagDependentIngredientItem.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/TagDependentIngredientItem.java @@ -1,10 +1,7 @@ package nl.requios.effortlessbuilding.create.foundation.item; -import net.minecraft.core.NonNullList; import net.minecraft.tags.TagKey; -import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.tags.ITagManager; @@ -17,12 +14,6 @@ public class TagDependentIngredientItem extends Item { this.tag = tag; } - @Override - public void fillItemCategory(CreativeModeTab tab, NonNullList list) { - if (!shouldHide()) - super.fillItemCategory(tab, list); - } - public boolean shouldHide() { ITagManager tagManager = ForgeRegistries.ITEMS.tags(); return !tagManager.isKnownTagName(tag) || tagManager.getTag(tag).isEmpty(); diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/TooltipHelper.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/TooltipHelper.java index b05958a..67f723c 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/TooltipHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/TooltipHelper.java @@ -1,32 +1,33 @@ package nl.requios.effortlessbuilding.create.foundation.item; import com.google.common.base.Strings; -import com.mojang.bridge.game.Language; -import nl.requios.effortlessbuilding.create.foundation.item.ItemDescription.Palette; -import nl.requios.effortlessbuilding.create.foundation.utility.Components; -import nl.requios.effortlessbuilding.create.foundation.utility.Couple; -import nl.requios.effortlessbuilding.create.foundation.utility.FontHelper; -import nl.requios.effortlessbuilding.create.foundation.utility.Lang; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ItemLike; +import nl.requios.effortlessbuilding.create.foundation.item.ItemDescription.Palette; +import nl.requios.effortlessbuilding.create.foundation.utility.Components; +import nl.requios.effortlessbuilding.create.foundation.utility.Couple; +import nl.requios.effortlessbuilding.create.foundation.utility.FontHelper; +import nl.requios.effortlessbuilding.create.foundation.utility.Lang; import java.text.BreakIterator; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.function.Supplier; public class TooltipHelper { public static final int maxWidthPerLine = 200; public static final Map cachedTooltips = new HashMap<>(); - public static Language cachedLanguage; private static boolean gogglesMode; private static final Map> tooltipReferrals = new HashMap<>(); @@ -212,36 +213,6 @@ public class TooltipHelper { // return lines; // } - private static void checkLocale() { - Language currentLanguage = Minecraft.getInstance() - .getLanguageManager() - .getSelected(); - if (cachedLanguage != currentLanguage) { - cachedTooltips.clear(); - cachedLanguage = currentLanguage; - } - } - - public static boolean hasTooltip(ItemStack stack, Player player) { - checkLocale(); - - String key = getTooltipTranslationKey(stack); - if (cachedTooltips.containsKey(key)) - return cachedTooltips.get(key) != ItemDescription.MISSING; - return findTooltip(stack); - } - - public static ItemDescription getTooltip(ItemStack stack) { - checkLocale(); - String key = getTooltipTranslationKey(stack); - if (cachedTooltips.containsKey(key)) { - ItemDescription itemDescription = cachedTooltips.get(key); - if (itemDescription != ItemDescription.MISSING) - return itemDescription; - } - return null; - } - private static boolean findTooltip(ItemStack stack) { String key = getTooltipTranslationKey(stack); if (I18n.exists(key)) { diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/CreateCustomRenderedItemModel.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/CreateCustomRenderedItemModel.java deleted file mode 100644 index 72748e5..0000000 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/CreateCustomRenderedItemModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package nl.requios.effortlessbuilding.create.foundation.item.render; - -import nl.requios.effortlessbuilding.create.Create; -import net.minecraft.client.resources.model.BakedModel; - -public abstract class CreateCustomRenderedItemModel extends CustomRenderedItemModel { - - public CreateCustomRenderedItemModel(BakedModel template, String basePath) { - super(template, Create.ID, basePath); - } - -} diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/CustomRenderedItemModel.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/CustomRenderedItemModel.java index 25191be..207a5d8 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/CustomRenderedItemModel.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/CustomRenderedItemModel.java @@ -1,29 +1,14 @@ package nl.requios.effortlessbuilding.create.foundation.item.render; import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.client.resources.model.BlockModelRotation; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.client.event.ModelEvent; +import net.minecraft.world.item.ItemDisplayContext; import net.minecraftforge.client.model.BakedModelWrapper; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +public class CustomRenderedItemModel extends BakedModelWrapper { -public abstract class CustomRenderedItemModel extends BakedModelWrapper { - - protected String namespace; - protected String basePath; - protected Map partials = new HashMap<>(); - - public CustomRenderedItemModel(BakedModel template, String namespace, String basePath) { - super(template); - this.namespace = namespace; - this.basePath = basePath; + public CustomRenderedItemModel(BakedModel originalModel) { + super(originalModel); } @Override @@ -32,43 +17,16 @@ public abstract class CustomRenderedItemModel extends BakedModelWrapper getModelLocations() { - return partials.keySet().stream().map(this::getPartialModelLocation).collect(Collectors.toList()); - } - - protected void addPartials(String... partials) { - for (String name : partials) - this.partials.put(name, null); - } - - public void loadPartials(ModelEvent.BakingCompleted event) { - ModelBakery modelLoader = event.getModelBakery(); - for (String name : partials.keySet()) - partials.put(name, loadPartial(modelLoader, name)); - } - - @SuppressWarnings("deprecation") - protected BakedModel loadPartial(ModelBakery modelLoader, String name) { - return modelLoader.bake(getPartialModelLocation(name), BlockModelRotation.X0_Y0); - } - - protected ResourceLocation getPartialModelLocation(String name) { - return new ResourceLocation(namespace, "item/" + basePath + "/" + name); - } - } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/PartialItemModelRenderer.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/PartialItemModelRenderer.java index e123fbf..88b9b51 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/PartialItemModelRenderer.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/PartialItemModelRenderer.java @@ -2,19 +2,19 @@ package nl.requios.effortlessbuilding.create.foundation.item.render; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import nl.requios.effortlessbuilding.create.foundation.render.RenderTypes; -import nl.requios.effortlessbuilding.create.foundation.utility.Iterate; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.Direction; import net.minecraft.util.RandomSource; +import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraftforge.client.extensions.common.IClientItemExtensions; import net.minecraftforge.client.model.data.ModelData; +import nl.requios.effortlessbuilding.create.foundation.render.RenderTypes; +import nl.requios.effortlessbuilding.create.foundation.utility.Iterate; public class PartialItemModelRenderer { @@ -23,12 +23,12 @@ public class PartialItemModelRenderer { private final RandomSource random = RandomSource.create(); private ItemStack stack; - private ItemTransforms.TransformType transformType; + private ItemDisplayContext transformType; private PoseStack ms; private MultiBufferSource buffer; private int overlay; - public static PartialItemModelRenderer of(ItemStack stack, ItemTransforms.TransformType transformType, + public static PartialItemModelRenderer of(ItemStack stack, ItemDisplayContext transformType, PoseStack ms, MultiBufferSource buffer, int overlay) { PartialItemModelRenderer instance = INSTANCE; instance.stack = stack; diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/networking/ISyncPersistentData.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/networking/ISyncPersistentData.java index 17b0310..b35bd98 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/networking/ISyncPersistentData.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/networking/ISyncPersistentData.java @@ -5,10 +5,8 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.Entity; import net.minecraftforge.network.NetworkEvent.Context; -import net.minecraftforge.network.PacketDistributor; import java.util.HashSet; -import java.util.function.Supplier; public interface ISyncPersistentData { @@ -37,19 +35,17 @@ public interface ISyncPersistentData { } @Override - public void handle(Supplier context) { - context.get() - .enqueueWork(() -> { - Entity entityByID = Minecraft.getInstance().level.getEntity(entityId); - CompoundTag data = entityByID.getPersistentData(); - new HashSet<>(data.getAllKeys()).forEach(data::remove); - data.merge(readData); - if (!(entityByID instanceof ISyncPersistentData)) - return; - ((ISyncPersistentData) entityByID).onPersistentDataUpdated(); - }); - context.get() - .setPacketHandled(true); + public boolean handle(Context context) { + context.enqueueWork(() -> { + Entity entityByID = Minecraft.getInstance().level.getEntity(entityId); + CompoundTag data = entityByID.getPersistentData(); + new HashSet<>(data.getAllKeys()).forEach(data::remove); + data.merge(readData); + if (!(entityByID instanceof ISyncPersistentData)) + return; + ((ISyncPersistentData) entityByID).onPersistentDataUpdated(); + }); + return true; } } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/networking/SimplePacketBase.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/networking/SimplePacketBase.java index 3217e84..4adb134 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/networking/SimplePacketBase.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/networking/SimplePacketBase.java @@ -3,12 +3,10 @@ package nl.requios.effortlessbuilding.create.foundation.networking; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent.Context; -import java.util.function.Supplier; - public abstract class SimplePacketBase { public abstract void write(FriendlyByteBuf buffer); - public abstract void handle(Supplier context); + public abstract boolean handle(Context context); } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/BakedModelRenderHelper.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/BakedModelRenderHelper.java index a3a4d9b..6b68393 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/BakedModelRenderHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/BakedModelRenderHelper.java @@ -2,8 +2,6 @@ package nl.requios.effortlessbuilding.create.foundation.render; import com.jozufozu.flywheel.core.model.ModelUtil; import com.jozufozu.flywheel.core.model.ShadeSeparatedBufferedData; -import com.jozufozu.flywheel.util.Pair; -import com.mojang.blaze3d.vertex.BufferBuilder.RenderedBuffer; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.BlockRenderDispatcher; diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/CachedBufferer.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/CachedBufferer.java index aca56b4..3da0b88 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/CachedBufferer.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/CachedBufferer.java @@ -3,7 +3,6 @@ package nl.requios.effortlessbuilding.create.foundation.render; import com.jozufozu.flywheel.core.PartialModel; import com.jozufozu.flywheel.util.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; -import nl.requios.effortlessbuilding.EffortlessBuildingClient; import nl.requios.effortlessbuilding.create.CreateClient; import nl.requios.effortlessbuilding.create.foundation.render.SuperByteBufferCache.Compartment; import nl.requios.effortlessbuilding.create.foundation.utility.AngleHelper; diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/RenderTypes.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/RenderTypes.java index 825968b..fb46e7c 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/RenderTypes.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/RenderTypes.java @@ -6,16 +6,8 @@ import nl.requios.effortlessbuilding.create.AllSpecialTextures; import nl.requios.effortlessbuilding.create.Create; import net.minecraft.client.renderer.RenderStateShard; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.ShaderInstance; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.world.inventory.InventoryMenu; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.RegisterShadersEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber; - -import java.io.IOException; // TODO 1.17: use custom shaders instead of vanilla ones public class RenderTypes extends RenderStateShard { @@ -79,7 +71,7 @@ public class RenderTypes extends RenderStateShard { private static final RenderType ADDITIVE = RenderType.create(createLayerName("additive"), DefaultVertexFormat.BLOCK, VertexFormat.Mode.QUADS, 256, true, true, RenderType.CompositeState.builder() - .setShaderState(BLOCK_SHADER) + .setShaderState(RENDERTYPE_SOLID_SHADER) .setTextureState(new TextureStateShard(InventoryMenu.BLOCK_ATLAS, false, false)) .setTransparencyState(ADDITIVE_TRANSPARENCY) .setCullState(NO_CULL) diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/ShadowRenderHelper.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/ShadowRenderHelper.java index d81b292..211c789 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/ShadowRenderHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/ShadowRenderHelper.java @@ -2,6 +2,7 @@ package nl.requios.effortlessbuilding.create.foundation.render; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; + import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/SuperByteBuffer.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/SuperByteBuffer.java index 188a749..ece25d2 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/SuperByteBuffer.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/SuperByteBuffer.java @@ -1,27 +1,18 @@ package nl.requios.effortlessbuilding.create.foundation.render; -import java.nio.ByteBuffer; -import java.util.function.IntPredicate; import com.jozufozu.flywheel.api.vertex.ShadedVertexList; import com.jozufozu.flywheel.api.vertex.VertexList; import com.jozufozu.flywheel.backend.ShadersModHandler; import com.jozufozu.flywheel.core.model.ShadeSeparatedBufferedData; import com.jozufozu.flywheel.core.vertex.BlockVertexList; +import com.jozufozu.flywheel.util.Color; import com.jozufozu.flywheel.util.DiffuseLightCalculator; import com.jozufozu.flywheel.util.transform.TStack; import com.jozufozu.flywheel.util.transform.Transform; import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.mojang.math.Matrix3f; -import com.mojang.math.Matrix4f; -import com.mojang.math.Quaternion; -import com.mojang.math.Vector3f; -import com.mojang.math.Vector4f; -import nl.requios.effortlessbuilding.create.foundation.block.render.SpriteShiftEntry; -import nl.requios.effortlessbuilding.create.foundation.utility.Color; - import it.unimi.dsi.fastutil.longs.Long2IntMap; import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; import net.minecraft.client.Minecraft; @@ -32,6 +23,15 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.Mth; import net.minecraft.world.level.Level; +import nl.requios.effortlessbuilding.create.foundation.block.render.SpriteShiftEntry; +import org.joml.Matrix3f; +import org.joml.Matrix4f; +import org.joml.Quaternionf; +import org.joml.Vector3f; +import org.joml.Vector4f; + +import java.nio.ByteBuffer; +import java.util.function.IntPredicate; public class SuperByteBuffer implements Transform, TStack { @@ -96,25 +96,22 @@ public class SuperByteBuffer implements Transform, TStack, TStack, TStack, TStack, TStack, TStack, TStack, TStack { float targetU = u - entry.getOriginal() - .getU0() + entry.getTarget() - .getU0() - + scrollU; + .getU0() + entry.getTarget() + .getU0() + + scrollU; float targetV = v - entry.getOriginal() - .getV0() + entry.getTarget() - .getV0() - + scrollV; + .getV0() + entry.getTarget() + .getV0() + + scrollV; builder.uv(targetU, targetV); }; return this; @@ -393,9 +390,9 @@ public class SuperByteBuffer implements Transform, TStack { float targetU = entry.getTarget() - .getU((SpriteShiftEntry.getUnInterpolatedU(entry.getOriginal(), u) / sheetSize) + uTarget * 16); + .getU((SpriteShiftEntry.getUnInterpolatedU(entry.getOriginal(), u) / sheetSize) + uTarget * 16); float targetV = entry.getTarget() - .getV((SpriteShiftEntry.getUnInterpolatedV(entry.getOriginal(), v) / sheetSize) + vTarget * 16); + .getV((SpriteShiftEntry.getUnInterpolatedV(entry.getOriginal(), v) / sheetSize) + vTarget * 16); builder.uv(targetU, targetV); }; return this; @@ -478,7 +475,7 @@ public class SuperByteBuffer implements Transform, TStack LevelRenderer.getLightColor(world, pos)); } @@ -492,4 +489,4 @@ public class SuperByteBuffer implements Transform, TStack, Cache> caches = new HashMap<>(); public synchronized void registerCompartment(Compartment compartment) { caches.put(compartment, CacheBuilder.newBuilder() + .removalListener(n -> n.getValue().delete()) .build()); } public synchronized void registerCompartment(Compartment compartment, long ticksUntilExpired) { caches.put(compartment, CacheBuilder.newBuilder() .expireAfterAccess(ticksUntilExpired * 50, TimeUnit.MILLISECONDS) + .removalListener(n -> n.getValue().delete()) .build()); } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/SuperRenderTypeBuffer.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/SuperRenderTypeBuffer.java index b586c4a..008ad8d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/SuperRenderTypeBuffer.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/SuperRenderTypeBuffer.java @@ -1,7 +1,10 @@ package nl.requios.effortlessbuilding.create.foundation.render; +import java.util.SortedMap; + import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.VertexConsumer; + import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; import net.minecraft.Util; import net.minecraft.client.renderer.ChunkBufferBuilderPack; @@ -10,8 +13,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.Sheets; import net.minecraft.client.resources.model.ModelBakery; -import java.util.SortedMap; - public class SuperRenderTypeBuffer implements MultiBufferSource { private static final SuperRenderTypeBuffer INSTANCE = new SuperRenderTypeBuffer(); diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/TileEntityRenderHelper.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/TileEntityRenderHelper.java index a3a9bcb..5e17cbf 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/TileEntityRenderHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/render/TileEntityRenderHelper.java @@ -6,11 +6,6 @@ import com.jozufozu.flywheel.config.BackendType; import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld; import com.jozufozu.flywheel.util.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.math.Matrix4f; -import com.mojang.math.Vector4f; -import nl.requios.effortlessbuilding.create.Create; -import nl.requios.effortlessbuilding.create.foundation.utility.AnimationTickHolder; -import nl.requios.effortlessbuilding.create.foundation.utility.RegisteredObjects; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; @@ -19,6 +14,11 @@ import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; +import nl.requios.effortlessbuilding.create.Create; +import nl.requios.effortlessbuilding.create.foundation.utility.AnimationTickHolder; +import nl.requios.effortlessbuilding.create.foundation.utility.RegisteredObjects; +import org.joml.Matrix4f; +import org.joml.Vector4f; import javax.annotation.Nullable; import java.util.Iterator; @@ -36,7 +36,7 @@ public class TileEntityRenderHelper { } public static void renderTileEntities(Level world, @Nullable VirtualRenderWorld renderWorld, - Iterable customRenderTEs, PoseStack ms, @Nullable Matrix4f lightTransform, MultiBufferSource buffer) { + Iterable customRenderTEs, PoseStack ms, @Nullable Matrix4f lightTransform, MultiBufferSource buffer) { renderTileEntities(world, renderWorld, customRenderTEs, ms, lightTransform, buffer, AnimationTickHolder.getPartialTicks()); } @@ -91,8 +91,8 @@ public class TileEntityRenderHelper { private static BlockPos getLightPos(@Nullable Matrix4f lightTransform, BlockPos contraptionPos) { if (lightTransform != null) { Vector4f lightVec = new Vector4f(contraptionPos.getX() + .5f, contraptionPos.getY() + .5f, contraptionPos.getZ() + .5f, 1); - lightVec.transform(lightTransform); - return new BlockPos(lightVec.x(), lightVec.y(), lightVec.z()); + lightVec.mul(lightTransform); + return BlockPos.containing(lightVec.x(), lightVec.y(), lightVec.z()); } else { return contraptionPos; } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/BlockHelper.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/BlockHelper.java index 44df777..6a37500 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/BlockHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/BlockHelper.java @@ -2,9 +2,9 @@ package nl.requios.effortlessbuilding.create.foundation.utility; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.Registry; import net.minecraft.core.SectionPos; import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvents; @@ -20,7 +20,12 @@ import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.GameRules; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.BaseRailBlock; +import net.minecraft.world.level.block.BedBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.IceBlock; +import net.minecraft.world.level.block.SlimeBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; @@ -29,10 +34,8 @@ import net.minecraft.world.level.block.state.properties.SlabType; import net.minecraft.world.level.chunk.LevelChunk; import net.minecraft.world.level.chunk.LevelChunkSection; import net.minecraft.world.level.material.FluidState; -import net.minecraft.world.level.material.Material; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.event.level.BlockEvent; import javax.annotation.Nullable; @@ -181,9 +184,8 @@ public class BlockHelper { .ultraWarm()) return false; - Material material = world.getBlockState(pos.below()) - .getMaterial(); - if (material.blocksMotion() || material.isLiquid()) + BlockState belowState = world.getBlockState(pos.below()); + if (belowState.blocksMotion() || belowState.liquid()) world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState()); return true; } @@ -211,8 +213,8 @@ public class BlockHelper { int idx = chunk.getSectionIndex(target.getY()); LevelChunkSection chunksection = chunk.getSection(idx); if (chunksection == null) { - chunksection = new LevelChunkSection(chunk.getSectionYFromSectionIndex(idx), world.registryAccess() - .registryOrThrow(Registry.BIOME_REGISTRY)); + chunksection = new LevelChunkSection(world.registryAccess() + .registryOrThrow(Registries.BIOME)); chunk.getSections()[idx] = chunksection; } BlockState old = chunksection.setBlockState(SectionPos.sectionRelative(target.getX()), diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/Color.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/Color.java index ed4a220..8fba9e5 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/Color.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/Color.java @@ -1,9 +1,9 @@ package nl.requios.effortlessbuilding.create.foundation.utility; import com.google.common.hash.Hashing; -import com.mojang.math.Vector3f; import net.minecraft.util.Mth; import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; import javax.annotation.Nonnull; import java.util.function.UnaryOperator; diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/CreateRegistry.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/CreateRegistry.java index d9545fb..28646cb 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/CreateRegistry.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/CreateRegistry.java @@ -2,7 +2,6 @@ package nl.requios.effortlessbuilding.create.foundation.utility; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.registries.IForgeRegistry; -import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.create.Create; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/FontHelper.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/FontHelper.java index 092c995..4f18057 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/FontHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/FontHelper.java @@ -2,11 +2,11 @@ package nl.requios.effortlessbuilding.create.foundation.utility; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; -import com.mojang.math.Matrix4f; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; +import org.joml.Matrix4f; import java.text.BreakIterator; import java.util.LinkedList; @@ -71,14 +71,14 @@ public final class FontHelper { } private static int draw(Font font, String p_228078_1_, float p_228078_2_, float p_228078_3_, - int p_228078_4_, Matrix4f p_228078_5_, boolean p_228078_6_) { + int p_228078_4_, Matrix4f p_228078_5_, boolean p_228078_6_) { if (p_228078_1_ == null) { return 0; } else { MultiBufferSource.BufferSource irendertypebuffer$impl = MultiBufferSource.immediate(Tesselator.getInstance() .getBuilder()); int i = font.drawInBatch(p_228078_1_, p_228078_2_, p_228078_3_, p_228078_4_, p_228078_6_, p_228078_5_, - irendertypebuffer$impl, false, 0, LightTexture.FULL_BRIGHT); + irendertypebuffer$impl, Font.DisplayMode.NORMAL, 0, LightTexture.FULL_BRIGHT); irendertypebuffer$impl.endBatch(); return i; } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/LangNumberFormat.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/LangNumberFormat.java index bcf9d41..77ae9e5 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/LangNumberFormat.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/LangNumberFormat.java @@ -17,7 +17,6 @@ public class LangNumberFormat { public void update() { format = NumberFormat.getInstance(Minecraft.getInstance() .getLanguageManager() - .getSelected() .getJavaLocale()); format.setMaximumFractionDigits(2); format.setMinimumFractionDigits(0); diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/VecHelper.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/VecHelper.java index e9ea1d0..e701f22 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/VecHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/VecHelper.java @@ -1,7 +1,5 @@ package nl.requios.effortlessbuilding.create.foundation.utility; -import com.mojang.math.Quaternion; -import com.mojang.math.Vector3f; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; @@ -19,6 +17,8 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.Mirror; import net.minecraft.world.phys.Vec3; +import org.joml.Quaternionf; +import org.joml.Vector3f; import javax.annotation.Nullable; @@ -237,13 +237,12 @@ public class VecHelper { */ Camera ari = Minecraft.getInstance().gameRenderer.getMainCamera(); Vec3 camera_pos = ari.getPosition(); - Quaternion camera_rotation_conj = ari.rotation() - .copy(); - camera_rotation_conj.conj(); + Quaternionf camera_rotation_conj = new Quaternionf(ari.rotation()); + camera_rotation_conj.conjugate(); Vector3f result3f = new Vector3f((float) (camera_pos.x - target.x), (float) (camera_pos.y - target.y), (float) (camera_pos.z - target.z)); - result3f.transform(camera_rotation_conj); + result3f.rotate(camera_rotation_conj); // ----- compensate for view bobbing (if active) ----- // the following code adapted from GameRenderer::applyBobbing (to invert it) @@ -257,18 +256,18 @@ public class VecHelper { float f = distwalked_modified - playerentity.walkDistO; float f1 = -(distwalked_modified + f * partialTicks); float f2 = Mth.lerp(partialTicks, playerentity.oBob, playerentity.bob); - Quaternion q2 = - new Quaternion(Vector3f.XP, Math.abs(Mth.cos(f1 * (float) Math.PI - 0.2F) * f2) * 5.0F, true); - q2.conj(); - result3f.transform(q2); + Quaternionf q2 = + com.mojang.math.Axis.XP.rotationDegrees(Math.abs(Mth.cos(f1 * (float) Math.PI - 0.2F) * f2) * 5.0F); + q2.conjugate(); + result3f.rotate(q2); - Quaternion q1 = new Quaternion(Vector3f.ZP, Mth.sin(f1 * (float) Math.PI) * f2 * 3.0F, true); - q1.conj(); - result3f.transform(q1); + Quaternionf q1 = com.mojang.math.Axis.ZP.rotationDegrees(Mth.sin(f1 * (float) Math.PI) * f2 * 3.0F); + q1.conjugate(); + result3f.rotate(q1); Vector3f bob_translation = new Vector3f((Mth.sin(f1 * (float) Math.PI) * f2 * 0.5F), (-Math.abs(Mth.cos(f1 * (float) Math.PI) * f2)), 0.0f); - bob_translation.setY(-bob_translation.y()); // this is weird but hey, if it works + bob_translation.y = -bob_translation.y(); // this is weird but hey, if it works result3f.add(bob_translation); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/WorldHelper.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/WorldHelper.java index fa26d0e..03489d4 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/WorldHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/WorldHelper.java @@ -1,13 +1,13 @@ package nl.requios.effortlessbuilding.create.foundation.utility; -import net.minecraft.core.Registry; +import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.LevelAccessor; public class WorldHelper { public static ResourceLocation getDimensionID(LevelAccessor world) { return world.registryAccess() - .registryOrThrow(Registry.DIMENSION_TYPE_REGISTRY) + .registryOrThrow(Registries.DIMENSION_TYPE) .getKey(world.dimensionType()); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/ghost/GhostBlockParams.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/ghost/GhostBlockParams.java index 7202e91..e05c7e8 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/ghost/GhostBlockParams.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/ghost/GhostBlockParams.java @@ -4,7 +4,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import nl.requios.effortlessbuilding.create.foundation.utility.Color; -import nl.requios.effortlessbuilding.create.foundation.utility.outliner.Outline; import java.util.function.Supplier; diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/ghost/GhostBlocks.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/ghost/GhostBlocks.java index 6334c95..96c2893 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/ghost/GhostBlocks.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/ghost/GhostBlocks.java @@ -1,7 +1,6 @@ package nl.requios.effortlessbuilding.create.foundation.utility.ghost; import com.mojang.blaze3d.vertex.PoseStack; -import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.create.foundation.render.SuperRenderTypeBuffer; import net.minecraft.util.Mth; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/outliner/Outline.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/outliner/Outline.java index a5d3e8e..898699f 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/outliner/Outline.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/outliner/Outline.java @@ -3,7 +3,6 @@ package nl.requios.effortlessbuilding.create.foundation.utility.outliner; import com.jozufozu.flywheel.util.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.mojang.math.Matrix3f; import nl.requios.effortlessbuilding.create.AllSpecialTextures; import nl.requios.effortlessbuilding.create.foundation.render.RenderTypes; import nl.requios.effortlessbuilding.create.foundation.render.SuperRenderTypeBuffer; @@ -16,6 +15,7 @@ import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.util.Mth; import net.minecraft.world.phys.Vec3; +import org.joml.Matrix3f; import javax.annotation.Nullable; import java.util.Optional; diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/DummyLevelEntityGetter.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/DummyLevelEntityGetter.java index 294fbed..1b53bc6 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/DummyLevelEntityGetter.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/DummyLevelEntityGetter.java @@ -1,5 +1,6 @@ package nl.requios.effortlessbuilding.create.foundation.utility.worldWrappers; +import net.minecraft.util.AbortableIterationConsumer; import net.minecraft.world.level.entity.EntityAccess; import net.minecraft.world.level.entity.EntityTypeTest; import net.minecraft.world.level.entity.LevelEntityGetter; @@ -27,7 +28,7 @@ public class DummyLevelEntityGetter implements LevelEnti } @Override - public void get(EntityTypeTest p_156935_, Consumer p_156936_) { + public void get(EntityTypeTest p_156935_, AbortableIterationConsumer p_156936_) { } @Override @@ -35,7 +36,7 @@ public class DummyLevelEntityGetter implements LevelEnti } @Override - public void get(EntityTypeTest p_156932_, AABB p_156933_, Consumer p_156934_) { + public void get(EntityTypeTest p_156932_, AABB p_156933_, AbortableIterationConsumer p_156934_) { } } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/WrappedServerWorld.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/WrappedServerWorld.java index 9c92219..f1675b8 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/WrappedServerWorld.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/WrappedServerWorld.java @@ -32,10 +32,10 @@ public class WrappedServerWorld extends ServerLevel { public WrappedServerWorld(ServerLevel world) { super(world.getServer(), Util.backgroundExecutor(), world.getServer().storageSource, - (ServerLevelData) world.getLevelData(), world.dimension(), - new LevelStem(world.dimensionTypeRegistration(), world.getChunkSource().getGenerator()), - new DummyStatusListener(), world.isDebug(), world.getBiomeManager().biomeZoomSeed, - Collections.emptyList(), false); + (ServerLevelData) world.getLevelData(), world.dimension(), + new LevelStem(world.dimensionTypeRegistration(), world.getChunkSource().getGenerator()), + new DummyStatusListener(), world.isDebug(), world.getBiomeManager().biomeZoomSeed, + Collections.emptyList(), false, world.getRandomSequences()); this.world = world; } diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/WrappedWorld.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/WrappedWorld.java index 4040b5e..ae8e400 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/WrappedWorld.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/WrappedWorld.java @@ -5,6 +5,7 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.flag.FeatureFlagSet; import net.minecraft.world.item.crafting.RecipeManager; import net.minecraft.world.level.Level; import net.minecraft.world.level.biome.Biome; @@ -36,8 +37,8 @@ public class WrappedWorld extends Level { protected LevelEntityGetter entityGetter = new DummyLevelEntityGetter<>(); public WrappedWorld(Level world) { - super((WritableLevelData) world.getLevelData(), world.dimension(), world.dimensionTypeRegistration(), - world::getProfiler, world.isClientSide, world.isDebug(), 0, 0); + super((WritableLevelData) world.getLevelData(), world.dimension(), world.registryAccess(), world.dimensionTypeRegistration(), + world::getProfiler, world.isClientSide, world.isDebug(), 0, 0); this.world = world; } @@ -110,19 +111,23 @@ public class WrappedWorld extends Level { @Override public void playSeededSound(Player p_220363_, double p_220364_, double p_220365_, double p_220366_, - SoundEvent p_220367_, SoundSource p_220368_, float p_220369_, float p_220370_, long p_220371_) {} + SoundEvent p_220367_, SoundSource p_220368_, float p_220369_, float p_220370_, long p_220371_) {} @Override - public void playSeededSound(Player p_220372_, Entity p_220373_, SoundEvent p_220374_, SoundSource p_220375_, - float p_220376_, float p_220377_, long p_220378_) {} + public void playSeededSound(Player pPlayer, double pX, double pY, double pZ, Holder pSound, + SoundSource pSource, float pVolume, float pPitch, long pSeed) {} + + @Override + public void playSeededSound(Player pPlayer, Entity pEntity, Holder pSound, SoundSource pCategory, + float pVolume, float pPitch, long pSeed) {} @Override public void playSound(@Nullable Player player, double x, double y, double z, SoundEvent soundIn, - SoundSource category, float volume, float pitch) {} + SoundSource category, float volume, float pitch) {} @Override public void playSound(@Nullable Player p_217384_1_, Entity p_217384_2_, SoundEvent p_217384_3_, - SoundSource p_217384_4_, float p_217384_5_, float p_217384_6_) {} + SoundSource p_217384_4_, float p_217384_5_, float p_217384_6_) {} @Override public Entity getEntity(int id) { @@ -247,4 +252,10 @@ public class WrappedWorld extends Level { public int getSectionYFromSectionIndex(int sectionIndex) { return sectionIndex + this.getMinSection(); } + + @Override + public FeatureFlagSet enabledFeatures() { + return world.enabledFeatures(); + } + } diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/DiamondRandomizerBagContainer.java b/src/main/java/nl/requios/effortlessbuilding/gui/DiamondRandomizerBagContainer.java index 8e4c50c..709d60b 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/DiamondRandomizerBagContainer.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/DiamondRandomizerBagContainer.java @@ -141,7 +141,7 @@ public class DiamondRandomizerBagContainer extends AbstractContainerMenu { @Override public void removed(Player player) { super.removed(player); - if (!player.level.isClientSide) { + if (!player.level().isClientSide) { broadcastChanges(); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/DiamondRandomizerBagScreen.java b/src/main/java/nl/requios/effortlessbuilding/gui/DiamondRandomizerBagScreen.java index 520623f..ba3b9c2 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/DiamondRandomizerBagScreen.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/DiamondRandomizerBagScreen.java @@ -1,7 +1,6 @@ package nl.requios.effortlessbuilding.gui; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -26,24 +25,22 @@ public class DiamondRandomizerBagScreen extends AbstractContainerScreen ShaderTypeList.this.y0 && rowTop + rowHeight - 5 < ShaderTypeList.this.y1) - drawString(ms, font, shaderType.name, ShaderTypeList.this.x0 + 8, rowTop + 4, 0xFFFFFF); + guiGraphics.drawString(font, shaderType.name, ShaderTypeList.this.x0 + 8, rowTop + 4, 0xFFFFFF, false); } @Override diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java index 71c5423..bcf17a1 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java @@ -1,39 +1,46 @@ package nl.requios.effortlessbuilding.gui.buildmode; -import com.mojang.blaze3d.vertex.*; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.math.Vector4f; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.Tesselator; +import com.mojang.blaze3d.vertex.VertexFormat; +import net.minecraft.ChatFormatting; +import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.resources.language.I18n; -import net.minecraft.client.KeyMapping; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.core.Direction; -import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.util.RandomSource; -import net.minecraftforge.server.command.TextComponentHelper; import nl.requios.effortlessbuilding.ClientEvents; import nl.requios.effortlessbuilding.EffortlessBuildingClient; +import nl.requios.effortlessbuilding.buildmode.BuildModeEnum; import nl.requios.effortlessbuilding.buildmode.ModeOptions; +import nl.requios.effortlessbuilding.buildmode.ModeOptions.ActionEnum; +import nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum; import nl.requios.effortlessbuilding.create.foundation.item.ItemDescription; import nl.requios.effortlessbuilding.create.foundation.item.TooltipHelper; +import nl.requios.effortlessbuilding.create.foundation.utility.Color; import nl.requios.effortlessbuilding.create.foundation.utility.Components; import nl.requios.effortlessbuilding.create.foundation.utility.Lang; import org.lwjgl.opengl.GL11; import java.util.ArrayList; -import java.util.List; -import static nl.requios.effortlessbuilding.buildmode.ModeOptions.*; - -import nl.requios.effortlessbuilding.buildmode.BuildModeEnum; -import nl.requios.effortlessbuilding.buildmode.ModeOptions.ActionEnum; -import nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum; +import static nl.requios.effortlessbuilding.buildmode.ModeOptions.getBuildSpeed; +import static nl.requios.effortlessbuilding.buildmode.ModeOptions.getCircleStart; +import static nl.requios.effortlessbuilding.buildmode.ModeOptions.getCubeFill; +import static nl.requios.effortlessbuilding.buildmode.ModeOptions.getFill; +import static nl.requios.effortlessbuilding.buildmode.ModeOptions.getLineThickness; +import static nl.requios.effortlessbuilding.buildmode.ModeOptions.getRaisedEdge; /** * Initially from Chisels and Bits by AlgorithmX2 @@ -44,11 +51,11 @@ public class RadialMenu extends Screen { public static final RadialMenu instance = new RadialMenu(); - private final Vector4f radialButtonColor = new Vector4f(0f, 0f, 0f, .5f); - private final Vector4f sideButtonColor = new Vector4f(.5f, .5f, .5f, .5f); - private final Vector4f highlightColor = new Vector4f(.6f, .8f, 1f, .6f); - private final Vector4f selectedColor = new Vector4f(0f, .5f, 1f, .5f); - private final Vector4f highlightSelectedColor = new Vector4f(0.2f, .7f, 1f, .7f); + private final Color radialButtonColor = new Color(0f, 0f, 0f, .5f); + private final Color sideButtonColor = new Color(.5f, .5f, .5f, .5f); + private final Color highlightColor = new Color(.6f, .8f, 1f, .6f); + private final Color selectedColor = new Color(0f, .5f, 1f, .5f); + private final Color highlightSelectedColor = new Color(0.2f, .7f, 1f, .7f); private final int whiteTextColor = 0xffffffff; private final int watermarkTextColor = 0x88888888; @@ -95,9 +102,10 @@ public class RadialMenu extends Screen { } @Override - public void render(PoseStack ms, final int mouseX, final int mouseY, final float partialTicks) { + public void render(GuiGraphics guiGraphics, final int mouseX, final int mouseY, final float partialTicks) { BuildModeEnum currentBuildMode = EffortlessBuildingClient.BUILD_MODES.getBuildMode(); + PoseStack ms = guiGraphics.pose(); ms.pushPose(); ms.translate(0, 0, 200); @@ -107,11 +115,11 @@ public class RadialMenu extends Screen { final int startColor = (int) (visibility * 98) << 24; final int endColor = (int) (visibility * 128) << 24; - fillGradient(ms, 0, 0, width, height, startColor, endColor); + guiGraphics.fillGradient(0, 0, width, height, startColor, endColor); - RenderSystem.disableTexture(); RenderSystem.enableBlend(); RenderSystem.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); + RenderSystem.setShader(GameRenderer::getPositionColorShader); final Tesselator tessellator = Tesselator.getInstance(); final BufferBuilder buffer = tessellator.getBuilder(); @@ -182,11 +190,10 @@ public class RadialMenu extends Screen { tessellator.end(); RenderSystem.disableBlend(); - RenderSystem.enableTexture(); - drawIcons(ms, middleX, middleY, modes, buttons); + drawIcons(guiGraphics, middleX, middleY, modes, buttons); - drawTexts(ms, currentBuildMode, middleX, middleY, modes, buttons, options, mouseXX, mouseYY); + drawTexts(guiGraphics, currentBuildMode, middleX, middleY, modes, buttons, options, mouseXX, mouseYY); ms.popPose(); } @@ -221,10 +228,10 @@ public class RadialMenu extends Screen { final boolean isSelected = currentBuildMode.ordinal() == i; final boolean isMouseInQuad = inTriangle(x1m1, y1m1, x2m2, y2m2, x2m1, y2m1, mouseXCenter, mouseYCenter) - || inTriangle(x1m1, y1m1, x1m2, y1m2, x2m2, y2m2, mouseXCenter, mouseYCenter); + || inTriangle(x1m1, y1m1, x1m2, y1m2, x2m2, y2m2, mouseXCenter, mouseYCenter); final boolean isHighlighted = beginRadians <= mouseRadians && mouseRadians <= endRadians && isMouseInQuad; - Vector4f color = radialButtonColor; + Color color = radialButtonColor; if (isSelected) color = selectedColor; if (isHighlighted) color = highlightColor; if (isSelected && isHighlighted) color = highlightSelectedColor; @@ -234,10 +241,10 @@ public class RadialMenu extends Screen { switchTo = menuRegion.mode; } - buffer.vertex(middleX + x1m1, middleY + y1m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex(); - buffer.vertex(middleX + x2m1, middleY + y2m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex(); - buffer.vertex(middleX + x2m2, middleY + y2m2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex(); - buffer.vertex(middleX + x1m2, middleY + y1m2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex(); + buffer.vertex(middleX + x1m1, middleY + y1m1, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex(); + buffer.vertex(middleX + x2m1, middleY + y2m1, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex(); + buffer.vertex(middleX + x2m2, middleY + y2m2, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex(); + buffer.vertex(middleX + x1m2, middleY + y1m2, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex(); //Category line color = menuRegion.mode.category.color; @@ -248,10 +255,10 @@ public class RadialMenu extends Screen { final double y1m3 = Math.sin(beginRadians + fragment) * categoryLineOuterEdge; final double y2m3 = Math.sin(endRadians - fragment) * categoryLineOuterEdge; - buffer.vertex(middleX + x1m1, middleY + y1m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex(); - buffer.vertex(middleX + x2m1, middleY + y2m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex(); - buffer.vertex(middleX + x2m3, middleY + y2m3, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex(); - buffer.vertex(middleX + x1m3, middleY + y1m3, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex(); + buffer.vertex(middleX + x1m1, middleY + y1m1, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex(); + buffer.vertex(middleX + x2m1, middleY + y2m1, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex(); + buffer.vertex(middleX + x2m3, middleY + y2m3, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex(); + buffer.vertex(middleX + x1m3, middleY + y1m3, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex(); } } } @@ -263,15 +270,15 @@ public class RadialMenu extends Screen { boolean isSelected = btn.action == getBuildSpeed() || - btn.action == getFill() || - btn.action == getCubeFill() || - btn.action == getRaisedEdge() || - btn.action == getLineThickness() || - btn.action == getCircleStart() || - btn.action == EffortlessBuildingClient.BUILD_SETTINGS.getReplaceModeActionEnum() || - btn.action == ActionEnum.TOGGLE_PROTECT_TILE_ENTITIES && EffortlessBuildingClient.BUILD_SETTINGS.shouldProtectTileEntities(); + btn.action == getFill() || + btn.action == getCubeFill() || + btn.action == getRaisedEdge() || + btn.action == getLineThickness() || + btn.action == getCircleStart() || + btn.action == EffortlessBuildingClient.BUILD_SETTINGS.getReplaceModeActionEnum() || + btn.action == ActionEnum.TOGGLE_PROTECT_TILE_ENTITIES && EffortlessBuildingClient.BUILD_SETTINGS.shouldProtectTileEntities(); - Vector4f color = sideButtonColor; + Color color = sideButtonColor; if (isSelected) color = selectedColor; if (isHighlighted) color = highlightColor; if (isSelected && isHighlighted) color = highlightSelectedColor; @@ -281,27 +288,25 @@ public class RadialMenu extends Screen { doAction = btn.action; } - buffer.vertex(middleX + btn.x1, middleY + btn.y1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex(); - buffer.vertex(middleX + btn.x1, middleY + btn.y2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex(); - buffer.vertex(middleX + btn.x2, middleY + btn.y2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex(); - buffer.vertex(middleX + btn.x2, middleY + btn.y1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex(); + buffer.vertex(middleX + btn.x1, middleY + btn.y1, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex(); + buffer.vertex(middleX + btn.x1, middleY + btn.y2, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex(); + buffer.vertex(middleX + btn.x2, middleY + btn.y2, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex(); + buffer.vertex(middleX + btn.x2, middleY + btn.y1, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex(); } } - private void drawIcons(PoseStack ms, double middleX, double middleY, + private void drawIcons(GuiGraphics guiGraphics, double middleX, double middleY, ArrayList modes, ArrayList buttons) { + PoseStack ms = guiGraphics.pose(); ms.pushPose(); - RenderSystem.enableTexture(); - RenderSystem.setShader(GameRenderer::getPositionColorTexShader); - RenderSystem.setShaderColor(1f, 1f, 1f, 1f); //Draw buildmode icons for (final MenuRegion menuRegion : modes) { final double x = (menuRegion.x1 + menuRegion.x2) * 0.5 * (ringOuterEdge * 0.55 + 0.45 * ringInnerEdge); final double y = (menuRegion.y1 + menuRegion.y2) * 0.5 * (ringOuterEdge * 0.55 + 0.45 * ringInnerEdge); - - menuRegion.mode.icon.render(ms, (int) (middleX + x - 8), (int) (middleY + y - 8)); + + menuRegion.mode.icon.render(guiGraphics, (int) (middleX + x - 8), (int) (middleY + y - 8)); } //Draw action icons @@ -310,28 +315,28 @@ public class RadialMenu extends Screen { final double x = (button.x1 + button.x2) / 2 + 0.01; final double y = (button.y1 + button.y2) / 2 + 0.01; - button.action.icon.render(ms, (int) (middleX + x - 8), (int) (middleY + y - 8)); + button.action.icon.render(guiGraphics, (int) (middleX + x - 8), (int) (middleY + y - 8)); } ms.popPose(); } - private void drawTexts(PoseStack ms, BuildModeEnum currentBuildMode, double middleX, double middleY, ArrayList modes, ArrayList buttons, OptionEnum[] options, int mouseX, int mouseY) { + private void drawTexts(GuiGraphics guiGraphics, BuildModeEnum currentBuildMode, double middleX, double middleY, ArrayList modes, ArrayList buttons, OptionEnum[] options, int mouseX, int mouseY) { //font.drawStringWithShadow("Actions", (int) (middleX - buttonDistance - 13) - font.getStringWidth("Actions") * 0.5f, (int) middleY - 38, 0xffffffff); //Draw option strings for (int i = 0; i < currentBuildMode.options.length; i++) { OptionEnum option = options[i]; - font.drawShadow(ms, I18n.get(option.name), (int) (middleX + buttonDistance - 9), (int) middleY - 37 + i * 39, optionTextColor); + guiGraphics.drawString(font, I18n.get(option.name), (int) (middleX + buttonDistance - 9), (int) middleY - 37 + i * 39, optionTextColor); } String credits = "Effortless Building"; - font.drawShadow(ms, credits, width - font.width(credits) - 4, height - 10, watermarkTextColor); + guiGraphics.drawString(font, credits, width - font.width(credits) - 4, height - 10, watermarkTextColor); //Draw power level info String powerLevelValue = minecraft.player.isCreative() ? "Creative" : String.valueOf(EffortlessBuildingClient.POWER_LEVEL.getPowerLevel()); String powerLevelText = I18n.get("key.effortlessbuilding.power_level") + ": " + powerLevelValue; - font.drawShadow(ms, powerLevelText, width - font.width(powerLevelText) - 4, height - 22, minecraft.player.isCreative() ? watermarkTextColor : ChatFormatting.DARK_PURPLE.getColor()); + guiGraphics.drawString(font, powerLevelText, width - font.width(powerLevelText) - 4, height - 22, minecraft.player.isCreative() ? watermarkTextColor : ChatFormatting.DARK_PURPLE.getColor()); //if hover over power level info, show tooltip if (mouseX >= width - font.width(powerLevelText) - 14 && mouseX <= width && mouseY >= height - 24 && mouseY <= height) { @@ -354,7 +359,7 @@ public class RadialMenu extends Screen { tooltip.addAll(TooltipHelper.cutTextComponent(Components.translatable("key.effortlessbuilding.next_power_level_how"), ChatFormatting.GRAY, ChatFormatting.WHITE)); } - renderComponentTooltip(ms, tooltip, mouseX, mouseY); + guiGraphics.renderComponentTooltip(font, tooltip, mouseX, mouseY); } @@ -375,11 +380,11 @@ public class RadialMenu extends Screen { fixed_x -= font.width(text) / 2; } - font.drawShadow(ms, text, (int) middleX + fixed_x, (int) middleY + fixed_y, whiteTextColor); + guiGraphics.drawString(font, text, (int) middleX + fixed_x, (int) middleY + fixed_y, whiteTextColor); //Draw description text = I18n.get(menuRegion.mode.getDescriptionKey()); - font.drawShadow(ms, text, (int) middleX - font.width(text) / 2f, (int) middleY + buildModeDescriptionHeight, descriptionTextColor); + guiGraphics.drawString(font, text, (int) ((int) middleX - font.width(text) / 2f), (int) middleY + buildModeDescriptionHeight, descriptionTextColor); } } @@ -400,13 +405,14 @@ public class RadialMenu extends Screen { //Add keybind in brackets var keybind = findKeybind(button); - if (keybind != null) tooltip.add(Lang.translateDirect("tooltip.keybind", keybind.withStyle(ChatFormatting.GRAY)).withStyle(ChatFormatting.DARK_GRAY)); - renderComponentTooltip(ms, tooltip, mouseX, mouseY); + if (keybind != null) + tooltip.add(Lang.translateDirect("tooltip.keybind", keybind.withStyle(ChatFormatting.GRAY)).withStyle(ChatFormatting.DARK_GRAY)); + guiGraphics.renderComponentTooltip(font, tooltip, mouseX, mouseY); } } } - private MutableComponent findKeybind(MenuButton button){ + private MutableComponent findKeybind(MenuButton button) { int keybindingIndex = -1; if (button.action == ActionEnum.OPEN_MODIFIER_SETTINGS) keybindingIndex = 1; @@ -476,7 +482,7 @@ public class RadialMenu extends Screen { public static void playRadialMenuSound() { final float volume = 0.1f; if (volume >= 0.0001f) { - SimpleSoundInstance sound = new SimpleSoundInstance(SoundEvents.UI_BUTTON_CLICK, SoundSource.MASTER, volume, + SimpleSoundInstance sound = new SimpleSoundInstance(SoundEvents.UI_BUTTON_CLICK.get(), SoundSource.MASTER, volume, 1.0f, RandomSource.create(), Minecraft.getInstance().player.blockPosition()); Minecraft.getInstance().getSoundManager().play(sound); } diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArrayEntry.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArrayEntry.java index d442b93..131eb28 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArrayEntry.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArrayEntry.java @@ -1,8 +1,8 @@ package nl.requios.effortlessbuilding.gui.buildmodifier; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -13,7 +13,6 @@ import nl.requios.effortlessbuilding.buildmodifier.BaseModifier; import nl.requios.effortlessbuilding.create.foundation.gui.widget.ScrollInput; import nl.requios.effortlessbuilding.gui.elements.LabeledScrollInput; import nl.requios.effortlessbuilding.utilities.MathHelper; -import nl.requios.effortlessbuilding.systems.PowerLevel; import java.util.Vector; @@ -60,25 +59,25 @@ public class ArrayEntry extends BaseModifierEntry { } @Override - public void render(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) { - super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks); + public void render(GuiGraphics guiGraphics, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) { + super.render(guiGraphics, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks); //draw offset inputs for (int i = 0; i < 3; i++) { - offsetInputs.get(i).x = left + 49 + 20 * i; - offsetInputs.get(i).y = top + 19; - offsetInputs.get(i).render(ms, mouseX, mouseY, partialTicks); + offsetInputs.get(i).setX(left + 49 + 20 * i); + offsetInputs.get(i).setY(top + 19); + offsetInputs.get(i).render(guiGraphics, mouseX, mouseY, partialTicks); } //draw count input - countInput.x = left + 49; - countInput.y = top + 41; - countInput.render(ms, mouseX, mouseY, partialTicks); + countInput.setX(left + 49); + countInput.setY(top + 41); + countInput.render(guiGraphics, mouseX, mouseY, partialTicks); //draw reach label - reachLabel.x = right - 8 - getFont().width(reachLabel.text); - reachLabel.y = top + 24; - reachLabel.render(ms, mouseX, mouseY, partialTicks); + reachLabel.setX(right - 8 - getFont().width(reachLabel.text)); + reachLabel.setY(top + 24); + reachLabel.render(guiGraphics, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java index b662b3f..1adce87 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java @@ -1,18 +1,11 @@ package nl.requios.effortlessbuilding.gui.buildmodifier; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import nl.requios.effortlessbuilding.AllGuiTextures; -import nl.requios.effortlessbuilding.AllIcons; import nl.requios.effortlessbuilding.buildmodifier.BaseModifier; -import nl.requios.effortlessbuilding.create.foundation.gui.AbstractSimiScreen; -import nl.requios.effortlessbuilding.create.foundation.gui.widget.BoxWidget; -import nl.requios.effortlessbuilding.create.foundation.gui.widget.ElementWidget; -import nl.requios.effortlessbuilding.create.foundation.gui.widget.IconButton; import nl.requios.effortlessbuilding.create.foundation.gui.widget.Label; import nl.requios.effortlessbuilding.create.foundation.utility.Components; -import nl.requios.effortlessbuilding.gui.elements.GuiCollapsibleScrollEntry; -import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane; import nl.requios.effortlessbuilding.gui.elements.MiniButton; public abstract class BaseModifierEntry extends ModifiersScreenList.Entry { @@ -87,41 +80,39 @@ public abstract class BaseModifierEntry extends Modifier } @Override - public void render(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) { + public void render(GuiGraphics guiGraphics, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) { left = x + width / 2 - BACKGROUND_WIDTH / 2; right = x + width / 2 + BACKGROUND_WIDTH / 2; top = y; bottom = y + BACKGROUND_HEIGHT; - background.render(ms, left, top, screen); + background.render(guiGraphics, left, top); - enableButton.x = left + 4; - enableButton.y = top + 3; - enableButton.render(ms, mouseX, mouseY, partialTicks); + enableButton.setX(left + 4); + enableButton.setY(top + 3); + enableButton.render(guiGraphics, mouseX, mouseY, partialTicks); if (modifier.enabled) - AllGuiTextures.CHECKMARK.render(ms, left + 5, top + 3, screen); + AllGuiTextures.CHECKMARK.render(guiGraphics, left + 5, top + 3); - nameLabel.x = left + 18; - nameLabel.y = top + 4; - nameLabel.render(ms, mouseX, mouseY, partialTicks); + nameLabel.setX(left + 18); + nameLabel.setY(top + 4); + nameLabel.render(guiGraphics, mouseX, mouseY, partialTicks); moveUpButton.visible = screen.canMoveUp(this); moveDownButton.visible = screen.canMoveDown(this); - moveUpButton.x = right - 31; - moveUpButton.y = top + 3; - moveUpButton.render(ms, mouseX, mouseY, partialTicks); + moveUpButton.setX(right - 31); + moveUpButton.setY(top + 3); + moveUpButton.render(guiGraphics, mouseX, mouseY, partialTicks); - moveDownButton.x = right - 22; - moveDownButton.y = top + 3; - moveDownButton.render(ms, mouseX, mouseY, partialTicks); + moveDownButton.setX(right - 22); + moveDownButton.setY(top + 3); + moveDownButton.render(guiGraphics, mouseX, mouseY, partialTicks); - removeButton.x = right - 13; - removeButton.y = top + 3; - removeButton.render(ms, mouseX, mouseY, partialTicks); - - super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks); + removeButton.setX(right - 13); + removeButton.setY(top + 3); + removeButton.render(guiGraphics, mouseX, mouseY, partialTicks); } public void onValueChanged() { diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorEntry.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorEntry.java index b109b48..3af092c 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorEntry.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorEntry.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.gui.buildmodifier; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; @@ -16,7 +16,6 @@ import nl.requios.effortlessbuilding.create.foundation.gui.widget.ScrollInput; import nl.requios.effortlessbuilding.create.foundation.utility.Components; import nl.requios.effortlessbuilding.gui.elements.LabeledScrollInput; import nl.requios.effortlessbuilding.utilities.MathHelper; -import nl.requios.effortlessbuilding.systems.PowerLevel; import java.text.DecimalFormat; import java.util.Vector; @@ -136,49 +135,49 @@ public class MirrorEntry extends BaseModifierEntry { } @Override - public void render(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) { - super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks); + public void render(GuiGraphics guiGraphics, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) { + super.render(guiGraphics, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks); //draw position inputs for (int i = 0; i < 3; i++) { ScrollInput input = positionInputs.get(i); - input.x = left + 49 + 38 * i; - input.y = top + 19; - input.render(ms, mouseX, mouseY, partialTicks); + input.setX(left + 49 + 38 * i); + input.setY(top + 19); + input.render(guiGraphics, mouseX, mouseY, partialTicks); } //draw player position button - playerPositionButton.x = left + 163; - playerPositionButton.y = top + 19; - playerPositionButton.render(ms, mouseX, mouseY, partialTicks); + playerPositionButton.setX(left + 163); + playerPositionButton.setY(top + 19); + playerPositionButton.render(guiGraphics, mouseX, mouseY, partialTicks); //draw toggle offset button - toggleOffsetButton.x = left + 183; - toggleOffsetButton.y = top + 19; - toggleOffsetButton.render(ms, mouseX, mouseY, partialTicks); + toggleOffsetButton.setX(left + 183); + toggleOffsetButton.setY(top + 19); + toggleOffsetButton.render(guiGraphics, mouseX, mouseY, partialTicks); //draw axis buttons for (int i = 0; i < 3; i++) { IconButton button = axisButtons.get(i); - button.x = left + 49 + 18 * i; - button.y = top + 41; - button.render(ms, mouseX, mouseY, partialTicks); + button.setX(left + 49 + 18 * i); + button.setY(top + 41); + button.render(guiGraphics, mouseX, mouseY, partialTicks); } //draw radius input - radiusInput.x = left + 134; - radiusInput.y = top + 41; - radiusInput.render(ms, mouseX, mouseY, partialTicks); + radiusInput.setX(left + 134); + radiusInput.setY(top + 41); + radiusInput.render(guiGraphics, mouseX, mouseY, partialTicks); //draw show lines button - showLinesButton.x = left + 163; - showLinesButton.y = top + 41; - showLinesButton.render(ms, mouseX, mouseY, partialTicks); + showLinesButton.setX(left + 163); + showLinesButton.setY(top + 41); + showLinesButton.render(guiGraphics, mouseX, mouseY, partialTicks); //draw show areas button - showAreasButton.x = left + 183; - showAreasButton.y = top + 41; - showAreasButton.render(ms, mouseX, mouseY, partialTicks); + showAreasButton.setX(left + 183); + showAreasButton.setY(top + 41); + showAreasButton.render(guiGraphics, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreen.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreen.java index c322712..4c7dc20 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreen.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreen.java @@ -1,13 +1,11 @@ package nl.requios.effortlessbuilding.gui.buildmodifier; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import nl.requios.effortlessbuilding.ClientEvents; -import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.EffortlessBuildingClient; import nl.requios.effortlessbuilding.buildmodifier.Array; import nl.requios.effortlessbuilding.buildmodifier.BaseModifier; @@ -17,14 +15,9 @@ import nl.requios.effortlessbuilding.create.foundation.gui.AbstractSimiScreen; import nl.requios.effortlessbuilding.create.foundation.gui.AllIcons; import nl.requios.effortlessbuilding.create.foundation.gui.widget.BoxWidget; import nl.requios.effortlessbuilding.create.foundation.utility.Components; -import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane; -import nl.requios.effortlessbuilding.network.PacketHandler; import javax.annotation.Nonnull; import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; @OnlyIn(Dist.CLIENT) public class ModifiersScreen extends AbstractSimiScreen { @@ -152,7 +145,7 @@ public class ModifiersScreen extends AbstractSimiScreen { } @Override - protected void renderWindow(PoseStack ms, int mouseX, int mouseY, float partialTicks) { + protected void renderWindow(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { } diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreenList.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreenList.java index dffb2cc..e91efae 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreenList.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreenList.java @@ -2,9 +2,9 @@ package nl.requios.effortlessbuilding.gui.buildmodifier; import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.ObjectSelectionList; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.network.chat.Component; @@ -30,30 +30,30 @@ public class ModifiersScreenList extends ObjectSelectionList= this.y0 && j1 <= this.y1) { - renderItemForeground(pPoseStack, pMouseX, pMouseY, pPartialTick, i1, i, j1, j, k); + renderItemForeground(guiGraphics, pMouseX, pMouseY, pPartialTick, i1, i, j1, j, k); } } } - protected void renderItemForeground(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick, int pIndex, int pLeft, int pTop, int pWidth, int pHeight) { + protected void renderItemForeground(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTick, int pIndex, int pLeft, int pTop, int pWidth, int pHeight) { Entry e = this.getEntry(pIndex); - e.renderForeground(pPoseStack, pIndex, pTop, pLeft, pWidth, pHeight, pMouseX, pMouseY, Objects.equals(this.getHovered(), e), pPartialTick); + e.renderForeground(guiGraphics, pIndex, pTop, pLeft, pWidth, pHeight, pMouseX, pMouseY, Objects.equals(this.getHovered(), e), pPartialTick); } @Override @@ -146,14 +146,14 @@ public class ModifiersScreenList extends ObjectSelectionList tooltip = simiWidget.getToolTip(); if (tooltip.isEmpty()) continue; - int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.x; - int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.y; - screen.renderComponentTooltip(ms, tooltip, ttx, tty); + int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.getX(); + int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.getY(); + guiGraphics.renderComponentTooltip(getFont(), tooltip, ttx, tty); } } } diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorEntry.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorEntry.java index 2e04841..31a7748 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorEntry.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorEntry.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.gui.buildmodifier; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; @@ -16,7 +16,6 @@ import nl.requios.effortlessbuilding.create.foundation.gui.widget.ScrollInput; import nl.requios.effortlessbuilding.create.foundation.utility.Components; import nl.requios.effortlessbuilding.gui.elements.LabeledScrollInput; import nl.requios.effortlessbuilding.utilities.MathHelper; -import nl.requios.effortlessbuilding.systems.PowerLevel; import java.text.DecimalFormat; import java.util.Vector; @@ -142,51 +141,51 @@ public class RadialMirrorEntry extends BaseModifierEntry { } @Override - public void render(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) { - super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks); + public void render(GuiGraphics guiGraphics, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) { + super.render(guiGraphics, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks); //draw position inputs for (int i = 0; i < 3; i++) { ScrollInput input = positionInputs.get(i); - input.x = left + 49 + 38 * i; - input.y = top + 19; - input.render(ms, mouseX, mouseY, partialTicks); + input.setX(left + 49 + 38 * i); + input.setY(top + 19); + input.render(guiGraphics, mouseX, mouseY, partialTicks); } //draw player position button - playerPositionButton.x = left + 163; - playerPositionButton.y = top + 19; - playerPositionButton.render(ms, mouseX, mouseY, partialTicks); + playerPositionButton.setX(left + 163); + playerPositionButton.setY(top + 19); + playerPositionButton.render(guiGraphics, mouseX, mouseY, partialTicks); //draw toggle offset button - toggleOffsetButton.x = left + 183; - toggleOffsetButton.y = top + 19; - toggleOffsetButton.render(ms, mouseX, mouseY, partialTicks); + toggleOffsetButton.setX(left + 183); + toggleOffsetButton.setY(top + 19); + toggleOffsetButton.render(guiGraphics, mouseX, mouseY, partialTicks); //draw slices input - slicesInput.x = left + 49; - slicesInput.y = top + 41; - slicesInput.render(ms, mouseX, mouseY, partialTicks); + slicesInput.setX(left + 49); + slicesInput.setY(top + 41); + slicesInput.render(guiGraphics, mouseX, mouseY, partialTicks); //draw alternate button - alternateButton.x = left + 78; - alternateButton.y = top + 41; - alternateButton.render(ms, mouseX, mouseY, partialTicks); + alternateButton.setX(left + 78); + alternateButton.setY(top + 41); + alternateButton.render(guiGraphics, mouseX, mouseY, partialTicks); //draw radius input - radiusInput.x = left + 134; - radiusInput.y = top + 41; - radiusInput.render(ms, mouseX, mouseY, partialTicks); + radiusInput.setX(left + 134); + radiusInput.setY(top + 41); + radiusInput.render(guiGraphics, mouseX, mouseY, partialTicks); //draw show lines button - showLinesButton.x = left + 163; - showLinesButton.y = top + 41; - showLinesButton.render(ms, mouseX, mouseY, partialTicks); + showLinesButton.setX(left + 163); + showLinesButton.setY(top + 41); + showLinesButton.render(guiGraphics, mouseX, mouseY, partialTicks); //draw show areas button - showAreasButton.x = left + 183; - showAreasButton.y = top + 41; - showAreasButton.render(ms, mouseX, mouseY, partialTicks); + showAreasButton.setX(left + 183); + showAreasButton.setY(top + 41); + showAreasButton.render(guiGraphics, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java index 917b58d..3ed6b88 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java @@ -1,8 +1,11 @@ package nl.requios.effortlessbuilding.gui.elements; -import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; +import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraftforge.client.gui.ScreenUtils; @@ -18,7 +21,7 @@ public class GuiCheckBoxFixed extends Button { public GuiCheckBoxFixed(int xPos, int yPos, String displayString, boolean isChecked) { super(xPos, yPos, Minecraft.getInstance().font.width(displayString) + 2 + 11, 11, Component.literal(displayString), b -> { - }); + }, DEFAULT_NARRATION); this.isChecked = isChecked; this.boxWidth = 11; this.height = 11; @@ -26,25 +29,25 @@ public class GuiCheckBoxFixed extends Button { } @Override - public void renderButton(PoseStack ms, int mouseX, int mouseY, float partial) { - if (this.visible) { - Minecraft mc = Minecraft.getInstance(); - this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.boxWidth && mouseY < this.y + this.height; - ScreenUtils.blitWithBorder(ms, WIDGETS_LOCATION, this.x, this.y, 0, 46, this.boxWidth, this.height, 200, 20, 2, 3, 2, 2, this.getBlitOffset()); - this.renderBg(ms, mc, mouseX, mouseY); - int color = 14737632; + public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partial) { + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderTexture(0, WIDGETS_LOCATION); + //Is deprecated but still works + ScreenUtils.blitWithBorder(guiGraphics, this.getX(), this.getY(), 0, 46, this.boxWidth, this.height, 200, 20, 2, 3, 2, 2, 0); + int color = 14737632; - if (packedFGColor != 0) { - color = packedFGColor; - } else if (!this.active) { - color = 10526880; - } - - if (this.isChecked) - drawCenteredString(ms, mc.font, "x", this.x + this.boxWidth / 2 + 1, this.y + 1, 14737632); - - drawString(ms, mc.font, getMessage(), this.x + this.boxWidth + 2, this.y + 2, color); + if (packedFGColor != 0) { + color = packedFGColor; + } else if (!this.active) { + color = 10526880; } + + Font font = Minecraft.getInstance().font; + + if (this.isChecked) + guiGraphics.drawCenteredString(font, "x", this.getX() + this.boxWidth / 2 + 1, this.getY() + 1, 14737632); + + guiGraphics.drawString(font, getMessage(), this.getX() + this.boxWidth + 2, this.getY() + 2, color, false); } @Override diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCollapsibleScrollEntry.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCollapsibleScrollEntry.java index 6340471..7a63add 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCollapsibleScrollEntry.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCollapsibleScrollEntry.java @@ -1,11 +1,10 @@ package nl.requios.effortlessbuilding.gui.elements; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.components.Widget; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.components.AbstractWidget; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -28,7 +27,7 @@ public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScroll } @Override - public void init(List renderables) { + public void init(List renderables) { left = scrollPane.getWidth() / 2 - 140; right = scrollPane.getWidth() / 2 + 140; top = scrollPane.getHeight() / 2 - 100; @@ -40,7 +39,7 @@ public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScroll } @Override - public void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY) { + public void drawTooltip(GuiGraphics guiGraphics, Screen guiScreen, int mouseX, int mouseY) { } @Override diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java index 1a47a6b..9cf44ed 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java @@ -1,7 +1,6 @@ package nl.requios.effortlessbuilding.gui.elements; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.components.Button; import net.minecraft.resources.ResourceLocation; @@ -28,7 +27,7 @@ public class GuiIconButton extends Button { } public GuiIconButton(int x, int y, int width, int height, int iconX, int iconY, int iconWidth, int iconHeight, int iconAltX, int iconAltY, ResourceLocation resourceLocation, Button.OnPress onPress) { - super(x, y, width, height, Component.empty(), onPress); + super(x, y, width, height, Component.empty(), onPress, DEFAULT_NARRATION); this.iconX = iconX; this.iconY = iconY; this.iconWidth = iconWidth; @@ -51,29 +50,24 @@ public class GuiIconButton extends Button { } @Override - public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) { - super.render(ms, mouseX, mouseY, partialTicks); - if (this.visible) { - this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height; - RenderSystem.setShaderTexture(0, this.resourceLocation); - int currentIconX = this.iconX; - int currentIconY = this.iconY; + public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { + int currentIconX = this.iconX; + int currentIconY = this.iconY; - if (useAltIcon) { - currentIconX += iconAltX; - currentIconY += iconAltY; - } - - //Draws a textured rectangle at the current z-value. Used to be drawTexturedModalRect in Gui. - this.blit(ms, this.x, this.y, currentIconX, currentIconY, this.iconWidth, this.iconHeight); + if (useAltIcon) { + currentIconX += iconAltX; + currentIconY += iconAltY; } + + //Draws a textured rectangle at the current z-value. Used to be drawTexturedModalRect in Gui. + guiGraphics.blit(resourceLocation, this.getX(), this.getY(), currentIconX, currentIconY, this.iconWidth, this.iconHeight); } - public void drawTooltip(PoseStack ms, Screen screen, int mouseX, int mouseY) { - boolean flag = mouseX >= x && mouseX < x + width && mouseY >= y && mouseY < y + height; + public void drawTooltip(GuiGraphics guiGraphics, Screen screen, int mouseX, int mouseY) { + boolean flag = mouseX >= getX() && mouseX < getX() + width && mouseY >= getY() && mouseY < getY() + height; if (flag) { - screen.renderComponentTooltip(ms, tooltip, mouseX - 10, mouseY + 25); + guiGraphics.renderComponentTooltip(screen.getMinecraft().font, tooltip, mouseX - 10, mouseY + 25); } } } diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java index df500ae..986d2a6 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java @@ -1,20 +1,18 @@ package nl.requios.effortlessbuilding.gui.elements; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.client.gui.GuiComponent; -import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.components.Widget; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.components.EditBox; -import net.minecraft.client.gui.components.Button; -import net.minecraft.network.chat.Component; import net.minecraft.ChatFormatting; +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.client.gui.components.Renderable; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.ParametersAreNonnullByDefault; -import java.awt.*; import java.text.DecimalFormat; import java.text.ParseException; import java.util.ArrayList; @@ -24,7 +22,7 @@ import java.util.List; @OnlyIn(Dist.CLIENT) @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -public class GuiNumberField extends GuiComponent { +public class GuiNumberField { public int x, y, width, height; public int buttonWidth = 10; @@ -34,27 +32,27 @@ public class GuiNumberField extends GuiComponent { List tooltip = new ArrayList<>(); - public GuiNumberField(Font font, List renderables, int x, int y, int width, int height) { + public GuiNumberField(Font font, List renderables, int x, int y, int width, int height) { this.x = x; this.y = y; this.width = width; this.height = height; textField = new EditBox(font, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2, Component.empty()); - minusButton = new Button(x, y - 1, buttonWidth, height + 2, Component.literal("-"), button -> { + minusButton = Button.builder(Component.literal("-"), button -> { float valueChanged = 1f; if (Screen.hasControlDown()) valueChanged = 5f; if (Screen.hasShiftDown()) valueChanged = 10f; setNumber(getNumber() - valueChanged); - }); - plusButton = new Button(x + width - buttonWidth, y - 1, buttonWidth, height + 2, Component.literal("+"), button -> { + }).bounds(x, y - 1, buttonWidth, height + 2).build(); + plusButton = Button.builder(Component.literal("+"), button -> { float valueChanged = 1f; if (Screen.hasControlDown()) valueChanged = 5f; if (Screen.hasShiftDown()) valueChanged = 10f; setNumber(getNumber() + valueChanged); - }); + }).bounds(x + width - buttonWidth, y - 1, buttonWidth, height + 2).build(); renderables.add(minusButton); renderables.add(plusButton); @@ -90,24 +88,24 @@ public class GuiNumberField extends GuiComponent { //Rightclicked inside textfield if (flag && mouseButton == 1) { textField.setValue(""); - textField.setFocus(true); + textField.setFocused(true); result = true; } return result; } - public void drawNumberField(PoseStack ms, int mouseX, int mouseY, float partialTicks) { - textField.y = y + 1; - minusButton.y = y - 1; - plusButton.y = y - 1; + public void drawNumberField(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + textField.setY(y + 1); + minusButton.setY(y - 1); + plusButton.setY(y - 1); - textField.render(ms, mouseX, mouseY, partialTicks); - minusButton.render(ms, mouseX, mouseY, partialTicks); - plusButton.render(ms, mouseX, mouseY, partialTicks); + textField.render(graphics, mouseX, mouseY, partialTicks); + minusButton.render(graphics, mouseX, mouseY, partialTicks); + plusButton.render(graphics, mouseX, mouseY, partialTicks); } - public void drawTooltip(PoseStack ms, Screen screen, int mouseX, int mouseY) { + public void drawTooltip(GuiGraphics graphics, Screen screen, int mouseX, int mouseY) { boolean insideTextField = mouseX >= x + buttonWidth && mouseX < x + width - buttonWidth && mouseY >= y && mouseY < y + height; boolean insideMinusButton = mouseX >= x && mouseX < x + buttonWidth && mouseY >= y && mouseY < y + height; boolean insidePlusButton = mouseX >= x + width - buttonWidth && mouseX < x + width && mouseY >= y && mouseY < y + height; @@ -135,8 +133,7 @@ public class GuiNumberField extends GuiComponent { textLines.add(Component.literal("Hold ").append(Component.literal("ctrl ").withStyle(ChatFormatting.DARK_GREEN)).append("for ") .append(Component.literal("5").withStyle(ChatFormatting.RED))); } - - screen.renderComponentTooltip(ms, textLines, mouseX - 10, mouseY + 25); + graphics.renderComponentTooltip(screen.getMinecraft().font, textLines, mouseX - 10, mouseY + 25); } diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiScrollPane.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiScrollPane.java index 465360f..30e5921 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiScrollPane.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiScrollPane.java @@ -6,10 +6,10 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.components.Widget; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.util.Mth; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -72,7 +72,7 @@ public class GuiScrollPane extends SlotGui { //Removed background @Override - public void render(PoseStack ms, int mouseXIn, int mouseYIn, float partialTicks) { + public void render(GuiGraphics guiGraphics, int mouseXIn, int mouseYIn, float partialTicks) { if (this.visible) { this.mouseX = mouseXIn; this.mouseY = mouseYIn; @@ -91,7 +91,7 @@ public class GuiScrollPane extends SlotGui { } //All entries - this.renderList(ms, insideLeft, insideTop, mouseXIn, mouseYIn, partialTicks); + this.renderList(guiGraphics, insideLeft, insideTop, mouseXIn, mouseYIn, partialTicks); RenderSystem.disableDepthTest(); //Dirt overlays on top and bottom @@ -100,7 +100,6 @@ public class GuiScrollPane extends SlotGui { RenderSystem.enableBlend(); RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE); - RenderSystem.disableTexture(); //top // bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); @@ -149,7 +148,6 @@ public class GuiScrollPane extends SlotGui { } //this.renderDecorations(mouseXIn, mouseYIn); - RenderSystem.enableTexture(); RenderSystem.disableBlend(); } } @@ -172,8 +170,8 @@ public class GuiScrollPane extends SlotGui { } @Override - protected void renderItem(PoseStack ms, int slotIndex, int xPos, int yPos, int heightIn, int mouseXIn, int mouseYIn, float partialTicks) { - this.getListEntry(slotIndex).drawEntry(ms, slotIndex, xPos, yPos, this.getRowWidth(), heightIn, mouseXIn, mouseYIn, + protected void renderItem(GuiGraphics guiGraphics, int slotIndex, int xPos, int yPos, int heightIn, int mouseXIn, int mouseYIn, float partialTicks) { + this.getListEntry(slotIndex).drawEntry(guiGraphics, slotIndex, xPos, yPos, this.getRowWidth(), heightIn, mouseXIn, mouseYIn, this.getSlotIndexFromScreenCoords(mouseXIn, mouseYIn) == slotIndex, partialTicks); } @@ -326,7 +324,7 @@ public class GuiScrollPane extends SlotGui { //Draw in center if it fits @Override - protected void renderList(PoseStack ms, int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks) { + protected void renderList(GuiGraphics guiGraphics, int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks) { int itemCount = this.getItemCount(); Tesselator tessellator = Tesselator.getInstance(); BufferBuilder bufferbuilder = tessellator.getBuilder(); @@ -353,7 +351,6 @@ public class GuiScrollPane extends SlotGui { if (this.renderSelection && this.isSelectedItem(i)) { int i1 = this.x0 + this.width / 2 - this.getRowWidth() / 2; int j1 = this.x0 + this.width / 2 + this.getRowWidth() / 2; - RenderSystem.disableTexture(); float f = this.isFocused() ? 1.0F : 0.5F; RenderSystem.setShaderColor(f, f, f, 1.0F); bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION); @@ -369,10 +366,9 @@ public class GuiScrollPane extends SlotGui { bufferbuilder.vertex(j1 - 1, y - 1, 0.0D).endVertex(); bufferbuilder.vertex(i1 + 1, y - 1, 0.0D).endVertex(); tessellator.end(); - RenderSystem.enableTexture(); } - this.renderItem(ms, i, insideLeft, y, entryHeight2, mouseXIn, mouseYIn, partialTicks); + this.renderItem(guiGraphics, i, insideLeft, y, entryHeight2, mouseXIn, mouseYIn, partialTicks); y += entryHeight; } } @@ -398,7 +394,7 @@ public class GuiScrollPane extends SlotGui { } //PASSTHROUGHS - public void init(List renderables) { + public void init(List renderables) { for (IScrollEntry entry : this.listEntries) { entry.init(renderables); } @@ -409,9 +405,9 @@ public class GuiScrollPane extends SlotGui { entry.updateScreen(); } - public void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY) { + public void drawTooltip(GuiGraphics guiGraphics, Screen guiScreen, int mouseX, int mouseY) { for (IScrollEntry entry : this.listEntries) - entry.drawTooltip(ms, guiScreen, mouseX, mouseY); + entry.drawTooltip(guiGraphics, guiScreen, mouseX, mouseY); } @Override @@ -436,11 +432,11 @@ public class GuiScrollPane extends SlotGui { } public interface IScrollEntry { - void init(List renderables); + void init(List renderables); void updateScreen(); - void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY); + void drawTooltip(GuiGraphics guiGraphics, Screen guiScreen, int mouseX, int mouseY); boolean charTyped(char eventChar, int eventKey); @@ -450,7 +446,7 @@ public class GuiScrollPane extends SlotGui { void updatePosition(int slotIndex, int x, int y, float partialTicks); - void drawEntry(PoseStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partialTicks); + void drawEntry(GuiGraphics guiGraphics, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partialTicks); /** * Called when the mouse is clicked within this entry. Returning true means that something within this entry was diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/LabeledScrollInput.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/LabeledScrollInput.java index 3fbaf2d..e1ef346 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/LabeledScrollInput.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/LabeledScrollInput.java @@ -1,8 +1,8 @@ package nl.requios.effortlessbuilding.gui.elements; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import nl.requios.effortlessbuilding.create.foundation.gui.widget.Label; import nl.requios.effortlessbuilding.create.foundation.gui.widget.ScrollInput; @@ -28,14 +28,15 @@ public class LabeledScrollInput extends ScrollInput { controlScrollsSlower = true; return this; } - + + //TODO: Check if this works @Override - public void renderButton(@NotNull PoseStack ms, int mouseX, int mouseY, float partialTicks) { - super.renderButton(ms, mouseX, mouseY, partialTicks); - - label.x = x + width / 2 - Minecraft.getInstance().font.width(label.text) / 2; - label.y = y + height / 2 - Minecraft.getInstance().font.lineHeight / 2; - label.renderButton(ms, mouseX, mouseY, partialTicks); + public void render(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { + super.render(guiGraphics, mouseX, mouseY, partialTicks); + + label.setX(getX() + width / 2 - Minecraft.getInstance().font.width(label.text) / 2); + label.setY(getY() + height / 2 - Minecraft.getInstance().font.lineHeight / 2); + label.render(guiGraphics, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/SlotGui.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/SlotGui.java index 21fdc32..ec7b0f2 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/SlotGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/SlotGui.java @@ -1,12 +1,17 @@ package nl.requios.effortlessbuilding.gui.elements; -import com.mojang.blaze3d.vertex.*; import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.Tesselator; +import com.mojang.blaze3d.vertex.VertexFormat; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.components.events.AbstractContainerEventHandler; import net.minecraft.client.gui.components.events.GuiEventListener; -import net.minecraft.client.gui.components.Widget; +import net.minecraft.client.renderer.GameRenderer; import net.minecraft.util.Mth; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -18,7 +23,7 @@ import java.util.List; @OnlyIn(Dist.CLIENT) @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -public abstract class SlotGui extends AbstractContainerEventHandler implements Widget { +public abstract class SlotGui extends AbstractContainerEventHandler implements Renderable { protected final Minecraft minecraft; protected final int itemHeight; protected int width; @@ -71,7 +76,7 @@ public abstract class SlotGui extends AbstractContainerEventHandler implements W protected void updateItemPosition(int p_updateItemPosition_1_, int p_updateItemPosition_2_, int p_updateItemPosition_3_, float p_updateItemPosition_4_) { } - protected abstract void renderItem(PoseStack ms, int p_renderItem_1_, int p_renderItem_2_, int p_renderItem_3_, int p_renderItem_4_, int p_renderItem_5_, int p_renderItem_6_, float p_renderItem_7_); + protected abstract void renderItem(GuiGraphics guiGraphics, int p_renderItem_1_, int p_renderItem_2_, int p_renderItem_3_, int p_renderItem_4_, int p_renderItem_5_, int p_renderItem_6_, float p_renderItem_7_); protected void renderHeader(int p_renderHeader_1_, int p_renderHeader_2_, Tesselator p_renderHeader_3_) { } @@ -103,7 +108,7 @@ public abstract class SlotGui extends AbstractContainerEventHandler implements W return p_isMouseInList_3_ >= (double) this.y0 && p_isMouseInList_3_ <= (double) this.y1 && p_isMouseInList_1_ >= (double) this.x0 && p_isMouseInList_1_ <= (double) this.x1; } - public abstract void render(PoseStack ms, int p_render_1_, int p_render_2_, float p_render_3_); + public abstract void render(GuiGraphics guiGraphics, int p_render_1_, int p_render_2_, float p_render_3_); protected void updateScrollingState(double p_updateScrollingState_1_, double p_updateScrollingState_3_, int p_updateScrollingState_5_) { this.scrolling = p_updateScrollingState_5_ == 0 && p_updateScrollingState_1_ >= (double) this.getScrollbarPosition() && p_updateScrollingState_1_ < (double) (this.getScrollbarPosition() + 6); @@ -210,7 +215,7 @@ public abstract class SlotGui extends AbstractContainerEventHandler implements W return 220; } - protected void renderList(PoseStack ms, int p_renderList_1_, int p_renderList_2_, int p_renderList_3_, int p_renderList_4_, float p_renderList_5_) { + protected void renderList(GuiGraphics guiGraphics, int p_renderList_1_, int p_renderList_2_, int p_renderList_3_, int p_renderList_4_, float p_renderList_5_) { int i = this.getItemCount(); Tesselator tessellator = Tesselator.getInstance(); BufferBuilder bufferbuilder = tessellator.getBuilder(); @@ -225,7 +230,7 @@ public abstract class SlotGui extends AbstractContainerEventHandler implements W if (this.renderSelection && this.isSelectedItem(j)) { int i1 = this.x0 + this.width / 2 - this.getRowWidth() / 2; int j1 = this.x0 + this.width / 2 + this.getRowWidth() / 2; - RenderSystem.disableTexture(); + RenderSystem.setShader(GameRenderer::getPositionShader); float f = this.isFocused() ? 1.0F : 0.5F; RenderSystem.setShaderColor(f, f, f, 1.0F); bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION); @@ -241,15 +246,15 @@ public abstract class SlotGui extends AbstractContainerEventHandler implements W bufferbuilder.vertex(j1 - 1, k - 1, 0.0D).endVertex(); bufferbuilder.vertex(i1 + 1, k - 1, 0.0D).endVertex(); tessellator.end(); - RenderSystem.enableTexture(); + RenderSystem.setShader(GameRenderer::getPositionTexShader); } - this.renderItem(ms, j, p_renderList_1_, k, l, p_renderList_3_, p_renderList_4_, p_renderList_5_); + this.renderItem(guiGraphics, j, p_renderList_1_, k, l, p_renderList_3_, p_renderList_4_, p_renderList_5_); } } - protected boolean isFocused() { + public boolean isFocused() { return false; } diff --git a/src/main/java/nl/requios/effortlessbuilding/item/AbstractRandomizerBagItem.java b/src/main/java/nl/requios/effortlessbuilding/item/AbstractRandomizerBagItem.java index c647cde..59937de 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/AbstractRandomizerBagItem.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/AbstractRandomizerBagItem.java @@ -1,46 +1,43 @@ package nl.requios.effortlessbuilding.item; +import net.minecraft.ChatFormatting; import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.entity.player.Player; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.material.Fluids; -import net.minecraft.world.MenuProvider; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.InteractionResult; -import net.minecraft.core.Direction; -import net.minecraft.world.InteractionHand; -import net.minecraft.core.BlockPos; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; -import net.minecraft.network.chat.Component; -import net.minecraft.ChatFormatting; -import net.minecraft.world.level.Level; -import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.network.NetworkHooks; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.network.NetworkHooks; import nl.requios.effortlessbuilding.EffortlessBuilding; -import nl.requios.effortlessbuilding.network.PacketHandler; import nl.requios.effortlessbuilding.systems.ServerBuildState; import nl.requios.effortlessbuilding.utilities.BlockEntry; import nl.requios.effortlessbuilding.utilities.BlockSet; -import nl.requios.effortlessbuilding.utilities.SurvivalHelper; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; -import java.util.*; - -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.item.context.UseOnContext; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.Random; @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault @@ -50,7 +47,7 @@ public abstract class AbstractRandomizerBagItem extends Item { private static final Random rand = new Random(currentSeed); public AbstractRandomizerBagItem() { - super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1)); + super(new Item.Properties().stacksTo(1)); } public abstract int getInventorySize(); @@ -61,7 +58,7 @@ public abstract class AbstractRandomizerBagItem extends Item { * Get the inventory of a randomizer bag by checking the capability. */ public IItemHandler getBagInventory(ItemStack bag) { - return bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).orElse(null); + return bag.getCapability(ForgeCapabilities.ITEM_HANDLER, null).orElse(null); } /** diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ItemHandlerCapabilityProvider.java b/src/main/java/nl/requios/effortlessbuilding/item/ItemHandlerCapabilityProvider.java index 6d99aa9..c967780 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ItemHandlerCapabilityProvider.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ItemHandlerCapabilityProvider.java @@ -3,9 +3,9 @@ package nl.requios.effortlessbuilding.item; import net.minecraft.nbt.CompoundTag; import net.minecraft.core.Direction; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.capabilities.ICapabilitySerializable; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemStackHandler; @@ -22,7 +22,7 @@ public class ItemHandlerCapabilityProvider implements ICapabilitySerializable LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { - return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.orEmpty(cap, LazyOptional.of(() -> itemHandler)); + return ForgeCapabilities.ITEM_HANDLER.orEmpty(cap, LazyOptional.of(() -> itemHandler)); } @Override diff --git a/src/main/java/nl/requios/effortlessbuilding/item/PowerLevelItem.java b/src/main/java/nl/requios/effortlessbuilding/item/PowerLevelItem.java index b1fe242..d507c3c 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/PowerLevelItem.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/PowerLevelItem.java @@ -8,7 +8,6 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; @@ -25,7 +24,7 @@ import java.util.List; @MethodsReturnNonnullByDefault public class PowerLevelItem extends Item { public PowerLevelItem() { - super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS)); + super(new Item.Properties()); } @Override @@ -39,7 +38,7 @@ public class PowerLevelItem extends Item { EffortlessBuilding.log(player, "Upgraded power level to " + EffortlessBuildingClient.POWER_LEVEL.getPowerLevel()); player.setItemInHand(hand, ItemStack.EMPTY); - SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup")); + SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("entity.player.levelup")); player.playSound(soundEvent, 1f, 1f); return InteractionResultHolder.consume(player.getItemInHand(hand)); @@ -48,7 +47,7 @@ public class PowerLevelItem extends Item { EffortlessBuilding.log(player, "Already reached maximum power level!"); - SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather")); + SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("item.armor.equip_leather")); player.playSound(soundEvent, 1f, 1f); return InteractionResultHolder.fail(player.getItemInHand(hand)); diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade1Item.java b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade1Item.java index d19ec9e..dfbdd9d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade1Item.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade1Item.java @@ -1,13 +1,16 @@ package nl.requios.effortlessbuilding.item; +import net.minecraft.ChatFormatting; import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.world.item.TooltipFlag; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; -import net.minecraft.network.chat.Component; -import net.minecraft.ChatFormatting; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import nl.requios.effortlessbuilding.CommonConfig; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -17,17 +20,12 @@ import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResultHolder; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class ReachUpgrade1Item extends Item { public ReachUpgrade1Item() { - super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1)); + super(new Item.Properties().stacksTo(1)); } @Override @@ -42,7 +40,7 @@ public class ReachUpgrade1Item extends Item { EffortlessBuilding.log(player, "Upgraded power level to " + EffortlessBuildingClient.POWER_LEVEL.getPowerLevel()); player.setItemInHand(hand, ItemStack.EMPTY); - SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup")); + SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("entity.player.levelup")); player.playSound(soundEvent, 1f, 1f); return InteractionResultHolder.consume(player.getItemInHand(hand)); @@ -51,7 +49,7 @@ public class ReachUpgrade1Item extends Item { EffortlessBuilding.log(player, "Already used this upgrade! Current power level is " + EffortlessBuildingClient.POWER_LEVEL.getPowerLevel() + "."); - SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather")); + SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("item.armor.equip_leather")); player.playSound(soundEvent, 1f, 1f); } diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade2Item.java b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade2Item.java index 7f4352a..1233733 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade2Item.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade2Item.java @@ -1,13 +1,16 @@ package nl.requios.effortlessbuilding.item; +import net.minecraft.ChatFormatting; import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.world.item.TooltipFlag; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; -import net.minecraft.network.chat.Component; -import net.minecraft.ChatFormatting; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import nl.requios.effortlessbuilding.CommonConfig; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -17,18 +20,12 @@ import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.InteractionResultHolder; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class ReachUpgrade2Item extends Item { public ReachUpgrade2Item() { - super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1)); + super(new Item.Properties().stacksTo(1)); } @Override @@ -43,7 +40,7 @@ public class ReachUpgrade2Item extends Item { EffortlessBuilding.log(player, "Upgraded power level to " + EffortlessBuildingClient.POWER_LEVEL.getPowerLevel()); player.setItemInHand(hand, ItemStack.EMPTY); - SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup")); + SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("entity.player.levelup")); player.playSound(soundEvent, 1f, 1f); return InteractionResultHolder.consume(player.getItemInHand(hand)); @@ -52,7 +49,7 @@ public class ReachUpgrade2Item extends Item { EffortlessBuilding.log(player, "Use Reach Upgrade 1 first."); - SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather")); + SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("item.armor.equip_leather")); player.playSound(soundEvent, 1f, 1f); @@ -60,7 +57,7 @@ public class ReachUpgrade2Item extends Item { EffortlessBuilding.log(player, "Already used this upgrade! Current power level is " + EffortlessBuildingClient.POWER_LEVEL.getPowerLevel() + "."); - SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather")); + SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("item.armor.equip_leather")); player.playSound(soundEvent, 1f, 1f); } diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade3Item.java b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade3Item.java index c55ed69..96da044 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade3Item.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade3Item.java @@ -1,13 +1,16 @@ package nl.requios.effortlessbuilding.item; +import net.minecraft.ChatFormatting; import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.world.item.TooltipFlag; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; -import net.minecraft.network.chat.Component; -import net.minecraft.ChatFormatting; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import nl.requios.effortlessbuilding.CommonConfig; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -17,18 +20,12 @@ import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.InteractionResultHolder; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class ReachUpgrade3Item extends Item { public ReachUpgrade3Item() { - super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1)); + super(new Item.Properties().stacksTo(1)); } @Override @@ -43,7 +40,7 @@ public class ReachUpgrade3Item extends Item { EffortlessBuilding.log(player, "Upgraded power level to " + EffortlessBuildingClient.POWER_LEVEL.getPowerLevel()); player.setItemInHand(hand, ItemStack.EMPTY); - SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup")); + SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("entity.player.levelup")); player.playSound(soundEvent, 1f, 1f); return InteractionResultHolder.consume(player.getItemInHand(hand)); @@ -53,7 +50,7 @@ public class ReachUpgrade3Item extends Item { if (currentLevel == 0) EffortlessBuilding.log(player, "Use Reach Upgrade 1 and 2 first."); if (currentLevel == 1) EffortlessBuilding.log(player, "Use Reach Upgrade 2 first."); - SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather")); + SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("item.armor.equip_leather")); player.playSound(soundEvent, 1f, 1f); @@ -61,7 +58,7 @@ public class ReachUpgrade3Item extends Item { EffortlessBuilding.log(player, "Already used this upgrade! Current power level is " + EffortlessBuildingClient.POWER_LEVEL.getPowerLevel() + "."); - SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather")); + SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("item.armor.equip_leather")); player.playSound(soundEvent, 1f, 1f); } diff --git a/src/main/java/nl/requios/effortlessbuilding/network/IsQuickReplacingPacket.java b/src/main/java/nl/requios/effortlessbuilding/network/IsQuickReplacingPacket.java index aa1dc0e..fcd65f1 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/IsQuickReplacingPacket.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/IsQuickReplacingPacket.java @@ -2,7 +2,6 @@ package nl.requios.effortlessbuilding.network; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; -import nl.requios.effortlessbuilding.create.foundation.networking.SimplePacketBase; import nl.requios.effortlessbuilding.systems.ServerBuildState; import java.util.function.Supplier; diff --git a/src/main/java/nl/requios/effortlessbuilding/network/ModifierSettingsPacket.java b/src/main/java/nl/requios/effortlessbuilding/network/ModifierSettingsPacket.java index f461db0..4548ca7 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/ModifierSettingsPacket.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/ModifierSettingsPacket.java @@ -1,19 +1,12 @@ package nl.requios.effortlessbuilding.network; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.Tag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Player; import net.minecraftforge.network.NetworkEvent; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.EffortlessBuildingClient; -import nl.requios.effortlessbuilding.buildmodifier.Array; -import nl.requios.effortlessbuilding.buildmodifier.BaseModifier; -import nl.requios.effortlessbuilding.buildmodifier.Mirror; -import nl.requios.effortlessbuilding.buildmodifier.RadialMirror; -import nl.requios.effortlessbuilding.create.foundation.utility.NBTHelper; -import java.util.List; import java.util.function.Supplier; /** diff --git a/src/main/java/nl/requios/effortlessbuilding/network/PerformRedoPacket.java b/src/main/java/nl/requios/effortlessbuilding/network/PerformRedoPacket.java index f0a4b91..f7f64bb 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/PerformRedoPacket.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/PerformRedoPacket.java @@ -3,7 +3,6 @@ package nl.requios.effortlessbuilding.network; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; import nl.requios.effortlessbuilding.EffortlessBuilding; -import nl.requios.effortlessbuilding.systems.UndoRedo; import java.util.function.Supplier; diff --git a/src/main/java/nl/requios/effortlessbuilding/network/PerformUndoPacket.java b/src/main/java/nl/requios/effortlessbuilding/network/PerformUndoPacket.java index 9d62f51..cec6892 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/PerformUndoPacket.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/PerformUndoPacket.java @@ -3,7 +3,6 @@ package nl.requios.effortlessbuilding.network; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; import nl.requios.effortlessbuilding.EffortlessBuilding; -import nl.requios.effortlessbuilding.systems.UndoRedo; import java.util.function.Supplier; diff --git a/src/main/java/nl/requios/effortlessbuilding/network/ServerBreakBlocksPacket.java b/src/main/java/nl/requios/effortlessbuilding/network/ServerBreakBlocksPacket.java index 4a30530..148d86b 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/ServerBreakBlocksPacket.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/ServerBreakBlocksPacket.java @@ -4,10 +4,8 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Player; import net.minecraftforge.network.NetworkEvent; import nl.requios.effortlessbuilding.EffortlessBuilding; -import nl.requios.effortlessbuilding.utilities.BlockEntry; import nl.requios.effortlessbuilding.utilities.BlockSet; -import java.util.List; import java.util.function.Supplier; /** diff --git a/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviews.java b/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviews.java index 947be04..d285500 100644 --- a/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviews.java +++ b/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviews.java @@ -5,7 +5,6 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.core.BlockPos; import net.minecraft.util.Mth; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -21,7 +20,6 @@ import nl.requios.effortlessbuilding.utilities.BlockSet; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; @OnlyIn(Dist.CLIENT) public class BlockPreviews { @@ -148,10 +146,10 @@ public class BlockPreviews { if (EffortlessBuildingClient.BUILDER_CHAIN.getLookingAtNear() != null) return; AABB aabb = new AABB(pos); - if (player.level.isLoaded(pos)) { - var blockState = player.level.getBlockState(pos); + if (player.level().isLoaded(pos)) { + var blockState = player.level().getBlockState(pos); if (!blockState.isAir()) { - aabb = blockState.getShape(player.level, pos).bounds().move(pos); + aabb = blockState.getShape(player.level(), pos).bounds().move(pos); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/render/ModifierRenderer.java b/src/main/java/nl/requios/effortlessbuilding/render/ModifierRenderer.java index 684d1d4..aba1a09 100644 --- a/src/main/java/nl/requios/effortlessbuilding/render/ModifierRenderer.java +++ b/src/main/java/nl/requios/effortlessbuilding/render/ModifierRenderer.java @@ -3,7 +3,6 @@ package nl.requios.effortlessbuilding.render; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource.BufferSource; -import com.mojang.math.Matrix4f; import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -11,6 +10,7 @@ import nl.requios.effortlessbuilding.EffortlessBuildingClient; import nl.requios.effortlessbuilding.buildmodifier.BaseModifier; import nl.requios.effortlessbuilding.buildmodifier.Mirror; import nl.requios.effortlessbuilding.buildmodifier.RadialMirror; +import org.joml.Matrix4f; import java.awt.*; import java.util.List; diff --git a/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java b/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java index c26b2c8..f9944b1 100644 --- a/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java +++ b/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java @@ -8,6 +8,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; @@ -18,7 +19,6 @@ import net.minecraftforge.client.event.RenderLevelStageEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import nl.requios.effortlessbuilding.EffortlessBuildingClient; -import nl.requios.effortlessbuilding.create.foundation.utility.Color; import nl.requios.effortlessbuilding.systems.BuilderChain; /*** @@ -49,9 +49,9 @@ public class RenderHandler { @SubscribeEvent public static void onRenderGuiEvent(RenderGuiEvent event) { - renderSubText(event.getPoseStack()); + renderSubText(event.getGuiGraphics()); - drawStacks(event.getPoseStack()); + drawStacks(event.getGuiGraphics()); } private static final ChatFormatting highlightColor = ChatFormatting.DARK_AQUA; @@ -64,7 +64,7 @@ public class RenderHandler { normalColor + "Left-click to " + highlightColor + "break, " + normalColor + "Right-click to " + highlightColor + "cancel"); - private static void renderSubText(PoseStack ms) { + private static void renderSubText(GuiGraphics guiGraphics) { var state = EffortlessBuildingClient.BUILDER_CHAIN.getBuildingState(); if (state == BuilderChain.BuildingState.IDLE) return; @@ -74,18 +74,19 @@ public class RenderHandler { int screenHeight = Minecraft.getInstance().getWindow().getGuiScaledHeight(); var font = Minecraft.getInstance().font; + PoseStack ms = guiGraphics.pose(); ms.pushPose(); ms.translate(screenWidth / 2.0, screenHeight - 54, 0.0D); RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); int l = font.width(text); - font.drawShadow(ms, text, (float)(-l / 2), -4.0F, 0xffffffff); + guiGraphics.drawString(font, text, (int)((float)(-l / 2)), -4, 0xffffffff, true); RenderSystem.disableBlend(); ms.popPose(); } //Draw item stacks at cursor, showing what will be used and what is missing - private static void drawStacks(PoseStack ms) { + private static void drawStacks(GuiGraphics guiGraphics) { var state = EffortlessBuildingClient.BUILDER_CHAIN.getBuildingState(); if (state != BuilderChain.BuildingState.PLACING) return; @@ -108,28 +109,29 @@ public class RenderHandler { int missing = EffortlessBuildingClient.ITEM_USAGE_TRACKER.getMissingCount(stack.getKey()); if (total - missing > 0) { - drawItemStack(ms, new ItemStack(stack.getKey(), total - missing), x + i * 20, y, false); + drawItemStack(guiGraphics, new ItemStack(stack.getKey(), total - missing), x + i * 20, y, false); i++; } if (missing > 0) { - drawItemStack(ms, new ItemStack(stack.getKey(), missing), x + i * 20, y, true); + drawItemStack(guiGraphics, new ItemStack(stack.getKey(), missing), x + i * 20, y, true); i++; } } } - private static void drawItemStack(PoseStack ms, ItemStack stack, int x, int y, boolean missing) { - Minecraft.getInstance().getItemRenderer().renderGuiItem(stack, x, y); + private static void drawItemStack(GuiGraphics guiGraphics, ItemStack stack, int x, int y, boolean missing) { + guiGraphics.renderItem(stack, x, y); //draw count text, red if missing //from ItemRenderer#renderGuiItemDecorations + PoseStack ms = guiGraphics.pose(); ms.pushPose(); Font font = Minecraft.getInstance().font; String text = String.valueOf(stack.getCount()); - ms.translate(0.0D, 0.0D, (double)(Minecraft.getInstance().getItemRenderer().blitOffset + 200.0F)); + ms.translate(0.0D, 0.0D, 200.0F); MultiBufferSource.BufferSource multibuffersource$buffersource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder()); - font.drawInBatch(text, (float)(x + 19 - 2 - font.width(text)), (float)(y + 6 + 3), missing ? ChatFormatting.RED.getColor() : ChatFormatting.WHITE.getColor(), true, ms.last().pose(), multibuffersource$buffersource, false, 0, 15728880); + font.drawInBatch(text, (float)(x + 19 - 2 - font.width(text)), (float)(y + 6 + 3), missing ? ChatFormatting.RED.getColor() : ChatFormatting.WHITE.getColor(), true, ms.last().pose(), multibuffersource$buffersource, Font.DisplayMode.NORMAL, 0, 15728880); multibuffersource$buffersource.endBatch(); ms.popPose(); } diff --git a/src/main/java/nl/requios/effortlessbuilding/systems/BuilderChain.java b/src/main/java/nl/requios/effortlessbuilding/systems/BuilderChain.java index cb3fbc7..d89e04d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/systems/BuilderChain.java +++ b/src/main/java/nl/requios/effortlessbuilding/systems/BuilderChain.java @@ -88,7 +88,7 @@ public class BuilderChain { player.swing(InteractionHand.MAIN_HAND); blocks.skipFirst = buildMode == BuildModeEnum.DISABLED; - long placeTime = player.level.getGameTime(); + long placeTime = player.level().getGameTime(); if (blocks.size() > 1) placeTime += ClientConfig.visuals.appearAnimationLength.get(); PacketHandler.INSTANCE.sendToServer(new ServerPlaceBlocksPacket(blocks, placeTime)); } @@ -112,7 +112,7 @@ public class BuilderChain { blocks.setStartPos(new BlockEntry(startPosForBreaking)); EffortlessBuildingClient.BUILD_MODIFIERS.findCoordinates(blocks, player); EffortlessBuildingClient.BUILDER_FILTER.filterOnCoordinates(blocks, player); - findExistingBlockStates(player.level); + findExistingBlockStates(player.level()); EffortlessBuildingClient.BUILDER_FILTER.filterOnExistingBlockStates(blocks, player); } @@ -231,7 +231,7 @@ public class BuilderChain { //Offset in direction of sidehit if not quickreplace and not replaceable boolean shouldOffsetStartPosition = EffortlessBuildingClient.BUILD_SETTINGS.shouldOffsetStartPosition(); - boolean replaceable = player.level.getBlockState(startPos).getMaterial().isReplaceable(); + boolean replaceable = player.level().getBlockState(startPos).canBeReplaced(); boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos); if (!shouldOffsetStartPosition && !replaceable && !becomesDoubleSlab) { startPos = startPos.relative(lookingAt.getDirection()); @@ -281,7 +281,7 @@ public class BuilderChain { } //Find new blockstate - blockEntry.setItemAndFindNewBlockState(itemStack, player.level, originalDirection, clickedFace, relativeHitVec); + blockEntry.setItemAndFindNewBlockState(itemStack, player.level(), originalDirection, clickedFace, relativeHitVec); //Filter on new blockstate if (EffortlessBuildingClient.BUILDER_FILTER.filterOnNewBlockState(blockEntry, player)) { @@ -320,9 +320,9 @@ public class BuilderChain { if (blocks.getLastBlockEntry() != null && blocks.getLastBlockEntry().newBlockState != null) { var lastBlockState = blocks.getLastBlockEntry().newBlockState; - SoundType soundType = lastBlockState.getBlock().getSoundType(lastBlockState, player.level, blocks.lastPos, player); + SoundType soundType = lastBlockState.getBlock().getSoundType(lastBlockState, player.level(), blocks.lastPos, player); SoundEvent soundEvent = buildingState == BuildingState.BREAKING ? soundType.getBreakSound() : soundType.getPlaceSound(); - player.level.playSound(player, player.blockPosition(), soundEvent, SoundSource.BLOCKS, 0.3f, 0.8f); + player.level().playSound(player, player.blockPosition(), soundEvent, SoundSource.BLOCKS, 0.3f, 0.8f); } } } diff --git a/src/main/java/nl/requios/effortlessbuilding/systems/BuilderFilter.java b/src/main/java/nl/requios/effortlessbuilding/systems/BuilderFilter.java index 424ed0c..3fa06d5 100644 --- a/src/main/java/nl/requios/effortlessbuilding/systems/BuilderFilter.java +++ b/src/main/java/nl/requios/effortlessbuilding/systems/BuilderFilter.java @@ -1,6 +1,5 @@ package nl.requios.effortlessbuilding.systems; -import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Player; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -9,12 +8,11 @@ import nl.requios.effortlessbuilding.compatibility.CompatHelper; import nl.requios.effortlessbuilding.utilities.BlockEntry; import nl.requios.effortlessbuilding.utilities.BlockSet; import nl.requios.effortlessbuilding.utilities.PlaceChecker; -import nl.requios.effortlessbuilding.utilities.SurvivalHelper; @OnlyIn(Dist.CLIENT) public class BuilderFilter { public void filterOnCoordinates(BlockSet blocks, Player player) { - var world = player.level; + var world = player.level(); var iter = blocks.entrySet().iterator(); while (iter.hasNext()) { var pos = iter.next().getValue().blockPos; @@ -42,7 +40,7 @@ public class BuilderFilter { if (placing && !buildSettings.shouldReplaceFiltered()) { if (!buildSettings.shouldReplaceAir() && blockState.isAir()) remove = true; - boolean isReplaceable = blockState.getMaterial().isReplaceable(); + boolean isReplaceable = blockState.canBeReplaced(); // boolean isSolid = blockState.isRedstoneConductor(player.level, blockEntry.blockPos); if (!buildSettings.shouldReplaceBlocks() && !isReplaceable) remove = true; } @@ -78,7 +76,7 @@ public class BuilderFilter { boolean remove = false; - if (placing && !PlaceChecker.shouldPlaceBlock(player.level, blockEntry)) remove = true; + if (placing && !PlaceChecker.shouldPlaceBlock(player.level(), blockEntry)) remove = true; return remove; } diff --git a/src/main/java/nl/requios/effortlessbuilding/systems/ItemUsageTracker.java b/src/main/java/nl/requios/effortlessbuilding/systems/ItemUsageTracker.java index b7f84a8..d7dbb09 100644 --- a/src/main/java/nl/requios/effortlessbuilding/systems/ItemUsageTracker.java +++ b/src/main/java/nl/requios/effortlessbuilding/systems/ItemUsageTracker.java @@ -2,9 +2,6 @@ package nl.requios.effortlessbuilding.systems; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import nl.requios.effortlessbuilding.compatibility.CompatHelper; -import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem; import nl.requios.effortlessbuilding.utilities.InventoryHelper; import java.util.HashMap; diff --git a/src/main/java/nl/requios/effortlessbuilding/systems/ServerBlockPlacer.java b/src/main/java/nl/requios/effortlessbuilding/systems/ServerBlockPlacer.java index c4190cc..9e12779 100644 --- a/src/main/java/nl/requios/effortlessbuilding/systems/ServerBlockPlacer.java +++ b/src/main/java/nl/requios/effortlessbuilding/systems/ServerBlockPlacer.java @@ -1,14 +1,9 @@ package nl.requios.effortlessbuilding.systems; import net.minecraft.ChatFormatting; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraftforge.items.ItemHandlerHelper; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.ServerConfig; -import nl.requios.effortlessbuilding.create.foundation.utility.BlockHelper; import nl.requios.effortlessbuilding.utilities.*; import java.util.*; @@ -34,7 +29,7 @@ public class ServerBlockPlacer { //Iterator to prevent concurrent modification exception for (var iterator = delayedEntries.iterator(); iterator.hasNext(); ) { DelayedEntry entry = iterator.next(); - long gameTime = entry.player.level.getGameTime(); + long gameTime = entry.player.level().getGameTime(); if (gameTime >= entry.placeTime) { applyBlockSet(entry.player, entry.blocks); iterator.remove(); @@ -104,7 +99,7 @@ public class ServerBlockPlacer { private boolean applyBlockEntry(Player player, BlockEntry block) { - block.existingBlockState = player.level.getBlockState(block.blockPos); + block.existingBlockState = player.level().getBlockState(block.blockPos); boolean breaking = BlockUtilities.isNullOrAir(block.newBlockState); if (!validateBlockEntry(player, block, breaking)) return false; @@ -139,7 +134,7 @@ public class ServerBlockPlacer { if (!validateBlockEntry(player, tempBlockEntry, breaking)) return false; //Update newBlockState for future redo's - block.newBlockState = player.level.getBlockState(block.blockPos); + block.newBlockState = player.level().getBlockState(block.blockPos); boolean success; isPlacingOrBreakingBlocks = true; @@ -236,7 +231,7 @@ public class ServerBlockPlacer { private boolean validateBlockEntry(Player player, BlockEntry block, boolean breaking) { - if (!player.level.isLoaded(block.blockPos)) return false; + if (!player.level().isLoaded(block.blockPos)) return false; if (breaking && BlockUtilities.isNullOrAir(block.existingBlockState)) return false; diff --git a/src/main/java/nl/requios/effortlessbuilding/systems/ServerBuildState.java b/src/main/java/nl/requios/effortlessbuilding/systems/ServerBuildState.java index 6206dfb..c87e35d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/systems/ServerBuildState.java +++ b/src/main/java/nl/requios/effortlessbuilding/systems/ServerBuildState.java @@ -2,7 +2,6 @@ package nl.requios.effortlessbuilding.systems; import net.minecraft.world.entity.player.Player; import nl.requios.effortlessbuilding.EffortlessBuilding; -import nl.requios.effortlessbuilding.EffortlessBuildingClient; public class ServerBuildState { private static final String IS_USING_BUILD_MODE_KEY = EffortlessBuilding.MODID + ":isUsingBuildMode"; diff --git a/src/main/java/nl/requios/effortlessbuilding/systems/UndoRedo.java b/src/main/java/nl/requios/effortlessbuilding/systems/UndoRedo.java index 604e38b..24eac41 100644 --- a/src/main/java/nl/requios/effortlessbuilding/systems/UndoRedo.java +++ b/src/main/java/nl/requios/effortlessbuilding/systems/UndoRedo.java @@ -3,7 +3,6 @@ package nl.requios.effortlessbuilding.systems; import net.minecraft.ChatFormatting; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; @@ -286,8 +285,8 @@ public class UndoRedo { //then anything it drops if (itemStack.isEmpty()) { //Cannot check drops on clientside because loot tables are server only - if (!player.level.isClientSide) { - List itemsDropped = Block.getDrops(blockState, (ServerLevel) player.level, BlockPos.ZERO, null); + if (!player.level().isClientSide) { + List itemsDropped = Block.getDrops(blockState, (ServerLevel) player.level(), BlockPos.ZERO, null); for (ItemStack itemStackDropped : itemsDropped) { if (itemStackDropped.getItem() instanceof BlockItem) { Block block = ((BlockItem) itemStackDropped.getItem()).getBlock(); diff --git a/src/main/java/nl/requios/effortlessbuilding/utilities/BlockEntry.java b/src/main/java/nl/requios/effortlessbuilding/utilities/BlockEntry.java index 1cb70d5..d136a89 100644 --- a/src/main/java/nl/requios/effortlessbuilding/utilities/BlockEntry.java +++ b/src/main/java/nl/requios/effortlessbuilding/utilities/BlockEntry.java @@ -2,6 +2,7 @@ package nl.requios.effortlessbuilding.utilities; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.NbtUtils; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.item.Item; @@ -80,7 +81,7 @@ public class BlockEntry { block.newBlockState = buf.readNullable(buffer -> { var nbt = buf.readNbt(); if (nbt == null) return null; - return NbtUtils.readBlockState(nbt); + return NbtUtils.readBlockState(BuiltInRegistries.BLOCK.asLookup(), nbt); }); block.item = Item.byId(buf.readInt()); return block; diff --git a/src/main/java/nl/requios/effortlessbuilding/utilities/BlockPlacerHelper.java b/src/main/java/nl/requios/effortlessbuilding/utilities/BlockPlacerHelper.java index aff742f..8b108b8 100644 --- a/src/main/java/nl/requios/effortlessbuilding/utilities/BlockPlacerHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/utilities/BlockPlacerHelper.java @@ -2,19 +2,11 @@ package nl.requios.effortlessbuilding.utilities; import com.google.common.collect.Lists; import net.minecraft.core.Direction; -import net.minecraft.core.Registry; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.stats.Stats; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.BucketItem; import net.minecraft.world.item.DiggerItem; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.pattern.BlockInWorld; import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.items.ItemHandlerHelper; @@ -35,7 +27,7 @@ public class BlockPlacerHelper { } } - boolean brokeBlock = BlockHelper.destroyBlockAs(player.level, blockEntry.blockPos, player, usedTool, 0f, stack -> { + boolean brokeBlock = BlockHelper.destroyBlockAs(player.level(), blockEntry.blockPos, player, usedTool, 0f, stack -> { if (!player.isCreative()) { ItemHandlerHelper.giveItemToPlayer(player, stack); } @@ -46,7 +38,7 @@ public class BlockPlacerHelper { //ForgeHooks::onPlaceItemIntoWorld, removed itemstack usage public static boolean placeBlock(Player player, BlockEntry blockEntry) { - Level level = player.level; + Level level = player.level(); var itemStack = new ItemStack(blockEntry.item); level.captureBlockSnapshots = true; diff --git a/src/main/java/nl/requios/effortlessbuilding/utilities/BlockSet.java b/src/main/java/nl/requios/effortlessbuilding/utilities/BlockSet.java index f730af7..a05955c 100644 --- a/src/main/java/nl/requios/effortlessbuilding/utilities/BlockSet.java +++ b/src/main/java/nl/requios/effortlessbuilding/utilities/BlockSet.java @@ -7,7 +7,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.EffortlessBuildingClient; -import nl.requios.effortlessbuilding.systems.PowerLevel; import org.jetbrains.annotations.NotNull; import java.util.HashMap; diff --git a/src/main/java/nl/requios/effortlessbuilding/utilities/ClientBlockUtilities.java b/src/main/java/nl/requios/effortlessbuilding/utilities/ClientBlockUtilities.java index cd26011..820bd91 100644 --- a/src/main/java/nl/requios/effortlessbuilding/utilities/ClientBlockUtilities.java +++ b/src/main/java/nl/requios/effortlessbuilding/utilities/ClientBlockUtilities.java @@ -43,13 +43,13 @@ public class ClientBlockUtilities { if (blockEntry == null || blockEntry.newBlockState == null) return; - SoundType soundType = blockEntry.newBlockState.getBlock().getSoundType(blockEntry.newBlockState, player.level, blockEntry.blockPos, player); + SoundType soundType = blockEntry.newBlockState.getBlock().getSoundType(blockEntry.newBlockState, player.level(), blockEntry.blockPos, player); SoundEvent soundEvent = breaking ? soundType.getBreakSound() : soundType.getPlaceSound(); - player.level.playSound(player, player.blockPosition(), soundEvent, SoundSource.BLOCKS, 0.6f, soundType.getPitch()); + player.level().playSound(player, player.blockPosition(), soundEvent, SoundSource.BLOCKS, 0.6f, soundType.getPitch()); } public static BlockHitResult getLookingAtFar(Player player) { - Level world = player.level; + Level world = player.level(); //base distance off of player ability (config) float raytraceRange = EffortlessBuildingClient.POWER_LEVEL.getPlacementReach(player); diff --git a/src/main/java/nl/requios/effortlessbuilding/utilities/PowerLevelCommand.java b/src/main/java/nl/requios/effortlessbuilding/utilities/PowerLevelCommand.java index 9a40669..e47e814 100644 --- a/src/main/java/nl/requios/effortlessbuilding/utilities/PowerLevelCommand.java +++ b/src/main/java/nl/requios/effortlessbuilding/utilities/PowerLevelCommand.java @@ -2,7 +2,6 @@ package nl.requios.effortlessbuilding.utilities; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.IntegerArgumentType; -import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; @@ -44,12 +43,12 @@ public class PowerLevelCommand { private static void logPowerLevel(CommandSourceStack source, Player player) { int powerLevel = EffortlessBuilding.SERVER_POWER_LEVEL.getPowerLevel(player); - source.sendSuccess(Component.translatable("effortlessbuilding.commands.powerlevel", player.getDisplayName(), powerLevel), false); + source.sendSuccess(() -> Component.translatable("effortlessbuilding.commands.powerlevel", player.getDisplayName(), powerLevel), false); } private static void setPowerLevel(CommandSourceStack source, Player player, int powerLevel) throws CommandSyntaxException { EffortlessBuilding.SERVER_POWER_LEVEL.setPowerLevel(player, powerLevel); EffortlessBuilding.SERVER_POWER_LEVEL.sendToClient(player); - source.sendSuccess(Component.translatable("effortlessbuilding.commands.powerlevel.success", player.getDisplayName(), powerLevel), true); + source.sendSuccess(() -> Component.translatable("effortlessbuilding.commands.powerlevel.success", player.getDisplayName(), powerLevel), true); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/utilities/SurvivalHelper.java b/src/main/java/nl/requios/effortlessbuilding/utilities/SurvivalHelper.java index ce9332e..6bfb9bc 100644 --- a/src/main/java/nl/requios/effortlessbuilding/utilities/SurvivalHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/utilities/SurvivalHelper.java @@ -1,32 +1,15 @@ package nl.requios.effortlessbuilding.utilities; -import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; -import net.minecraft.core.Registry; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.sounds.SoundSource; -import net.minecraft.tags.BlockTags; import net.minecraft.world.InteractionHand; -import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SlabBlock; -import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.pattern.BlockInWorld; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.event.ForgeEventFactory; -import nl.requios.effortlessbuilding.CommonConfig; -import nl.requios.effortlessbuilding.EffortlessBuildingClient; import nl.requios.effortlessbuilding.compatibility.CompatHelper; -import nl.requios.effortlessbuilding.systems.ServerBuildState; - -import javax.annotation.Nullable; public class SurvivalHelper { @@ -43,7 +26,7 @@ public class SurvivalHelper { public static boolean doesBecomeDoubleSlab(Player player, BlockPos pos) { - BlockState placedBlockState = player.level.getBlockState(pos); + BlockState placedBlockState = player.level().getBlockState(pos); ItemStack itemstack = player.getItemInHand(InteractionHand.MAIN_HAND); if (CompatHelper.isItemBlockProxy(itemstack)) diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 2752a32..3b3cd51 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -11,7 +11,7 @@ protected net.minecraft.client.particle.Particle f_107205_ # stoppedByCollision public net.minecraft.client.renderer.ItemInHandRenderer f_109300_ # mainHandItem public net.minecraft.client.renderer.ItemInHandRenderer f_109301_ # offHandItem public net.minecraft.client.renderer.entity.ItemRenderer f_115096_ # textureManager - +public net.minecraft.world.entity.Entity f_19853_ # level public-f net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket f_132663_ # flyingSpeed public net.minecraft.server.MinecraftServer f_129744_ # storageSource diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index b08a175..4afac51 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[40,)" +loaderVersion="[47,)" license="GNU LESSER GENERAL PUBLIC LICENSE" issueTrackerURL="https://bitbucket.org/Requios/effortless-building/issues?status=new&status=open&status=submitted&is_spam=%21spam" showAsResourcePack=false @@ -19,20 +19,20 @@ Makes building easier by providing tools like mirrors, arrays, build modes and a [[dependencies.effortlessbuilding]] modId="forge" mandatory=true - versionRange="[40.2.4,)" + versionRange="[47.1.3,)" ordering="NONE" side="BOTH" [[dependencies.effortlessbuilding]] modId="minecraft" mandatory=true - versionRange="[1.19,1.20)" + versionRange="[1.20,1.21)" ordering="NONE" side="BOTH" [[dependencies.effortlessbuilding]] modId="flywheel" mandatory=true - versionRange="[0.6.9,0.7)" + versionRange="[0.6.10,0.7)" ordering="AFTER" side="CLIENT" \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 4a33ce3..53e3a7e 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,8 +1,6 @@ { "pack": { - "description": "examplemod resources", - "pack_format": 10, - "forge:resource_pack_format": 9, - "forge:data_pack_format": 10 + "description": "Effortless Building resources", + "pack_format": 15 } }