diff --git a/build.gradle b/build.gradle index dde4ac24f..367a574d5 100644 --- a/build.gradle +++ b/build.gradle @@ -39,8 +39,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17) println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) minecraft { - //mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}" - mappings channel: 'official', version: "${minecraft_version}" + mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}" accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { diff --git a/gradle.properties b/gradle.properties index 827f321e5..87dcfda52 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,10 +5,10 @@ org.gradle.daemon = false # mod version info mod_version = 0.5.0.d -artifact_minecraft_version = 1.19 +artifact_minecraft_version = 1.19.2 -minecraft_version = 1.19 -forge_version = 41.0.110 +minecraft_version = 1.19.2 +forge_version = 43.0.8 # build dependency versions forgegradle_version = 5.1.53 @@ -16,16 +16,16 @@ mixingradle_version = 0.7-SNAPSHOT mixin_version = 0.8.5 librarian_version = 1.+ cursegradle_version = 1.4.0 -parchment_version = 2022.07.10 +parchment_version = 2022.08.10 # dependency versions registrate_version = MC1.19-1.1.5 -flywheel_minecraft_version = 1.19 +flywheel_minecraft_version = 1.19.2 flywheel_version = 0.6.5-3 -jei_minecraft_version = 1.19 -jei_version = 11.1.0.235 -curios_minecraft_version = 1.19 -curios_version = 5.1.0.4 +jei_minecraft_version = 1.19.2 +jei_version = 11.2.0.246 +curios_minecraft_version = 1.19.2 +curios_version = 5.1.1.0 # curseforge information projectId = 328085 diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java index cf01fe6fd..89f732c9b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java @@ -3,6 +3,8 @@ package com.simibubi.create.content.contraptions.components.deployer; import java.util.OptionalInt; import java.util.UUID; +import javax.annotation.Nullable; + import org.apache.commons.lang3.tuple.Pair; import com.mojang.authlib.GameProfile; @@ -10,10 +12,9 @@ import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.config.CKinetics; import com.simibubi.create.foundation.utility.Lang; -import io.netty.util.concurrent.Future; -import io.netty.util.concurrent.GenericFutureListener; import net.minecraft.core.BlockPos; import net.minecraft.network.Connection; +import net.minecraft.network.PacketSendListener; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.PacketFlow; @@ -171,7 +172,7 @@ public class DeployerFakePlayer extends FakePlayer { public void send(Packet packetIn) {} @Override - public void send(Packet packetIn, GenericFutureListener> futureListeners) {} + public void send(Packet p_243227_, @Nullable PacketSendListener p_243273_) {} } } diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayRenderer.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayRenderer.java index f4902659b..06f6842ca 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayRenderer.java @@ -156,7 +156,7 @@ public class FlapDisplayRenderer extends KineticTileEntityRenderer { dim = 0.75f; } - GlyphInfo glyphinfo = fontset.getGlyphInfo(glyph); + GlyphInfo glyphinfo = fontset.getGlyphInfo(glyph, false); float glyphWidth = glyphinfo.getAdvance(false); if (!section.renderCharsIndividually() && section.spinning[0]) { diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/NoShadowFontWrapper.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/NoShadowFontWrapper.java index eb0144d9d..cc6b3b452 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/NoShadowFontWrapper.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/NoShadowFontWrapper.java @@ -19,7 +19,7 @@ public class NoShadowFontWrapper extends Font { private Font wrapped; public NoShadowFontWrapper(Font wrapped) { - super(null); + super(null, false); this.wrapped = wrapped; } diff --git a/src/main/java/com/simibubi/create/foundation/command/HighlightCommand.java b/src/main/java/com/simibubi/create/foundation/command/HighlightCommand.java index 605c5782e..47b0f876e 100644 --- a/src/main/java/com/simibubi/create/foundation/command/HighlightCommand.java +++ b/src/main/java/com/simibubi/create/foundation/command/HighlightCommand.java @@ -101,6 +101,6 @@ public class HighlightCommand { BlockPos p = exception.getPosition(); String command = "/create highlight " + p.getX() + " " + p.getY() + " " + p.getZ(); return player.server.getCommands() - .performCommand(source, command); + .performPrefixedCommand(source, command); } } diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/ConfigScreenList.java b/src/main/java/com/simibubi/create/foundation/config/ui/ConfigScreenList.java index 3e537be81..f8918c6f8 100644 --- a/src/main/java/com/simibubi/create/foundation/config/ui/ConfigScreenList.java +++ b/src/main/java/com/simibubi/create/foundation/config/ui/ConfigScreenList.java @@ -55,11 +55,11 @@ public class ConfigScreenList extends ObjectSelectionList, TStack { - private final VertexList template; - private final IntPredicate shadedPredicate; + private final ShadedVertexList template; // Vertex Position private final PoseStack transforms; @@ -67,15 +63,9 @@ public class SuperByteBuffer implements Transform, TStack true; - } + DrawState drawState = buf.drawState(); + template = new BlockVertexList.Shaded(buf.vertexBuffer(), drawState.vertexCount(), drawState.format().getVertexSize(), unshadedStartVertex); + transforms = new PoseStack(); transforms.pushPose(); } @@ -158,7 +148,7 @@ public class SuperByteBuffer implements Transform, TStack, TStack biomeModifiers = new HashMap<>(); + for (Map.Entry entry : OreFeatureConfigEntry.ALL.entrySet()) { + DatagenExtension datagenExt = entry.getValue().datagenExt(); + if (datagenExt != null) { + biomeModifiers.put(entry.getKey(), datagenExt.createBiomeModifier(registryAccess)); + } + } + + DynamicDataProvider biomeModifierProvider = DynamicDataProvider.create(generator, "Create's Biome Modifiers", registryAccess, ForgeRegistries.Keys.BIOME_MODIFIERS, biomeModifiers); + if (biomeModifierProvider != null) { + generator.addProvider(true, biomeModifierProvider); + } } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 6da1989f1..e93d0ee8c 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[41,)" +loaderVersion="[43,)" issueTrackerURL="https://github.com/Creators-of-Create/Create/issues" license="MIT" @@ -19,14 +19,14 @@ Technology that empowers the player.''' [[dependencies.create]] modId="forge" mandatory=true - versionRange="[41.0.110,)" + versionRange="[43.0.0,)" ordering="NONE" side="BOTH" [[dependencies.create]] modId="minecraft" mandatory=true - versionRange="[1.19,1.20)" + versionRange="[1.19.2,1.20)" ordering="NONE" side="BOTH"