Selaa lähdekoodia

Build 2.0.5
Add workaround for arch bug

malte0811 4 vuotta sitten
vanhempi
sitoutus
6ae939c299

+ 2 - 2
build.gradle

@@ -2,7 +2,7 @@ import java.util.stream.Collectors
 
 plugins {
     id "architectury-plugin" version "3.1-SNAPSHOT"
-    id "forgified-fabric-loom" version "0.6.78" apply false
+    id "dev.architectury.loom" version "0.7.2-SNAPSHOT" apply false
 }
 
 architectury {
@@ -10,7 +10,7 @@ architectury {
 }
 
 subprojects {
-    apply plugin: "forgified-fabric-loom"
+    apply plugin: "dev.architectury.loom"
 
     def fcMixinConfigs = [
             "predicates",

+ 2 - 1
common/src/main/java/malte0811/ferritecore/mixin/blockstatecache/BlockStateCacheAccess.java

@@ -7,7 +7,8 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 
 import javax.annotation.Nullable;
 
-@Mixin(targets = "net.minecraft.block.AbstractBlock$AbstractBlockState$Cache")
+//TODO This is a hack to fix builds for the time being (should be AB$ABS$C). Running in dev is currently not possible.
+@Mixin(targets = "net.minecraft.block.AbstractBlock.AbstractBlockState.Cache")
 public interface BlockStateCacheAccess {
     @Accessor
     VoxelShape getCollisionShape();

+ 2 - 2
common/src/main/java/malte0811/ferritecore/mixin/config/FerriteConfig.java

@@ -56,8 +56,8 @@ public class FerriteConfig {
         );
         POPULATE_NEIGHBOR_TABLE = builder.createOptInOption(
                 "populateNeighborTable",
-                "Populate the neighbor table used by vanilla. This will increase memory usage, but increases" +
-                        " compatibility with mods using this table directly."
+                "Populate the neighbor table used by vanilla. Enabling this slightly increases memory usage, but" +
+                        " can help with issues in the rare case where mods access it directly."
         );
         builder.finish();
     }

+ 10 - 6
fabric/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 configurations {
-    shadow
+    shadowCommon
 }
 
 architectury {
@@ -21,7 +21,7 @@ dependencies {
     developmentFabric(project(path: ":common")) {
         transitive = false
     }
-    shadow(project(path: ":common", configuration: "transformProductionFabric")) {
+    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) {
         transitive = false
     }
 }
@@ -35,16 +35,20 @@ processResources {
 }
 
 shadowJar {
-    configurations = [project.configurations.shadow]
-    classifier "shadow"
+    configurations = [project.configurations.shadowCommon]
+    classifier "dev-shadow"
 }
 
 remapJar {
-    dependsOn(shadowJar)
-    input.set(shadowJar.archivePath)
+    input.set shadowJar.archiveFile
+    dependsOn shadowJar
     classifier "fabric"
 }
 
+jar {
+    classifier "dev"
+}
+
 loom {
     mixinConfigs += "ferritecore.fabric.mixin.json"
 }

+ 1 - 1
forge/gradle.properties

@@ -1 +1 @@
-loom.forge=true
+loom.platform=forge

+ 1 - 1
gradle.properties

@@ -5,7 +5,7 @@ minecraft_version=1.16.5
 mcp_version=20210309-1.16.5
 
 archives_base_name=ferritecore
-mod_version=2.0.4
+mod_version=2.0.5
 maven_group=malte0811.ferritecore
 
 fabric_loader_version=0.11.1