Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
dependencies {
compileOnly('org.jetbrains:annotations:26.0.1')

implementation("com.github.GTNewHorizons:GTNHLib:0.11.22:dev")
implementation("com.github.GTNewHorizons:GTNHLib:0.11.23:dev")
implementation("com.github.GTNewHorizons:ModularUI2:2.3.79-1.7.10:dev")
implementation('curse.maven:cofh-lib-220333:2388748')
compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.7:dev")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
import com.fouristhenumber.utilitiesinexcess.compat.ForgeMultipart.FMPItems;
import com.fouristhenumber.utilitiesinexcess.compat.ForgeMultipart.multipart.Content;
import com.fouristhenumber.utilitiesinexcess.compat.Mods;
import com.fouristhenumber.utilitiesinexcess.compat.exu.ExuWorldConversionWarning;
import com.fouristhenumber.utilitiesinexcess.compat.exu.PosteaTransforms;
import com.fouristhenumber.utilitiesinexcess.compat.tinkers.TinkersCompat;
import com.fouristhenumber.utilitiesinexcess.config.OtherConfig;
import com.fouristhenumber.utilitiesinexcess.config.blocks.ColoredBlocksConfig;
import com.fouristhenumber.utilitiesinexcess.network.PacketHandler;
import com.fouristhenumber.utilitiesinexcess.utils.SoundVolumeChecks;
import com.gtnewhorizon.gtnhlib.api.gui.WorldConversionWarningManager;
import com.gtnewhorizon.gtnhlib.datastructs.space.ArrayProximityCheck4D;
import com.gtnewhorizon.gtnhlib.datastructs.space.VolumeShape;
import com.gtnewhorizon.gtnhlib.keybind.SyncedKeybind;
Expand Down Expand Up @@ -67,6 +69,10 @@ public void preInit(FMLPreInitializationEvent event) {
if (ColoredBlocksConfig.INSTANCE.enableColoredBlocks) {
BlockColored.registerConfigBlocks();
}

if (OtherConfig.enableWorldConversionWarning) {
WorldConversionWarningManager.register(UtilitiesInExcess.MODID + "_EXU", new ExuWorldConversionWarning());
}
}

public void init(FMLInitializationEvent event) {
Expand Down Expand Up @@ -99,4 +105,5 @@ public void loadComplete(FMLLoadCompleteEvent event) {
}

public void serverStarting(FMLServerStartingEvent event) {}

}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.fouristhenumber.utilitiesinexcess.common.worldgen.WorldGenEnderLotus;
import com.fouristhenumber.utilitiesinexcess.compat.Mods;
import com.fouristhenumber.utilitiesinexcess.compat.crafttweaker.EnderLocusCraftTweakerSupport;
import com.fouristhenumber.utilitiesinexcess.compat.exu.ExuWorldConversionWarning;
import com.fouristhenumber.utilitiesinexcess.utils.PinkFuelHelper;
import com.fouristhenumber.utilitiesinexcess.utils.TEChunkLoadingCallback;
import com.gtnewhorizon.gtnhlib.blockstate.registry.BlockPropertyRegistry;
Expand All @@ -26,6 +27,7 @@
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
Expand All @@ -37,7 +39,7 @@
version = Tags.VERSION,
name = "UtilitiesInExcess",
acceptedMinecraftVersions = "[1.7.10]",
dependencies = "required-after:gtnhlib@[0.9.9,);after:ForgeMicroblock;after:Waila;after:NotEnoughItems@[2.8.108-GTNH,);")
dependencies = "required-after:gtnhlib@[0.11.23,);after:ForgeMicroblock;after:Waila;after:NotEnoughItems@[2.8.108-GTNH,);")
public class UtilitiesInExcess {

public static final String MODID = "utilitiesinexcess";
Expand Down Expand Up @@ -141,4 +143,9 @@ public ItemStack getIconItemStack() {
return ICON_ITEM;
}
};

@Mod.EventHandler
public void onMissingMapping(FMLMissingMappingsEvent event) {
ExuWorldConversionWarning.onMissingMapping(event);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
package com.fouristhenumber.utilitiesinexcess.compat.exu;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiLabel;
import net.minecraft.client.gui.GuiOptionButton;
import net.minecraft.util.StatCollector;

import com.gtnewhorizon.gtnhlib.api.gui.GuiConfirmationWCW;

import cpw.mods.fml.common.StartupQuery;

@SuppressWarnings("unused")
public class ExtendedConfirmationGui extends GuiConfirmationWCW {

private final List<String> lines;
private final String warning;

public ExtendedConfirmationGui(StartupQuery query) {
super(query);
lines = new ArrayList<>(
Arrays.asList(
query.getText()
.split("\\\\n")));
warning = lines.get(0);
}

@Override
public void initGui() {
boolean dwc = ExuWorldConversionWarning.doWorldConversion();
this.buttonList.add(
new GuiOptionButton(
0,
this.width / 2 - 155,
this.height - 58,
dwc ? StatCollector.translateToLocal("gui.yes")
: StatCollector.translateToLocal("uie.gui.text.continue")));
this.buttonList.add(
new GuiOptionButton(
1,
this.width / 2 - 155 + 160,
this.height - 58,
dwc ? StatCollector.translateToLocal("gui.no")
: StatCollector.translateToLocal("uie.gui.text.cancel")));
}

private static byte colorTick = 0;

@Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
this.drawDefaultBackground();

colorTick++;

String color = Math.abs(colorTick % 16) >= 8 ? "§4§l" : "§c§l";
lines.set(0, "§kABC§r " + color + warning + " §r§kCBA");

int spaceAvailable = this.height - 58 - 20;
int spaceRequired = Math.min(spaceAvailable, 10 + 10 * lines.size());

int offset = 10 + (spaceAvailable - spaceRequired) / 2; // vertically centered
for (String line : lines) {
if (offset >= spaceAvailable) {
this.drawCenteredString(this.fontRendererObj, "...", this.width / 2, offset, 0xFFFFFF);
break;
} else {
if (!line.isEmpty())
this.drawCenteredString(this.fontRendererObj, line, this.width / 2, offset, 0xFFFFFF);
offset += 10;
}
}

for (GuiButton button : this.buttonList) {
button.drawButton(this.mc, mouseX, mouseY);
}

for (GuiLabel label : this.labelList) {
label.func_146159_a(this.mc, mouseX, mouseY);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package com.fouristhenumber.utilitiesinexcess.compat.exu;

import net.minecraft.util.StatCollector;

import com.fouristhenumber.utilitiesinexcess.compat.Mods;
import com.fouristhenumber.utilitiesinexcess.config.OtherConfig;
import com.gtnewhorizon.gtnhlib.api.gui.GuiConfirmationWCW;
import com.gtnewhorizon.gtnhlib.api.gui.IWorldConversionWarning;

import cpw.mods.fml.common.StartupQuery;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class ExuWorldConversionWarning implements IWorldConversionWarning {

public static boolean show = false;

@Override
public boolean shouldShow() {
return show;
}

@Override
public String getServerMessage() {
return doWorldConversion() ? StatCollector.translateToLocal("uie.world_conversion.warning_enabled.server")
: StatCollector.translateToLocal("uie.world_conversion.warning_disabled.server");
}

@SideOnly(Side.CLIENT)
@Override
public String getClientMessage() {
return doWorldConversion() ? StatCollector.translateToLocal("uie.world_conversion.warning_enabled.client")
: StatCollector.translateToLocal("uie.world_conversion.warning_disabled.client");
}

@SideOnly(Side.CLIENT)
@Override
public GuiConfirmationWCW getGui(StartupQuery startupQuery) {
return new ExtendedConfirmationGui(startupQuery);
}

public static boolean doWorldConversion() {
return OtherConfig.enableWorldConversion && !Mods.ExtraUtilities.isLoaded() && Mods.Postea.isLoaded();
}

public static void onMissingMapping(FMLMissingMappingsEvent event) {
if (!OtherConfig.enableWorldConversionWarning) return;
if (ExuWorldConversionWarning.show) return;

for (FMLMissingMappingsEvent.MissingMapping mapping : event.getAll()) {
if (mapping.name.startsWith("ExtraUtilities")) {
ExuWorldConversionWarning.show = true;
return;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,15 @@ public PaintRollerColorPickerDialog(String name, BiConsumer<Integer, Boolean> re
.child(
new ButtonWidget<>().heightRel(1f)
.width(50)
.overlay(IKey.str(StatCollector.translateToLocal("uie.gui.text.paint_roller.cancel")))
.overlay(IKey.str(StatCollector.translateToLocal("uie.gui.text.cancel")))
.onMousePressed(button -> {
closeIfOpen();
return true;
}))
.child(
new ButtonWidget<>().heightRel(1f)
.width(50)
.overlay(IKey.str(StatCollector.translateToLocal("uie.gui.text.paint_roller.confirm")))
.overlay(IKey.str(StatCollector.translateToLocal("uie.gui.text.confirm")))
.onMousePressed(button -> {
resultConsumer.accept(this.color, this.paintStripper);
closeIfOpen();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,19 @@ public class OtherConfig {

@Config.Order(0)
@Config.DefaultBoolean(true) // TODO Set default to false before release
@Config.Comment("Enable the Extra Utilities to Utilities In Excess world conversion system")
@Config.Name("World Conversion")
@Config.Comment({ "Enable the Extra Utilities to Utilities In Excess world conversion system",
Comment thread
SuperSoupr marked this conversation as resolved.
"Requires the Postea mod (Except for ForgeMultipart materials conversion)" })
@Config.RequiresMcRestart
public static boolean enableWorldConversion;

@Config.Order(50)
@Config.DefaultBoolean(true)
@Config.Name("World Conversion warning")
@Config.Comment("Display a warning before loading a world that needs to have its Extra Utilities items and blocks be converted to UiE items and blocks")
@Config.RequiresMcRestart
public static boolean enableWorldConversionWarning;

@Config.Order(100)
@Config.DefaultBoolean(true)
@Config.Comment("Enable rendering some UIE baubles on players who have them equipped")
Expand Down
12 changes: 10 additions & 2 deletions src/main/resources/assets/utilitiesinexcess/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -664,8 +664,10 @@ uie.gui.text.slot_dir.horizontal=Horizontal
uie.gui.text.slot_dir.vertical=Vertical

uie.gui.text.paint_roller.paintstripper=Paint Stripper Mode
uie.gui.text.paint_roller.cancel=Cancel
uie.gui.text.paint_roller.confirm=Confirm

uie.gui.text.cancel=Cancel
uie.gui.text.confirm=Confirm
uie.gui.text.continue=Continue

## Gui Tooltips
uie.gui.tooltip.generator.energy-max=RF: %s / %s
Expand Down Expand Up @@ -702,6 +704,12 @@ uie.gui.tooltip.trading_post.search.buy_prefix=buy:
uie.gui.tooltip.trading_post.search.sell_prefix=sell:
#

## World conversion warning gui
uie.world_conversion.warning_enabled.client=WARNING!!\n\nThe §aExtra Utilities§f mod has been replaced with §aUtilities in Excess§f.\nAfter pressing "Yes" every item in your world from Extra Utilities\nwill be replaced with their Utilities in Excess counterpart.\nWe recommend making a backup of this world before proceeding.
uie.world_conversion.warning_enabled.server=WARNING!! The Extra Utilities mod has been replaced with Utilities in Excess. After typing "/fml confirm" every item in your world from Extra Utilities will be replaced with their Utilities in Excess counterpart. We recommend making a backup of this world before proceeding.
uie.world_conversion.warning_disabled.client=WARNING!!\n\nThe §aExtra Utilities§f mod has been removed, but the §aUtilities in Excess\n§4§l§nWorld Conversion system is DISABLED!! §rIf you continue,\nEvery item and block in your world from Extra Utilities will be §lpermanently deleted§r.\nYou can enable the Utilities in Excess world conversion system in the config\n(Requires the §aPostea§r mod)
uie.world_conversion.warning_disabled.server=WARNING!! The Extra Utilities mod has been removed, but the Utilities in Excess World Conversion system is DISABLED!!. If you continue, every item and block in your world from Extra Utilities will be PERMANENTLY DELETED. You can enable the Utilities in Excess world conversion system in the config, (Requires the Postea mod).

### Chat
uie.chat.quarry.finished=Your Void Quarry at (%d %d %d) in DIM %d has finished.

Expand Down