Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@KryptonCaptain
KryptonCaptain committed Jun 27, 2017
2 parents b96e3a7 + 3a08d71 commit f70468d
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 35 deletions.
2 changes: 1 addition & 1 deletion build.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=1.1.67
version=1.1.68
dir_output=../Build Output/TD/
mc_version=1.7.10
forge_version=10.13.4.1614
Expand Down
18 changes: 13 additions & 5 deletions src/main/java/flaxbeard/thaumicexploration/ThaumicExploration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,14 +439,22 @@ public void load(FMLInitializationEvent event) {
WAND_CAP_MECHANIST.setTexture(new ResourceLocation("thaumicexploration:textures/models/capMechanist.png"));

//WandRod.rods.put("transmutation1", WAND_ROD_CRYSTAL1);
enchantmentBinding = new EnchantmentBinding(Config.enchantmentBindingID, 1);
enchantmentNightVision = new EnchantmentNightVision(Config.enchantmentNightVisionID, 1);
enchantmentDisarm = new EnchantmentDisarm(Config.enchantmentDisarmID, 1);

if (Config.enchantmentBindingEnable){
enchantmentBinding = new EnchantmentBinding(Config.enchantmentBindingID, 1);
}
if (Config.enchantmentNVEnable) {
enchantmentNightVision = new EnchantmentNightVision(Config.enchantmentNightVisionID, 1);
}
if (Config.enchantmentDisarmEnable) {
enchantmentDisarm = new EnchantmentDisarm(Config.enchantmentDisarmID, 1);
}


if (Loader.isModLoaded("ThaumicTinkerer")) {
TTIntegration.registerEnchants();
}
if(Loader.isModLoaded("Waila"))
{
if(Loader.isModLoaded("Waila")) {
FMLInterModComms.sendMessage("Waila","register","flaxbeard.thaumicexploration.interop.WailaConfig.callbackRegister");
}
EntityRegistry.registerModEntity(EntityTaintacleMinion.class, "TaintacleMinion", 0, ThaumicExploration.instance, 64, 3, false);
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/flaxbeard/thaumicexploration/block/BlockEverburnUrn.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,21 +87,21 @@ public void randomDisplayTick(World par1World, int par2, int par3, int par4, Ran
int l = par1World.getBlockMetadata(par2, par3, par4);
float f = (float)par2 + 0.5F;
float f1 = (float)par3 + 1.0F;
float f2 = (float)par4 + 0.5F;
float f2 = (float)par4;
float f3 = 0.52F;
float f4 = par5Random.nextFloat() * 0.6F - 0.3F;
// par1World.spawnParticle("splash", f, f1, f2, 0.0D, 1.0D, 0.0D);
// par1World.spawnParticle("splash", f, f1, f2, 0.0D, 1.0D, 0.0D);
// par1World.spawnParticle("splash", f, f1, f2, 0.0D, 1.0D, 0.0D);
// par1World.spawnParticle("splash", f, f1, f2, 0.0D, 1.0D, 0.0D);
// par1World.spawnParticle("splash", f, f1, f2, 0.0D, 1.0D, 0.0D);
// par1World.spawnPamorticle("splash", f, f1, f2, 0.0D, 1.0D, 0.0D);
par1World.spawnParticle("lava", f, f1, f2, 0.0D, 1.0D, 0.0D);
//par1World.spawnParticle("lava", f, f1, f2, 0.0D, 1.0D, 0.0D);
//par1World.spawnParticle("lava", f, f1, f2, 0.0D, 1.0D, 0.0D);
//par1World.spawnParticle("lava", f, f1, f2, 0.0D, 1.0D, 0.0D);
//par1World.spawnParticle("lava", f, f1, f2, 0.0D, 1.0D, 0.0D);
//par1World.spawnParticle("lava", f, f1, f2, 0.0D, 1.0D, 0.0D);
if (Math.random() < 0.1) {

}

//par1World.spawnParticle("smoke", (double)(f + f4), (double)f1, (double)(f2 + f3), 0.0D, 0.0D, 0.0D);
//par1World.spawnParticle("flame", (double)(f + f4), (double)f1, (double)(f2 + f3), 0.0D, 0.0D, 0.0D);
par1World.spawnParticle("smoke", (double)(f + f4), (double)f1 + 0.2F, (double)(f2 + f3), 0.0D, 0.0D, 0.0D);
par1World.spawnParticle("flame", (double)(f + f4), (double)f1 + 0.2F, (double)(f2 + f3), 0.0D, 0.0D, 0.0D);


}
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/flaxbeard/thaumicexploration/common/Config.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ public class Config {
public static int enchantmentNightVisionID;
public static int enchantmentDisarmID;

public static boolean enchantmentBindingEnable;
public static boolean enchantmentNVEnable;
public static boolean enchantmentDisarmEnable;

public static boolean prefix;
public static boolean breadWand;
public static boolean brainsGolem;
Expand Down Expand Up @@ -44,6 +48,11 @@ public static void loadConfig(FMLPreInitializationEvent event) {
enchantmentBindingID = config.get("Enchantment", "Binding", 77).getInt();
enchantmentNightVisionID = config.get("Enchantment", "Night Vision", 78).getInt();
enchantmentDisarmID = config.get("Enchantment", "Disarming", 79).getInt();

enchantmentBindingEnable = config.get("Enchantment", "Binding enabled", true).getBoolean(true);
enchantmentNVEnable = config.get("Enchantment", "Night Vision enabled", true).getBoolean(true);
enchantmentDisarmEnable = config.get("Enchantment", "Disarm enabled", true).getBoolean(true);


//allowOsmotic = config.get("Miscellaneous", "Add new enchantments to Thaumic Tinkerer's Osmotic Enchanter (Requires TT Build 72+)", true).getBoolean(true);
prefix = config.get("Miscellaneous", "Display [TX] prefix before Thaumic Exploration research", true).getBoolean(true);
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/flaxbeard/thaumicexploration/integration/TTIntegration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import net.minecraft.entity.player.EntityPlayer;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;

import cpw.mods.fml.relauncher.ReflectionHelper;
import flaxbeard.thaumicexploration.ThaumicExploration;
import flaxbeard.thaumicexploration.common.Config;
import thaumic.tinkerer.common.enchantment.EnchantmentVampirism;
import thaumic.tinkerer.common.enchantment.core.EnchantmentManager;
import thaumic.tinkerer.common.lib.LibEnchantIDs;
Expand All @@ -19,9 +19,11 @@
public class TTIntegration {

public static void registerEnchants() {

if (Config.enchantmentBindingEnable)
EnchantmentManager.registerExponentialCostData(ThaumicExploration.enchantmentBinding, "thaumicexploration:textures/tabs/binding.png", false, new AspectList().add(Aspect.ENTROPY, 15).add(Aspect.ORDER, 15), "ENCHBINDING");
if (Config.enchantmentNVEnable)
EnchantmentManager.registerExponentialCostData(ThaumicExploration.enchantmentNightVision, "thaumicexploration:textures/tabs/nightVision.png", false, new AspectList().add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 10).add(Aspect.ORDER, 20), "ENCHNIGHTVISION");
if (Config.enchantmentDisarmEnable)
EnchantmentManager.registerExponentialCostData(ThaumicExploration.enchantmentDisarm, "thaumicexploration:textures/tabs/disarm.png", false, new AspectList().add(Aspect.AIR, 12).add(Aspect.ORDER, 7).add(Aspect.ENTROPY, 7), "ENCHDISARM");

}
Expand Down
26 changes: 15 additions & 11 deletions src/main/java/flaxbeard/thaumicexploration/research/ModRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,17 +173,21 @@ private static void initInfusionRecipes() {
new ItemStack(Blocks.netherrack), new ItemStack(Blocks.netherrack),
new ItemStack(Blocks.netherrack), new ItemStack(ConfigItems.itemFocusFire));

registerResearchItemIE("ENCHBINDING","ENCHBINDING", Enchantment.enchantmentsList[ThaumicExploration.enchantmentBinding.effectId], 3,
new AspectList().add(Aspect.TRAP, 8).add(Aspect.ENTROPY, 4).add(Aspect.TRAVEL, 4),
new ItemStack(Items.iron_sword), new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Blocks.soul_sand));

registerResearchItemIE("ENCHDISARM","ENCHDISARM", Enchantment.enchantmentsList[ThaumicExploration.enchantmentDisarm.effectId], 5,
new AspectList().add(Aspect.WEAPON, 4).add(Aspect.SLIME, 8).add(Aspect.TRAP, 4),
new ItemStack(Items.iron_sword), new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.slime_ball));

registerResearchItemIE("ENCHNIGHTVISION","ENCHNIGHTVISION", Enchantment.enchantmentsList[ThaumicExploration.enchantmentNightVision.effectId], 5,
new AspectList().add(Aspect.SENSES, 16).add(Aspect.DARKNESS, 8).add(Aspect.LIGHT, 16),
new ItemStack(Items.golden_carrot), new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.golden_carrot));
if (Config.enchantmentBindingEnable) {
registerResearchItemIE("ENCHBINDING","ENCHBINDING", Enchantment.enchantmentsList[ThaumicExploration.enchantmentBinding.effectId], 3,
new AspectList().add(Aspect.TRAP, 8).add(Aspect.ENTROPY, 4).add(Aspect.TRAVEL, 4),
new ItemStack(Items.iron_sword), new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Blocks.soul_sand));
}
if (Config.enchantmentDisarmEnable) {
registerResearchItemIE("ENCHDISARM","ENCHDISARM", Enchantment.enchantmentsList[ThaumicExploration.enchantmentDisarm.effectId], 5,
new AspectList().add(Aspect.WEAPON, 4).add(Aspect.SLIME, 8).add(Aspect.TRAP, 4),
new ItemStack(Items.iron_sword), new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.slime_ball));
}
if (Config.enchantmentNVEnable) {
registerResearchItemIE("ENCHNIGHTVISION","ENCHNIGHTVISION", Enchantment.enchantmentsList[ThaumicExploration.enchantmentNightVision.effectId], 5,
new AspectList().add(Aspect.SENSES, 16).add(Aspect.DARKNESS, 8).add(Aspect.LIGHT, 16),
new ItemStack(Items.golden_carrot), new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.golden_carrot));
}

registerResearchItemI("TALISMANFOOD", new ItemStack(ThaumicExploration.talismanFood), 5,
new AspectList().add(Aspect.HUNGER, 30).add(Aspect.FLESH, 25).add(Aspect.CROP, 25).add(Aspect.EXCHANGE,10),
Expand Down
19 changes: 12 additions & 7 deletions src/main/java/flaxbeard/thaumicexploration/research/ModResearch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,18 @@ public static void initResearch() {
research = new FauxResearchItem("TXINFUSIONENCHANTMENT","TX","INFUSIONENCHANTMENT","ARTIFICE",-5,-6,getOriginalGraphic("INFUSIONENCHANTMENT","ARTIFICE")).registerResearchItem();
//research = new TXResearchItem("ENCHBINDING", "ARTIFICE", new AspectList().add(Aspect.TRAP, 6).add(Aspect.ENTROPY, 5).add(Aspect.TRAVEL, 3), -8, 9, 1, new ResourceLocation("thaumicexploration:textures/tabs/binding.png")).setParents("INFUSIONENCHANTMENT").setConcealed().setSecondary().registerResearchItem();
// research.setPages(new ResearchPage("1"), infusionEnchantPage("ENCHBINDING"));
research = new TXResearchItem("ENCHBINDING", "TX", new AspectList().add(Aspect.TRAP, 6).add(Aspect.ENTROPY, 5).add(Aspect.TRAVEL, 3), -7, -4, 1, new ResourceLocation("thaumicexploration:textures/tabs/binding.png")).setParents("TXINFUSIONENCHANTMENT","INFUSIONENCHANTMENT").setConcealed().setSecondary().registerResearchItem();
research.setPages(new ResearchPage("1"), infusionEnchantPage("ENCHBINDING"));

research = new TXResearchItem("ENCHNIGHTVISION", "TX", new AspectList().add(Aspect.SENSES, 6).add(Aspect.DARKNESS, 2).add(Aspect.LIGHT, 6), -5, -4, 1, new ResourceLocation("thaumicexploration:textures/tabs/nightVision.png")).setParents("TXINFUSIONENCHANTMENT","INFUSIONENCHANTMENT").setConcealed().setSecondary().registerResearchItem();
research.setPages(new ResearchPage("1"), infusionEnchantPage("ENCHNIGHTVISION"));
research = new TXResearchItem("ENCHDISARM", "TX", new AspectList().add(Aspect.SLIME, 6).add(Aspect.TRAP, 4).add(Aspect.WEAPON, 4), -3, -4, 1, new ResourceLocation("thaumicexploration:textures/tabs/disarm.png")).setParents("TXINFUSIONENCHANTMENT","INFUSIONENCHANTMENT").setConcealed().setSecondary().registerResearchItem();
research.setPages(new ResearchPage("1"), infusionEnchantPage("ENCHDISARM"));
if (Config.enchantmentBindingEnable) {
research = new TXResearchItem("ENCHBINDING", "TX", new AspectList().add(Aspect.TRAP, 6).add(Aspect.ENTROPY, 5).add(Aspect.TRAVEL, 3), -7, -4, 1, new ResourceLocation("thaumicexploration:textures/tabs/binding.png")).setParents("TXINFUSIONENCHANTMENT","INFUSIONENCHANTMENT").setConcealed().setSecondary().registerResearchItem();
research.setPages(new ResearchPage("1"), infusionEnchantPage("ENCHBINDING"));
}
if (Config.enchantmentNVEnable) {
research = new TXResearchItem("ENCHNIGHTVISION", "TX", new AspectList().add(Aspect.SENSES, 6).add(Aspect.DARKNESS, 2).add(Aspect.LIGHT, 6), -5, -4, 1, new ResourceLocation("thaumicexploration:textures/tabs/nightVision.png")).setParents("TXINFUSIONENCHANTMENT","INFUSIONENCHANTMENT").setConcealed().setSecondary().registerResearchItem();
research.setPages(new ResearchPage("1"), infusionEnchantPage("ENCHNIGHTVISION"));
}
if (Config.enchantmentDisarmEnable) {
research = new TXResearchItem("ENCHDISARM", "TX", new AspectList().add(Aspect.SLIME, 6).add(Aspect.TRAP, 4).add(Aspect.WEAPON, 4), -3, -4, 1, new ResourceLocation("thaumicexploration:textures/tabs/disarm.png")).setParents("TXINFUSIONENCHANTMENT","INFUSIONENCHANTMENT").setConcealed().setSecondary().registerResearchItem();
research.setPages(new ResearchPage("1"), infusionEnchantPage("ENCHDISARM"));
}
}

//Wandcraft
Expand Down

0 comments on commit f70468d

Please sign in to comment.