Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ neoforge_loader_version_range=[4,)
neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/cyclops-core.json
# Dependencies
neoforge_curios_version=7.3.4+1.20.4
neoforge_almostunified_version=1.21.1-1.3.0

# Forge
forge_version=52.0.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public final class Reference {
public static final String MOD_CURIOS = "curios";
public static final String MOD_JEI = "jei";
public static final String MOD_COMMONCAPABILITIES = "commoncapabilities";
public static final String MOD_ALMOSTUNIFIED = "almostunified";

// Paths
public static final String TEXTURE_PATH_PARTICLES = "textures/particle/";
Expand Down
6 changes: 6 additions & 0 deletions loader-neoforge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,19 @@ repositories {
name "Curios"
url "https://maven.theillusivec4.top/"
}
maven {
name "BlameJared"
url "https://maven.blamejared.com"
}
}

dependencies {
implementation "net.neoforged:neoforge:${neoforge_version}" // Only necessary for the api sourceSet

//runtimeOnly fg.deobf("top.theillusivec4.curios:curios-neoforge:${curios_version}") // https://maven.theillusivec4.top/top/theillusivec4/curios/curios-neoforge/
compileOnly "top.theillusivec4.curios:curios-neoforge:${neoforge_curios_version}:api"
//runtimeOnly "com.almostreliable.mods:almostunified-neoforge:${neoforge_almostunified_version}" // https://maven.blamejared.com/com/almostreliable/mods/almostunified-neoforge/
compileOnly "com.almostreliable.mods:almostunified-neoforge:${neoforge_almostunified_version}:api"

// Project lombok
compileOnly 'org.projectlombok:lombok:1.18.30'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import org.cyclops.cyclopscore.metadata.RegistryExportableRegistry;
import org.cyclops.cyclopscore.metadata.RegistryExportables;
import org.cyclops.cyclopscore.modcompat.ModCompatLoader;
import org.cyclops.cyclopscore.modcompat.almostunified.ModCompatAlmostUnified;
import org.cyclops.cyclopscore.modcompat.curios.ModCompatCurios;
import org.cyclops.cyclopscore.network.PacketCodecsNeoForge;
import org.cyclops.cyclopscore.persist.nbt.NBTClassTypesNeoForge;
Expand Down Expand Up @@ -102,6 +103,7 @@ protected ModCompatLoader constructModCompatLoader() {
ModCompatLoader modCompatLoader = super.constructModCompatLoader();

modCompatLoader.addModCompat(new ModCompatCurios());
modCompatLoader.addModCompat(new ModCompatAlmostUnified());

return modCompatLoader;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package org.cyclops.cyclopscore.modcompat.almostunified;

import com.almostreliable.unified.api.AlmostUnified;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import org.jetbrains.annotations.Nullable;

public class AlmostUnifiedAdapter {

public static boolean enabled = false;

@Nullable
public static Item getTagTargetItem(TagKey<Item> tag) {
if (enabled) {
return Adapter.getTagTargetItem(tag);
}

return null;
}

private static final class Adapter {

@Nullable
private static Item getTagTargetItem(TagKey<Item> tag) {
return AlmostUnified.INSTANCE.getTagTargetItem(tag);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package org.cyclops.cyclopscore.modcompat.almostunified;

import org.cyclops.cyclopscore.Reference;
import org.cyclops.cyclopscore.modcompat.ICompatInitializer;
import org.cyclops.cyclopscore.modcompat.IModCompat;

public class ModCompatAlmostUnified implements IModCompat {
@Override
public String getId() {
return Reference.MOD_ALMOSTUNIFIED;
}

@Override
public boolean isEnabledDefault() {
return true;
}

@Override
public String getComment() {
return "Recipe unification";
}

@Override
public ICompatInitializer createInitializer() {
return new ModCompatAlmostUnifiedInitializer();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package org.cyclops.cyclopscore.modcompat.almostunified;

import org.cyclops.cyclopscore.modcompat.ICompatInitializer;

public class ModCompatAlmostUnifiedInitializer implements ICompatInitializer {
@Override
public void initialize() {
AlmostUnifiedAdapter.enabled = true;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient;
import org.cyclops.cyclopscore.modcompat.almostunified.AlmostUnifiedAdapter;

import javax.annotation.Nullable;
import java.util.Arrays;
Expand Down Expand Up @@ -53,6 +58,12 @@ public ItemStack getFirstItemStack() {
return firstItemStack;
}

TagKey<Item> tagKey = TagKey.create(Registries.ITEM, ResourceLocation.parse(tag));
Item almostUnifiedTarget = AlmostUnifiedAdapter.getTagTargetItem(tagKey);
if (almostUnifiedTarget != null) {
return new ItemStack(almostUnifiedTarget, count);
}

// Obtain all stacks for the given tag
ItemStack[] matchingStacks = ingredient.getItems();

Expand Down