Skip to content

Commit 57504f8

Browse files
florianreuthflorianreuth
committed
Setup unobfuscated environment
1 parent e7a6c9d commit 57504f8

12 files changed

Lines changed: 44 additions & 41 deletions

File tree

‎build.gradle.kts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import de.florianreuth.baseproject.*
22

33
plugins {
4-
id("net.fabricmc.fabric-loom-remap")
4+
id("net.fabricmc.fabric-loom")
55
id("de.florianreuth.baseproject")
66
}
77

88
allprojects {
99

1010
setupProject()
11-
setupFabricRemap()
11+
setupFabric()
1212
setupViaPublishing()
1313

1414
repositories {
@@ -40,20 +40,22 @@ project.property("updating_minecraft").toString().toBoolean().let {
4040
}
4141
}
4242

43-
val jij = configureJij()
43+
val jij = configureApiJij()
44+
4445
configureVVDependencies("jij")
4546

4647
includeFabricApiModules("fabric-resource-loader-v1", "fabric-resource-loader-v0", "fabric-networking-api-v1", "fabric-command-api-v2", "fabric-lifecycle-events-v1", "fabric-particles-v1", "fabric-registry-sync-v0")
47-
includeFabricSubmodule("viafabricplus-api")
48-
includeFabricSubmodule("viafabricplus-visuals")
4948

5049
dependencies {
50+
jij(project(":viafabricplus-api"))
51+
jij(project(":viafabricplus-visuals"))
52+
5153
jij("net.lenni0451:Reflect:1.6.2")
5254
jij("de.florianreuth:classic4j:2.3.0")
5355
configureBedrockDependencies()
5456

5557
testImplementation("net.fabricmc:fabric-loader-junit:${property("fabric_loader_version")}")
56-
modCompileOnly("com.terraformersmc:modmenu:16.0.0")
58+
//modCompileOnly("com.terraformersmc:modmenu:16.0.0") // TODO Can't have right now as they don't publish unobfuscated builds
5759
}
5860

5961
includeTransitiveJijDependencies()

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ project_jvm_version=21
77

88
project_group=com.viaversion
99
project_name=ViaFabricPlus
10-
project_version=4.4.8-SNAPSHOT
10+
project_version=4.4.8-SNAPSHOT-UNOBF
1111
project_description=Minecraft Fabric mod which allows you to join EVERY Minecraft server version (Classic, Alpha, Beta, Release, April Fools, Bedrock)
1212

1313
publishing_dev_id=florianreuth
1414
publishing_dev_name=Florian Reuth
1515
publishing_dev_mail=git@florianreuth.de
1616

17-
minecraft_version=1.21.11
17+
minecraft_version=1.21.11_unobfuscated
1818
fabric_loader_version=0.18.4
19-
fabric_api_version=0.141.2+1.21.11
19+
fabric_api_version=0.139.4+1.21.11_unobfuscated
2020

2121
# Allows running of `gradle test` - disable after running
2222
updating_minecraft=false
2323

2424
# Set to empty to use the Minecraft version above, otherwise use version ranges: >=1.21.7 <=1.21.8
25-
supported_minecraft_versions=
25+
supported_minecraft_versions=1.21.11+unobfuscated

‎settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pluginManagement {
77
}
88

99
plugins {
10-
id("net.fabricmc.fabric-loom-remap") version "1.15-SNAPSHOT"
10+
id("net.fabricmc.fabric-loom") version "1.15-SNAPSHOT"
1111
id("de.florianreuth.baseproject") version "2.0.1"
1212
}
1313
}

‎src/main/java/com/viaversion/viafabricplus/base/ModMenuScreenFactory.java‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,22 @@
1919
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2020
*/
2121

22-
package com.viaversion.viafabricplus.base;
23-
24-
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
25-
import com.terraformersmc.modmenu.api.ModMenuApi;
26-
import com.viaversion.viafabricplus.screen.impl.ProtocolSelectionScreen;
27-
28-
/**
29-
* Implementation of the ModMenu integration allowing users to open the protocol selection screen from the mod menu.
30-
*/
31-
public final class ModMenuScreenFactory implements ModMenuApi {
32-
33-
@Override
34-
public ConfigScreenFactory<?> getModConfigScreenFactory() {
35-
//noinspection Convert2MethodRef
36-
return screen -> ProtocolSelectionScreen.INSTANCE.get(screen);
37-
}
38-
39-
}
22+
// TODO see build.gradle.kts
23+
//package com.viaversion.viafabricplus.base;
24+
//
25+
//import com.terraformersmc.modmenu.api.ConfigScreenFactory;
26+
//import com.terraformersmc.modmenu.api.ModMenuApi;
27+
//import com.viaversion.viafabricplus.screen.impl.ProtocolSelectionScreen;
28+
//
29+
///**
30+
// * Implementation of the ModMenu integration allowing users to open the protocol selection screen from the mod menu.
31+
// */
32+
//public final class ModMenuScreenFactory implements ModMenuApi {
33+
//
34+
// @Override
35+
// public ConfigScreenFactory<?> getModConfigScreenFactory() {
36+
// //noinspection Convert2MethodRef
37+
// return screen -> ProtocolSelectionScreen.INSTANCE.get(screen);
38+
// }
39+
//
40+
//}

‎src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinConnectScreen_1.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public abstract class MixinConnectScreen_1 {
6262

6363
@Shadow
6464
@Final
65-
ConnectScreen field_2416;
65+
ConnectScreen this$0;
6666

6767
@Unique
6868
private boolean viaFabricPlus$useClassiCubeAccount;
@@ -84,7 +84,7 @@ private Object setServerInfoAndProtocolVersion(Optional<InetSocketAddress> insta
8484
targetVersion = ProtocolVersion.getProtocol(this.val$server.protocol);
8585
}
8686
if (!serverPinged || !targetVersion.isKnown()) {
87-
this.field_2416.updateStatus(Component.translatable("base.viafabricplus.detecting_server_version"));
87+
this.this$0.updateStatus(Component.translatable("base.viafabricplus.detecting_server_version"));
8888
try {
8989
targetVersion = ProtocolVersionDetector.get(this.val$hostAndPort, address, ProtocolTranslator.NATIVE_VERSION);
9090
} catch (final ConnectException ignored) {

‎src/main/java/com/viaversion/viafabricplus/injection/mixin/features/execute_inputs_sync/MixinKeyboardHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public abstract class MixinKeyboardHandler implements IMouseKeyboardHandlers {
4444
@Unique
4545
private final Queue<Runnable> viaFabricPlus$pendingScreenEvents = new ConcurrentLinkedQueue<>();
4646

47-
@Redirect(method = {"method_22676", "method_22675"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;execute(Ljava/lang/Runnable;)V"))
47+
@Redirect(method = {"lambda$setup$6", "lambda$setup$8"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;execute(Ljava/lang/Runnable;)V"))
4848
private void storeEvent(Minecraft instance, Runnable runnable) {
4949
if (this.minecraft.getConnection() != null && this.minecraft.screen != null && DebugSettings.INSTANCE.executeInputsSynchronously.isEnabled()) {
5050
this.viaFabricPlus$pendingScreenEvents.offer(runnable);

‎src/main/java/com/viaversion/viafabricplus/injection/mixin/features/execute_inputs_sync/MixinMouseHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public abstract class MixinMouseHandler implements IMouseKeyboardHandlers {
4444
@Unique
4545
private final Queue<Runnable> viaFabricPlus$pendingScreenEvents = new ConcurrentLinkedQueue<>();
4646

47-
@Redirect(method = {"method_22684", "method_22685"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;execute(Ljava/lang/Runnable;)V"))
47+
@Redirect(method = {"lambda$setup$5", "lambda$setup$7"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;execute(Ljava/lang/Runnable;)V"))
4848
private void storeEvent(Minecraft instance, Runnable runnable) {
4949
if (this.minecraft.getConnection() != null && this.minecraft.screen != null && DebugSettings.INSTANCE.executeInputsSynchronously.isEnabled()) {
5050
this.viaFabricPlus$pendingScreenEvents.offer(runnable);

‎src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/replace_block_item_use_logic/MixinMultiPlayerGameMode.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private boolean fixPacketOrder(MultiPlayerGameMode instance, ClientLevel clientL
129129
}
130130
}
131131

132-
@Redirect(method = {"method_41936", "method_41935"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/MultiPlayerGameMode;destroyBlock(Lnet/minecraft/core/BlockPos;)Z"))
132+
@Redirect(method = {"lambda$startDestroyBlock$0", "lambda$continueDestroyBlock$2"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/MultiPlayerGameMode;destroyBlock(Lnet/minecraft/core/BlockPos;)Z"))
133133
private boolean checkFireBlock(MultiPlayerGameMode instance, BlockPos pos, @Local(argsOnly = true) Direction direction) {
134134
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_15_2)) {
135135
return !this.viaFabricPlus$extinguishFire(pos, direction) && instance.destroyBlock(pos);
@@ -198,7 +198,7 @@ private void cancelOffHandBlockPlace(LocalPlayer player, InteractionHand hand, B
198198
}
199199
}
200200

201-
@Redirect(method = "method_41929", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;use(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult;"))
201+
@Redirect(method = "lambda$useItem$6", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;use(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult;"))
202202
private InteractionResult eitherSuccessOrPass(ItemStack instance, Level world, Player user, InteractionHand hand, @Local ItemStack itemStack) {
203203
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) {
204204
final int count = instance.getCount();
@@ -224,7 +224,7 @@ private InteractionResult eitherSuccessOrPass(ItemStack instance, Level world, P
224224
}
225225
}
226226

227-
@Inject(method = "method_41929", at = @At("HEAD"))
227+
@Inject(method = "lambda$useItem$6", at = @At("HEAD"))
228228
private void trackLastUsedItem(InteractionHand hand, Player playerEntity, MutableObject<InteractionResult> mutableObject, int sequence, CallbackInfoReturnable<Packet<?>> cir) {
229229
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) {
230230
ViaFabricPlusHandItemProvider.lastUsedItem = playerEntity.getItemInHand(hand).copy();
@@ -236,7 +236,7 @@ private void trackLastUsedItem(InteractionHand hand, Player playerEntity, Mutabl
236236
* @reason Block place fix
237237
*/
238238
@Overwrite
239-
private Packet<?> method_41933(MutableObject<InteractionResult> mutableObject, LocalPlayer clientPlayerEntity, InteractionHand hand, BlockHitResult blockHitResult, int sequence) {
239+
private Packet<?> lambda$useItemOn$4(MutableObject<InteractionResult> mutableObject, LocalPlayer clientPlayerEntity, InteractionHand hand, BlockHitResult blockHitResult, int sequence) {
240240
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) {
241241
ViaFabricPlusHandItemProvider.lastUsedItem = clientPlayerEntity.getItemInHand(hand).copy();
242242
}

‎src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinUnconfiguredPipelineHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
@Mixin(UnconfiguredPipelineHandler.class)
3434
public abstract class MixinUnconfiguredPipelineHandler {
3535

36-
@WrapOperation(method = "method_56353", at = @At(value = "INVOKE", target = "Lio/netty/channel/ChannelConfig;setAutoRead(Z)Lio/netty/channel/ChannelConfig;", remap = false))
36+
@WrapOperation(method = "lambda$setupInboundHandler$0", at = @At(value = "INVOKE", target = "Lio/netty/channel/ChannelConfig;setAutoRead(Z)Lio/netty/channel/ChannelConfig;", remap = false))
3737
private static ChannelConfig dontChangeAutoRead(ChannelConfig instance, boolean b, Operation<ChannelConfig> original) {
3838
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_20_3)) {
3939
return null;

‎src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/srv_resolving/MixinServerRedirectHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@Mixin(ServerRedirectHandler.class)
3636
public interface MixinServerRedirectHandler {
3737

38-
@Inject(method = "method_36911", at = @At("HEAD"), cancellable = true)
38+
@Inject(method = "lambda$createDnsSrvRedirectHandler$1", at = @At("HEAD"), cancellable = true)
3939
private static void disableSrvForPre1_3(DirContext context, ServerAddress address, CallbackInfoReturnable<Optional<ServerAddress>> cir) {
4040
if (ProtocolTranslator.getTargetVersion().olderThan(LegacyProtocolVersion.r1_3_1tor1_3_2)) {
4141
cir.setReturnValue(Optional.empty());

0 commit comments

Comments
 (0)