Skip to content
This repository was archived by the owner on Mar 10, 2024. It is now read-only.
Open
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
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
plugins {
id 'fabric-loom' version '0.11-SNAPSHOT'
id 'fabric-loom' version '0.12-SNAPSHOT'
id 'maven-publish'
id 'com.matthewprenger.cursegradle' version '1.4.0'
id 'com.modrinth.minotaur' version '2.1.1'
id 'com.modrinth.minotaur' version '2.3.3'
id 'org.cadixdev.licenser' version '0.6.1'
id "com.github.breadmoirai.github-release" version "2.2.12"
id "com.github.breadmoirai.github-release" version "2.4.1"
}

sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name
version = "${project.mod_version}+mc${project.minecraft_version}"
Expand Down Expand Up @@ -45,9 +45,9 @@ dependencies {
modCompileOnly("me.shedaniel:RoughlyEnoughItems-fabric:9.0.491") {
exclude group: "net.fabricmc.fabric-api"
}
//modImplementation("de.siphalor:modsoftheworld-$minecraft_major_version:1.0.9+mc1.18-pre1") {
// transitive false
//}
modImplementation("de.siphalor:modsoftheworld-${minecraft_major_version}:${project.modsoftheworld_version}") {
transitive false
}

modRuntimeOnly("com.github.astei:lazydfu:master-SNAPSHOT")

Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.14.8

# Mod Properties
mod_version = 2.1.3
mod_version = 2.1.4
mod_release = release
mod_mc_version_specifier = 1.19
mod_mc_versions = 1.19
Expand All @@ -20,3 +20,4 @@ org.gradle.jvmargs=-Xmx1G

# Dependencies
fabric_api_version = 0.56.1+1.19
modsoftheworld_version = 1.0.9+mc1.19
Empty file modified gradlew
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ private static IngredientEntry advancedEntryFromJson(JsonObject jsonObject) {
}
Collection<Integer> itemIds = new IntArrayList();
for (RegistryEntry<Item> entry : Registry.ITEM.iterateEntries(tag)) {
itemIds.add(Registry.ITEM.getRawId(entry.value()));
itemIds.add(Registry.ITEM.getRawId(entry.comp_349()));
}
IngredientMultiStackEntry entry = new IngredientMultiStackEntry(itemIds, loadIngredientEntryCondition(jsonObject));
entry.setTag(identifier2.toString());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@

package de.siphalor.nbtcrafting.mixin.anvil;

import io.netty.buffer.Unpooled;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.packet.s2c.play.ScreenHandlerSlotUpdateS2CPacket;
import net.minecraft.screen.*;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Final;
Expand All @@ -40,6 +30,20 @@

import de.siphalor.nbtcrafting.NbtCrafting;
import de.siphalor.nbtcrafting.recipe.AnvilRecipe;
import io.netty.buffer.Unpooled;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.packet.s2c.play.ScreenHandlerSlotUpdateS2CPacket;
import net.minecraft.screen.AnvilScreenHandler;
import net.minecraft.screen.ForgingScreenHandler;
import net.minecraft.screen.Property;
import net.minecraft.screen.ScreenHandlerContext;
import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;

@Mixin(AnvilScreenHandler.class)
public abstract class MixinAnvilContainer extends ForgingScreenHandler {
Expand Down