mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 07:20:24 +01:00
Readd BlockBehavior inlining patch
This commit is contained in:
parent
2f97008db9
commit
169ac46b2b
1 changed files with 79 additions and 0 deletions
|
@ -0,0 +1,79 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||||||
|
Date: Mon, 6 Jul 2020 20:46:50 -0700
|
||||||
|
Subject: [PATCH] Improve inlinig for some hot BlockBehavior and FluidState
|
||||||
|
methods
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
|
||||||
|
+++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
|
||||||
|
@@ -0,0 +0,0 @@ public abstract class BlockBehaviour implements FeatureElement {
|
||||||
|
return this.shapeExceedsCube; // Paper - moved into shape cache init
|
||||||
|
}
|
||||||
|
|
||||||
|
- public boolean useShapeForLightOcclusion() {
|
||||||
|
+ public final boolean useShapeForLightOcclusion() { // Paper
|
||||||
|
return this.useShapeForLightOcclusion;
|
||||||
|
}
|
||||||
|
|
||||||
|
- public int getLightEmission() {
|
||||||
|
+ public final int getLightEmission() { // Paper
|
||||||
|
return this.lightEmission;
|
||||||
|
}
|
||||||
|
|
||||||
|
- public boolean isAir() {
|
||||||
|
+ public final boolean isAir() { // Paper
|
||||||
|
return this.isAir;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -0,0 +0,0 @@ public abstract class BlockBehaviour implements FeatureElement {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- public boolean canOcclude() {
|
||||||
|
+ public final boolean canOcclude() { // Paper
|
||||||
|
return this.canOcclude;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -0,0 +0,0 @@ public abstract class BlockBehaviour implements FeatureElement {
|
||||||
|
return this.getBlock() == block;
|
||||||
|
}
|
||||||
|
|
||||||
|
- public FluidState getFluidState() {
|
||||||
|
+ public final FluidState getFluidState() { // Paper
|
||||||
|
return this.fluidState;
|
||||||
|
}
|
||||||
|
|
||||||
|
- public boolean isRandomlyTicking() {
|
||||||
|
+ public final boolean isRandomlyTicking() { // Paper
|
||||||
|
return this.isRandomlyTicking;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/world/level/material/FluidState.java b/src/main/java/net/minecraft/world/level/material/FluidState.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/world/level/material/FluidState.java
|
||||||
|
+++ b/src/main/java/net/minecraft/world/level/material/FluidState.java
|
||||||
|
@@ -0,0 +0,0 @@ public final class FluidState extends StateHolder<Fluid, FluidState> {
|
||||||
|
public static final int AMOUNT_MAX = 9;
|
||||||
|
public static final int AMOUNT_FULL = 8;
|
||||||
|
|
||||||
|
+ // Paper start
|
||||||
|
+ protected final boolean isEmpty;
|
||||||
|
+ // Paper end
|
||||||
|
public FluidState(Fluid fluid, ImmutableMap<Property<?>, Comparable<?>> propertiesMap, MapCodec<FluidState> codec) {
|
||||||
|
super(fluid, propertiesMap, codec);
|
||||||
|
+ this.isEmpty = fluid.isEmpty(); // Paper - moved from isEmpty()
|
||||||
|
}
|
||||||
|
|
||||||
|
public Fluid getType() {
|
||||||
|
@@ -0,0 +0,0 @@ public final class FluidState extends StateHolder<Fluid, FluidState> {
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isEmpty() {
|
||||||
|
- return this.getType().isEmpty();
|
||||||
|
+ return this.isEmpty; // Paper - moved into constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getHeight(BlockGetter world, BlockPos pos) {
|
Loading…
Reference in a new issue