Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Create 6 #1022

Merged
merged 1 commit into from
Mar 7, 2025
Merged

Update to Create 6 #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@ void exclusiveRepo(RepositoryHandler handler, String url, Consumer<InclusiveRepo
}

repositories { RepositoryHandler handler ->
exclusiveRepo(handler, 'https://maven.tterrag.com/', 'com.tterrag.registrate', 'com.jozufozu.flywheel')
exclusiveRepo(handler, 'https://maven.tterrag.com/', 'com.tterrag.registrate')
exclusiveRepo(handler, 'https://maven.createmod.net/', 'dev.engine-room.flywheel')
exclusiveRepo(handler, "https://modmaven.dev/", "mezz.jei", "mcjty.theoneprobe", "appeng", "mekanism")
exclusiveRepo(handler, 'https://cursemaven.com', 'curse.maven')
exclusiveRepo(handler, 'https://maven.blamejared.com', 'vazkii.patchouli', 'net.darkhax.bookshelf', 'net.darkhax.enchdesc', 'com.almostreliable.mods')
Expand Down Expand Up @@ -281,8 +282,8 @@ dependencies {
//fluxnetworks
localRuntime fg.deobf("curse.maven:fluxnetworks-248020:4651164")

//Flywheel
compileOnly fg.deobf("com.jozufozu.flywheel:flywheel-forge-1.20.1:0.6.9-5") // REMOVE When crash is fixed
// Flywheel -- REMOVE When crash is fixed
compileOnly fg.deobf("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:1.0.1")

// Almost Unified
compileOnly fg.deobf("com.almostreliable.mods:almostunified-forge:${minecraft_version}-${almostunified_version}")
Expand Down
4 changes: 2 additions & 2 deletions src/core/java/com/enderio/core/common/compat/FlywheelCompat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.enderio.core.common.compat;

import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
import dev.engine_room.flywheel.api.visualization.VisualizationLevel;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.entity.BlockEntity;
Expand All @@ -10,7 +10,7 @@ public class FlywheelCompat {

@Nullable
public static BlockEntity getExistingBlockEntity(BlockGetter level, BlockPos pos) {
if (level instanceof VirtualRenderWorld) {
if (level instanceof VisualizationLevel) {
return level.getBlockEntity(pos);
}
return level.getExistingBlockEntity(pos);
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/META-INF/mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,10 @@ modId="kubejs_enderio"
mandatory=false
versionRange="[1.20.1-0.6.0,)"
side="BOTH"

# Flywheel breaking changes
[[dependencies.enderio]]
modId="create"
mandatory=false
versionRange="[6.0.0,)"
side="BOTH"
Loading