Skip to content

Commit

Permalink
Sync
Browse files Browse the repository at this point in the history
  • Loading branch information
GlennFolker committed Apr 24, 2024
1 parent 05c7741 commit 01fad6e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 3 deletions.
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
10 changes: 10 additions & 0 deletions src/confictura/entities/effect/CEffect.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package confictura.entities.effect;

import arc.func.*;
import mindustry.entities.*;

public class CEffect extends Effect{
public CEffect(float lifetime, float clip, Cons<EffectContainer> cons){
super(lifetime, clip, cons);
}
}
2 changes: 1 addition & 1 deletion src/confictura/entities/effect/ExtEffect.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import mindustry.entities.*;
import mindustry.gen.*;

public class ExtEffect extends Effect{
public class ExtEffect extends CEffect{
public Prov<? extends EffectState> constructor;
public @Nullable Prov<Object> data;

Expand Down
2 changes: 1 addition & 1 deletion src/confictura/util/ReflectUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ private ReflectUtils(){
public static <T> @Nullable Class<T> findClass(String name){
try{
return (Class<T>)Class.forName(name, true, mods.mainLoader());
}catch(ClassNotFoundException | NoClassDefFoundError e){
}catch(ClassNotFoundException e){
return null;
}
}
Expand Down

0 comments on commit 01fad6e

Please sign in to comment.