Skip to content

Commit

Permalink
Merge pull request #988 from Gu-ZT/releases/1.20.1
Browse files Browse the repository at this point in the history
导入AnvilLib,实现REI拖拽设置过滤
  • Loading branch information
Gugle2308 authored Jun 29, 2024
2 parents a48db13 + 014a8e3 commit 12b1e85
Show file tree
Hide file tree
Showing 50 changed files with 255 additions and 786 deletions.
40 changes: 22 additions & 18 deletions common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ configurations {
}

repositories {
maven { url = "https://mvn.devos.one/snapshots/" } // Create Fabric, Porting Lib, Forge Tags, Milk Lib, Registrate Fabric
maven { url = "https://server.cjsah.net:1002/maven/" } // AnvilLib
maven { url = "https://mvn.devos.one/snapshots/" }
// Create Fabric, Porting Lib, Forge Tags, Milk Lib, Registrate Fabric
maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes
maven { url = "https://jitpack.io/" } // Mixin Extras, Fabric ASM
maven {
Expand All @@ -48,43 +50,45 @@ repositories {
dependencies {
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
// Do NOT use other classes from fabric loader
modImplementation fabric.fabricLoader
modCompileOnly fabric.fabricApi
modImplementation(fabric.fabricLoader)
modCompileOnly(fabric.fabricApi)

modCompileOnly fabric.registrate
modCompileOnly(fabric.registrate)

// AnvilLib
modImplementation(fabric.anvilLib) { transitive = false }

// JEI
modCompileOnly fabric.jei.common.api
modCompileOnly fabric.jei.fabric.api
modCompileOnly fabric.jei.fabric.impl
modCompileOnly(fabric.jei.common.api)
modCompileOnly(fabric.jei.fabric.api)
modCompileOnly(fabric.jei.fabric.impl)

// REI
modCompileOnly fabric.rei.plugin
modCompileOnly fabric.rei.api
modCompileOnly fabric.rei.fabric
modCompileOnly(fabric.rei.plugin)
modCompileOnly(fabric.rei.api)
modCompileOnly(fabric.rei.fabric)

// EMI
modCompileOnly("dev.emi:emi-fabric:${fabric.versions.emi.get()}:api")
modCompileOnly fabric.emi
modCompileOnly(fabric.emi)

// Jade
modCompileOnly fabric.jade
modCompileOnly(fabric.jade)

// KJS
modCompileOnly fabric.kubejs
modCompileOnly(fabric.kubejs)

// Mixin Extras
implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:${fabric.versions.mixinextras.get()}"))

// cloth config api
modCompileOnly fabric.clothConfig
modCompileOnly(fabric.clothConfig)

// Patchouli
modImplementation fabric.patchouli
modImplementation(fabric.patchouli)

modCompileOnly("com.simibubi.create:create-fabric-${minecraft_version}:${create_fabric_version}"){
exclude group: "io.github.llamalad7"
}
// Create
modCompileOnly(fabric.create) { exclude group: "io.github.llamalad7" }
}

publishing {
Expand Down
3 changes: 1 addition & 2 deletions common/src/main/java/dev/dubhe/anvilcraft/AnvilCraft.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import dev.dubhe.anvilcraft.api.event.EventManager;
import dev.anvilcraft.lib.event.EventManager;
import dev.dubhe.anvilcraft.api.registry.AnvilCraftRegistrate;
import dev.dubhe.anvilcraft.config.AnvilCraftConfig;
import dev.dubhe.anvilcraft.data.generator.AnvilCraftDatagen;
Expand All @@ -15,7 +15,6 @@
import dev.dubhe.anvilcraft.init.ModEvents;
import dev.dubhe.anvilcraft.init.ModItemGroups;
import dev.dubhe.anvilcraft.init.ModItems;
import dev.dubhe.anvilcraft.init.ModLootContextParamSet;
import dev.dubhe.anvilcraft.init.ModMenuTypes;
import dev.dubhe.anvilcraft.init.ModNetworks;
import dev.dubhe.anvilcraft.util.EnchantmentDisableUtil;
Expand Down

This file was deleted.

This file was deleted.

166 changes: 0 additions & 166 deletions common/src/main/java/dev/dubhe/anvilcraft/api/network/Network.java

This file was deleted.

44 changes: 0 additions & 44 deletions common/src/main/java/dev/dubhe/anvilcraft/api/network/Packet.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package dev.dubhe.anvilcraft.event;

import dev.anvilcraft.lib.event.SubscribeEvent;
import dev.dubhe.anvilcraft.AnvilCraft;
import dev.dubhe.anvilcraft.api.IHasMultiBlock;
import dev.dubhe.anvilcraft.api.depository.ItemDepository;
import dev.dubhe.anvilcraft.api.event.SubscribeEvent;
import dev.dubhe.anvilcraft.api.event.entity.AnvilFallOnLandEvent;
import dev.dubhe.anvilcraft.api.event.entity.AnvilHurtEntityEvent;
import dev.dubhe.anvilcraft.api.recipe.AnvilRecipeManager;
Expand Down
Loading

0 comments on commit 12b1e85

Please sign in to comment.