Make Uncertain Resolver X the default version

src/main/java/tectech/loader/recipe/Assembler.java

@@ -3034,7 +3034,7 @@ public void cleanroomRecipes() {
             .duration(40 * SECONDS)
             .eut(TierEU.RECIPE_ZPM)
             .addTo(assemblerRecipes);
-        // Uncertainty
+        // Uncertainty X
         GTValues.RA.stdBuilder()
             .itemInputs(
                 CustomItemList.eM_Computer_Casing.get(1),
@@ -3043,21 +3043,6 @@ public void cleanroomRecipes() {
                 ItemList.Cover_Screen.get(1),
                 new ItemStack(Blocks.stone_button, 16),
                 GTUtility.getIntegratedCircuit(4))
-            .itemOutputs(CustomItemList.Uncertainty_Hatch.get(1))
-            .fluidInputs(Materials.Iridium.getMolten(2592))
-            .requiresCleanRoom()
-            .duration(60 * SECONDS)
-            .eut(TierEU.RECIPE_ZPM)
-            .addTo(assemblerRecipes);
-        // Uncertainty X
-        GTValues.RA.stdBuilder()
-            .itemInputs(
-                CustomItemList.eM_Computer_Casing.get(1),
-                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 1),
-                CustomItemList.DATApipe.get(32),
-                ItemList.Cover_Screen.get(1),
-                new ItemStack(Blocks.stone_button, 16),
-                GTUtility.getIntegratedCircuit(5))
             .itemOutputs(CustomItemList.UncertaintyX_Hatch.get(1))
             .fluidInputs(Materials.Iridium.getMolten(2592))
             .requiresCleanRoom()

src/main/java/tectech/loader/thing/MachineLoader.java

@@ -2279,10 +2279,10 @@ public void run() {
                                                                                                                         // for
                                                                                                                         // NH
         Uncertainty_Hatch.set(
-            new MTEHatchUncertainty(UncertaintyResolver.ID, "hatch.certain.tier.07", "Uncertainty Resolver", 7)
+            new MTEHatchUncertainty(UncertaintyResolver.ID, "hatch.certain.tier.05", "Uncertainty Resolver", 5)
                 .getStackForm(1L));
         UncertaintyX_Hatch.set(
-            new MTEHatchUncertainty(UncertaintyResolverX.ID, "hatch.certain.tier.10", "Uncertainty Resolver X", 10)
+            new MTEHatchUncertainty(UncertaintyResolverX.ID, "hatch.certain.tier.07", "Uncertainty Resolver X", 7)
                 .getStackForm(1L));
         dataIn_Hatch.set(
             new MTEHatchDataInput(OpticalSlaveConnector.ID, "hatch.datain.tier.07", "Optical Reception Connector", 7)

src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchUncertainty.java

@@ -199,13 +199,15 @@ public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlaye
 
     @Override
     public String[] getDescription() {
-        return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.certain.desc.0"), // Feeling
-                                                                                                                   // certain,
-                                                                                                                   // or
-                                                                                                                   // not?
-            EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD
-                + translateToLocal("gt.blockmachines.hatch.certain.desc.1") // Schrödinger equation in a box
-        };
+        String[] description = new String[4];
+        description[0] = CommonValues.TEC_MARK_EM;
+        description[1] = translateToLocal("gt.blockmachines.hatch.certain.desc.0"); // Feeling certain, or not?
+        description[2] = EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD
+            + translateToLocal("gt.blockmachines.hatch.certain.desc.1"); // Schrödinger equation in a box
+        if (mTier < 6) {
+            description[3] = EnumChatFormatting.DARK_RED + translateToLocal("gt.blockmachines.hatch.certain.desc.2");
+        }
+        return description;
     }
 
     private boolean balanceCheck(int sideLenY, short... masses) {
@@ -343,7 +345,6 @@ public void addGregTechLogo(ModularWindow.Builder builder) {
 
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
-        final boolean isAdvanced = mTier > 7;
 
         builder.widget(
             new DrawableWidget().setDrawable(TecTechUITextures.BACKGROUND_SCREEN_BLUE)
@@ -431,23 +432,17 @@ public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildCont
 
                 @Override
                 public void draw(float partialTicks) {
-                    if (isAdvanced) {
-                        glEnable(GL_BLEND);
-                        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-                        glColor4f(1f, 1f, 1f, (float) matrix[index] / 1000f);
-
-                        // super.draw but without disabling blend
-                        GlStateManager.pushMatrix();
-                        getDrawable().draw(Pos2d.ZERO, getSize(), partialTicks);
-                        GlStateManager.popMatrix();
-
-                        glDisable(GL_BLEND);
-                        glColor4f(1f, 1f, 1f, 1f);
-                    } else {
-                        if (TecTech.RANDOM.nextInt(1000) < matrix[index]) {
-                            super.draw(partialTicks);
-                        }
-                    }
+                    glEnable(GL_BLEND);
+                    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                    glColor4f(1f, 1f, 1f, (float) matrix[index] / 1000f);
+
+                    // super.draw but without disabling blend
+                    GlStateManager.pushMatrix();
+                    getDrawable().draw(Pos2d.ZERO, getSize(), partialTicks);
+                    GlStateManager.popMatrix();
+
+                    glDisable(GL_BLEND);
+                    glColor4f(1f, 1f, 1f, 1f);
                 }
             }.setDrawable(TecTechUITextures.PICTURE_UNCERTAINTY_INDICATOR)
                 .setPos(47 + (i / 4) * 12, 28 + (i % 4) * 12)

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

@@ -503,10 +503,11 @@ gt.blockmachines.hatch.param.tier.10.name=Parametrizer tXt
 gt.blockmachines.hatch.param.desc.0=For parametrization of Multiblocks
 gt.blockmachines.hatch.param.desc.1=E=mine*craft
 
-gt.blockmachines.hatch.certain.tier.07.name=Uncertainty Resolver
-gt.blockmachines.hatch.certain.tier.10.name=Uncertainty Resolver X
+gt.blockmachines.hatch.certain.tier.05.name=Uncertainty Resolver
+gt.blockmachines.hatch.certain.tier.07.name=Uncertainty Resolver X
 gt.blockmachines.hatch.certain.desc.0=Feeling certain, or not?
 gt.blockmachines.hatch.certain.desc.1=Schrödinger equation in a box
+gt.blockmachines.hatch.certain.desc.2=Deprecated! Use Uncertainty Resolver X
 
 gt.blockmachines.hatch.datain.tier.07.name=Optical Reception Connector
 gt.blockmachines.hatch.datain.desc.0=Quantum Data Input for Multiblocks

src/main/resources/assets/tectech/lang/zh_CN.lang

@@ -403,8 +403,8 @@ gt.blockmachines.hatch.param.tier.10.name=参数仪 tXt
 gt.blockmachines.hatch.param.desc.0=多方块机器的参数化
 gt.blockmachines.hatch.param.desc.1=E=mine*craft²
 
-gt.blockmachines.hatch.certain.tier.07.name=未定元解析器
-gt.blockmachines.hatch.certain.tier.10.name=未定元解析器 X
+gt.blockmachines.hatch.certain.tier.05.name=未定元解析器
+gt.blockmachines.hatch.certain.tier.07.name=未定元解析器 X
 gt.blockmachines.hatch.certain.desc.0=你真的很确定吗？
 gt.blockmachines.hatch.certain.desc.1=盒子里的薛定谔方程