MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update to 1.14.2

Browse Source
This commit is contained in:
Marcel Konrad
2019-06-18 17:37:55 +02:00
parent ae1bc97906
commit e5e6226fbf
90 changed files with 1310 additions and 1447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/exopandora/worldhandler/config/ConfigCategoryButcher.java
View File

@@ -44,7 +44,7 @@ public class ConfigCategoryButcher
for(String entity : this.entities)
{
ResourceLocation resource = ResourceLocation.makeResourceLocation(entity);
ResourceLocation resource = ResourceLocation.tryCreate(entity);
if(resource != null)
{
@@ -85,7 +85,7 @@ public class ConfigCategoryButcher
{
if(string != null)
{
return ForgeRegistries.ENTITIES.containsKey(ResourceLocation.makeResourceLocation(string.toString()));
return ForgeRegistries.ENTITIES.containsKey(ResourceLocation.tryCreate(string.toString()));
}
return false;

61
src/main/java/exopandora/worldhandler/config/ConfigCategorySettings.java
View File

@@ -2,7 +2,6 @@ package exopandora.worldhandler.config;
import java.util.Arrays;
import net.minecraft.client.resources.I18n;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.ForgeConfigSpec;
@@ -50,66 +49,66 @@ public class ConfigCategorySettings
builder.push("settings");
this.valueCommandSyntax = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.command_syntax"))
.translation("gui.worldhandler.config.key.settings.command_syntax")
.translation("gui.worldhandler.config.settings.command_syntax")
.comment("Whether or not to display the current command at the bottom")
.define("command_syntax", false);
this.valueShortcuts = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.shortcuts"))
.translation("gui.worldhandler.config.key.settings.shortcuts")
.translation("gui.worldhandler.config.settings.shortcuts")
.comment("Whether or not to display a row of quick access buttons at the top")
.define("shortcuts", false);
this.valueShortcutKeys = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.key_shortcuts"))
.translation("gui.worldhandler.config.key.settings.key_shortcuts")
.translation("gui.worldhandler.config.settings.key_shortcuts")
.comment("Whether or not to enable button keys for pos1 and pos2")
.define("key_shortcuts", false);
this.valueTooltips = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.tooltips"))
.translation("gui.worldhandler.config.key.settings.tooltips")
.translation("gui.worldhandler.config.settings.tooltips")
.comment("Whether or not to display tooltips for buttons")
.define("tooltips", true);
this.valueWatch = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.watch"))
.translation("gui.worldhandler.config.key.settings.watch")
.translation("gui.worldhandler.config.settings.watch")
.comment("Whether or not to display a watch")
.define("watch", true);
this.valueSmoothWatch = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.smooth_watch"))
.translation("gui.worldhandler.config.key.settings.smooth_watch")
.translation("gui.worldhandler.config.settings.smooth_watch")
.comment("Whether or not the watch pointers move smoothly")
.define("smooth_watch", true);
this.valuePause = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.pause_game"))
.translation("gui.worldhandler.config.key.settings.pause_game")
.translation("gui.worldhandler.config.settings.pause_game")
.comment("Whether or not to pause the game when the gui is opened")
.define("pause_game", false);
this.valueCustomTimes = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.custom_times"))
.translation("gui.worldhandler.config.key.settings.custom_times")
.translation("gui.worldhandler.config.settings.custom_times")
.comment("Whether or not to use the custom times")
.define("custom_times", false);
this.valuePermissionQuery = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.permission_query"))
.translation("gui.worldhandler.config.key.settings.permission_query")
.translation("gui.worldhandler.config.settings.permission_query")
.comment("Whether or not the permission query is enabled")
.define("permission_query", true);
this.valueHighlightBlocks = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.highlight_blocks"))
.translation("gui.worldhandler.config.key.settings.highlight_blocks")
.translation("gui.worldhandler.config.settings.highlight_blocks")
.comment("Whether or not selected blocks will be highlighted")
.define("highlight_blocks", true);
this.valueDawn = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.custom_time_dawn"))
.translation("gui.worldhandler.config.key.settings.custom_time_dawn")
.translation("gui.worldhandler.config.settings.custom_time_dawn")
.comment("Ticks upon dawn")
.defineInRange("custom_time_dawn", 1000, 0, 24000);
this.valueNoon = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.custom_time_noon"))
.translation("gui.worldhandler.config.key.settings.custom_time_noon")
.translation("gui.worldhandler.config.settings.custom_time_noon")
.comment("Ticks upon noon")
.defineInRange("custom_time_noon", 6000, 0, 24000);
this.valueSunset = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.custom_time_sunset"))
.translation("gui.worldhandler.config.key.settings.custom_time_sunset")
.translation("gui.worldhandler.config.settings.custom_time_sunset")
.comment("Ticks upon sunset")
.defineInRange("custom_time_sunset", 12500, 0, 24000);
this.valueMidnight = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.custom_time_midnight"))
.translation("gui.worldhandler.config.key.settings.custom_time_midnight")
.translation("gui.worldhandler.config.settings.custom_time_midnight")
.comment("Ticks upon midnight")
.defineInRange("custom_time_midnight", 18000, 0, 24000);
this.valueBlockPlacingMode = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.block_placing_mode"))
.translation("gui.worldhandler.config.key.settings.block_placing_mode")
.translation("gui.worldhandler.config.settings.block_placing_mode")
.comment("Block placing mode (keep, replace, destroy)")
.defineInList("block_placing_mode", "keep", Arrays.asList("keep", "replace", "destroy"));
builder.pop();

57
src/main/java/exopandora/worldhandler/config/ConfigCategorySkin.java
View File

@@ -2,7 +2,6 @@ package exopandora.worldhandler.config;
import java.util.Arrays;
import net.minecraft.client.resources.I18n;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.ForgeConfigSpec;
@@ -48,64 +47,64 @@ public class ConfigCategorySkin
builder.push("skin");
this.valueIconSize = builder
.comment(I18n.format("gui.worldhandler.config.comment.skin.icon_size"))
.translation("gui.worldhandler.config.key.skin.icon_size")
.translation("gui.worldhandler.config.skin.icon_size")
.comment("Size of the icons")
.defineInList("icon_size", 16, Arrays.asList(16, 32, 64));
this.valueLabelColor = builder
.comment(I18n.format("gui.worldhandler.config.comment.skin.label_color"))
.translation("gui.worldhandler.config.key.skin.label_color")
.translation("gui.worldhandler.config.skin.label_color")
.comment("Label color")
.defineInRange("label_color", 0x1F1F1F, 0x80000000, 0x7FFFFFFF);
this.valueHeadlineColor = builder
.comment(I18n.format("gui.worldhandler.config.comment.skin.headline_color"))
.translation("gui.worldhandler.config.key.skin.headline_color")
.translation("gui.worldhandler.config.skin.headline_color")
.comment("Headline color")
.defineInRange("headline_color", 0x4F4F4F, 0x80000000, 0x7FFFFFFF);
this.valueBackgroundRed = builder
.comment(I18n.format("gui.worldhandler.config.comment.skin.background_red"))
.translation("gui.worldhandler.config.key.skin.background_red")
.translation("gui.worldhandler.config.skin.background_red")
.comment("Background red")
.defineInRange("background_red", 255, 0, 255);
this.valueBackgroundGreen = builder
.comment(I18n.format("gui.worldhandler.config.comment.skin.background_green"))
.translation("gui.worldhandler.config.key.skin.background_green")
.translation("gui.worldhandler.config.skin.background_green")
.comment("Background green")
.defineInRange("background_green", 255, 0, 255);
this.valueBackgroundBlue = builder
.comment(I18n.format("gui.worldhandler.config.comment.skin.background_blue"))
.translation("gui.worldhandler.config.key.skin.background_blue")
.translation("gui.worldhandler.config.skin.background_blue")
.comment("Background blue")
.defineInRange("background_blue", 255, 0, 255);
this.valueBackgroundAlpha = builder
.comment(I18n.format("gui.worldhandler.config.comment.skin.background_alpha"))
.translation("gui.worldhandler.config.key.skin.background_alpha")
.translation("gui.worldhandler.config.skin.background_alpha")
.comment("Background alpha")
.defineInRange("background_alpha", 255, 0, 255);
this.valueButtonRed = builder
.comment(I18n.format("gui.worldhandler.config.comment.skin.button_red"))
.translation("gui.worldhandler.config.key.skin.button_red")
.translation("gui.worldhandler.config.skin.button_red")
.comment("Button eed")
.defineInRange("button_red", 255, 0, 255);
this.valueButtonGreen = builder
.comment(I18n.format("gui.worldhandler.config.comment.skin.button_green"))
.translation("gui.worldhandler.config.key.skin.button_green")
.translation("gui.worldhandler.config.skin.button_green")
.comment("Button green")
.defineInRange("button_green", 255, 0, 255);
this.valueButtonBlue = builder
.comment(I18n.format("gui.worldhandler.config.comment.skin.button_blue"))
.translation("gui.worldhandler.config.key.skin.button_blue")
.translation("gui.worldhandler.config.skin.button_blue")
.comment("Button blue")
.defineInRange("button_blue", 255, 0, 255);
this.valueButtonAlpha = builder
.comment(I18n.format("gui.worldhandler.config.comment.skin.button_alpha"))
.translation("gui.worldhandler.config.key.skin.button_alpha")
.translation("gui.worldhandler.config.skin.button_alpha")
.comment("Button alpha")
.defineInRange("button_alpha", 255, 0, 255);
this.valueType = builder
.comment(I18n.format("gui.worldhandler.config.comment.skin.textures"))
.translation("gui.worldhandler.config.key.skin.textures")
.translation("gui.worldhandler.config.skin.textures")
.comment("Background texture (resourcepack, vanilla)")
.defineInList("textures", "resourcepack", Arrays.asList("resourcepack", "vanilla"));
this.valueSharpEdges = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.sharp_tab_edges"))
.translation("gui.worldhandler.config.key.settings.sharp_tab_edges")
.translation("gui.worldhandler.config.settings.sharp_tab_edges")
.comment("Whether or not the gui has sharp or smooth tab edges")
.define("sharp_tab_edges", false);
this.valueDrawBackground = builder
.comment(I18n.format("gui.worldhandler.config.comment.settings.draw_background"))
.translation("gui.worldhandler.config.key.settings.draw_background")
.translation("gui.worldhandler.config.settings.draw_background")
.comment("Whether or not to enable background drawing")
.define("draw_background", true);
builder.pop();

37
src/main/java/exopandora/worldhandler/config/ConfigCategorySliders.java
View File

@@ -1,6 +1,5 @@
package exopandora.worldhandler.config;
import net.minecraft.client.resources.I18n;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.ForgeConfigSpec;
@@ -34,43 +33,43 @@ public class ConfigCategorySliders
builder.push("sliders");
this.valueMaxPotionAmplifier = builder
.comment(I18n.format("gui.worldhandler.config.comment.sliders.max_potion_amplifier"))
.translation("gui.worldhandler.config.key.sliders.max_potion_amplifier")
.translation("gui.worldhandler.config.sliders.max_potion_amplifier")
.comment("Maximum value for the potion amplifier")
.defineInRange("max_potion_amplifier", 100D, 0D, Byte.MAX_VALUE);
this.valueMaxItemEnchantment = builder
.comment(I18n.format("gui.worldhandler.config.comment.sliders.max_item_enchantment"))
.translation("gui.worldhandler.config.key.sliders.max_item_enchantment")
.translation("gui.worldhandler.config.sliders.max_item_enchantment")
.comment("Maximum value for an item enchantment")
.defineInRange("max_item_enchantment", 100D, 0D, Integer.MAX_VALUE);
this.valueMaxItemAttributes = builder
.comment(I18n.format("gui.worldhandler.config.comment.sliders.max_item_attributes"))
.translation("gui.worldhandler.config.key.sliders.max_item_attributes")
.translation("gui.worldhandler.config.sliders.max_item_attributes")
.comment("Maximum value for an item attribute")
.defineInRange("max_item_attributes", 100D, 0D, Double.MAX_VALUE);
this.valueMaxSummonPotionAmplifier = builder
.comment(I18n.format("gui.worldhandler.config.comment.sliders.max_summon_potion_amplifier"))
.translation("gui.worldhandler.config.key.sliders.max_summon_potion_amplifier")
.translation("gui.worldhandler.config.sliders.max_summon_potion_amplifier")
.comment("Maximum value for the potion amplifier for summon")
.defineInRange("max_summon_potion_amplifier", 100D, 0D, Byte.MAX_VALUE);
this.valueMaxSummonPotionMinutes = builder
.comment(I18n.format("gui.worldhandler.config.comment.sliders.max_summon_potion_minutes"))
.translation("gui.worldhandler.config.key.sliders.max_summon_potion_minutes")
.translation("gui.worldhandler.config.sliders.max_summon_potion_minutes")
.comment("Maximum value for the potion duration in minutes for summon")
.defineInRange("max_summon_potion_minutes", 100D, 0D, 16000);
this.valueMaxSummonAttributes = builder
.comment(I18n.format("gui.worldhandler.config.comment.sliders.max_summon_attributes"))
.translation("gui.worldhandler.config.key.sliders.max_summon_attributes")
.translation("gui.worldhandler.config.sliders.max_summon_attributes")
.comment("Maximum value for attributes")
.defineInRange("max_summon_attributes", 100D, 0D, Double.MAX_VALUE);
this.valueMaxExperience = builder
.comment(I18n.format("gui.worldhandler.config.comment.sliders.max_experience"))
.translation("gui.worldhandler.config.key.sliders.max_experience")
.translation("gui.worldhandler.config.sliders.max_experience")
.comment("Maximum value for experience")
.defineInRange("max_experience", 100D, 0D, 100000D);
this.valueMaxPlayerPoints = builder
.comment(I18n.format("gui.worldhandler.config.comment.sliders.max_player_points"))
.translation("gui.worldhandler.config.key.sliders.max_player_points")
.translation("gui.worldhandler.config.sliders.max_player_points")
.comment("Maximum value for player points")
.defineInRange("max_player_points", 100D, 0D, 100000D);
this.valueMaxTriggerValue = builder
.comment(I18n.format("gui.worldhandler.config.comment.sliders.max_trigger_value"))
.translation("gui.worldhandler.config.key.sliders.max_trigger_value")
.translation("gui.worldhandler.config.sliders.max_trigger_value")
.comment("Maximum value for triggers")
.defineInRange("max_trigger_value", 100D, 0D, 100000D);
builder.pop();