icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mappings

Browse Source
This commit is contained in:
gnembon committed 2020-03-15 02:49:46 -03:00
1 parent cb52646695
commit 6351f28dfb
4 files changed
+6 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+1 -1
View File
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
# or better: https://modmuss50.me/fabric.html # or better: https://modmuss50.me/fabric.html
minecraft_version=20w11a minecraft_version=20w11a
yarn_mappings=20w11a+build.1 yarn_mappings=20w11a+build.6
loader_version=0.7.8+build.187 loader_version=0.7.8+build.187
# Mod Properties # Mod Properties
src/main/java/carpet/mixins/IntegratedServerMixin.java
+2 -4
View File
@@ -1,10 +1,8 @@
package carpet.mixins; package carpet.mixins;
import carpet.CarpetServer; import carpet.CarpetServer;
import com.google.gson.JsonElement;
import net.minecraft.class_4952;
import net.minecraft.server.integrated.IntegratedServer; import net.minecraft.server.integrated.IntegratedServer;
import net.minecraft.world.level.LevelGeneratorType; import net.minecraft.world.level.LevelGeneratorOptions;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@@ -14,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
public class IntegratedServerMixin public class IntegratedServerMixin
{ {
@Inject(method = "loadWorld", at = @At("HEAD")) @Inject(method = "loadWorld", at = @At("HEAD"))
private void onSetupServerIntegrated(String name, String serverName, long seed, class_4952 arg, CallbackInfo ci) { private void onSetupServerIntegrated(String name, String serverName, long seed, LevelGeneratorOptions arg, CallbackInfo ci) {
CarpetServer.onServerLoaded((IntegratedServer) (Object) this); CarpetServer.onServerLoaded((IntegratedServer) (Object) this);
} }
} }
src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class MinecraftDedicatedServerMixin
// this.tickWorlds(booleanSupplier_1); // this.tickWorlds(booleanSupplier_1);
@Inject(method = "setupServer", at = @At( @Inject(method = "setupServer", at = @At(
value = "INVOKE", value = "INVOKE",
target = "Lnet/minecraft/server/dedicated/MinecraftDedicatedServer;loadWorld(Ljava/lang/String;Ljava/lang/String;JLnet/minecraft/class_4952;)V", target = "Lnet/minecraft/server/dedicated/MinecraftDedicatedServer;loadWorld(Ljava/lang/String;Ljava/lang/String;JLnet/minecraft/world/level/LevelGeneratorOptions;)V",
shift = At.Shift.BEFORE shift = At.Shift.BEFORE
)) ))
private void onSetupServer(CallbackInfoReturnable<Boolean> cir) { private void onSetupServer(CallbackInfoReturnable<Boolean> cir) {
src/main/java/carpet/mixins/MinecraftServer_coreMixin.java
+2 -4
View File
@@ -1,10 +1,8 @@
package carpet.mixins; package carpet.mixins;
import carpet.CarpetServer; import carpet.CarpetServer;
import com.google.gson.JsonElement;
import net.minecraft.class_4952;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.world.level.LevelGeneratorType; import net.minecraft.world.level.LevelGeneratorOptions;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@@ -32,7 +30,7 @@ public abstract class MinecraftServer_coreMixin
// Dedicated server only // Dedicated server only
@Inject(method = "loadWorld", at = @At("HEAD")) @Inject(method = "loadWorld", at = @At("HEAD"))
private void serverLoaded(String name, String serverName, long seed, class_4952 arg, CallbackInfo ci) private void serverLoaded(String name, String serverName, long seed, LevelGeneratorOptions arg, CallbackInfo ci)
{ {
CarpetServer.onServerLoaded((MinecraftServer) (Object) this); CarpetServer.onServerLoaded((MinecraftServer) (Object) this);
} }