Skip to content

Commit

Permalink
Remove Future MC integration
Browse files Browse the repository at this point in the history
Also remove Pam's HarvestCraft from build.gradle as it's not needed for our ore dictionary support.
  • Loading branch information
IcarussOne committed Dec 18, 2024
1 parent c66f66f commit 089c1c6
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 107 deletions.
27 changes: 16 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -102,25 +102,27 @@ dependencies {
implementation 'zone.rong:mixinbooter:7.1'
}

// Example of deobfuscating a dependency
// Thermal Expansion
implementation rfg.deobf("curse.maven:cofh-core-69162:2920433")
implementation rfg.deobf("curse.maven:future-mc-310059:3924863")
implementation rfg.deobf("curse.maven:thaumcraft-223628:2629023")
implementation rfg.deobf("curse.maven:thermal-expansion-69163:2926431")
implementation rfg.deobf("curse.maven:thermal-foundation-222880:2926428")
//implementation rfg.deobf("maven.modrinth:crossbow:1.1.0")
implementation "curse.maven:industrial-foregoing-266515:2745324"
implementation "curse.maven:morph-229080:2995522"
implementation "curse.maven:pams-harvestcraft-221857:2904825"
//runtimeOnly "com.cleanroommc:assetmover:2.5"
runtimeOnly "curse.maven:baubles-227083:2518667"
runtimeOnly "curse.maven:codechicken-lib-1-8-242818:2779848"
implementation rfg.deobf("curse.maven:thermal-foundation-222880:2926428")
runtimeOnly "curse.maven:cofh-world-271384:2920434"
runtimeOnly "curse.maven:ichunutil-229060:2801262"
runtimeOnly "curse.maven:redstone-flux-270789:2920436"

// Thaumcraft + Baubles
implementation rfg.deobf("curse.maven:thaumcraft-223628:2629023")
runtimeOnly "curse.maven:baubles-227083:2518667"

// Industrial Foregoing
implementation "curse.maven:industrial-foregoing-266515:2745324"
runtimeOnly "curse.maven:forgelin-continuous-456403:5946402"
runtimeOnly "curse.maven:tesla-core-lib-254602:3438487"

// Morph
implementation "curse.maven:morph-229080:2995522"
runtimeOnly "curse.maven:ichunutil-229060:2801262"

// Had Enough Items + Addons
runtimeOnly "curse.maven:had-enough-items-557549:5906628"
implementation "curse.maven:just-enough-resources-jer-240630:4440936"
Expand All @@ -130,6 +132,9 @@ dependencies {
implementation "curse.maven:tinkers-construct-74072:2902483"
implementation "curse.maven:constructs-armory-287683:3174535"

// Unused
//implementation rfg.deobf("maven.modrinth:crossbow:1.1.0")
//runtimeOnly "com.cleanroommc:assetmover:2.5"

if (project.use_mixins.toBoolean()) {
// Change your mixin refmap name here:
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/drzhark/mocreatures/MoCConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ public class MoCConstants {
public static final String MOD_ID = "mocreatures";
public static final String MOD_PREFIX = MOD_ID + ":";
public static final String MOD_NAME = "DrZhark's Mo'Creatures Extended";
public static final String MOD_VERSION = "12.4.5";
public static final String MOD_VERSION = "12.4.6";
public static final String MOD_ACCEPTED_VERSIONS = "[" + MOD_VERSION + "]";
public static final String MOD_DEPENDENCIES = "after:crossbow;after:futuremc;after:thaumcraft;after:thermalexpansion;after:traverse";
public static final String MOD_DEPENDENCIES = "after:thaumcraft;after:thermalexpansion;after:traverse";
public static final Integer DATAFIXER_VERSION = 1;
}
11 changes: 0 additions & 11 deletions src/main/java/drzhark/mocreatures/compat/CompatHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,14 @@
import com.buuz135.industrial.api.extractor.ExtractorEntry;
import com.buuz135.industrial.api.recipe.ProteinReactorEntry;
import drzhark.mocreatures.MoCConstants;
import drzhark.mocreatures.compat.crossbow.CrossbowIntegration;
import drzhark.mocreatures.compat.crossbow.item.MoCItemCrossbow;
import drzhark.mocreatures.compat.futuremc.FutureMCIntegration;
import drzhark.mocreatures.compat.industrialforegoing.IndustrialForegoingIntegration;
import drzhark.mocreatures.compat.jer.JERIntegration;
import drzhark.mocreatures.compat.morph.MorphIntegration;
import drzhark.mocreatures.compat.thaumcraft.ThaumcraftIntegration;
import drzhark.mocreatures.compat.thermalexpansion.ThermalExpansionIntegration;
import drzhark.mocreatures.init.MoCItems;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.launchwrapper.Launch;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.RegistryEvent;
Expand Down Expand Up @@ -86,16 +81,10 @@ public class CompatHandler {

@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event) {
// TODO: Clean-up once item registration is reworked
// jbredwards' Crossbow Backport
/*if (Loader.isModLoaded("crossbow")) event.getRegistry().registerAll(
MoCItems.setup(new MoCItemCrossbow(788, Ingredient.fromStacks(new ItemStack(MoCItems.ancientSilverIngot))), "ancient_silver_crossbow")
);*/
}

@SubscribeEvent
public static void registerRecipes(RegistryEvent.Register<IRecipe> event) {
if (Loader.isModLoaded("futuremc")) FutureMCIntegration.addRecipes();
if (Loader.isModLoaded("thermalexpansion")) ThermalExpansionIntegration.addRecipes();
}

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 089c1c6

Please sign in to comment.