aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub <53441451+kuba6000@users.noreply.github.com>2023-10-10 09:19:18 +0200
committerGitHub <noreply@github.com>2023-10-10 09:19:18 +0200
commitb03d20488c43e8533cc2a8468244b50ae62521a0 (patch)
tree53ec9a6a39edabb5b1e0de780e382a42ff4ada60
parent5d89f230b896915367d03209e52685fd516e6c0e (diff)
downloadGT5-Unofficial-b03d20488c43e8533cc2a8468244b50ae62521a0.tar.gz
GT5-Unofficial-b03d20488c43e8533cc2a8468244b50ae62521a0.tar.bz2
GT5-Unofficial-b03d20488c43e8533cc2a8468244b50ae62521a0.zip
Use the new method to copy entity from MobsInfo (#98)
* Update build.gradle * Update dependencies.gradle * Use the new API
-rw-r--r--build.gradle15
-rw-r--r--dependencies.gradle20
-rw-r--r--src/main/java/kubatech/loaders/MobHandlerLoader.java5
3 files changed, 14 insertions, 26 deletions
diff --git a/build.gradle b/build.gradle
index 7ff83a31bc..621bc62fa6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1695409603
+//version: 1696265388
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -793,23 +793,14 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
}
dependencies {
- def lwjgl3ifyVersion = '1.4.0'
- def asmVersion = '9.4'
+ def lwjgl3ifyVersion = '1.5.0'
if (modId != 'lwjgl3ify') {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
if (modId != 'hodgepodge') {
- java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.26')
+ java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7')
}
- java17PatchDependencies('net.minecraft:launchwrapper:1.17.2') {transitive = false}
- java17PatchDependencies("org.ow2.asm:asm:${asmVersion}")
- java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}")
- java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}")
- java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}")
- java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}")
- java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1')
- java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0")
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
}
diff --git a/dependencies.gradle b/dependencies.gradle
index cec9fb618c..009d3cdd00 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -35,17 +35,17 @@
*/
dependencies {
- api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.23:dev')
+ api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.31:dev')
api("com.github.GTNewHorizons:EnderCore:0.2.17:dev")
- api("com.github.GTNewHorizons:EnderIO:2.5.0:dev")
+ api("com.github.GTNewHorizons:EnderIO:2.5.2:dev")
api("com.github.GTNewHorizons:ForestryMC:4.6.14:dev")
- api("com.github.GTNewHorizons:ModularUI:1.1.18:dev")
- api("com.github.GTNewHorizons:Mobs-Info:0.1.6-GTNH:dev")
+ api("com.github.GTNewHorizons:ModularUI:1.1.20:dev")
+ api("com.github.GTNewHorizons:Mobs-Info:0.1.8-GTNH:dev")
devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.7.9-GTNH:dev")
//compileOnly("curse.maven:extrautilities-225561:2264384") {
// transitive = false
//}
- compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.10:dev")
+ compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.13:dev")
{
transitive = false
}
@@ -61,11 +61,11 @@ dependencies {
{
transitive = false
}
- compileOnly("com.github.GTNewHorizons:bartworks:0.8.5:dev")
+ compileOnly("com.github.GTNewHorizons:bartworks:0.8.7:dev")
{
transitive = false
}
- compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.8:dev")
+ compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.13:dev")
{
transitive = false
}
@@ -84,11 +84,11 @@ dependencies {
// For testing
//runtimeOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.5.0-GTNH:dev")
- //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.10.10:dev")
+ //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.10.13:dev")
//runtimeOnly("com.github.GTNewHorizons:harvestcraft:1.1.1-GTNH:dev")
- //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.8:dev")
+ //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.13:dev")
//runtimeOnly("com.github.GTNewHorizons:OpenBlocks:1.7.0-GTNH:dev")
- //runtimeOnly("com.github.GTNewHorizons:bartworks:0.8.5:dev")
+ //runtimeOnly("com.github.GTNewHorizons:bartworks:0.8.7:dev")
//runtimeOnly("com.github.GTNewHorizons:CraftTweaker:3.2.13:dev")
//api("com.github.GTNewHorizons:SpecialMobs:3.4.3:dev")
//api("com.github.GTNewHorizons:twilightforest:2.5.0:dev")
diff --git a/src/main/java/kubatech/loaders/MobHandlerLoader.java b/src/main/java/kubatech/loaders/MobHandlerLoader.java
index 35d92de13d..bcef5b96d9 100644
--- a/src/main/java/kubatech/loaders/MobHandlerLoader.java
+++ b/src/main/java/kubatech/loaders/MobHandlerLoader.java
@@ -38,7 +38,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.JsonToNBT;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import org.apache.logging.log4j.LogManager;
@@ -92,9 +91,7 @@ public class MobHandlerLoader {
this.mOutputs = transformedDrops;
this.recipe = recipe;
try {
- this.entityCopy = this.recipe.entity.getClass()
- .getConstructor(World.class)
- .newInstance(this.recipe.entity.worldObj);
+ this.entityCopy = this.recipe.createEntityCopy();
} catch (NoSuchMethodException | InvocationTargetException | InstantiationException
| IllegalAccessException e) {
throw new RuntimeException(e);