Skip to content

Commit 6afab1e

Browse files
gniftygnomegniftygnome
authored
Merge pull request #27 from gniftygnome/1.19
Updates and fixes for Minecraft 1.19.
2 parents 9af1051 + c343327 commit 6afab1e

File tree

11 files changed

+47
-59
lines changed

11 files changed

+47
-59
lines changed

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
if: ${{ runner.os != 'Windows' }}
4646
run: chmod +x ./gradlew
4747
- name: Build
48-
run: ./gradlew generateChangelog build publish curseforge github publishModrinth --stacktrace --parallel -PlastTag="v${{ github.event.inputs.previousVersion }}" -PcurrentTag="v${{ github.event.inputs.version }}"
48+
run: ./gradlew generateChangelog build publish curseforge github modrinth --stacktrace --parallel -PlastTag="v${{ github.event.inputs.previousVersion }}" -PcurrentTag="v${{ github.event.inputs.version }}"
4949
env:
5050
MAVEN_URL: ${{ secrets.MAVEN_URL }}
5151
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
id 'fabric-loom' version '0.10-SNAPSHOT'
2+
id 'fabric-loom' version '0.12-SNAPSHOT'
33
}
44

5-
apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.1/ferry.gradle'
5+
apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.5/ferry.gradle'
66

77
sourceCompatibility = JavaVersion.VERSION_17
88
targetCompatibility = JavaVersion.VERSION_17

‎gradle.properties

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G
33
maven_group=com.terraformersmc
44
archive_name=vistas
55

6-
minecraft_version=1.18
7-
yarn_mappings=1.18+build.1
8-
loader_version=0.12.6
9-
fabric_version=0.43.1+1.18
10-
modmenu_version=3.0.0
11-
clothconfig_version=6.0.42
6+
minecraft_version=1.19.2
7+
yarn_mappings=1.19.2+build.3
8+
loader_version=0.14.9
9+
fabric_version=0.59.0+1.19.2
10+
modmenu_version=4.0.6
11+
clothconfig_version=8.0.75
1212

1313
# Project Metadata
1414
project_name=Vistas
@@ -21,14 +21,14 @@ default_release_type=beta
2121
# CurseForge Metadata
2222
curseforge_slug=vistas
2323
curseforge_id=423659
24-
curseforge_game_versions=1.18, Fabric
24+
curseforge_game_versions=1.19, 1.19.1, 1.19.2, Fabric
2525
curseforge_required_dependencies=
2626
curseforge_optional_dependencies=
2727

2828
# Modrinth Metadata
2929
modrinth_slug=vistas
3030
modrinth_id=itzZXRxq
31-
modrinth_game_versions=1.18
31+
modrinth_game_versions=1.19, 1.19.1, 1.19.2
3232
modrinth_mod_loaders=fabric
3333

3434
# Mod Loader Metadata

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎src/main/java/com/terraformersmc/vistas/mixin/GameRendererMixin.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.nio.file.Path;
1212
import java.util.Optional;
1313

14+
import net.minecraft.text.Text;
1415
import org.spongepowered.asm.mixin.Final;
1516
import org.spongepowered.asm.mixin.Mixin;
1617
import org.spongepowered.asm.mixin.Shadow;
@@ -34,8 +35,6 @@
3435
import net.minecraft.client.util.ScreenshotRecorder;
3536
import net.minecraft.client.util.math.MatrixStack;
3637
import net.minecraft.text.ClickEvent;
37-
import net.minecraft.text.LiteralText;
38-
import net.minecraft.text.TranslatableText;
3938
import net.minecraft.util.Formatting;
4039
import net.minecraft.util.Util;
4140
import net.minecraft.util.math.Direction;
@@ -69,7 +68,7 @@ public abstract class GameRendererMixin {
6968
client.player.setYaw(PanoramicScreenshots.startingRotation.get().getSecond());
7069
}
7170
if (client.player != null) {
72-
client.player.sendMessage(new TranslatableText("vistas.panoramic_screenshot.broke"), false);
71+
client.player.sendMessage(Text.translatable("vistas.panoramic_screenshot.broke"), false);
7372
}
7473
PanoramicScreenshots.onShot = -1;
7574
PanoramicScreenshots.startingRotation = Optional.empty();
@@ -126,7 +125,7 @@ public abstract class GameRendererMixin {
126125
framebuffer.delete();
127126

128127
if (client.player != null && VistasConfig.getInstance().screenshotIndividually) {
129-
client.player.sendMessage(new TranslatableText("vistas.panoramic_screenshot.taken", new LiteralText(String.valueOf(PanoramicScreenshots.onShot)), new LiteralText(file.getName()).formatted(Formatting.UNDERLINE).styled((style) -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, file.getAbsolutePath())))), false);
128+
client.player.sendMessage(Text.translatable("vistas.panoramic_screenshot.taken", Text.literal(String.valueOf(PanoramicScreenshots.onShot)), Text.literal(file.getName()).formatted(Formatting.UNDERLINE).styled((style) -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, file.getAbsolutePath())))), false);
130129
}
131130

132131
if (PanoramicScreenshots.onShot == 5) {
@@ -138,7 +137,7 @@ public abstract class GameRendererMixin {
138137
PanoramicScreenshots.time = 0.0D;
139138
PanoramicScreenshots.timeSinceLastKeyPress = 10.0D;
140139
if (client.player != null) {
141-
client.player.sendMessage(new TranslatableText("vistas.panoramic_screenshot.saved", new LiteralText(root.toAbsolutePath().toString()).styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, root.toAbsolutePath().toString())).withUnderline(true))), false);
140+
client.player.sendMessage(Text.translatable("vistas.panoramic_screenshot.saved", Text.literal(root.toAbsolutePath().toString()).styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, root.toAbsolutePath().toString())).withUnderline(true))), false);
142141
}
143142
} else {
144143
// push

‎src/main/java/com/terraformersmc/vistas/mixin/MinecraftClientMixin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import net.minecraft.client.MinecraftClient;
2121
import net.minecraft.client.RunArgs;
2222
import net.minecraft.client.network.ClientPlayerEntity;
23-
import net.minecraft.resource.ReloadableResourceManager;
23+
import net.minecraft.resource.ReloadableResourceManagerImpl;
2424
import net.minecraft.sound.MusicSound;
2525

2626
@Environment(EnvType.CLIENT)
@@ -32,13 +32,13 @@ public class MinecraftClientMixin implements MinecraftClientAccess {
3232

3333
@Shadow
3434
@Final
35-
private ReloadableResourceManager resourceManager;
35+
private ReloadableResourceManagerImpl resourceManager;
3636

3737
@Nullable
3838
@Shadow
3939
public ClientPlayerEntity player;
4040

41-
@Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/ReloadableResourceManager;registerReloader(Lnet/minecraft/resource/ResourceReloader;)V", ordinal = 2, shift = Shift.AFTER))
41+
@Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/ReloadableResourceManagerImpl;registerReloader(Lnet/minecraft/resource/ResourceReloader;)V", ordinal = 2, shift = Shift.AFTER))
4242
private void vistas$init$registerPanoramaReloader(RunArgs args, CallbackInfo ci) {
4343
this.panoramaResourceReloader = new PanoramaResourceReloader();
4444
this.resourceManager.registerReloader(panoramaResourceReloader);

‎src/main/java/com/terraformersmc/vistas/mixin/SplashTextResourceSupplierMixin.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.terraformersmc.vistas.mixin;
22

3+
import com.terraformersmc.vistas.title.VistasTitle;
4+
import net.minecraft.util.Identifier;
35
import org.spongepowered.asm.mixin.Mixin;
46
import org.spongepowered.asm.mixin.injection.At;
57
import org.spongepowered.asm.mixin.injection.Inject;
@@ -30,7 +32,9 @@ public class SplashTextResourceSupplierMixin {
3032
private void vistas$get(CallbackInfoReturnable<String> ci) {
3133
MinecraftClient client = MinecraftClient.getInstance();
3234
PanoramaResourceReloader resourceReloader = ((MinecraftClientAccess) client).getPanoramaResourceReloader();
33-
if (resourceReloader != null) {
35+
Identifier panoramaId = VistasTitle.PANORAMAS_INVERT.get(VistasTitle.CURRENT.getValue());
36+
37+
if (resourceReloader != null && panoramaId != null) {
3438
ci.setReturnValue(resourceReloader.get());
3539
}
3640
}

‎src/main/java/com/terraformersmc/vistas/mixin/TitleScreenMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected TitleScreenMixin(Text title) {
8585
PanoramaRenderer panoramaRenderer = new PanoramaRenderer(cubemap);
8686
panoramaRenderer.render(delta, MathHelper.clamp(f, 0.0F, 1.0F));
8787
Identifier overlayId = new Identifier(panoramaRenderer.getCubemap().getCubemapId() + "_overlay.png");
88-
if (this.client.getResourceManager().containsResource(overlayId)) {
88+
if (this.client.getResourceManager().getResource(overlayId).isPresent()) {
8989
RenderSystem.setShader(GameRenderer::getPositionTexShader);
9090
RenderSystem.setShaderTexture(0, overlayId);
9191
RenderSystem.enableBlend();

‎src/main/java/com/terraformersmc/vistas/resource/PanoramaResourceReloader.java

Lines changed: 20 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -120,50 +120,35 @@ protected Pair<List<String>, List<Identifier>> prepare(Identifier splashId, Reso
120120
profiler.push(splashId.toString());
121121
try {
122122
profiler.push("parse");
123-
Resource resource = MinecraftClient.getInstance().getResourceManager().getResource(splashId);
123+
Resource resource = MinecraftClient.getInstance().getResourceManager().getResource(splashId).get();
124+
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8));
124125
try {
125-
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8));
126-
try {
127-
splashTexts = Lists.newArrayList(bufferedReader.lines().map(String::trim).map((splash) -> {
128-
if (splash.startsWith("$vistas$import$")) {
129-
try {
130-
imports.add(new Identifier(splash.substring(15)));
131-
} catch (InvalidIdentifierException badId) {
132-
Vistas.LOGGER.error("Splash: '{}' imports invalid Identifier: '{}'", splashId, splash.substring(15));
133-
}
126+
splashTexts = Lists.newArrayList(bufferedReader.lines().map(String::trim).map((splash) -> {
127+
if (splash.startsWith("$vistas$import$")) {
128+
try {
129+
imports.add(new Identifier(splash.substring(15)));
130+
} catch (InvalidIdentifierException badId) {
131+
Vistas.LOGGER.error("Splash: '{}' imports invalid Identifier: '{}'", splashId, splash.substring(15));
134132
}
135-
Session session = MinecraftClient.getInstance().getSession();
136-
splash = splash.replace("$vistas$name$", session.getUsername().toLowerCase(Locale.ROOT));
137-
splash = splash.replace("$vistas$Name$", session.getUsername());
138-
splash = splash.replace("$vistas$NAME$", session.getUsername().toUpperCase(Locale.ROOT));
139-
return splash;
140-
}).filter((splash) -> splash.hashCode() != 125780783 && !splash.startsWith("$vistas$import$")).toList());
141-
} catch (Throwable throwable) {
142-
try {
143-
bufferedReader.close();
144-
} catch (Throwable closeable) {
145-
throwable.addSuppressed(closeable);
146133
}
147-
148-
throw throwable;
149-
}
150-
151-
bufferedReader.close();
134+
Session session = MinecraftClient.getInstance().getSession();
135+
splash = splash.replace("$vistas$name$", session.getUsername().toLowerCase(Locale.ROOT));
136+
splash = splash.replace("$vistas$Name$", session.getUsername());
137+
splash = splash.replace("$vistas$NAME$", session.getUsername().toUpperCase(Locale.ROOT));
138+
return splash;
139+
}).filter((splash) -> splash.hashCode() != 125780783 && !splash.startsWith("$vistas$import$")).toList());
152140
} catch (Throwable throwable) {
153-
if (resource != null) {
154-
try {
155-
resource.close();
156-
} catch (Throwable closeable) {
157-
throwable.addSuppressed(closeable);
158-
}
141+
try {
142+
bufferedReader.close();
143+
} catch (Throwable closeable) {
144+
throwable.addSuppressed(closeable);
159145
}
160146

161147
throw throwable;
162148
}
163149

164-
if (resource != null) {
165-
resource.close();
166-
}
150+
bufferedReader.close();
151+
167152
profiler.pop();
168153
} catch (IOException exception) {
169154
Vistas.LOGGER.error("Splash: '{}' doesn't exist!", splashId);

‎src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"vistas.mixins.json"
3030
],
3131
"depends": {
32-
"fabricloader": ">=0.11.3",
32+
"fabricloader": ">=0.12.12",
3333
"fabric": "*"
3434
}
3535
}

‎src/main/resources/vistas.mixins.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"required": true,
33
"minVersion": "0.8",
44
"package": "com.terraformersmc.vistas.mixin",
5-
"compatibilityLevel": "JAVA_16",
5+
"compatibilityLevel": "JAVA_17",
66
"client": [
77
"GameRendererMixin",
88
"MinecraftClientMixin",

0 commit comments

Comments
 (0)