Skip to content

Commit 5d92677

Browse files
committed
Update 1.2.7
1 parent 19961f4 commit 5d92677

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinChunk.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class MixinChunk {
1414
@Shadow public short[] blocks;
1515

1616
@Inject(method = "setChunkData", at = @At("RETURN"))
17-
public void onSetChunkData(byte[] data, int mix, int miy, int miz, int max, int may, int maz, int progress, CallbackInfoReturnable<Integer> cir) {
17+
public void onSetChunkData(byte[] data, int mix, int miy, int miz, int max, int may, int maz, boolean init, int progress, CallbackInfoReturnable<Integer> cir) {
1818
if (ClientModLoader.Internal.networkChunkBytes == data) {
1919
for (int var17 = mix; var17 < max; ++var17) {
2020
for (int var31 = miy; var31 < may; ++var31) {

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinNetClientHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ public void onHandleMultiBlockChange(Packet52MultiBlockChange packet52, Callback
4343
}
4444

4545
@Redirect(method = "handleMapChunk", at = @At(value = "INVOKE", target =
46-
"Lnet/minecraft/src/game/level/WorldClient;setChunkData(IIIIII[B)V"))
47-
public void onSetChunkData(WorldClient instance, int mx, int my, int mz, int mxx, int mxy, int mxz, byte[] data) {
46+
"Lnet/minecraft/src/game/level/WorldClient;setChunkData(IIIIIIZ[B)V"))
47+
public void onSetChunkData(WorldClient instance, int mx, int my, int mz, int mxx, int mxy, int mxz, boolean init, byte[] data) {
4848
ClientModLoader.Internal.networkChunkBytes = data;
4949
try {
50-
instance.setChunkData(mx, my, mz, mxx, mxy, mxz, data);
50+
instance.setChunkData(mx, my, mz, mxx, mxy, mxz, init, data);
5151
} finally {
5252
ClientModLoader.Internal.networkChunkBytes = null;
5353
}

final/src/main/java/com/fox2code/foxloader/installer/Main.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.fox2code.foxloader.launcher.ServerMain;
66
import com.fox2code.foxloader.launcher.utils.SourceUtil;
77

8+
import java.awt.GraphicsEnvironment;
89
import java.io.File;
910
import java.io.IOException;
1011
import java.net.MalformedURLException;
@@ -20,6 +21,10 @@ public class Main {
2021
static final String optJvmArgsWithMem = optJvmArgs + " -Xmn512M -Xms512M -Xmx2G";
2122
static final File currentInstallerFile = SourceUtil.getSourceFile(Main.class);
2223
public static void main(String[] args) throws ReflectiveOperationException, MalformedURLException {
24+
if (args.length == 0 && GraphicsEnvironment.isHeadless()) {
25+
ServerMain.main(args);
26+
return;
27+
}
2328
boolean platform = false;
2429
boolean update = false;
2530
if (args.length >= 1) {

gradle.properties

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ org.gradle.parallel=true
33
org.gradle.jvmargs=-Xmx1024m -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
44

55
# FoxLoader properties
6-
foxloader.version=1.2.6
6+
foxloader.version=1.2.7
77
foxloader.lastReIndevTransformerChanges=1.2.4
88

99
# ReIndev properties
10-
reindev.clientUrl=https://cdn.fox2code.com/files/reindev_2.8.1_02.jar
11-
reindev.serverUrl=https://cdn.fox2code.com/files/reindev281-02_server.jar
12-
reindev.clientJar=reindev_2.8.1_02.jar
13-
reindev.serverJar=reindev281-02_server.jar
14-
reindev.version=2.8.1_2
15-
reindev.version.allowFrom=2.8.1_1
10+
reindev.clientUrl=https://cdn.fox2code.com/files/reindev_2.8.1_03.jar
11+
reindev.serverUrl=https://cdn.fox2code.com/files/reindev281-03_server.jar
12+
reindev.clientJar=reindev_2.8.1_03.jar
13+
reindev.serverJar=reindev281-03_server.jar
14+
reindev.version=2.8.1_3
15+
reindev.version.allowFrom=2.8.1_2
1616

1717
#Spark properties
1818
spark.dependency=maven.modrinth:spark:1.10.37-fabric

server/src/main/java/com/fox2code/foxloader/server/mixins/MixinItemStack.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
public abstract class MixinItemStack implements RegisteredItemStack {
1212
@Shadow
1313
public int stackSize;
14-
@Shadow int itemDamage;
14+
@Shadow
15+
public int itemDamage;
1516

1617
@Shadow public abstract Item getItem();
1718
@Shadow public abstract String getDisplayName();

0 commit comments

Comments
 (0)