Release 1.11.6, Fix #425, Fix #424, Fix #422

Signed-off-by: shedaniel <[email protected]>
Mixinors · Jan 22, 2022 · ee147f1 · ee147f1
1 parent 637ed17
commit ee147f1
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle

diff --git a/.../com/github/chainmailstudios/astromine/registry/client/AstromineBlockEntityRenderers.java b/.../com/github/chainmailstudios/astromine/registry/client/AstromineBlockEntityRenderers.java
@@ -36,7 +36,7 @@
 public class AstromineBlockEntityRenderers {
 	public static void initialize() {}
 
-	public static <B extends BlockEntity, C extends BlockEntityType<B>> void register(C c, Function<BlockEntityRenderDispatcher, BlockEntityRenderer<B>> b) {
+	public static <B extends BlockEntity, C extends BlockEntityType<B>> void register(C c, Function<BlockEntityRenderDispatcher, BlockEntityRenderer<? super B>> b) {
 		BlockEntityRendererRegistry.INSTANCE.register(c, b);
 	}
 }
diff --git a/astromine-core/src/main/resources/astromine-core.accesswidener b/astromine-core/src/main/resources/astromine-core.accesswidener
@@ -1,7 +1,7 @@
 accessWidener v1 named
 
 accessible method net/minecraft/block/FluidBlock <init> (Lnet/minecraft/fluid/FlowableFluid;Lnet/minecraft/block/AbstractBlock$Settings;)V
-accessible method net/minecraft/com.github.chainmailstudios.astromine.technologies.client.particle/DefaultParticleType <init> (Z)V
+accessible method net/minecraft/particle/DefaultParticleType <init> (Z)V
 accessible method net/minecraft/item/Item rayTrace (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/RayTraceContext$FluidHandling;)Lnet/minecraft/util/hit/BlockHitResult
 accessible method net/minecraft/recipe/RecipeManager getAllOfType (Lnet/minecraft/recipe/RecipeType;)Ljava/util/Map;
 accessible field net/minecraft/block/EntityShapeContext heldItem Lnet/minecraft/item/Item;

diff --git a/...udios/astromine/discoveries/registry/client/AstromineDiscoveriesBlockEntityRenderers.java b/...udios/astromine/discoveries/registry/client/AstromineDiscoveriesBlockEntityRenderers.java
@@ -42,7 +42,7 @@ public static void initialize() {
 		register(AstromineDiscoveriesBlockEntityTypes.ALTAR, AltarBlockEntityRenderer::new);
 	}
 
-	public static <B extends BlockEntity, C extends BlockEntityType<B>> void register(C c, Function<BlockEntityRenderDispatcher, BlockEntityRenderer<B>> b) {
+	public static <B extends BlockEntity, C extends BlockEntityType<B>> void register(C c, Function<BlockEntityRenderDispatcher, BlockEntityRenderer<? super B>> b) {
 		AstromineBlockEntityRenderers.register(c, b);
 	}
 }
diff --git a/astromine-technologies/src/main/resources/astromine-technologies.accesswidener b/astromine-technologies/src/main/resources/astromine-technologies.accesswidener
@@ -2,11 +2,11 @@ accessWidener v1 named
 
 accessible method net/minecraft/block/FluidBlock <init> (Lnet/minecraft/fluid/FlowableFluid;Lnet/minecraft/block/AbstractBlock$Settings;)V
 accessible method net/minecraft/block/StairsBlock <init> (Lnet/minecraft/block/BlockState;Lnet/minecraft/block/AbstractBlock$Settings;)V
-accessible method net/minecraft/com.github.chainmailstudios.astromine.technologies.client.particle/DefaultParticleType <init> (Z)V
+accessible method net/minecraft/particle/DefaultParticleType <init> (Z)V
 accessible method net/minecraft/item/Item rayTrace (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/RayTraceContext$FluidHandling;)Lnet/minecraft/util/hit/BlockHitResult
 accessible method net/minecraft/recipe/RecipeManager getAllOfType (Lnet/minecraft/recipe/RecipeType;)Ljava/util/Map;
 accessible method net/minecraft/entity/SpawnRestriction register (Lnet/minecraft/entity/EntityType;Lnet/minecraft/entity/SpawnRestriction$Location;Lnet/minecraft/world/Heightmap$Type;Lnet/minecraft/entity/SpawnRestriction$SpawnPredicate;)V
-accessible method net/minecraft/client/com.github.chainmailstudios.astromine.technologies.client.particle/CrackParticle <init> (Lnet/minecraft/client/world/ClientWorld;DDDLnet/minecraft/item/ItemStack;)V
+accessible method net/minecraft/client/particle/CrackParticle <init> (Lnet/minecraft/client/world/ClientWorld;DDDLnet/minecraft/item/ItemStack;)V
 accessible field net/minecraft/block/EntityShapeContext heldItem Lnet/minecraft/item/Item;
 accessible method net/minecraft/block/TallPlantBlock onBreakInCreative (Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/player/PlayerEntity;)V
 accessible field net/minecraft/util/DyeColor color I

diff --git a/astromine-transportations/src/main/resources/astromine-transportations.accesswidener b/astromine-transportations/src/main/resources/astromine-transportations.accesswidener
@@ -2,9 +2,9 @@ accessWidener v1 named
 
 accessible method net/minecraft/block/FluidBlock <init> (Lnet/minecraft/fluid/FlowableFluid;Lnet/minecraft/block/AbstractBlock$Settings;)V
 accessible method net/minecraft/block/StairsBlock <init> (Lnet/minecraft/block/BlockState;Lnet/minecraft/block/AbstractBlock$Settings;)V
-accessible method net/minecraft/com.github.chainmailstudios.astromine.technologies.client.particle/DefaultParticleType <init> (Z)V
+accessible method net/minecraft/particle/DefaultParticleType <init> (Z)V
 accessible method net/minecraft/item/Item rayTrace (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/RayTraceContext$FluidHandling;)Lnet/minecraft/util/hit/BlockHitResult
 accessible method net/minecraft/recipe/RecipeManager getAllOfType (Lnet/minecraft/recipe/RecipeType;)Ljava/util/Map;
 accessible method net/minecraft/entity/SpawnRestriction register (Lnet/minecraft/entity/EntityType;Lnet/minecraft/entity/SpawnRestriction$Location;Lnet/minecraft/world/Heightmap$Type;Lnet/minecraft/entity/SpawnRestriction$SpawnPredicate;)V
-accessible method net/minecraft/client/com.github.chainmailstudios.astromine.technologies.client.particle/CrackParticle <init> (Lnet/minecraft/client/world/ClientWorld;DDDLnet/minecraft/item/ItemStack;)V
+accessible method net/minecraft/client/particle/CrackParticle <init> (Lnet/minecraft/client/world/ClientWorld;DDDLnet/minecraft/item/ItemStack;)V
 accessible field net/minecraft/block/EntityShapeContext heldItem Lnet/minecraft/item/Item;
diff --git a/build.gradle b/build.gradle
@@ -71,25 +71,15 @@ allprojects {
             }
         }
         maven {
-            name = "Ladysnake Libs"
-            url = 'https://dl.bintray.com/ladysnake/libs'
+            name = 'Ladysnake Mods'
+            url = 'https://ladysnake.jfrog.io/artifactory/mods'
             content {
                 includeGroup "io.github.onyxstudios.Cardinal-Components-API"
             }
         }
         maven {
-            name = "Wrenchable"
-            url = "https://dl.bintray.com/zundrel/wrenchable"
-            content {
-                includeGroup "com.zundrel"
-            }
-        }
-        maven {
-            name = "Cloth"
-            url = "https://dl.bintray.com/shedaniel/cloth"
-            content {
-                includeGroup "me.shedaniel.cloth.api"
-            }
+            name = "shedaniel"
+            url = "https://maven.shedaniel.me"
         }
         maven {
             name = "Earthcomputer"
@@ -109,6 +99,10 @@ allprojects {
             name = "dblsaiko"
             url = "https://maven.dblsaiko.net/"
         }
+        maven {
+            name = "terraformersmc"
+            url = "https://maven.terraformersmc.com/releases/"
+        }
     }
 
     dependencies {
@@ -118,6 +112,7 @@ allprojects {
                     exclude group: "net.fabricmc.fabric-api"
                 }
                 exclude group: "net.fabricmc"
+                exclude group: "io.github.prospector", module: "modmenu"
                 if (!dep.contains("me.shedaniel")) {
                     exclude group: "me.shedaniel"
                 }
@@ -134,6 +129,7 @@ allprojects {
                     exclude group: "net.fabricmc.fabric-api"
                 }
                 exclude group: "net.fabricmc"
+                exclude group: "io.github.prospector", module: "modmenu"
                 if (!dep.contains("me.shedaniel")) {
                     exclude group: "me.shedaniel"
                 }
@@ -147,6 +143,8 @@ allprojects {
         modImplementation "com.google.code.findbugs:jsr305:3.0.2"
 
         tap(rootProject.ext.setDefaultApis)
+
+        annotationProcessor "net.fabricmc:fabric-mixin-compile-extensions:0.4.6"
     }
 
     afterEvaluate {

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -19,7 +19,7 @@ project.ext.setDefaultApis = {
     useAsApi("vazkii.patchouli:Patchouli:${patchouli_version}")
 
     // ModMenu
-    useAsApiOptionally("io.github.prospector:modmenu:${modmenu_version}")
+    useAsApiOptionally("com.terraformersmc:modmenu:${modmenu_version}")
 
     // AutoConfig
     useAsApi("me.sargunvohra.mcmods:autoconfig1u:${auto_config_version}")

diff --git a/gradle.properties b/gradle.properties
@@ -4,19 +4,19 @@ ignoreRemapSrc=false
 # Fabric
 minecraft_version=1.16.5
 mappings_version=1.16.5+build.1
-loader_version=0.11.1
+loader_version=0.12.12
 # Fabric API
-api_version=0.29.3+1.16
+api_version=0.42.0+1.16
 # Mod
 mod_name=astromine
-mod_version=1.11.5
+mod_version=1.11.6
 mod_group=com.github.chainmailstudios.astromine
 version_meta=fabric-1.16.5
 # CurseForge
 tagged_versions=1.16.4,1.16.5,Fabric,Java 8
 release_cycle=release
 # Dependencies
-cardinal_components_version=2.7.10
+cardinal_components_version=2.8.3
 blade_version=2e84810
 shapes_version=1.0.0+build.4
 patchouli_version=1.16.4-48-FABRIC
@@ -33,7 +33,7 @@ piglib_version=1.0.2-1.16
 fermion_version=1.10.218
 # Conveniences
 rei_version=5.8.10
-modmenu_version=1.14.13+build.19
+modmenu_version=1.16.0
 databreaker_version=0.2.6
 tech_reborn_version=3.7.3+build.192
 reborn_core_version=4.6.3+build.110