aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2023-01-03 13:13:28 +0100
committerGitHub <noreply@github.com>2023-01-03 13:13:28 +0100
commit22d69ce6f7e84a821f6797816cbb34c572bacae0 (patch)
treeb853c0315a0946d269c0e8dec780fa8c79c9579c
parent14249055d0b3871aeee918a8e1f9ee1da01f0541 (diff)
parent89e0788689c2716109c37979002df10eaf4cfee6 (diff)
downloadGT5-Unofficial-22d69ce6f7e84a821f6797816cbb34c572bacae0.tar.gz
GT5-Unofficial-22d69ce6f7e84a821f6797816cbb34c572bacae0.tar.bz2
GT5-Unofficial-22d69ce6f7e84a821f6797816cbb34c572bacae0.zip
Merge pull request #126 from GTNewHorizons/feature/parametrizer-deprecation
Add deprecation tooltip to Parametrizers
-rw-r--r--dependencies.gradle4
-rw-r--r--repositories.gradle1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java6
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java6
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java1
5 files changed, 8 insertions, 10 deletions
diff --git a/dependencies.gradle b/dependencies.gradle
index ce8f825c62..7bfba2df1c 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,8 +2,8 @@
dependencies {
shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
- compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.145:dev')
- compile("com.github.GTNewHorizons:ModularUI:1.0.16:dev") {transitive=false}
+ compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.196:dev')
+ compile('com.github.GTNewHorizons:ModularUI:1.0.38:dev')
compile('com.github.GTNewHorizons:Yamcl:0.5.84:dev')
compile('com.github.GTNewHorizons:NotEnoughItems:2.3.7-GTNH:dev')
compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.5:dev')
diff --git a/repositories.gradle b/repositories.gradle
index 9d72b53b8e..bb2c605d5c 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -1,6 +1,7 @@
// Add any additional repositories for your dependencies here
repositories {
+ mavenLocal()
maven {
name 'GTNH Maven'
url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java
index 7a59e39c6d..bf315e1dfe 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java
@@ -1,6 +1,5 @@
package com.github.technus.tectech.thing.metaTileEntity.hatch;
-import static net.minecraft.util.StatCollector.translateToLocal;
import static net.minecraft.util.StatCollector.translateToLocalFormatted;
import com.github.technus.tectech.TecTech;
@@ -217,9 +216,8 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple
public String[] getDescription() {
return new String[] {
CommonValues.TEC_MARK_GENERAL,
- translateToLocal("gt.blockmachines.hatch.param.desc.0"), // For parametrization of Multiblocks
- EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD
- + translateToLocal("gt.blockmachines.hatch.param.desc.1") + "\u00b2" // E=mine*craft
+ EnumChatFormatting.DARK_RED + "Deprecated; Now you can set parameter by clicking LED on multiblock GUI.",
+ EnumChatFormatting.DARK_RED + "If it doesn't work, try removing Parametrizer from multiblock structure.",
};
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java
index 810c04d861..9b795a0a08 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java
@@ -1,6 +1,5 @@
package com.github.technus.tectech.thing.metaTileEntity.hatch;
-import static net.minecraft.util.StatCollector.translateToLocal;
import static net.minecraft.util.StatCollector.translateToLocalFormatted;
import com.github.technus.tectech.TecTech;
@@ -162,9 +161,8 @@ public class GT_MetaTileEntity_Hatch_ParamText extends GT_MetaTileEntity_Hatch_P
public String[] getDescription() {
return new String[] {
CommonValues.TEC_MARK_GENERAL,
- translateToLocal("gt.blockmachines.hatch.param.desc.0"), // For parametrization of Multiblocks
- EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD
- + translateToLocal("gt.blockmachines.hatch.param.desc.1") + "\u00b2" // E=mine*craft
+ EnumChatFormatting.DARK_RED + "Deprecated; Now you can set parameter by clicking LED on multiblock GUI.",
+ EnumChatFormatting.DARK_RED + "If it doesn't work, try removing Parametrizer from multiblock structure.",
};
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 7e8bb045e6..8146414ac8 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -3143,6 +3143,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
}
})
.setTextAlignment(Alignment.CenterLeft)
+ .setFocusOnGuiOpen(true)
.setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
.setPos(5, 20)
.setSize(90, 15))