Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-28 11:29:17 +00:00
Code Issues Releases Activity

修复1.20.1光照

Browse Source
This commit is contained in:
XiaoMoMi
2025-06-21 20:55:41 +08:00
parent 747df75f6f
commit 2dc35bf2c2
6 changed files with 80 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/main/java/net/momirealms/craftengine/core/block/BlockSettings.java
View File

@@ -23,6 +23,8 @@ public class BlockSettings {
Tristate isRedstoneConductor = Tristate.UNDEFINED;
Tristate isSuffocating = Tristate.UNDEFINED;
Tristate isViewBlocking = Tristate.UNDEFINED;
Tristate useShapeForLightOcclusion = Tristate.UNDEFINED;
Tristate propagatesSkylightDown = Tristate.UNDEFINED;
MapColor mapColor = MapColor.CLEAR;
PushReaction pushReaction = PushReaction.NORMAL;
int luminance;
@@ -35,7 +37,6 @@ public class BlockSettings {
Set<Key> correctTools = Set.of();
String name;
String supportShapeBlockState;
boolean propagatesSkylightDown;
private BlockSettings() {}
@@ -98,6 +99,7 @@ public class BlockSettings {
newSettings.incorrectToolSpeed = settings.incorrectToolSpeed;
newSettings.supportShapeBlockState = settings.supportShapeBlockState;
newSettings.propagatesSkylightDown = settings.propagatesSkylightDown;
newSettings.useShapeForLightOcclusion = settings.useShapeForLightOcclusion;
return newSettings;
}
@@ -205,10 +207,14 @@ public class BlockSettings {
return supportShapeBlockState;
}
public boolean propagatesSkylightDown() {
public Tristate propagatesSkylightDown() {
return propagatesSkylightDown;
}
public Tristate useShapeForLightOcclusion() {
return useShapeForLightOcclusion;
}
public BlockSettings correctTools(Set<Key> correctTools) {
this.correctTools = correctTools;
return this;
@@ -304,7 +310,7 @@ public class BlockSettings {
return this;
}
public BlockSettings propagatesSkylightDown(boolean propagatesSkylightDown) {
public BlockSettings propagatesSkylightDown(Tristate propagatesSkylightDown) {
this.propagatesSkylightDown = propagatesSkylightDown;
return this;
}
@@ -344,6 +350,11 @@ public class BlockSettings {
return this;
}
public BlockSettings useShapeForLightOcclusion(Tristate useShapeForLightOcclusion) {
this.useShapeForLightOcclusion = useShapeForLightOcclusion;
return this;
}
public interface Modifier {
void apply(BlockSettings settings);
@@ -380,7 +391,7 @@ public class BlockSettings {
}));
registerFactory("propagate-skylight", (value -> {
boolean booleanValue = (boolean) value;
return settings -> settings.propagatesSkylightDown(booleanValue);
return settings -> settings.propagatesSkylightDown(booleanValue ? Tristate.TRUE : Tristate.FALSE);
}));
registerFactory("push-reaction", (value -> {
PushReaction reaction = PushReaction.valueOf(value.toString().toUpperCase(Locale.ENGLISH));
@@ -440,7 +451,7 @@ public class BlockSettings {
}));
registerFactory("can-occlude", (value -> {
boolean booleanValue = (boolean) value;
return settings -> settings.canOcclude(booleanValue ? Tristate.FALSE : Tristate.TRUE);
return settings -> settings.canOcclude(booleanValue ? Tristate.TRUE : Tristate.FALSE);
}));
registerFactory("correct-tools", (value -> {
List<String> tools = MiscUtils.getAsStringList(value);
@@ -454,6 +465,10 @@ public class BlockSettings {
boolean booleanValue = (boolean) value;
return settings -> settings.respectToolComponent(booleanValue);
}));
registerFactory("use-shape-for-light-occlusion", (value -> {
boolean booleanValue = (boolean) value;
return settings -> settings.useShapeForLightOcclusion(booleanValue ? Tristate.TRUE : Tristate.FALSE);
}));
registerFactory("incorrect-tool-dig-speed", (value -> {
float floatValue = ResourceConfigUtils.getAsFloat(value, "incorrect-tool-dig-speed");
return settings -> settings.incorrectToolSpeed(floatValue);

1
core/src/main/java/net/momirealms/craftengine/core/item/ItemManager.java
View File

@@ -4,7 +4,6 @@ import net.momirealms.craftengine.core.entity.player.Player;
import net.momirealms.craftengine.core.item.behavior.ItemBehavior;
import net.momirealms.craftengine.core.item.modifier.ItemDataModifier;
import net.momirealms.craftengine.core.pack.misc.EquipmentGeneration;
import net.momirealms.craftengine.core.pack.model.ItemModel;
import net.momirealms.craftengine.core.pack.model.LegacyOverridesModel;
import net.momirealms.craftengine.core.pack.model.ModernItemModel;
import net.momirealms.craftengine.core.pack.model.generation.ModelGenerator;

1
core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java
View File

@@ -17,7 +17,6 @@ import net.momirealms.craftengine.core.pack.host.ResourcePackHost;
import net.momirealms.craftengine.core.pack.host.ResourcePackHosts;
import net.momirealms.craftengine.core.pack.host.impl.NoneHost;
import net.momirealms.craftengine.core.pack.misc.EquipmentGeneration;
import net.momirealms.craftengine.core.pack.model.ItemModel;
import net.momirealms.craftengine.core.pack.model.LegacyOverridesModel;
import net.momirealms.craftengine.core.pack.model.ModernItemModel;
import net.momirealms.craftengine.core.pack.model.generation.ModelGeneration;