Rosa and research fixes

Fixed Rosa seeds being eaten by crystal blocks if one was already planted on it 
Possibly fixed server d/c on eating last rosa fragment in a stack 
Fixed research progression stop with Thaumic Nature node
Minor lang file changes for Tainted enchant. No, you can't just throw it in a node and get the enchant
Altered progression for bracelets slightly 
Phased out config for entity deconstructor now that it doesn't crash

build.properties

@@ -5,5 +5,5 @@ dir_output=../Build Output/TB/
 mc_version=1.7.10
 forge_version=10.13.4.1558
 dir_repo=./
-build_number=3
+build_number=7
 mod_name=ThaumicBased

changelog.txt

@@ -18,4 +18,18 @@
 	Added module config for Entity deconstructor - disabled by default
 	Changed aurelia behviour
 		Reduced petal spawn radius from 8 to 5
-		Petals will now only spawn on grass or dirt type blocks
+		Petals will now only spawn on grass or dirt type blocks
+
+1.4.1710.3
+	Fixed progression bug with Thaumium/Void bracelets
+
+1.4.1710.4
+	Added missing mcmod.info file
+	
+1.4.1710.7
+	Fixed Rosa seeds being eaten by crystal blocks if one was already planted on it
+	Possibly fixed server d/c on eating last rosa fragment in a stack
+	Fixed research progression stop with Thaumic Nature
+	Minor lang file changes
+	Altered progression for bracelets slightly
+	Phased out config for entity deconstructor now that it doesn't crash

src/main/java/tb/common/enchantment/EnchantmentTainted.java

@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 
 public class EnchantmentTainted extends Enchantment{
 
-	public EnchantmentTainted(int id, int weight,	EnumEnchantmentType type) 
+	public EnchantmentTainted(int id, int weight, EnumEnchantmentType type) 
 	{
 		super(id, weight, type);
 	}
@@ -21,7 +21,9 @@ public class EnchantmentTainted extends Enchantment{
     	return !(ench instanceof EnchantmentElderKnowledge) && !(ench instanceof EnchantmentMagicTouch) && !(ench instanceof EnchantmentTainted) && !(ench instanceof EnchantmentVaporising);
     }
 
-    public boolean canApply(ItemStack p_92089_1_)
+    //do I even want to know why this is here?
+    
+    public boolean canApply(ItemStack itemStack)
     {
     	return false;
     }

src/main/java/tb/common/item/ItemKnoseFragment.java

@@ -128,7 +128,12 @@ public class ItemKnoseFragment extends Item
 	    	}
     	player.inventory.decrStackSize(player.inventory.currentItem, 1);
     	
-    	return stk.stackSize <= 0 ? null : stk;
+    	//1.7 old
+    	//return stk.stackSize <= 0 ? null : stk;
+    	
+    	//1.8 change
+    	--stk.stackSize;
+    	return stk;
     }
 	
     @SuppressWarnings({ "unchecked", "rawtypes" })

src/main/java/tb/common/item/ItemKnoseSeeds.java

@@ -2,44 +2,43 @@ package tb.common.item;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemSeeds;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 public class ItemKnoseSeeds extends ItemSeeds{
 
-    private Block field_150925_a;
+    private Block cropBlock;
     private Block soilBlockID;
 	
-	public ItemKnoseSeeds(Block p_i45352_1_, Block p_i45352_2_) {
-		super(p_i45352_1_, p_i45352_2_);
-        this.field_150925_a = p_i45352_1_;
-        this.soilBlockID = p_i45352_2_;
+	public ItemKnoseSeeds(Block crop, Block soil) {
+		super(crop, soil);
+        this.cropBlock = crop;
+        this.soilBlockID = soil;
 	}
 	
-    public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_)
+    public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float fx, float fy, float fz)
     {
-        if (p_77648_7_ != 1)
-        {
+        if (side != 1) {
             return false;
         }
-        else if (p_77648_2_.canPlayerEdit(p_77648_4_, p_77648_5_, p_77648_6_, p_77648_7_, p_77648_1_) && p_77648_2_.canPlayerEdit(p_77648_4_, p_77648_5_ + 1, p_77648_6_, p_77648_7_, p_77648_1_))
-        {
-            if (p_77648_3_.getBlock(p_77648_4_, p_77648_5_, p_77648_6_) == soilBlockID)
-            {
-                p_77648_3_.setBlock(p_77648_4_, p_77648_5_ + 1, p_77648_6_, this.field_150925_a);
-                --p_77648_1_.stackSize;
-                return true;
+        else if (player.canPlayerEdit(x, y, z, side, itemStack) && player.canPlayerEdit(x, y + 1, z, side, itemStack)) {
+            if (world.getBlock(x, y, z) == soilBlockID) {
+            	if (world.getBlock(x, y + 1, z) == Blocks.air) {
+            		world.setBlock(x, y + 1, z, this.cropBlock);
+                    --itemStack.stackSize;
+                    return true;
+            	}
             }
-            else
-            {
+            else {
                 return false;
             }
         }
-        else
-        {
+        else {
             return false;
         }
+		return false;
     }
 
 }

src/main/java/tb/init/TBBlocks.java

@@ -241,10 +241,10 @@ public class TBBlocks {
 			BlocksRegistry.registerBlock(nodeLinker, "nodeLinker",core,ItemBlock.class);
 		}
 		
-		if (TBConfig.enableEntityDecon) {
+		
 			//Ent Decon
 			BlocksRegistry.registerBlock(entityDeconstructor, "entityDeconstructor",core,ItemBlock.class);
-		}
+		
 
 		
 	}

src/main/java/tb/init/TBItems.java

@@ -70,8 +70,11 @@ public class TBItems {
 	public static Item plaxSeed = new ItemSeeds(TBBlocks.plax, Blocks.farmland).setUnlocalizedName("plaxSeeds").setTextureName("thaumicbases:plax_seeds");
 	public static Item metalleatSeeds = new ItemSeeds(TBBlocks.metalleat, Blocks.farmland).setUnlocalizedName("metalleatSeeds").setTextureName("thaumicbases:metalleat_seeds");
 	public static Item lucriteSeeds = new ItemSeeds(TBBlocks.lucrite, Blocks.farmland).setUnlocalizedName("lucriteSeeds").setTextureName("thaumicbases:lucrite_seeds");
+	
+	//TODO ROSA
 	public static Item knoseFragment = new ItemKnoseFragment().setUnlocalizedName("knoseFragment.").setTextureName("thaumicbases:knose/");
 	public static Item knoseSeed = new ItemKnoseSeeds(TBBlocks.knose, TBBlocks.crystalBlock).setUnlocalizedName("knoseSeed").setTextureName("thaumicbases:knose_seed");
+	
 	public static Item sweedSeeds = new ItemKnoseSeeds(TBBlocks.sweed,Blocks.grass).setUnlocalizedName("sweedSeeds").setTextureName("thaumicbases:seeds_sweed");
 	public static Item lazulliaSeeds = new ItemSeeds(TBBlocks.lazullia,Blocks.farmland).setUnlocalizedName("lazulliaSeeds").setTextureName("thaumicbases:lazullia_seeds");
 	public static Item redlonSeeds = new ItemSeeds(TBBlocks.redlonStem,Blocks.farmland).setUnlocalizedName("redlonSeeds").setTextureName("thaumicbases:redlon_seed");

src/main/java/tb/init/TBThaumonomicon.java

@@ -1317,6 +1317,7 @@ public class TBThaumonomicon {
 			new ResearchItem("TB.Bracelet.Reed",catName,new AspectList().add(Aspect.AIR, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3).add(Aspect.AURA, 3).add(Aspect.EXCHANGE, 3),-19,6,2,new ItemStack(TBItems.castingBracelet,1,5))
 			.setConcealed()
 			.setParents("TB.ROD_reed")
+			.setParentsHidden("TB.Bracelet.Greatwood")
 			.setPages(
 				new ResearchPage("tb.rec.bracelet.reed.page.0"),
 				new ResearchPage(reedBraceletRec)
@@ -1325,6 +1326,7 @@ public class TBThaumonomicon {
 			new ResearchItem("TB.Bracelet.Blaze",catName,new AspectList().add(Aspect.FIRE, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3).add(Aspect.AURA, 3).add(Aspect.EXCHANGE, 3),-15,6,2,new ItemStack(TBItems.castingBracelet,1,8))
 			.setConcealed()
 			.setParents("TB.ROD_blaze")
+			.setParentsHidden("TB.Bracelet.Greatwood")
 			.setPages(
 				new ResearchPage("tb.rec.bracelet.blaze.page.0"),
 				new ResearchPage(blazeBraceletRec)
@@ -1333,6 +1335,7 @@ public class TBThaumonomicon {
 			new ResearchItem("TB.Bracelet.Obsidian",catName,new AspectList().add(Aspect.EARTH, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3).add(Aspect.AURA, 3).add(Aspect.EXCHANGE, 3),-19,10,2,new ItemStack(TBItems.castingBracelet,1,7))
 			.setConcealed()
 			.setParents("TB.ROD_obsidian")
+			.setParentsHidden("TB.Bracelet.Greatwood")
 			.setPages(
 				new ResearchPage("tb.rec.bracelet.obsidian.page.0"),
 				new ResearchPage(obsidianBraceletRec)
@@ -1341,6 +1344,7 @@ public class TBThaumonomicon {
 			new ResearchItem("TB.Bracelet.Ice",catName,new AspectList().add(Aspect.WATER, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3).add(Aspect.AURA, 3).add(Aspect.EXCHANGE, 3),-17,6,2,new ItemStack(TBItems.castingBracelet,1,9))
 			.setConcealed()
 			.setParents("TB.ROD_ice")
+			.setParentsHidden("TB.Bracelet.Greatwood")
 			.setPages(
 				new ResearchPage("tb.rec.bracelet.ice.page.0"),
 				new ResearchPage(iceBraceletRec)
@@ -1349,6 +1353,7 @@ public class TBThaumonomicon {
 			new ResearchItem("TB.Bracelet.Quartz",catName,new AspectList().add(Aspect.ORDER, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3).add(Aspect.AURA, 3).add(Aspect.EXCHANGE, 3),-17,10,2,new ItemStack(TBItems.castingBracelet,1,10))
 			.setConcealed()
 			.setParents("TB.ROD_quartz")
+			.setParentsHidden("TB.Bracelet.Greatwood")
 			.setPages(
 				new ResearchPage("tb.rec.bracelet.quartz.page.0"),
 				new ResearchPage(quartzBraceletRec)
@@ -1357,6 +1362,7 @@ public class TBThaumonomicon {
 			new ResearchItem("TB.Bracelet.Bone",catName,new AspectList().add(Aspect.ENTROPY, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3).add(Aspect.AURA, 3).add(Aspect.EXCHANGE, 3),-15,10,2,new ItemStack(TBItems.castingBracelet,1,6))
 			.setConcealed()
 			.setParents("TB.ROD_bone")
+			.setParentsHidden("TB.Bracelet.Greatwood")
 			.setPages(
 				new ResearchPage("tb.rec.bracelet.bone.page.0"),
 				new ResearchPage(boneBraceletRec)
@@ -1480,7 +1486,7 @@ public class TBThaumonomicon {
 				new ItemStack(ConfigItems.itemResource,1,1)
 			});
 			
-			new ResearchItem("TB.BasicPlants",catName,new AspectList(),-8,-2,0,new ItemStack(Items.wheat_seeds,1,0))
+			new ResearchItem("TB.BasicPlants",catName,new AspectList().add(Aspect.CROP, 2).add(Aspect.PLANT, 2),-8,-2,1,new ItemStack(Items.wheat_seeds,1,0))
 			.setParentsHidden("TB.CRUCIBLE")
 			.setRound()
 			.setPages(
@@ -2280,38 +2286,38 @@ public class TBThaumonomicon {
 		
 		
 		//TODO entity decon
-		if (TBConfig.enableEntityDecon) {
-			InfusionRecipe entityDeconstructorRec = new InfusionRecipe("TB.EntityDec",new ItemStack(TBBlocks.entityDeconstructor,1,0),4,new AspectList().add(Aspect.DEATH, 16).add(Aspect.SOUL, 4).add(Aspect.MIND, 16),new ItemStack(ConfigItems.itemThaumometer),new ItemStack[]{
-				new ItemStack(Blocks.light_weighted_pressure_plate),
-				new ItemStack(Blocks.light_weighted_pressure_plate),
-				new ItemStack(Blocks.heavy_weighted_pressure_plate),
-				new ItemStack(Blocks.heavy_weighted_pressure_plate),
-				new ItemStack(ConfigItems.itemResource,1,9),
-				new ItemStack(ConfigItems.itemResource,1,9),
-				new ItemStack(ConfigItems.itemResource,1,15),
-				new ItemStack(ConfigItems.itemResource,1,15)
-			});
-			
-			new ResearchItem("TB.EntityDec",catName,new AspectList().add(Aspect.MIND, 8).add(Aspect.DEATH, 8).add(Aspect.SOUL, 8),3,-2,1,new ItemStack(TBBlocks.entityDeconstructor,1,0))
-			.setParents("TB.INFUSION")
-			.setSecondary()
-			.setConcealed()
-			.setPages(
-				new ResearchPage("tb.rec.eDec.page.0"),
-				new ResearchPage(entityDeconstructorRec)
-				).registerResearchItem();
-			
-			new ResearchItem("TB.EntityDecAdv",catName,new AspectList().add(Aspect.MIND, 8).add(Aspect.DEATH, 8),5,-3,1,new ItemStack(ConfigBlocks.blockCrystal,1,OreDictionary.WILDCARD_VALUE))
-			.setParents("TB.EntityDec")
-			.setSecondary()
-			.setConcealed()
-			.setPages(
-				new ResearchPage("tb.rec.eDeca.page.0"),
-				new ResearchPage("tb.rec.eDeca.page.1")
-				).registerResearchItem();
-			
-			ThaumcraftApi.getCraftingRecipes().add(entityDeconstructorRec);
-		}
+		
+		InfusionRecipe entityDeconstructorRec = new InfusionRecipe("TB.EntityDec",new ItemStack(TBBlocks.entityDeconstructor,1,0),4,new AspectList().add(Aspect.DEATH, 16).add(Aspect.SOUL, 4).add(Aspect.MIND, 16),new ItemStack(ConfigItems.itemThaumometer),new ItemStack[]{
+			new ItemStack(Blocks.light_weighted_pressure_plate),
+			new ItemStack(Blocks.light_weighted_pressure_plate),
+			new ItemStack(Blocks.heavy_weighted_pressure_plate),
+			new ItemStack(Blocks.heavy_weighted_pressure_plate),
+			new ItemStack(ConfigItems.itemResource,1,9),
+			new ItemStack(ConfigItems.itemResource,1,9),
+			new ItemStack(ConfigItems.itemResource,1,15),
+			new ItemStack(ConfigItems.itemResource,1,15)
+		});
+		
+		new ResearchItem("TB.EntityDec",catName,new AspectList().add(Aspect.MIND, 8).add(Aspect.DEATH, 8).add(Aspect.SOUL, 8),3,-2,1,new ItemStack(TBBlocks.entityDeconstructor,1,0))
+		.setParents("TB.INFUSION")
+		.setSecondary()
+		.setConcealed()
+		.setPages(
+			new ResearchPage("tb.rec.eDec.page.0"),
+			new ResearchPage(entityDeconstructorRec)
+			).registerResearchItem();
+		
+		new ResearchItem("TB.EntityDecAdv",catName,new AspectList().add(Aspect.MIND, 8).add(Aspect.DEATH, 8),5,-3,1,new ItemStack(ConfigBlocks.blockCrystal,1,OreDictionary.WILDCARD_VALUE))
+		.setParents("TB.EntityDec")
+		.setSecondary()
+		.setConcealed()
+		.setPages(
+			new ResearchPage("tb.rec.eDeca.page.0"),
+			new ResearchPage("tb.rec.eDeca.page.1")
+			).registerResearchItem();
+		
+		ThaumcraftApi.getCraftingRecipes().add(entityDeconstructorRec);
+		
 		
 			
 			

src/main/java/tb/utils/TBConfig.java

@@ -32,7 +32,6 @@ public class TBConfig implements IDummyConfig{
 	public static boolean enableFlora;
 	public static boolean enableBloodyMess;
 	//public static boolean enableVoidTools;
-	public static boolean enableEntityDecon;
 
 	public static int minBlazePowderFromPyrofluid;
 	public static int maxBlazePowderFromPyrofluid;
@@ -102,10 +101,7 @@ public class TBConfig implements IDummyConfig{
 				"If set to false the void shears and igniter will be disabled - there will be no recipes/no entries in Thaumonomicon");
 		*/
 		
-		//TODO ent decon
-		enableEntityDecon = cfg.getBoolean("enableEntityDecon", "General", true,
-				"Enables the Entity Deconstructor. Config will probably be phased out now that bugs are fixed");
-		
+				
 		//pyrofluid
 		minBlazePowderFromPyrofluid = cfg.getInt("minBlazePowderFromPyrofluid", "Pyrofluid", 5, 0, Integer.MAX_VALUE, "");
 		maxBlazePowderFromPyrofluid = cfg.getInt("maxBlazePowderFromPyrofluid", "Pyrofluid", 5+32, 0, Integer.MAX_VALUE, "");

src/main/resources/assets/thaumicbases/lang/en_US.lang

@@ -465,7 +465,7 @@ tb.rec.enchantments.ewisdom=Weapons, enchanted with Elder Wisdom will have a cha
 tb.rec.enchantments.ebane=Weapons, enchanted with Eldritch bane will deal more damage to endermen and eldritch creatures.
 tb.rec.enchantments.magictouch=Weapons, enchanted with Magic Touched will provide thaumaturge using them with more primal aspects from enemies he kills.
 tb.rec.enchantments.vaporise=Weapons, enchanted with Vaporising enchantment will have a chance to provide the thaumaturge using them with some crystallised life essentia of creatures he slays.
-tb.rec.enchantments.taint=Weapons, infused with Taint will deal additional tainted damage upon hit. They will also apply Taint Poison to their target. They will be weaker against tainted creatures. To infuse a weapon with taint a thaumaturge should drop the weapon into a center of a tainted node and wait for the node to radiate the weapon with taint. Level of the enchantment is completely random, and can get up to 3.
+tb.rec.enchantments.taint=Weapons infused with Taint will deal additional tainted damage upon hit. They will also apply Taint Poison to their target. They will be weaker against tainted creatures. 
 
 #1.1 researches
 tc.research_name.TB.EntityDecAdv=Entity Deconstructor Improvements

src/main/resources/mcmod.info

@@ -1,14 +1,14 @@
 [
 {
-  "modid": "examplemod",
-  "name": "Example Mod",
-  "description": "Example placeholder mod.",
-  "version": "${version}",
-  "mcversion": "${mcversion}",
+  "modid": "thaumicbases",
+  "name": "Thaumic Bases",
+  "description": "A Thaumcraft addon, that adds more earlygame and midgame content.",
+  "version": "1.4.1",
+  "mcversion": "1.7.10",
   "url": "",
   "updateUrl": "",
-  "authorList": ["ExampleDude"],
-  "credits": "The Forge and FML guys, for making this example",
+  "authorList": ["Modbder", "KryptonCaptain"],
+  "credits": "",
   "logoFile": "",
   "screenshots": [],
   "dependencies": []