Skip to content

Commit 7389a52

Browse files
committed
opti
1 parent 9865765 commit 7389a52

111 files changed

Lines changed: 932 additions & 846 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'idea'
33
id 'java-library'
44
id 'maven-publish'
5-
id 'net.neoforged.moddev' version '2.0.74'
5+
id 'net.neoforged.moddev' version '2.0.83'
66
}
77

88
tasks.named('wrapper', Wrapper).configure {
@@ -130,7 +130,7 @@ dependencies {
130130
// localRuntime "mezz.jei:jei-${mc_version}-neoforge:${jei_version}"
131131
compileOnly "mezz.jei:jei-1.21-neoforge-api:${jei_version}"
132132
implementation "mezz.jei:jei-1.21-neoforge:${jei_version}"
133-
implementation "curse.maven:lionfish-api-1001614:6168249"
133+
implementation "curse.maven:lionfish-api-1001614:8094835"
134134

135135
// Use the full Curios API jar at runtime
136136
implementation "top.theillusivec4.curios:curios-neoforge:${curios_version}"
@@ -140,10 +140,11 @@ dependencies {
140140
// implementation "blank:coolmod-${mc_version}:${coolmod_version}"
141141
runtimeOnly "curse.maven:tslatentitystatus-tes-830420:6041374"
142142
runtimeOnly "curse.maven:mob-battle-mod-268746:5780368"
143-
//implementation "curse.maven:mowzies-mobs-250498:6700443"
143+
//runtimeOnly "curse.maven:embeddium-908741:6118392"
144+
runtimeOnly "curse.maven:sodium-394468:6382651"
144145
// Example mod dependency using a file as dependency
145146
// implementation files("libs/coolmod-${mc_version}-${coolmod_version}.jar")
146-
147+
// runtimeOnly "curse.maven:irisshaders-455508:6661598"
147148
// Example project dependency using a sister or child project:
148149
// implementation project(":myproject")
149150

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ mod_name=L_Ender's Cataclysm 1.21.1
4141
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
4242
mod_license=All assets of The Cataclysm are unlicensed and all rights are reserved to them by MCL_Ender. The source code LGPL v3.0 license
4343
# The mod version. See https://semver.org/
44-
mod_version=3.22
44+
mod_version=3.28
4545
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
4646
# This should match the base package used for the mod sources.
4747
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/com/github/L_Ender/cataclysm/client/animation/Ancient_Remnant_Animation.java

Lines changed: 221 additions & 191 deletions
Large diffs are not rendered by default.

src/main/java/com/github/L_Ender/cataclysm/client/animation/Cindaria_Animation.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import net.minecraft.client.animation.KeyframeAnimations;
77
import net.neoforged.api.distmarker.Dist;
88
import net.neoforged.api.distmarker.OnlyIn;
9+
//import net.neoforged.api.distmarker.Dist;
10+
//import net.neoforged.api.distmarker.OnlyIn;
911

1012
/**
1113
* Made with Blockbench 4.9.4

src/main/java/com/github/L_Ender/cataclysm/client/animation/Elemental_Spear_Animation.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import net.minecraft.client.animation.AnimationDefinition;
55
import net.minecraft.client.animation.Keyframe;
66
import net.minecraft.client.animation.KeyframeAnimations;
7+
78
/**
89
* Made with Blockbench 4.9.4
910
* Exported for Minecraft version 1.19 or later with Mojang mappings

src/main/java/com/github/L_Ender/cataclysm/client/animation/Netherite_Ministrosity_Animation.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import net.neoforged.api.distmarker.Dist;
88
import net.neoforged.api.distmarker.OnlyIn;
99

10-
1110
/**
1211
* Made with Blockbench 4.11.2
1312
* Exported for Minecraft version 1.19 or later with Mojang mappings

src/main/java/com/github/L_Ender/cataclysm/client/animation/Netherite_Monstrosity_Animation.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import net.neoforged.api.distmarker.Dist;
88
import net.neoforged.api.distmarker.OnlyIn;
99

10-
1110
@OnlyIn(Dist.CLIENT)
1211
public class Netherite_Monstrosity_Animation {
1312
public static final AnimationDefinition IDLE = AnimationDefinition.Builder.withLength(2.25F).looping()
@@ -50,12 +49,12 @@ public class Netherite_Monstrosity_Animation {
5049
.build();
5150

5251
public static final AnimationDefinition WALK = AnimationDefinition.Builder.withLength(2.2083F).looping()
53-
.addAnimation("root", new AnimationChannel(AnimationChannel.Targets.ROTATION,
52+
.addAnimation("roots", new AnimationChannel(AnimationChannel.Targets.ROTATION,
5453
new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
5554
new Keyframe(1.125F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
5655
new Keyframe(2.2083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM)
5756
))
58-
.addAnimation("root", new AnimationChannel(AnimationChannel.Targets.POSITION,
57+
.addAnimation("roots", new AnimationChannel(AnimationChannel.Targets.POSITION,
5958
new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, -2.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
6059
new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
6160
new Keyframe(1.125F, KeyframeAnimations.posVec(0.0F, -2.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
@@ -465,14 +464,14 @@ public class Netherite_Monstrosity_Animation {
465464
.build();
466465

467466
public static final AnimationDefinition PHASE = AnimationDefinition.Builder.withLength(2.6667F)
468-
.addAnimation("root", new AnimationChannel(AnimationChannel.Targets.ROTATION,
467+
.addAnimation("roots", new AnimationChannel(AnimationChannel.Targets.ROTATION,
469468
new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
470469
new Keyframe(0.5417F, KeyframeAnimations.degreeVec(0.0F, -12.5F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
471470
new Keyframe(0.7917F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
472471
new Keyframe(1.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
473472
new Keyframe(2.5F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM)
474473
))
475-
.addAnimation("root", new AnimationChannel(AnimationChannel.Targets.POSITION,
474+
.addAnimation("roots", new AnimationChannel(AnimationChannel.Targets.POSITION,
476475
new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
477476
new Keyframe(0.5417F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
478477
new Keyframe(0.7917F, KeyframeAnimations.posVec(0.0F, -10.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
@@ -651,7 +650,7 @@ public class Netherite_Monstrosity_Animation {
651650
.build();
652651

653652
public static final AnimationDefinition FIRE = AnimationDefinition.Builder.withLength(2.1667F)
654-
.addAnimation("root", new AnimationChannel(AnimationChannel.Targets.POSITION,
653+
.addAnimation("roots", new AnimationChannel(AnimationChannel.Targets.POSITION,
655654
new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
656655
new Keyframe(0.7083F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
657656
new Keyframe(1.0F, KeyframeAnimations.posVec(0.0F, -2.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
@@ -977,8 +976,9 @@ public class Netherite_Monstrosity_Animation {
977976
))
978977
.build();
979978

979+
980980
public static final AnimationDefinition OVERPOWER = AnimationDefinition.Builder.withLength(3.75F)
981-
.addAnimation("root", new AnimationChannel(AnimationChannel.Targets.POSITION,
981+
.addAnimation("roots", new AnimationChannel(AnimationChannel.Targets.POSITION,
982982
new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
983983
new Keyframe(0.375F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
984984
new Keyframe(0.5833F, KeyframeAnimations.posVec(0.0F, -3.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
@@ -1247,7 +1247,7 @@ public class Netherite_Monstrosity_Animation {
12471247

12481248

12491249
public static final AnimationDefinition DEATH = AnimationDefinition.Builder.withLength(2.5F)
1250-
.addAnimation("root", new AnimationChannel(AnimationChannel.Targets.POSITION,
1250+
.addAnimation("roots", new AnimationChannel(AnimationChannel.Targets.POSITION,
12511251
new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR),
12521252
new Keyframe(1.0417F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.LINEAR),
12531253
new Keyframe(1.1667F, KeyframeAnimations.posVec(0.0F, -1.17F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
@@ -1400,14 +1400,14 @@ public class Netherite_Monstrosity_Animation {
14001400

14011401

14021402
public static final AnimationDefinition FLARE_SHOT = AnimationDefinition.Builder.withLength(3.0F)
1403-
.addAnimation("root", new AnimationChannel(AnimationChannel.Targets.ROTATION,
1403+
.addAnimation("roots", new AnimationChannel(AnimationChannel.Targets.ROTATION,
14041404
new Keyframe(0.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
14051405
new Keyframe(1.7083F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
14061406
new Keyframe(2.0F, KeyframeAnimations.degreeVec(0.0F, -7.5F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
14071407
new Keyframe(2.375F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
14081408
new Keyframe(3.0F, KeyframeAnimations.degreeVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM)
14091409
))
1410-
.addAnimation("root", new AnimationChannel(AnimationChannel.Targets.POSITION,
1410+
.addAnimation("roots", new AnimationChannel(AnimationChannel.Targets.POSITION,
14111411
new Keyframe(0.0F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
14121412
new Keyframe(0.5F, KeyframeAnimations.posVec(0.0F, 0.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),
14131413
new Keyframe(0.625F, KeyframeAnimations.posVec(0.0F, -2.0F, 0.0F), AnimationChannel.Interpolations.CATMULLROM),

0 commit comments

Comments
 (0)