From 95643e5c7e3758d25574c69fcdb6eb38e9b419bd Mon Sep 17 00:00:00 2001
From: UnRealDinnerbone <unrealdinnerbone@gmail.com>
Date: Fri, 21 Jun 2024 14:31:39 -0500
Subject: [PATCH] Re Added Mek Support

---
 CHANGELOG.md                                  |  4 +--
 build.gradle                                  |  5 +++
 gradle.properties                             | 10 ++++--
 neo/build.gradle                              |  2 +-
 .../unrealdinnerbone/jamd/neo/JAMDNeo.java    |  4 ++-
 .../jamd/neo/compact/MekenismOreCompact.java  | 36 +++++++++----------
 6 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd683d4..cfaffcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,3 @@
-### 6.0.0
+### 6.0.1
 
-- Updated to 1.21
\ No newline at end of file
+- Re add Mekanism Support
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 775054a..639cfe0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,6 +57,11 @@ subprojects {
             name = "Nanite"
             url = "https://maven.nanite.dev/releases"
         }
+        maven {
+            name = "Mek"
+            url = 'https://modmaven.dev/'
+        }
+
     }
     tasks.withType(ProcessResources).configureEach {
         outputs.upToDateWhen { false }
diff --git a/gradle.properties b/gradle.properties
index fab5305..9006a9d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,14 +13,18 @@ minecraft_version=1.21
 # Forge
 #forge_version=49.0.13
 
-neo_version=21.0.0-beta
+neo_version=21.0.9-beta
 
 fabric_version=0.100.1+1.21
 fabric_loader_version=0.15.11
 
 # Other
-trenzalore_version=6.0.0
+trenzalore_version=6.0.1
 
 # Gradle
 org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
\ No newline at end of file
+org.gradle.daemon=false
+
+
+#Mekanism
+mekanism_version=1.21-10.6.0.44
\ No newline at end of file
diff --git a/neo/build.gradle b/neo/build.gradle
index 626a9cc..385ada6 100644
--- a/neo/build.gradle
+++ b/neo/build.gradle
@@ -5,7 +5,7 @@ multiLoader.neo() {
 dependencies {
     implementation("com.unrealdinnerbone:trenzalore-neo:${project.property("trenzalore_version")}+mc${project.property("minecraft_version")}")
 
-//    api "mekanism:Mekanism:${mekanism_version}"
+    api "mekanism:Mekanism:${mekanism_version}"
 //    api "blusunrize.immersiveengineering:ImmersiveEngineering:${immersive_engineering_version}"
 }
 
diff --git a/neo/src/main/java/com/unrealdinnerbone/jamd/neo/JAMDNeo.java b/neo/src/main/java/com/unrealdinnerbone/jamd/neo/JAMDNeo.java
index 6fd1daf..2c9e162 100644
--- a/neo/src/main/java/com/unrealdinnerbone/jamd/neo/JAMDNeo.java
+++ b/neo/src/main/java/com/unrealdinnerbone/jamd/neo/JAMDNeo.java
@@ -1,7 +1,9 @@
 package com.unrealdinnerbone.jamd.neo;
 
 import com.unrealdinnerbone.jamd.JAMD;
+import com.unrealdinnerbone.jamd.api.FeatureTypeRegistry;
 import com.unrealdinnerbone.jamd.command.JamdCommand;
+import com.unrealdinnerbone.jamd.neo.compact.MekenismOreCompact;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
@@ -18,7 +20,7 @@ public JAMDNeo() {
     }
 
     public static void registerCompact() {
-//        FeatureTypeRegistry.register("mekanism", "ore", MekenismOreCompact::new);
+        FeatureTypeRegistry.register("mekanism", "ore", MekenismOreCompact::new);
 //        FeatureTypeRegistry.register("immersiveengineering", "ie_ore", IECompact::new);
     }
 
diff --git a/neo/src/main/java/com/unrealdinnerbone/jamd/neo/compact/MekenismOreCompact.java b/neo/src/main/java/com/unrealdinnerbone/jamd/neo/compact/MekenismOreCompact.java
index 5484136..9c2223b 100644
--- a/neo/src/main/java/com/unrealdinnerbone/jamd/neo/compact/MekenismOreCompact.java
+++ b/neo/src/main/java/com/unrealdinnerbone/jamd/neo/compact/MekenismOreCompact.java
@@ -1,18 +1,18 @@
-//package com.unrealdinnerbone.jamd.neo.compact;
-//
-//import com.unrealdinnerbone.jamd.OresCodec;
-//import com.unrealdinnerbone.jamd.api.IFeatureTypeCompact;
-//import mekanism.common.world.ResizableOreFeatureConfig;
-//import net.minecraft.resources.ResourceLocation;
-//import net.minecraft.world.level.levelgen.placement.PlacementModifier;
-//
-//import java.util.List;
-//
-//public class MekenismOreCompact implements IFeatureTypeCompact<ResizableOreFeatureConfig> {
-//
-//    @Override
-//    public OresCodec parse(ResizableOreFeatureConfig config, List<PlacementModifier> placementModifiers) {
-//        return new OresCodec(config.size().getAsInt(), config.discardChanceOnAirExposure().getAsFloat(), placementModifiers, config.targetStates());
-//    }
-//
-//}
+package com.unrealdinnerbone.jamd.neo.compact;
+
+import com.unrealdinnerbone.jamd.OresCodec;
+import com.unrealdinnerbone.jamd.api.IFeatureTypeCompact;
+import mekanism.common.world.ResizableOreFeatureConfig;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.levelgen.placement.PlacementModifier;
+
+import java.util.List;
+
+public class MekenismOreCompact implements IFeatureTypeCompact<ResizableOreFeatureConfig> {
+
+    @Override
+    public OresCodec parse(ResizableOreFeatureConfig config, List<PlacementModifier> placementModifiers) {
+        return new OresCodec(config.size().getAsInt(), config.discardChanceOnAirExposure().getAsFloat(), placementModifiers, config.targetStates());
+    }
+
+}