diff --git a/README.md b/README.md index 70bb55392..d224ad76e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Patreon Supported Versions License - Discord + Discord Curseforge Downloads

diff --git a/build.gradle b/build.gradle index de6396c7b..c131c2c06 100644 --- a/build.gradle +++ b/build.gradle @@ -134,7 +134,11 @@ dependencies { // at runtime, use the full JEI jar runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:${jei_version}") - compile fg.deobf("curse.maven:flywheel-486392:3357100") // cursemaven for now + if (findProject(':Flywheel') != null) { + compile project(':Flywheel') // jozu: I use a gradle workspace with both projects + } else { + compile fg.deobf("com.jozufozu.flywheel:Flywheel:1.16-0.0.2.7") + } // implementation fg.deobf("curse.maven:druidcraft-340991:3101903") diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index c175c3c66..13af7d571 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -1301,13 +1301,6 @@ public class AllBlocks { }) .register(); - public static final BlockEntry CHROMATIC_PROJECTOR = - REGISTRATE.block("chromatic_projector", ChromaticProjectorBlock::new) - .initialProperties(() -> Blocks.IRON_BLOCK) - .item() - .build() - .register(); - // Materials static { diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index ef6108ebb..e0455c9c2 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -665,11 +665,5 @@ public class AllTileEntities { .renderer(() -> CopperBacktankRenderer::new) .register(); - public static final TileEntityEntry CHROMATIC_PROJECTOR =Create.registrate() - .tileEntity("chromatic_projector", ChromaticProjectorTileEntity::new) - .instance(() -> ChromaticProjectorInstance::new) - .validBlocks(AllBlocks.CHROMATIC_PROJECTOR) - .register(); - public static void register() {} } diff --git a/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorBlock.java b/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorBlock.java index 28d493cc5..86fcea0f8 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorBlock.java +++ b/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorBlock.java @@ -54,7 +54,7 @@ public class ChromaticProjectorBlock extends Block implements ITE