Minor Research improvements

Nividica · Mar 12, 2019 · 3dd5ce4 · 3dd5ce4
1 parent 3d09e85
commit 3dd5ce4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/main/java/thaumicenergistics/integration/thaumcraft/research/CardTinkerAE.java b/src/main/java/thaumicenergistics/integration/thaumcraft/research/CardTinkerAE.java
@@ -1,5 +1,8 @@
 package thaumicenergistics.integration.thaumcraft.research;
 
+import java.util.Random;
+
+import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 
 import thaumcraft.api.research.theorycraft.ResearchTableData;
@@ -8,6 +11,8 @@
 import thaumicenergistics.init.ModGlobals;
 
 /**
+ *
+ *
  * @author BrockWS
  */
 public class CardTinkerAE extends TheorycraftCard {
@@ -19,17 +24,17 @@ public int getInspirationCost() {
 
     @Override
     public String getLocalizedName() {
-        return "card.tinkerae.name";
+        return I18n.format("card.tinkerae.name");
     }
 
     @Override
     public String getLocalizedText() {
-        return "Experiment with Energy/Matter Conversion";
+        return I18n.format("card.tinkerae.text");
     }
 
     @Override
     public boolean activate(EntityPlayer player, ResearchTableData data) {
-        data.addTotal(ModGlobals.RESEARCH_CATEGORY, 15);
+        data.addTotal(ModGlobals.RESEARCH_CATEGORY, new Random().nextInt(15) + 10);
         return true;
     }
 }
diff --git a/src/main/resources/assets/thaumicenergistics/lang/en_us.lang b/src/main/resources/assets/thaumicenergistics/lang/en_us.lang
@@ -41,6 +41,9 @@ gui.thaumicenergistics.vis_required=Vis: %s
 gui.thaumicenergistics.vis_available=%s Available
 gui.thaumicenergistics.vis_discount=%s%% Discount
 
+card.tinkerae.name=Tinker with Matter/Energy
+card.tinkerae.text=Experiment with converting Essentia into Energy similar to your current Matter/Energy network. Gain 10-25 Energistics.
+
 # FROM THAUMCRAFT en_US.lang
 # BEST TO RECHECK THE LATEST LANG FILE FOR CHANGED FORMATTING
 #
@@ -110,4 +113,4 @@ research.infusionprovider.stage.2=I can now make Infusion Provider
 research.arcaneterminal.title=Arcane Crafting Terminal
 research.arcaneterminal.stage.1=Maybe I can combine a ME Terminal with a Arcane Workbench to get something that will help me with my arcane endeavours
 research.arcaneterminal.stage.2=I can now make Arcane Crafting Terminal
-research.arcaneterminal.addena.1=I can upgrade my Arcane Crafting Terminal to increase its vis draw range
+research.arcaneterminal.addenda.1=I can upgrade my Arcane Crafting Terminal to increase its vis draw range
diff --git a/src/main/resources/assets/thaumicenergistics/research/thaumicenergistics.json b/src/main/resources/assets/thaumicenergistics/research/thaumicenergistics.json
@@ -97,8 +97,8 @@
                         "THEORY;THAUMICENERGISTICS;1"
                     ],
                     "required_item": [
-                        "thaumcraft:salis_mundus",
-                        "appliedenergistics2:material;1;0",
+                        "thaumcraft:salis_mundus;4",
+                        "appliedenergistics2:material;4;0",
                         "appliedenergistics2:material;1;22"
                     ]
                 },
@@ -144,6 +144,7 @@
                     "required_item": [
                         "thaumcraft:salis_mundus;4",
                         "thaumicenergistics:essentia_component_1k;3",
+                        "appliedenergistics2:quartz_glass",
                         "appliedenergistics2:material;1;23"
                     ]
                 },
@@ -189,6 +190,7 @@
                     "required_item": [
                         "thaumcraft:salis_mundus;4",
                         "thaumicenergistics:essentia_component_4k;3",
+                        "appliedenergistics2:quartz_glass",
                         "appliedenergistics2:material;1;24"
                     ]
                 },
@@ -234,6 +236,7 @@
                     "required_item": [
                         "thaumcraft:salis_mundus;4",
                         "thaumicenergistics:essentia_component_16k;3",
+                        "appliedenergistics2:quartz_glass",
                         "appliedenergistics2:material;1;24"
                     ]
                 },
@@ -389,7 +392,7 @@
             ],
             "addenda": [
                 {
-                    "text": "research.arcaneterminal.addena.1",
+                    "text": "research.arcaneterminal.addenda.1",
                     "recipes": [
                         "thaumicenergistics:upgrade_arcane"
                     ],