From f0e697bc5335a05c37a3d265eee40f3aa72cc2ea Mon Sep 17 00:00:00 2001
From: gamma-delta <29877714+gamma-delta@users.noreply.github.com>
Date: Sat, 14 May 2022 15:15:25 -0500
Subject: [PATCH] nothing workksssss

---
 Fabric/build.gradle                                 | 13 +++++++------
 Fabric/gradle.properties                            |  4 ++++
 .../hexcasting/fabric/xplat/FabricXplatImpl.java    |  3 ++-
 Fabric/src/main/resources/fabric.mod.json           |  2 ++
 Forge/gradle.properties                             |  1 +
 gradle.properties                                   |  4 ----
 settings.gradle                                     |  6 +++++-
 7 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 Forge/gradle.properties

diff --git a/Fabric/build.gradle b/Fabric/build.gradle
index 511ea006..c1ce3709 100644
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'fabric-loom' version '0.11-SNAPSHOT'
-    id 'maven-publish'
+    id 'fabric-loom' version "$loomVersion"
+    id 'io.github.juuxel.loom-quiltflower-mini' version '1.2.1'
 }
 
 version = getVersion("fabric")
@@ -42,20 +42,21 @@ dependencies {
     mappings loom.officialMojangMappings()
     modImplementation "net.fabricmc:fabric-loader:${fabricLoaderVersion}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${fabricVersion}"
+    modImplementation("net.fabricmc:fabric-language-kotlin:1.7.4+kotlin.1.6.21")
+
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
     compileOnly project(":Common")
 
-    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
-
     modImplementation "at.petra-k.paucal:paucal-$minecraftVersion:$paucalVersion-fabric"
     modImplementation "vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion-FABRIC"
 
-    modImplementation("net.fabricmc:fabric-language-kotlin:1.7.4+kotlin.1.6.21")
-    implementation "me.zeroeightsix:fiber:$fiberVersion"
+    modImplementation "me.zeroeightsix:fiber:$fiberVersion"
+    include "me.zeroeightsix:fiber:$fiberVersion"
 
     modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-api:$cardinalComponentsVersion"
 
     modImplementation "com.jamieswhiteshirt:reach-entity-attributes:2.1.1"
+    include "com.jamieswhiteshirt:reach-entity-attributes:2.1.1"
 }
 
 compileJava {
diff --git a/Fabric/gradle.properties b/Fabric/gradle.properties
index b84bf785..0d9902e3 100644
--- a/Fabric/gradle.properties
+++ b/Fabric/gradle.properties
@@ -1,2 +1,6 @@
+loomVersion=0.11-SNAPSHOT
+fabricVersion=0.51.1+1.18.2
+fabricLoaderVersion=0.14.5
+
 fiberVersion=0.23.0-2
 cardinalComponentsVersion=4.1.4
\ No newline at end of file
diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java
index ac910bce..ce19c541 100644
--- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java
+++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java
@@ -14,6 +14,7 @@ import at.petrak.hexcasting.common.network.IMessage;
 import at.petrak.hexcasting.fabric.cc.HexCardinalComponents;
 import at.petrak.hexcasting.xplat.IXplatAbstractions;
 import at.petrak.hexcasting.xplat.Platform;
+import com.jamieswhiteshirt.reachentityattributes.ReachEntityAttributes;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
 import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
@@ -59,7 +60,7 @@ public class FabricXplatImpl implements IXplatAbstractions {
 
     @Override
     public Attribute getReachDistance() {
-        return jaredFixYourSite;
+        return ReachEntityAttributes.REACH;
     }
 
     @Override
diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
index a4841707..228a0d59 100644
--- a/Fabric/src/main/resources/fabric.mod.json
+++ b/Fabric/src/main/resources/fabric.mod.json
@@ -49,6 +49,8 @@
       "hexcasting:favored_colorizer",
       "hexcasting:sentinel",
       "hexcasting:flight",
+      "hexcasting:harness",
+      "hexcasting:patterns",
 
       "hexcasting:colorizer",
       "hexcasting:data_holder",
diff --git a/Forge/gradle.properties b/Forge/gradle.properties
new file mode 100644
index 00000000..ad1f412f
--- /dev/null
+++ b/Forge/gradle.properties
@@ -0,0 +1 @@
+forgeVersion=40.1.0
diff --git a/gradle.properties b/gradle.properties
index 7bc63a3a..169a74d3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,3 @@ modVersion=0.9.0
 paucalVersion=0.4.0-prerelease-15
 patchouliVersion=67
 jeiVersion=9.5.3.143
-
-forgeVersion=40.1.0
-fabricVersion=0.51.1+1.18.2
-fabricLoaderVersion=0.14.5
diff --git a/settings.gradle b/settings.gradle
index 174e9446..5e9449d1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,6 +5,10 @@ pluginManagement {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+        maven {
+            name = 'QuiltFlower'
+            url = 'https://server.bbkr.space/artifactory/libs-release/'
+        }
         maven {
             name = 'Sponge Snapshots'
             url = 'https://repo.spongepowered.org/repository/maven-public/'
@@ -12,5 +16,5 @@ pluginManagement {
     }
 }
 
-rootProject.name = 'MultiLoader'
+rootProject.name = 'Hex Casting'
 include("Common", "Fabric", "Forge")
\ No newline at end of file