diff --git a/build.gradle b/build.gradle index 8507c7df..50c3291c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1701530445 +//version: 1702141377 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -54,7 +54,7 @@ plugins { id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.26' } print("You might want to check out './gradlew :faq' if your build fails.\n") @@ -613,7 +613,7 @@ repositories { } maven { name = "ic2" - url = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/") + url = getURL("https://maven2.ic2.player.to/", "https://maven.ic2.player.to/") content { includeGroup "net.industrial-craft" } @@ -672,6 +672,8 @@ configurations.all { substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier") + + substitute module('org.scala-lang:scala-library:2.11.1') using module('org.scala-lang:scala-library:2.11.5') because('To allow mixing with Java 8 targets') } } diff --git a/dependencies.gradle b/dependencies.gradle index bb5b9093..a442786f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -19,11 +19,11 @@ dependencies { transformedMod("com.github.GTNewHorizons:Baubles:1.0.3:dev") // Transitive updates to make runClient17 work transformedMod("com.github.GTNewHorizons:ForgeMultipart:1.4.1:dev") - transformedMod("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.96:dev") - transformedMod("com.github.GTNewHorizons:harvestcraft:1.1.3-GTNH:dev") + transformedMod("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.106:dev") + transformedMod("com.github.GTNewHorizons:harvestcraft:1.1.4-GTNH:dev") transformedMod("com.github.GTNewHorizons:HungerOverhaul:1.0.4-GTNH:dev") transformedMod("com.github.GTNewHorizons:MrTJPCore:1.1.5:dev") // Do not update, fixed afterwards - transformedMod("com.github.GTNewHorizons:Railcraft:9.15.1:dev") { exclude group: "thaumcraft", module: "Thaumcraft" } + transformedMod("com.github.GTNewHorizons:Railcraft:9.15.3:dev") { exclude group: "thaumcraft", module: "Thaumcraft" } transformedMod("com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev") transformedMod(deobfCurse("bibliocraft-228027:2423369")) transformedMod("curse.maven:biomes-o-plenty-220318:2499612") diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java b/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java index 91d71111..83843a78 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java @@ -268,8 +268,9 @@ public enum Mixins { .addMixinClasses("minecraft.MixinBlockBed").setSide(Side.BOTH) .setApplyIf(() -> Common.config.bedMessageAboveHotbar).addTargetedMod(TargetedMod.VANILLA)), FIX_PLAYER_SKIN_FETCHING(new Builder("Fix player skin fetching").setPhase(Phase.EARLY) - .addMixinClasses("minecraft.MixinAbstractClientPlayer").setSide(Side.CLIENT) - .setApplyIf(() -> Common.config.fixPlayerSkinFetching).addTargetedMod(TargetedMod.VANILLA)), + .addMixinClasses("minecraft.MixinAbstractClientPlayer", "minecraft.MixinThreadDownloadImageData") + .setSide(Side.CLIENT).setApplyIf(() -> Common.config.fixPlayerSkinFetching) + .addTargetedMod(TargetedMod.VANILLA)), VALIDATE_PACKET_ENCODING_BEFORE_SENDING(new Builder("Validate packet encoding before sending").setPhase(Phase.EARLY) .addMixinClasses("minecraft.packets.MixinDataWatcher", "minecraft.packets.MixinS3FPacketCustomPayload") .setSide(Side.BOTH).setApplyIf(() -> Common.config.validatePacketEncodingBeforeSending) diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinThreadDownloadImageData.java b/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinThreadDownloadImageData.java new file mode 100644 index 00000000..af0a14e2 --- /dev/null +++ b/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinThreadDownloadImageData.java @@ -0,0 +1,27 @@ +package com.mitchej123.hodgepodge.mixins.early.minecraft; + +import java.net.HttpURLConnection; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +import com.mitchej123.hodgepodge.Tags; + +@Mixin(targets = "net/minecraft/client/renderer/ThreadDownloadImageData$1") +public class MixinThreadDownloadImageData { + + @SuppressWarnings("UnresolvedMixinReference") // mcdev cannot find references in anonymous classes correctly + @Inject( + method = "run()V", + at = @At(value = "INVOKE", target = "Ljava/net/HttpURLConnection;setDoInput(Z)V"), + locals = LocalCapture.CAPTURE_FAILSOFT, + remap = false) + private void hodgepodge$injectRun(CallbackInfo ci, HttpURLConnection httpURLConnection) { + httpURLConnection.setRequestProperty( + "User-Agent", + "Minecraft/1.7.10 Hodgepodge/" + Tags.VERSION + " (+https://github.com/GTNewHorizons/Hodgepodge)"); + } +}