mirror of
https://github.com/GTNewHorizons/ThaumicHorizons.git
synced 2026-10-27 07:03:46 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Harald Korneliussen
|
6523b26038 |
No files matched your search
+1
-2
@@ -4,8 +4,7 @@ dependencies {
|
||||
api('com.github.GTNewHorizons:Baubles-Expanded:2.2.24-GTNH:dev')
|
||||
api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
|
||||
|
||||
api("com.github.GTNewHorizons:GT5-Unofficial:5.99.99-mu57:dev") {transitive = false}
|
||||
api("com.ruling_0:MaterialLib:0.24.0-mu:dev")
|
||||
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.168:dev') {transitive = false}
|
||||
|
||||
runtimeOnlyNonPublishable('com.github.GTNewHorizons:AspectRecipeIndex:1.1.5:dev')
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
// Add any additional repositories for your dependencies here
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
}
|
||||
@@ -225,7 +225,6 @@ import com.kentington.thaumichorizons.common.tiles.TileVatSlave;
|
||||
import com.kentington.thaumichorizons.common.tiles.TileVisDynamo;
|
||||
import com.kentington.thaumichorizons.common.tiles.TileVortex;
|
||||
import com.kentington.thaumichorizons.common.tiles.TileVortexStabilizer;
|
||||
import com.ruling_0.materiallib.api.MaterialLibAPI;
|
||||
|
||||
import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
@@ -241,8 +240,9 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.common.registry.EntityRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import gregtech.api.enums.materials.Materials;
|
||||
import gregtech.api.enums.materials.Shapes;
|
||||
import gregtech.api.enums.Materials;
|
||||
import gregtech.api.enums.OrePrefixes;
|
||||
import gregtech.api.util.GTOreDictUnificator;
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
@@ -2082,17 +2082,17 @@ public class ThaumicHorizons {
|
||||
.add(Aspect.AURA, 32).add(Aspect.MIND, 16).add(Aspect.ELDRITCH, 64),
|
||||
new ItemStack(itemPlanarConduit),
|
||||
new ItemStack[] { new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
MaterialLibAPI.getStack(Materials.Glass, Shapes.gemExquisite, 1),
|
||||
MaterialLibAPI.getStack(Materials.InfusedOrder, Shapes.lens, 1),
|
||||
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Glass, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
MaterialLibAPI.getStack(Materials.Glass, Shapes.gemExquisite, 1),
|
||||
MaterialLibAPI.getStack(Materials.InfusedOrder, Shapes.lens, 1),
|
||||
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Glass, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
MaterialLibAPI.getStack(Materials.Glass, Shapes.gemExquisite, 1),
|
||||
MaterialLibAPI.getStack(Materials.InfusedOrder, Shapes.lens, 1),
|
||||
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Glass, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
MaterialLibAPI.getStack(Materials.Glass, Shapes.gemExquisite, 1),
|
||||
MaterialLibAPI.getStack(Materials.InfusedOrder, Shapes.lens, 1) });
|
||||
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Glass, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L) });
|
||||
recipeKeystone1 = ThaumcraftApi.addInfusionCraftingRecipe(
|
||||
"planarKeystone",
|
||||
new ItemStack(itemKeystone),
|
||||
@@ -2102,11 +2102,11 @@ public class ThaumicHorizons {
|
||||
new ItemStack(Items.ender_eye),
|
||||
new ItemStack[] { new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 3),
|
||||
MaterialLibAPI.getStack(Materials.Glass, Shapes.lens, 1),
|
||||
GTOreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 3),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 3),
|
||||
MaterialLibAPI.getStack(Materials.Glass, Shapes.lens, 1),
|
||||
GTOreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 3) });
|
||||
recipeSlot = ThaumcraftApi.addInfusionCraftingRecipe(
|
||||
"planarKeystone",
|
||||
@@ -2115,18 +2115,18 @@ public class ThaumicHorizons {
|
||||
(new AspectList()).add(Aspect.VOID, 48).add(Aspect.TRAVEL, 64).add(Aspect.AIR, 64)
|
||||
.add(Aspect.MECHANISM, 32).add(Aspect.ELDRITCH, 64).add(Aspect.MAGIC, 16),
|
||||
new ItemStack(itemPlanarConduit),
|
||||
new ItemStack[] { MaterialLibAPI.getStack(Materials.Void, Shapes.plateDense, 1),
|
||||
MaterialLibAPI.getStack(Materials.Titanium, Shapes.screw, 1),
|
||||
MaterialLibAPI.getStack(Materials.Enderium, Shapes.plateDense, 1),
|
||||
MaterialLibAPI.getStack(Materials.Void, Shapes.plateDense, 1),
|
||||
MaterialLibAPI.getStack(Materials.InfusedGold, Shapes.plateDense, 1),
|
||||
MaterialLibAPI.getStack(Materials.Titanium, Shapes.screw, 1),
|
||||
MaterialLibAPI.getStack(Materials.Void, Shapes.plateDense, 1),
|
||||
MaterialLibAPI.getStack(Materials.Titanium, Shapes.screw, 1),
|
||||
MaterialLibAPI.getStack(Materials.InfusedGold, Shapes.plateDense, 1),
|
||||
MaterialLibAPI.getStack(Materials.Void, Shapes.plateDense, 1),
|
||||
MaterialLibAPI.getStack(Materials.Enderium, Shapes.plateDense, 1),
|
||||
MaterialLibAPI.getStack(Materials.Titanium, Shapes.screw, 1) });
|
||||
new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Enderium, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.InfusedGold, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.InfusedGold, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Enderium, 1L),
|
||||
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L) });
|
||||
} else {
|
||||
recipeKeystone = ThaumcraftApi.addInfusionCraftingRecipe(
|
||||
"pocketPlane",
|
||||
@@ -3243,7 +3243,7 @@ public class ThaumicHorizons {
|
||||
critterRecipes.add(
|
||||
new CreatureInfusionRecipe(
|
||||
"cowInfusion",
|
||||
EntityList.getEntityID(new EntityMooshroom(null)),
|
||||
-EntityList.getEntityID(new EntityMooshroom(null)),
|
||||
2,
|
||||
(new AspectList()).add(Aspect.PLANT, 8).add(Aspect.BEAST, 4),
|
||||
EntityCow.class,
|
||||
|
||||
@@ -1239,22 +1239,25 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
|
||||
EntityLivingBase created = null;
|
||||
if ((Integer) out < 0) {
|
||||
created = (EntityLivingBase) EntityList.createEntityByID(-(Integer) out, this.worldObj);
|
||||
} else {
|
||||
final ModContainer mc = Loader.instance().getIndexedModList().get("ThaumicHorizons");
|
||||
try {
|
||||
created = (EntityLivingBase) EntityRegistry.instance().lookupModSpawn(mc, (Integer) out)
|
||||
.getEntityClass().getConstructor(World.class).newInstance(this.worldObj);
|
||||
} catch (InvocationTargetException e) {
|
||||
e.getCause().printStackTrace();
|
||||
} catch (Exception e2) {
|
||||
e2.printStackTrace();
|
||||
}
|
||||
}
|
||||
final ModContainer mc = Loader.instance().getIndexedModList().get("ThaumicHorizons");
|
||||
try {
|
||||
created = (EntityLivingBase) EntityRegistry.instance().lookupModSpawn(mc, (Integer) out)
|
||||
.getEntityClass().getConstructor(World.class).newInstance(this.worldObj);
|
||||
} catch (InvocationTargetException e) {
|
||||
e.getCause().printStackTrace();
|
||||
} catch (Exception e2) {
|
||||
e2.printStackTrace();
|
||||
if (created != null) {
|
||||
created.copyLocationAndAnglesFrom(this.getEntityContained());
|
||||
created.copyDataFrom(this.getEntityContained(), true);
|
||||
if (created instanceof IEntityInfusedStats) {
|
||||
((IEntityInfusedStats) created).resetStats();
|
||||
}
|
||||
this.setEntityContained(created);
|
||||
}
|
||||
created.copyLocationAndAnglesFrom(this.getEntityContained());
|
||||
created.copyDataFrom(this.getEntityContained(), true);
|
||||
if (created instanceof IEntityInfusedStats) {
|
||||
((IEntityInfusedStats) created).resetStats();
|
||||
}
|
||||
this.setEntityContained(created);
|
||||
} else if (out instanceof NBTBase) {
|
||||
final NBTTagCompound tagMods = (NBTTagCompound) out;
|
||||
final Multimap map = HashMultimap.create();
|
||||
|
||||
Reference in new issue
Block a user