mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-12-27 07:26:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

One more thing...

Browse source 
- Missed a level param in LightVolume
 - Public removeAndMark
 - Remove batching warning
 - Bump forge and parchment builds
This commit is contained in:
Jozufozu 2022-07-10 15:22:02 -04:00
parent 055802160f
commit c3b1a43beb
5 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gradle.properties
View file

@ -5,7 +5,7 @@ org.gradle.daemon = false
mod_version = 0.6.4 mod_version = 0.6.4
mc_update_version = 1.18 mc_update_version = 1.18
minecraft_version = 1.18.2 minecraft_version = 1.18.2
forge_version = 40.0.15 forge_version = 40.1.60
# build dependency versions # build dependency versions
forgegradle_version = 5.1.+ forgegradle_version = 5.1.+
@ -13,7 +13,7 @@ mixingradle_version = 0.7-SNAPSHOT
mixin_version = 0.8.5 mixin_version = 0.8.5
librarian_version = 1.+ librarian_version = 1.+
cursegradle_version = 1.4.0 cursegradle_version = 1.4.0
parchment_version = 2022.03.13 parchment_version = 2022.07.10
# curseforge info # curseforge info
projectId = 486392 projectId = 486392

2
src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstance.java
View file

@ -38,7 +38,7 @@ public abstract class AbstractInstance implements Instance, LightListener {
} }
final void removeAndMark() { public final void removeAndMark() {
if (removed) { if (removed) {
return; return;
} }

12
src/main/java/com/jozufozu/flywheel/config/FlwCommands.java
View file

@ -118,17 +118,7 @@ public class FlwCommands {
return switch (type) { return switch (type) {
case OFF -> new TextComponent("Disabled Flywheel").withStyle(ChatFormatting.RED); case OFF -> new TextComponent("Disabled Flywheel").withStyle(ChatFormatting.RED);
case INSTANCING -> new TextComponent("Using Instancing Engine").withStyle(ChatFormatting.GREEN); case INSTANCING -> new TextComponent("Using Instancing Engine").withStyle(ChatFormatting.GREEN);
case BATCHING -> { case BATCHING -> new TextComponent("Using Batching Engine").withStyle(ChatFormatting.GREEN);
MutableComponent msg = new TextComponent("Using Batching Engine").withStyle(ChatFormatting.GREEN);
if (ModList.get()
.isLoaded("create")) {
// FIXME: batching engine contraption lighting issues
msg.append(new TextComponent("\nWARNING: May cause issues with Create Contraptions").withStyle(ChatFormatting.RED));
}
yield msg;
}
}; };
} }

5
src/main/java/com/jozufozu/flywheel/light/GPULightVolume.java
View file

@ -27,7 +27,6 @@ import com.jozufozu.flywheel.util.box.GridAlignedBB;
import com.jozufozu.flywheel.util.box.ImmutableBox; import com.jozufozu.flywheel.util.box.ImmutableBox;
import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraft.world.level.LightLayer;
public class GPULightVolume extends LightVolume { public class GPULightVolume extends LightVolume {
@ -111,14 +110,14 @@ public class GPULightVolume extends LightVolume {
glTexture.delete(); glTexture.delete();
} }
public void move(BlockAndTintGetter level, ImmutableBox newSampleVolume) { public void move(ImmutableBox newSampleVolume) {
if (lightData == null) return; if (lightData == null) return;
if (box.contains(newSampleVolume)) { if (box.contains(newSampleVolume)) {
sampleVolume.assign(newSampleVolume); sampleVolume.assign(newSampleVolume);
initialize(); initialize();
} else { } else {
super.move(level, newSampleVolume); super.move(newSampleVolume);
} }
} }

2
src/main/java/com/jozufozu/flywheel/light/LightVolume.java
View file

@ -60,7 +60,7 @@ public class LightVolume implements ImmutableBox, LightListener {
return box.getMaxZ(); return box.getMaxZ();
} }
public void move(BlockAndTintGetter level, ImmutableBox newSampleVolume) { public void move(ImmutableBox newSampleVolume) {
if (lightData == null) return; if (lightData == null) return;
setBox(newSampleVolume); setBox(newSampleVolume);