Name & description changed

Thorium High Temperature Reactor -> High Temeperature Gas-cooled Reactor


Former-commit-id: b37a05b7dff3247bc370290c04a764855c721276

6 files changed, 93 insertions, 66 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
index 10ada4ea61..d277862e9a 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
@@ -37,7 +37,7 @@ import com.github.bartimaeusnek.bartworks.common.tileentities.debug.CreativeScan
 import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_CircuitAssemblyLine;
 import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_DEHP;
 import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_ElectricImplosionCompressor;
-import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_THTR;
+import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR;
 import com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega.GT_TileEntity_MegaBlastFurnace;
 import com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega.GT_TileEntity_MegaDistillTower;
 import com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega.GT_TileEntity_MegaVacuumFreezer;
@@ -143,7 +143,7 @@ public class ItemRegistry {
     public static ItemStack[] megaMachines = new ItemStack[3];
     public static ItemStack dehp;
     public static ItemStack[] voidminer = new ItemStack[3];
-    public static ItemStack thtr;
+    public static ItemStack HTGR;
     public static ItemStack eic;
     public static ItemStack cal;
     public static ItemStack compressedHatch;
@@ -185,8 +185,8 @@ public class ItemRegistry {
             if (ConfigHandler.creativeScannerID != 0)
                 new CreativeScanner(ConfigHandler.creativeScannerID,"Creative Debug Scanner","Creative Debug Scanner",20);
             ItemRegistry.eic = new GT_TileEntity_ElectricImplosionCompressor(ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 6, "ElectricImplosionCompressor", "Electric Implosion Compressor").getStackForm(1L);
-            ItemRegistry.thtr = new GT_TileEntity_THTR(ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 5, "THTR", "Thorium High Temperature Reactor").getStackForm(1L);
-            GT_TileEntity_THTR.THTRMaterials.registeraTHR_Materials();
+            ItemRegistry.HTGR = new GT_TileEntity_HTGR(ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 5, "HTGR", "High Temperature Gas-cooled Reactor").getStackForm(1L);
+            GT_TileEntity_HTGR.HTGRMaterials.registeraTHR_Materials();
             GT_OreDictUnificator.add(OrePrefixes.block, Materials.BorosilicateGlass, new ItemStack(ItemRegistry.bw_glasses[0], 1, 0));
             GT_OreDictUnificator.registerOre(OrePrefixes.block, Materials.NickelZincFerrite, new ItemStack(ItemRegistry.BW_BLOCKS[2]));
             for (int i = 0; i < GT_Values.VN.length; i++) {
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
index b300adaa11..3e716ac8bf 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
@@ -26,7 +26,7 @@ import com.github.bartimaeusnek.bartworks.API.LoaderReference;
 import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
 import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_LESU;
 import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_ManualTrafo;
-import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_THTR;
+import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR;
 import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_Windmill;
 import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
@@ -744,9 +744,9 @@ public class RecipeLoader {
                             'G', GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L),
                     }
             );
-            GT_TileEntity_THTR.THTRMaterials.registerTHR_Recipes();
+            GT_TileEntity_HTGR.HTGRMaterials.registerTHR_Recipes();
             GT_ModHandler.addCraftingRecipe(
-                    ItemRegistry.thtr,
+                    ItemRegistry.HTGR,
                     RecipeLoader.BITSD,
                     new Object[]{
                             "BZB",
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java
index 61a1e707e4..eb665ec035 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java
@@ -53,9 +53,11 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.ArrayList;
+import java.util.HashMap;
 
-public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
+public class GT_TileEntity_HTGR extends GT_MetaTileEntity_MultiBlockBase {
 
     private static final int BASECASINGINDEX = 44;
     private static final int HELIUM_NEEDED = 730000;
@@ -65,11 +67,11 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
     private int emptyticksnodiff = 0;
     private int coolanttaking = 0;
 
-    public GT_TileEntity_THTR(int aID, String aName, String aNameRegional) {
+    public GT_TileEntity_HTGR(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
 
-    private GT_TileEntity_THTR(String aName) {
+    private GT_TileEntity_HTGR(String aName) {
         super(aName);
     }
 
@@ -85,6 +87,7 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
         this.fueltype = aNBT.getInteger("fueltype");
         this.fuelsupply = aNBT.getInteger("fuelsupply");
         this.empty = aNBT.getBoolean("EmptyMode");
+        this.coolanttaking = aNBT.getInteger("coolanttaking");
     }
 
     @Override
@@ -94,19 +97,20 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
         aNBT.setInteger("fueltype", this.fueltype);
         aNBT.setInteger("fuelsupply", this.fuelsupply);
         aNBT.setBoolean("EmptyMode", this.empty);
+        aNBT.setInteger("coolanttaking", this.coolanttaking);
     }
 
     @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         super.onPostTick(aBaseMetaTileEntity, aTick);
         if (aBaseMetaTileEntity.isServerSide() && !this.empty){
-            if (this.HeliumSupply < GT_TileEntity_THTR.HELIUM_NEEDED){
+            if (this.HeliumSupply < GT_TileEntity_HTGR.HELIUM_NEEDED){
                 for (FluidStack fluidStack : this.getStoredFluids()){
                     if (fluidStack.isFluidEqual(Materials.Helium.getGas(1))) {
-                        int toget = Math.min(GT_TileEntity_THTR.HELIUM_NEEDED - this.HeliumSupply, fluidStack.amount);
+                        int toget = Math.min(GT_TileEntity_HTGR.HELIUM_NEEDED - this.HeliumSupply, fluidStack.amount);
                         fluidStack.amount -= toget;
                         this.HeliumSupply += toget;
-                        if(GT_TileEntity_THTR.HELIUM_NEEDED == this.HeliumSupply && fluidStack.amount == 0)
+                        if(GT_TileEntity_HTGR.HELIUM_NEEDED == this.HeliumSupply && fluidStack.amount == 0)
                             fluidStack = null;
                     }
                 }
@@ -115,10 +119,10 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
                 for (ItemStack itemStack : this.getStoredInputs()) {
                     int type = -1;
                     if(itemStack == null) continue;
-                    if(itemStack.getItem() != THTRMaterials.aTHTR_Materials) continue;
-                    int damage = THTRMaterials.aTHTR_Materials.getDamage(itemStack);
-                    if(!((damage + 1) % THTRMaterials.MATERIALS_PER_FUEL == THTRMaterials.USABLE_FUEL_INDEX + 1)) continue; // is fuel
-                    type = damage / THTRMaterials.MATERIALS_PER_FUEL;
+                    if(itemStack.getItem() != HTGRMaterials.aHTGR_Materials) continue;
+                    int damage = HTGRMaterials.aHTGR_Materials.getDamage(itemStack);
+                    if(!((damage + 1) % HTGRMaterials.MATERIALS_PER_FUEL == HTGRMaterials.USABLE_FUEL_INDEX + 1)) continue; // is fuel
+                    type = damage / HTGRMaterials.MATERIALS_PER_FUEL;
                     if(this.fueltype == -1)
                         this.fueltype = type;
                     if(this.fueltype != type)
@@ -141,7 +145,7 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
             this.mMaxProgresstime = 100;
             return true;
         }
-        if (!(this.HeliumSupply >= GT_TileEntity_THTR.HELIUM_NEEDED && this.fuelsupply >= 72000))
+        if (!(this.HeliumSupply >= GT_TileEntity_HTGR.HELIUM_NEEDED && this.fuelsupply >= 72000))
             return false;
 
         double eff = Math.min(Math.pow(((double)this.fuelsupply-72000D)/72000D, 2D)+19D, 100D)/100D - ((double)(getIdealStatus() - getRepairStatus()) / 10D);
@@ -156,16 +160,16 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
         if(burnedballs > 0)
             toReduce -= burnedballs*64;
 
-        int meta = (this.fueltype * THTRMaterials.MATERIALS_PER_FUEL) + THTRMaterials.BURNED_OUT_FUEL_INDEX;
+        int meta = (this.fueltype * HTGRMaterials.MATERIALS_PER_FUEL) + HTGRMaterials.BURNED_OUT_FUEL_INDEX;
 
         this.mOutputItems = new ItemStack[] {
-            new ItemStack(THTRMaterials.aTHTR_Materials, burnedballs, meta),
-            new ItemStack(THTRMaterials.aTHTR_Materials, toReduce, meta + 1)
+            new ItemStack(HTGRMaterials.aHTGR_Materials, burnedballs, meta),
+            new ItemStack(HTGRMaterials.aHTGR_Materials, toReduce, meta + 1)
         };
         
         this.updateSlots();
 
-        this.coolanttaking = (int)(4000D * ((this.fueltype * 0.5D) + 1) * ((double)this.mEfficiency / 10000D)) * 20; // 100 LHEs btw, why?
+        this.coolanttaking = (int)(4000D * ((this.fueltype * 0.5D) + 1) * ((double)this.mEfficiency / 10000D));
 
         this.mEfficiency = (int)(eff*10000D);
         this.mEUt=0;
@@ -173,7 +177,7 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
         return true;
     }
     
-    private static int runningtick = 0;
+    private int runningtick = 0;
 
     @Override
     public boolean onRunningTick(ItemStack aStack) {
@@ -190,7 +194,7 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
             }
             if(this.fuelsupply > 0)
             {
-                ItemStack iStack = new ItemStack(THTRMaterials.aTHTR_Materials, this.fuelsupply, (THTRMaterials.MATERIALS_PER_FUEL * this.fueltype) + THTRMaterials.USABLE_FUEL_INDEX);
+                ItemStack iStack = new ItemStack(HTGRMaterials.aHTGR_Materials, this.fuelsupply, (HTGRMaterials.MATERIALS_PER_FUEL * this.fueltype) + HTGRMaterials.USABLE_FUEL_INDEX);
                 boolean storedAll = false;
                 for (GT_MetaTileEntity_Hatch_OutputBus tHatch : this.mOutputBusses) {
                     if(!isValidMetaTileEntity(tHatch))
@@ -207,6 +211,7 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
                 else{
                     this.fuelsupply = 0;
                     this.fueltype = -1;
+                    this.coolanttaking = 0;
                 }
             }
             return true;
@@ -262,9 +267,9 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
                         if (!(aBaseMetaTileEntity.getBlockOffset(xDir + x, y, zDir + z) == GregTech_API.sBlockCasings3 && aBaseMetaTileEntity.getMetaIDOffset(xDir + x, y, zDir + z) == 12)) {
                             IGregTechTileEntity tEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, y, zDir + z);
                             if (
-                                    !(y == 11 && this.addInputToMachineList(tEntity, GT_TileEntity_THTR.BASECASINGINDEX)) &&
-                                    !(y == 0 && this.addOutputToMachineList(tEntity, GT_TileEntity_THTR.BASECASINGINDEX)) &&
-                                    !this.addMaintenanceToMachineList(tEntity, GT_TileEntity_THTR.BASECASINGINDEX)
+                                    !(y == 11 && this.addInputToMachineList(tEntity, GT_TileEntity_HTGR.BASECASINGINDEX)) &&
+                                    !(y == 0 && this.addOutputToMachineList(tEntity, GT_TileEntity_HTGR.BASECASINGINDEX)) &&
+                                    !this.addMaintenanceToMachineList(tEntity, GT_TileEntity_HTGR.BASECASINGINDEX)
                             ) {
                                 return false;
                             }
@@ -308,7 +313,7 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
 
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) {
-        return new GT_TileEntity_THTR(this.mName);
+        return new GT_TileEntity_HTGR(this.mName);
     }
 
 
@@ -317,38 +322,55 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
         return new String[]{
                 "Mode:", this.empty ? "Emptying" : "Normal",
                 "Progress:", GT_Utility.formatNumbers(this.mProgresstime / 20) + "s / " + GT_Utility.formatNumbers(this.mMaxProgresstime / 20) + "s",
-                "Fuel type:", (this.fueltype == -1 ? "NONE" : ("TRISO (" + THTRMaterials.sTHTR_Fuel[this.fueltype].sEnglish) + ")"),
+                "Fuel type:", (this.fueltype == -1 ? "NONE" : ("TRISO (" + HTGRMaterials.sHTGR_Fuel[this.fueltype].sEnglish) + ")"),
                 "Fuel amount:", GT_Utility.formatNumbers(this.fuelsupply) + " pcs.",
-                "Helium-Level:", GT_Utility.formatNumbers(this.HeliumSupply) + "L / " + GT_Utility.formatNumbers(GT_TileEntity_THTR.HELIUM_NEEDED) + "L",
-                "Coolant/t:", GT_Utility.formatNumbers(coolanttaking) + "L/s",
+                "Helium-Level:", GT_Utility.formatNumbers(this.HeliumSupply) + "L / " + GT_Utility.formatNumbers(GT_TileEntity_HTGR.HELIUM_NEEDED) + "L",
+                "Coolant:", GT_Utility.formatNumbers(coolanttaking) + "L/s",
                 "Problems:", String.valueOf(this.getIdealStatus() - this.getRepairStatus())
         };
     }
 
     @Override
     public String[] getDescription() {
-        return BW_Tooltip_Reference.getTranslatedBrandedTooltip("tooltip.tile.htr.0.name");
+        return BW_Tooltip_Reference.getTranslatedBrandedTooltip("tooltip.tile.htgr.0.name");
     }
 
     @Override
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-        return aSide == aFacing ? new ITexture[]{Textures.BlockIcons.getCasingTextureForId(GT_TileEntity_THTR.BASECASINGINDEX), TextureFactory.of(aActive ? TextureFactory.of(TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE), TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW).glow().build()) : TextureFactory.of(TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER), TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_GLOW).glow().build()))} : new ITexture[]{Textures.BlockIcons.getCasingTextureForId(GT_TileEntity_THTR.BASECASINGINDEX)};
+        return aSide == aFacing ? new ITexture[]{Textures.BlockIcons.getCasingTextureForId(GT_TileEntity_HTGR.BASECASINGINDEX), TextureFactory.of(aActive ? TextureFactory.of(TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE), TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW).glow().build()) : TextureFactory.of(TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER), TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_GLOW).glow().build()))} : new ITexture[]{Textures.BlockIcons.getCasingTextureForId(GT_TileEntity_HTGR.BASECASINGINDEX)};
     }
 
     @Override
     public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if(this.mMaxProgresstime > 0)
         {
-            GT_Utility.sendChatToPlayer(aPlayer, "THTR mode cant be changed when running.");
+            GT_Utility.sendChatToPlayer(aPlayer, "HTGR mode cannot be changed while the machine is running.");
             return;
         }
         this.empty = !this.empty;
-        GT_Utility.sendChatToPlayer(aPlayer, "THTR is now running in " + (this.empty ? "emptying mode." : "normal Operation"));
+        GT_Utility.sendChatToPlayer(aPlayer, "HTGR is now running in " + (this.empty ? "emptying mode." : "normal Operation"));
     }
 
     
+    
+    public static class HTGRMaterials{
+
+        private static class CustomHTGRSimpleSubItemClass extends SimpleSubItemClass{
+            HashMap<Integer, String> tooltip = null;
+            public CustomHTGRSimpleSubItemClass(HashMap<Integer, String> tooltip, String... tex){
+                super(tex);
+                this.tooltip = tooltip;
+            }
+            @Override
+            @SuppressWarnings("unchecked")
+            public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
+                if(tooltip.containsKey(getDamage(p_77624_1_)))
+                    aList.add(tooltip.get(getDamage(p_77624_1_)));
+                aList.add("Material for High Temperature Gas-cooled Reactor");
+                super.addInformation(p_77624_1_, p_77624_2_, aList, p_77624_4_);
+            }
+        }
 
-    public static class THTRMaterials{
         private static class Base_{
             public String sName;
             public String sEnglish;
@@ -372,7 +394,8 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
             public ItemStack[] recycledItems = { GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI };
             public FluidStack recycledFluid;
             public int[] recycleChances;
-            public Fuel_(String sName, String sEnglish, ItemStack mainItem, ItemStack secondaryItem, FluidStack recycledFluid, ItemStack[] recycledItems, int[] recycleChances){
+            public String tooltip;
+            public Fuel_(String sName, String sEnglish, ItemStack mainItem, ItemStack secondaryItem, FluidStack recycledFluid, ItemStack[] recycledItems, int[] recycleChances, String tooltip){
                 this.sName = sName;
                 this.sEnglish = sEnglish;
                 this.mainItem = mainItem;
@@ -381,6 +404,7 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
                 for(int i = 0; i < recycledItems.length; i++)
                     this.recycledItems[i] = recycledItems[i];
                 this.recycleChances = recycleChances;
+                this.tooltip = tooltip;
             }
         }
         private static class LangEntry_{
@@ -392,7 +416,7 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
             }
         }
         
-        static final Base_[] sTHTR_Bases = new Base_[]{ 
+        static final Base_[] sHTGR_Bases = new Base_[]{ 
             new Base_("HTGRFuelMixture", "HTGR fuel mixture"),
             new Base_("BISOPebbleCompound", "BISO pebble compound"),
             new Base_("TRISOPebbleCompound", "TRISO pebble compound"),
@@ -401,48 +425,51 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
             new Base_("BurnedOutTRISOBall", "Burned out TRISO Ball"),
             new Base_("BurnedOutTRISOPebble", "Burned out TRISO Pebble"),
         };
-        static final int MATERIALS_PER_FUEL = sTHTR_Bases.length;
+        static final int MATERIALS_PER_FUEL = sHTGR_Bases.length;
         static final int USABLE_FUEL_INDEX = 4;
         static final int BURNED_OUT_FUEL_INDEX = 5;
-        static final Fuel_[] sTHTR_Fuel = new Fuel_[]{
+        static final Fuel_[] sHTGR_Fuel = new Fuel_[]{
             new Fuel_("Thorium", "Thorium", WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 64), Materials.Uranium235.getDust(4), 
                 GT_Values.NF, new ItemStack[]{ 
                     Materials.Silicon.getDustSmall(1), Materials.Graphite.getDustSmall(1), Materials.Carbon.getDustSmall(1),
                     Materials.Lutetium.getDustSmall(1), WerkstoffLoader.Thorium232.get(OrePrefixes.dustSmall,1)},
-                new int[]{9000, 9000, 9000, 9000, 1000}),
+                new int[]{9000, 9000, 9000, 9000, 1000}, "Multiplies coolant by 1"),
             new Fuel_("Uranium", "Uranium", Materials.Uranium.getDust(60), Materials.Uranium235.getDust(8), 
                 FluidRegistry.getFluidStack("krypton", 7), new ItemStack[]{ 
                     Materials.Silicon.getDustSmall(1), Materials.Graphite.getDustSmall(1), Materials.Carbon.getDustSmall(1),
                     Materials.Lead.getDustSmall(1),
                     Materials.Uranium.getDustSmall(1)},
-                new int[]{9000, 9000, 9000, 6562, 937}),
+                new int[]{9000, 9000, 9000, 6562, 937}, "Multiplies coolant by 1.5"),
             new Fuel_("Plutonium", "Plutonium", Materials.Plutonium.getDust(64), Materials.Plutonium241.getDust(4), 
                 FluidRegistry.getFluidStack("xenon", 8), new ItemStack[]{ 
                     Materials.Silicon.getDustSmall(1), Materials.Graphite.getDustSmall(1), Materials.Carbon.getDustSmall(1),
                     Materials.Lead.getDustSmall(1),
                     Materials.Plutonium.getDustSmall(1)},
-                new int[]{9000, 9000, 9000, 7000, 1000}),
+                new int[]{9000, 9000, 9000, 7000, 1000}, "Multiplies coolant by 2"),
         };
-        static final SimpleSubItemClass aTHTR_Materials;
-        static final ArrayList<LangEntry_> aTHTR_Localizations = new ArrayList<LangEntry_>();
+        static final CustomHTGRSimpleSubItemClass aHTGR_Materials;
+        static final ArrayList<LangEntry_> aHTGR_Localizations = new ArrayList<LangEntry_>();
         static{
-            String[] sTHTR_Materials = new String[sTHTR_Bases.length*sTHTR_Fuel.length];
+            String[] sHTGR_Materials = new String[sHTGR_Bases.length*sHTGR_Fuel.length];
+            HashMap<Integer, String> tooltip = new HashMap<Integer, String>();
             int i = 0;
-            for(Fuel_ fuel : sTHTR_Fuel)
-                for(Base_ base : sTHTR_Bases)
+            for(Fuel_ fuel : sHTGR_Fuel)
+                for(Base_ base : sHTGR_Bases)
                 {
-                    sTHTR_Materials[i] = "HTGR" + base.sName + fuel.sName;
-                    aTHTR_Localizations.add(new LangEntry_("item." + sTHTR_Materials[i] + ".name", base.sEnglish + " (" + fuel.sEnglish + ")"));
+                    sHTGR_Materials[i] = "HTGR" + base.sName + fuel.sName;
+                    aHTGR_Localizations.add(new LangEntry_("item." + sHTGR_Materials[i] + ".name", base.sEnglish + " (" + fuel.sEnglish + ")"));
+                    if(((i+1) % MATERIALS_PER_FUEL == (USABLE_FUEL_INDEX + 1)) && fuel.tooltip != null && fuel.tooltip != "")
+                        tooltip.put(i, fuel.tooltip);
                     i++;
                 }
-            aTHTR_Materials = new SimpleSubItemClass(sTHTR_Materials);
+            aHTGR_Materials = new CustomHTGRSimpleSubItemClass(tooltip, sHTGR_Materials);
         }
         
 
         public static void registeraTHR_Materials(){
-            for(LangEntry_ iName : aTHTR_Localizations)
+            for(LangEntry_ iName : aHTGR_Localizations)
                 GT_LanguageManager.addStringLocalization(iName.sName, iName.sEnglish);
-            GameRegistry.registerItem(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials,"bw.THTRMaterials");
+            GameRegistry.registerItem(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials,"bw.HTGRMaterials");
         }
 
         public static void registerTHR_Recipes(){
@@ -463,17 +490,17 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
                     BW_Util.getMachineVoltageFromTier(5)
             );
             int i = 0;
-            for(Fuel_ fuel : sTHTR_Fuel){
-                GT_Values.RA.addMixerRecipe(fuel.mainItem, fuel.secondaryItem ,GT_Utility.getIntegratedCircuit(1),null,null,null,new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, i),400,30);
-                GT_Values.RA.addFormingPressRecipe(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, i), Materials.Carbon.getDust(64),new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, i + 1),40,30);
-                GT_Values.RA.addFormingPressRecipe(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, i + 1), Materials.Silicon.getDust(64),new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, i + 2),40,30);
-                GT_Values.RA.addFormingPressRecipe(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, i + 2), Materials.Graphite.getDust(64),new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, i + 3),40,30);
+            for(Fuel_ fuel : sHTGR_Fuel){
+                GT_Values.RA.addMixerRecipe(fuel.mainItem, fuel.secondaryItem ,GT_Utility.getIntegratedCircuit(1),null,null,null,new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i),400,30);
+                GT_Values.RA.addFormingPressRecipe(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i), Materials.Carbon.getDust(64),new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 1),40,30);
+                GT_Values.RA.addFormingPressRecipe(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 1), Materials.Silicon.getDust(64),new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 2),40,30);
+                GT_Values.RA.addFormingPressRecipe(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 2), Materials.Graphite.getDust(64),new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 3),40,30);
                 ItemStack[] pellets = new ItemStack[4];
-                Arrays.fill(pellets,new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 64, i + 4));
-                GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(false, new ItemStack[]{new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, i + 3), GT_Utility.getIntegratedCircuit(17)}, pellets, null, null, null, null, 32000, 30, 0);
-                GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(false, new ItemStack[]{new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, i + 5), GT_Utility.getIntegratedCircuit(17)}, new ItemStack[]{new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 64, i + 6)}, null, null, null, null,48000,30,0);
+                Arrays.fill(pellets,new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4));
+                GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(false, new ItemStack[]{new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 3), GT_Utility.getIntegratedCircuit(17)}, pellets, null, null, null, null, 32000, 30, 0);
+                GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe(false, new ItemStack[]{new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 5), GT_Utility.getIntegratedCircuit(17)}, new ItemStack[]{new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 6)}, null, null, null, null,48000,30,0);
                 GT_Values.RA.addCentrifugeRecipe(
-                        new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, i + 6), GT_Values.NI, GT_Values.NF,
+                        new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 6), GT_Values.NI, GT_Values.NF,
                         fuel.recycledFluid,
                         fuel.recycledItems[0],
                         fuel.recycledItems[1],
@@ -483,7 +510,7 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
                         fuel.recycledItems[5],
                         fuel.recycleChances,
                         1200, 30);
-                i += sTHTR_Bases.length;
+                i += sHTGR_Bases.length;
             }
         }
 
diff --git a/src/main/resources/assets/bartworks/lang/de_DE.lang b/src/main/resources/assets/bartworks/lang/de_DE.lang
index baf62d614a..b9c756e863 100644
--- a/src/main/resources/assets/bartworks/lang/de_DE.lang
+++ b/src/main/resources/assets/bartworks/lang/de_DE.lang
@@ -106,7 +106,7 @@ tooltip.tile.bvat.0.name=Controller Block for the Bacterial Vat;Size(WxHxD): 5x4
 tooltip.tile.diode.0.name=A Simple diode that will allow Energy Flow in only one direction.
 tooltip.tile.eic.0.name=Controller Block for the Electric Implosion Compressor;Size(WxHxD): 3x9x3;Uses Electricity instead of Explosives;Controller: Layer 3, front, center;Layer 1 and Layer 9: Solid Steel Machine Casings, each: 1 Energy Hatch in the middle;Layer 2,3,7,8: Middle: Nickel-Zinc-Ferrit Blocks, Outer: Transformer-Winding Blocks;Layer 4,5,6: Neutronium Blocks;1+ Input Bus, 1+ Output Bus, 1 Maintenance Hatch at any Solid Steel Machine Casing;Do NOT Obstruct or mine the Moving parts while in Operation, will explode if you do so!
 tooltip.tile.energydistributor.0.name=Splits Amperage into several Sides.
-tooltip.tile.htr.0.name=Controller Block für den Thorium Hoch Temperatur Reaktor;Größe(BxHxL): 11x12x11 (Innen Leer);Controller: Vorne Mitte, Unterste Schicht;Ecken und die 2 beührenden Blöcke sind Luft (Zylinder);Once build, Helium is inserted into the Fluid Input Hatch until it doesnt accept any more;1+ Output Hatch (Any Bottom casing);1+ Input Hatch (Any Top casing);1+ Input Bus (Any Top casing);1x Maintenance Hatch (Any casing);Raidation Proof Casings for the Rest;Needs a constant supply of coolant while running, will output after complete Operation;Needs at least 100k Fuel pebbles to start operation (can hold up to 675k pebbles);Consumes 1 Fuel Pellet per Operation;TRISO pebbles provide 30% more Energy;Each pebble increases the amount of converted coolant;One Operation takes 27 Ingame Days
+#tooltip.tile.htgr.0.name=Controller Block für den Thorium Hoch Temperatur Reaktor;Größe(BxHxL): 11x12x11 (Innen Leer);Controller: Vorne Mitte, Unterste Schicht;Ecken und die 2 beührenden Blöcke sind Luft (Zylinder);Once build, Helium is inserted into the Fluid Input Hatch until it doesnt accept any more;1+ Output Hatch (Any Bottom casing);1+ Input Hatch (Any Top casing);1+ Input Bus (Any Top casing);1x Maintenance Hatch (Any casing);Raidation Proof Casings for the Rest;Needs a constant supply of coolant while running, will output after complete Operation;Needs at least 100k Fuel pebbles to start operation (can hold up to 675k pebbles);Consumes 1 Fuel Pellet per Operation;TRISO pebbles provide 30% more Energy;Each pebble increases the amount of converted coolant;One Operation takes 27 Ingame Days
 tooltip.tile.lesu.0.name=Controller Block for the GT2-Styled L.E.S.U.;Size: ANY
 tooltip.tile.lesu.1.name=Storage per LESU Casing:
 tooltip.tile.lesu.2.name=Output EU: LESU Casings amount;Input EU: Next Voltage Tier to Output EU;Input/Output Amps can be configured via 4 Circuits in GUI;Output Side has a dot on it.
diff --git a/src/main/resources/assets/bartworks/lang/en_US.lang b/src/main/resources/assets/bartworks/lang/en_US.lang
index 38d274c5b8..96db7499dd 100644
--- a/src/main/resources/assets/bartworks/lang/en_US.lang
+++ b/src/main/resources/assets/bartworks/lang/en_US.lang
@@ -144,7 +144,7 @@ tile.radiohatch.name=Radio Hatch
 tile.bw.windmill.name=Windmill
 tile.manutrafo.name=Manual Trafo
 
-tooltip.tile.htr.0.name=Controller Block for the Thorium High Temperature Reactor;Size(WxHxD): 11x12x11 (Hollow);Controller: Front Center, Lowest Layer;Corners and the 2 touching blocks are air (cylindric);Once built, Helium is inserted into the Fluid Input Hatch until it doesn't accept any more;1+ Output Hatch (Any Bottom casing);1+ Input Hatch (Any Top casing);1+ Input Bus (Any Top casing);1x Maintenance Hatch (Any casing);Radiation Proof Casings for the Rest;Needs a constant supply of coolant while running, will output after complete operation;Needs at least 100k Fuel pebbles to start operation (can hold up to 675k pebbles);Consumes up to 0.5% of total Fuel Pellets per Operation;TRISO pebbles provide 30% more Energy;Each pebble increases the amount of converted coolant;One Operation takes 27 Ingame Days
+tooltip.tile.htgr.0.name=Controller Block for the High Temperature Gas-cooled Reactor;Size(WxHxD): 11x12x11 (Hollow);Controller: Front Center, Lowest Layer;Corners and the 2 touching blocks are air (cylindric);Once built, Helium is inserted into the Fluid Input Hatch until it doesn't accept any more (730000L);1+ Output Bus (Any Bottom casing);1+ Output Hatch (Any Bottom casing);1+ Input Bus (Any Top casing);1+ Input Hatch (Any Top casing);1x Maintenance Hatch (Any casing);Radiation Proof Casings for the Rest;Needs a constant supply of coolant while running;Needs at least 72k Fuel pebbles to start operation (can hold up to 720k pebbles);Consumes up to 0.5% of total Fuel Pellets per Operation depending on efficiency;Efficiency is calculated exponentially depending on the amount of pebbles in the internal buffer;Base coolant amount is 4 000L/s multiplied by efficiency and by fuel coolant value (check tooltips);One Operation takes 1 hour
 
 itemGroup.bartworksMetaMaterials=BartWorks' Meta Materials
 
diff --git a/src/main/resources/assets/bartworks/lang/zh_CN.lang b/src/main/resources/assets/bartworks/lang/zh_CN.lang
index 9b54684d3c..c0bb7e4722 100644
--- a/src/main/resources/assets/bartworks/lang/zh_CN.lang
+++ b/src/main/resources/assets/bartworks/lang/zh_CN.lang
@@ -144,7 +144,7 @@ tile.radiohatch.name=放射仓
 tile.bw.windmill.name=风车
 tile.manutrafo.name=手动变压器
 
-tooltip.tile.htr.0.name=高温钍反应堆的控制器方块;大小(宽x高x长):11x12x11 (中空);控制器:正面中心,最低一层;角落和两个相邻的方块是空气;:一旦搭建完成,需要在输入仓中输入氦气直到不再接受;1+输出仓(任意底部机械方块);1+输入仓(任意顶部机械方块);1+输入总线(任意顶部机械方块);1x维护仓(任意机械方块);其余的为辐射防护机械方块;在运行时需要持续供应冷却液,完成工作后输出;需要至少100k卵石燃料才能开始工作(最多可使用675k个卵石);每次操作消耗1个燃料颗粒;TRISO卵石将提供30%的额外能量;每个卵石都会增加转换冷却剂的需求数量;一次工作耗时27个游戏日
+#tooltip.tile.htgr.0.name=高温钍反应堆的控制器方块;大小(宽x高x长):11x12x11 (中空);控制器:正面中心,最低一层;角落和两个相邻的方块是空气;:一旦搭建完成,需要在输入仓中输入氦气直到不再接受;1+输出仓(任意底部机械方块);1+输入仓(任意顶部机械方块);1+输入总线(任意顶部机械方块);1x维护仓(任意机械方块);其余的为辐射防护机械方块;在运行时需要持续供应冷却液,完成工作后输出;需要至少100k卵石燃料才能开始工作(最多可使用675k个卵石);每次操作消耗1个燃料颗粒;TRISO卵石将提供30%的额外能量;每个卵石都会增加转换冷却剂的需求数量;一次工作耗时27个游戏日
 
 itemGroup.bartworksMetaMaterials=BartWorks-meta材料