Merge branch 'master' into structure-sockets-and-controller-pos
No files matched your search
@@ -1,8 +1,8 @@
|
||||
// Add your dependencies here
|
||||
|
||||
dependencies {
|
||||
api("com.github.GTNewHorizons:GTNHLib:0.6.39:dev")
|
||||
implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.86-GTNH:dev")
|
||||
api("com.github.GTNewHorizons:GTNHLib:0.7.1:dev")
|
||||
implementation("com.github.GTNewHorizons:NotEnoughItems:2.8.21-GTNH:dev")
|
||||
|
||||
testImplementation(platform('org.junit:junit-bom:5.9.2'))
|
||||
testImplementation('org.junit.jupiter:junit-jupiter')
|
||||
|
||||
@@ -96,7 +96,9 @@ usesMixinDebug = false
|
||||
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
|
||||
mixinPlugin =
|
||||
|
||||
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
|
||||
# Specify the package that contains all of your Mixins. The package must exist or
|
||||
# the build will fail. If you have a package property defined in your mixins.<modid>.json,
|
||||
# it must match with this or the build will fail.
|
||||
mixinsPackage = mixins
|
||||
|
||||
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
|
||||
|
||||
@@ -17,7 +17,7 @@ pluginManagement {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.42'
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.47'
|
||||
}
|
||||
|
||||
|
||||
@@ -50,6 +50,10 @@ public class BlockHint extends Block {
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(int aSide, int aMeta) {
|
||||
// For numbered hints, top and bottom are blank
|
||||
if (aSide <= 1 && aMeta <= 11) {
|
||||
return hint[13];
|
||||
}
|
||||
return hint[aMeta];
|
||||
}
|
||||
|
||||
|
||||
@@ -261,6 +261,11 @@ public class GuiScreenConfigureChannels extends GuiContainer implements IGuiScre
|
||||
switch (aKey) {
|
||||
case Keyboard.KEY_TAB:
|
||||
if (key.isFocused()) {
|
||||
if (autoCompleteList.getSelectedElement() != null) {
|
||||
key.setText(autoCompleteList.getSelectedElement());
|
||||
return;
|
||||
}
|
||||
|
||||
key.setFocused(false);
|
||||
value.setFocused(true);
|
||||
} else {
|
||||
@@ -298,11 +303,10 @@ public class GuiScreenConfigureChannels extends GuiContainer implements IGuiScre
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (key.textboxKeyTyped(aChar, aKey)) {
|
||||
if (key.textboxKeyTyped(aChar, aKey) || value.textboxKeyTyped(aChar, aKey)) {
|
||||
updateButtons();
|
||||
return;
|
||||
}
|
||||
if (value.textboxKeyTyped(aChar, aKey)) return;
|
||||
super.keyTyped(aChar, aKey);
|
||||
}
|
||||
|
||||
@@ -313,7 +317,8 @@ public class GuiScreenConfigureChannels extends GuiContainer implements IGuiScre
|
||||
boolean existing = !StringUtils.isEmpty(keyText) && ChannelDataAccessor.hasSubChannel(trigger, keyText);
|
||||
getButtonList().get(ADD_BTN).displayString = existing ? I18n.format(I18N_PREFIX + "set")
|
||||
: I18n.format(I18N_PREFIX + "add");
|
||||
getButtonList().get(ADD_BTN).enabled = !StringUtils.isBlank(value.getText())
|
||||
getButtonList().get(ADD_BTN).enabled = !StringUtils.isBlank(key.getText())
|
||||
&& !StringUtils.isBlank(value.getText())
|
||||
&& Integer.parseInt(value.getText()) > 0;
|
||||
getButtonList().get(UNSET_BTN).enabled = existing && !StringUtils.isBlank(value.getText());
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 273 B After Width: | Height: | Size: 176 B |
|
Before Width: | Height: | Size: 279 B After Width: | Height: | Size: 208 B |
|
Before Width: | Height: | Size: 296 B After Width: | Height: | Size: 212 B |
|
Before Width: | Height: | Size: 301 B After Width: | Height: | Size: 234 B |
|
Before Width: | Height: | Size: 282 B After Width: | Height: | Size: 196 B |
|
Before Width: | Height: | Size: 281 B After Width: | Height: | Size: 186 B |
|
Before Width: | Height: | Size: 285 B After Width: | Height: | Size: 186 B |
|
Before Width: | Height: | Size: 289 B After Width: | Height: | Size: 204 B |
|
Before Width: | Height: | Size: 293 B After Width: | Height: | Size: 184 B |
|
Before Width: | Height: | Size: 295 B After Width: | Height: | Size: 198 B |
|
Before Width: | Height: | Size: 296 B After Width: | Height: | Size: 204 B |
|
Before Width: | Height: | Size: 297 B After Width: | Height: | Size: 225 B |
|
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 133 B |
|
Before Width: | Height: | Size: 301 B After Width: | Height: | Size: 183 B |
|
Before Width: | Height: | Size: 306 B After Width: | Height: | Size: 197 B |
|
Before Width: | Height: | Size: 281 B After Width: | Height: | Size: 164 B |