mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-10 12:33:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bump flywheel build

Browse Source 
- New project slug
 - StitchedSprite changes
This commit is contained in:
Jozufozu 2021-11-27 12:46:01 -08:00
parent 569975bc07
commit 7a4ed99fb5
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@ -139,10 +139,10 @@ dependencies {
implementation fg.deobf(registrate) implementation fg.deobf(registrate)
shade registrate shade registrate
if (findProject(':Flywheel') != null) { if (findProject(':Flywheel-Forge') != null) {
implementation project(':Flywheel') // jozu: I use a gradle workspace with both projects implementation project(':Flywheel-Forge') // jozu: I use a gradle workspace with both projects
} else { } 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") compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api")
@ -256,7 +256,7 @@ String getChangelogText() {
// if (project.hasProperty('simi_curseforge_key')) { // if (project.hasProperty('simi_curseforge_key')) {
// apiKey = project.simi_curseforge_key // apiKey = project.simi_curseforge_key
// } // }
// //
// project { // project {
// id = project.projectId // id = project.projectId
// changelog = System.getenv('CHANGELOG') == null || System.getenv('CHANGELOG').equals('none') ? getChangelogText() : System.getenv('CHANGELOG') // changelog = System.getenv('CHANGELOG') == null || System.getenv('CHANGELOG').equals('none') ? getChangelogText() : System.getenv('CHANGELOG')

2
gradle.properties
View File

@ -18,7 +18,7 @@ parchment_version = 2021.10.31
# dependency versions # dependency versions
registrate_version = MC1.17.1-1.0.14 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 jei_version = 8.2.0.36
# curseforge information # curseforge information

3
src/main/java/com/simibubi/create/AllStitchedTextures.java
View File

@ -1,13 +1,12 @@
package com.simibubi.create; package com.simibubi.create;
import com.jozufozu.flywheel.core.AtlasStitcher;
import com.jozufozu.flywheel.core.StitchedSprite; import com.jozufozu.flywheel.core.StitchedSprite;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
public class AllStitchedTextures { 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() { public static void init() {

2
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueInstance.java
View File

@ -134,7 +134,7 @@ public class GlueInstance extends EntityInstance<SuperGlueEntity> implements ITi
float maxV; float maxV;
if (USE_ATLAS) { if (USE_ATLAS) {
TextureAtlasSprite sprite = AllStitchedTextures.SUPER_GLUE.getSprite(); TextureAtlasSprite sprite = AllStitchedTextures.SUPER_GLUE.get();
minU = sprite.getU0(); minU = sprite.getU0();
maxU = sprite.getU1(); maxU = sprite.getU1();
minV = sprite.getV0(); minV = sprite.getV0();