1.20-pre5
This commit is contained in:
1 parent
f15a0eabf7
commit
e28f52171f
4 files changed
+9
-5
No files matched your search
+1
-1
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
|
|||||||
|
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check https://fabricmc.net/develop/
|
# check https://fabricmc.net/develop/
|
||||||
minecraft_version=1.20-pre2
|
minecraft_version=1.20-pre5
|
||||||
loader_version=0.14.19
|
loader_version=0.14.19
|
||||||
jsr305_version=3.0.2
|
jsr305_version=3.0.2
|
||||||
fabric_version=0.81.2+1.20
|
fabric_version=0.81.2+1.20
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import java.util.stream.Collectors;
|
|||||||
import carpet.fakes.SimpleEntityLookupInterface;
|
import carpet.fakes.SimpleEntityLookupInterface;
|
||||||
import carpet.fakes.ServerWorldInterface;
|
import carpet.fakes.ServerWorldInterface;
|
||||||
import net.minecraft.Util;
|
import net.minecraft.Util;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
import net.minecraft.server.TickTask;
|
import net.minecraft.server.TickTask;
|
||||||
import net.minecraft.server.level.ChunkHolder;
|
import net.minecraft.server.level.ChunkHolder;
|
||||||
@@ -439,12 +440,14 @@ public abstract class ChunkMap_scarpetChunkCreationMixin implements ThreadedAnvi
|
|||||||
if (futures == null)
|
if (futures == null)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
report.put("layer_count_" + status.getName(), futures.size());
|
String statusName = BuiltInRegistries.CHUNK_STATUS.getKey(status).getPath();
|
||||||
|
|
||||||
|
report.put("layer_count_" + statusName, futures.size());
|
||||||
final long start = System.currentTimeMillis();
|
final long start = System.currentTimeMillis();
|
||||||
|
|
||||||
this.waitFor(futures);
|
this.waitFor(futures);
|
||||||
|
|
||||||
report.put("layer_time_" + status.getName(), (int) (System.currentTimeMillis() - start));
|
report.put("layer_time_" + statusName, (int) (System.currentTimeMillis() - start));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ public class EntityPlayerMPFake extends ServerPlayer
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void checkFallDamage(double y, boolean onGround, BlockState state, BlockPos pos) {
|
protected void checkFallDamage(double y, boolean onGround, BlockState state, BlockPos pos) {
|
||||||
doCheckFallDamage(y, onGround);
|
doCheckFallDamage(0.0, y, 0.0, onGround);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ import net.minecraft.core.Holder;
|
|||||||
import net.minecraft.core.HolderSet;
|
import net.minecraft.core.HolderSet;
|
||||||
import net.minecraft.core.QuartPos;
|
import net.minecraft.core.QuartPos;
|
||||||
import net.minecraft.core.Registry;
|
import net.minecraft.core.Registry;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
import net.minecraft.core.registries.Registries;
|
import net.minecraft.core.registries.Registries;
|
||||||
import net.minecraft.resources.ResourceKey;
|
import net.minecraft.resources.ResourceKey;
|
||||||
import net.minecraft.server.level.DistanceManager;
|
import net.minecraft.server.level.DistanceManager;
|
||||||
@@ -632,7 +633,7 @@ public class WorldAccess
|
|||||||
forceLoad = lv.get(blockArgument.offset).getBoolean();
|
forceLoad = lv.get(blockArgument.offset).getBoolean();
|
||||||
}
|
}
|
||||||
ChunkAccess chunk = ((CarpetContext) c).level().getChunk(pos.getX() >> 4, pos.getZ() >> 4, ChunkStatus.EMPTY, forceLoad);
|
ChunkAccess chunk = ((CarpetContext) c).level().getChunk(pos.getX() >> 4, pos.getZ() >> 4, ChunkStatus.EMPTY, forceLoad);
|
||||||
return chunk == null ? Value.NULL : new StringValue(chunk.getStatus().getName());
|
return chunk == null ? Value.NULL : ValueConversions.of(BuiltInRegistries.CHUNK_STATUS.getKey(chunk.getStatus()));
|
||||||
});
|
});
|
||||||
|
|
||||||
expression.addContextFunction("chunk_tickets", -1, (c, t, lv) ->
|
expression.addContextFunction("chunk_tickets", -1, (c, t, lv) ->
|
||||||
|
|||||||
Reference in new issue
Block a user