diff --git a/build.gradle b/build.gradle index 306d8a9dc..6df71f6b1 100644 --- a/build.gradle +++ b/build.gradle @@ -139,10 +139,10 @@ dependencies { implementation fg.deobf(registrate) shade registrate - if (findProject(':Flywheel') != null) { - implementation project(':Flywheel') // jozu: I use a gradle workspace with both projects + if (findProject(':Flywheel-Forge') != null) { + implementation project(':Flywheel-Forge') // jozu: I use a gradle workspace with both projects } else { - implementation fg.deobf("com.jozufozu.flywheel:Flywheel:${flywheel_version}") + implementation fg.deobf("com.jozufozu.flywheel:Flywheel-Forge:${flywheel_version}") } compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api") @@ -256,7 +256,7 @@ String getChangelogText() { // if (project.hasProperty('simi_curseforge_key')) { // apiKey = project.simi_curseforge_key // } -// +// // project { // id = project.projectId // changelog = System.getenv('CHANGELOG') == null || System.getenv('CHANGELOG').equals('none') ? getChangelogText() : System.getenv('CHANGELOG') diff --git a/gradle.properties b/gradle.properties index 1aaf62906..383fe0145 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ parchment_version = 2021.10.31 # dependency versions registrate_version = MC1.17.1-1.0.14 -flywheel_version = 1.17-0.3.0.15 +flywheel_version = 1.17-0.3.0.17 jei_version = 8.2.0.36 # curseforge information diff --git a/src/main/java/com/simibubi/create/AllStitchedTextures.java b/src/main/java/com/simibubi/create/AllStitchedTextures.java index f18196e89..5a1038dd4 100644 --- a/src/main/java/com/simibubi/create/AllStitchedTextures.java +++ b/src/main/java/com/simibubi/create/AllStitchedTextures.java @@ -1,13 +1,12 @@ package com.simibubi.create; -import com.jozufozu.flywheel.core.AtlasStitcher; import com.jozufozu.flywheel.core.StitchedSprite; import net.minecraft.resources.ResourceLocation; public class AllStitchedTextures { - public static final StitchedSprite SUPER_GLUE = AtlasStitcher.getInstance().get(new ResourceLocation(Create.ID, "entity/super_glue/slime")); + public static final StitchedSprite SUPER_GLUE = new StitchedSprite(new ResourceLocation(Create.ID, "entity/super_glue/slime")); public static void init() { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueInstance.java index 5d8564541..e56e7f577 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueInstance.java @@ -134,7 +134,7 @@ public class GlueInstance extends EntityInstance implements ITi float maxV; if (USE_ATLAS) { - TextureAtlasSprite sprite = AllStitchedTextures.SUPER_GLUE.getSprite(); + TextureAtlasSprite sprite = AllStitchedTextures.SUPER_GLUE.get(); minU = sprite.getU0(); maxU = sprite.getU1(); minV = sprite.getV0();