Skip to content

Commit

Permalink
Re Added Mek Support
Browse files Browse the repository at this point in the history
  • Loading branch information
UnRealDinnerbone committed Jun 21, 2024
1 parent f065668 commit 95643e5
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 25 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
### 6.0.0
### 6.0.1

- Updated to 1.21
- Re add Mekanism Support
5 changes: 5 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
10 changes: 7 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
org.gradle.daemon=false


#Mekanism
mekanism_version=1.21-10.6.0.44
2 changes: 1 addition & 1 deletion neo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}

Expand Down
4 changes: 3 additions & 1 deletion neo/src/main/java/com/unrealdinnerbone/jamd/neo/JAMDNeo.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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());
}

}

0 comments on commit 95643e5

Please sign in to comment.