Merge pull request #26 from DaFuqs/1.18.2

Cleanup of unused mixin classes
Azzyypaaras · Dec 5, 2022 · b96faa9 · b96faa9
2 parents b1f5514 + feba2a6
commit b96faa9
Show file tree

Hide file tree

Showing 15 changed files with 460 additions and 652 deletions.
diff --git a/build.gradle b/build.gradle
@@ -53,14 +53,15 @@ dependencies {
 	modImplementation(include("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${project.cardinal_version}"))
 
 	// Implement Trinkets for parachutes, rings etc.
-	modImplementation(include("dev.emi:trinkets:${project.trinkets_version}"))
+	modImplementation("dev.emi:trinkets:${project.trinkets_version}")
 
 	modRuntimeOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
 
 	modImplementation "io.wispforest:owo-lib:${project.owo_version}+1.18"
 	modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
 
-	testImplementation 'com.google.code.findbugs:jsr305:3.0.2'
+	implementation 'com.google.code.findbugs:jsr305:3.0.2'
+	implementation 'javax.annotation:javax.annotation-api:1.3.2'
 }
 
 loom {

diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ max_errors=400
 	fabric_version=0.66.0+1.18.2
 
 # Mod Properties
-	mod_version = 1.8.0-INDEV.2
+	mod_version = 1.8.1+1.18.2
 	# todo change
 	maven_group = azzy.fabric
 	archives_base_name = incubus-core

diff --git a/src/main/java/net/id/incubus_core/annotations/NonnullByDefault.java b/src/main/java/net/id/incubus_core/annotations/NonnullByDefault.java
@@ -8,9 +8,9 @@
 
 @Nonnull
 @TypeQualifierDefault({
-        ElementType.FIELD,
-        ElementType.METHOD,
-        ElementType.PARAMETER})
+		ElementType.FIELD,
+		ElementType.METHOD,
+		ElementType.PARAMETER})
 @Retention(RetentionPolicy.CLASS)
 public @interface NonnullByDefault {
 

diff --git a/src/main/java/net/id/incubus_core/misc/IncubusSounds.java b/src/main/java/net/id/incubus_core/misc/IncubusSounds.java
@@ -5,12 +5,7 @@
 import static net.id.incubus_core.IncubusCore.registerSoundEvent;
 
 public class IncubusSounds {
-
-    public static final SoundEvent DUPED_SHOVELS = registerSoundEvent("duped_shovels");
-    public static final SoundEvent COSMIC_OCEAN = registerSoundEvent("cosmic_ocean");
-    public static final SoundEvent DECLINE = registerSoundEvent("decline");
-    public static final SoundEvent VINESUS = registerSoundEvent("vinesus");
-
+
     public static final SoundEvent WEAK = registerSoundEvent("weak");
     public static final SoundEvent BLAST = registerSoundEvent("blast");
     public static final SoundEvent PARRY = registerSoundEvent("parry");
@@ -22,7 +17,5 @@ public class IncubusSounds {
     public static final SoundEvent DRIP = registerSoundEvent("drip");
     public static final SoundEvent DRIP_LONG = registerSoundEvent("drip_long");
 
-    public static final SoundEvent TRASH_ISAAC = registerSoundEvent("trash_isaac");
-
     public static void init() {}
 }