mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-21 20:52:11 +00:00
Update buildscript & apply automatic formatting rules
This commit is contained in:
1 parent
a7683b885d
commit
f7a900e910
173 files changed
+4581
-5321
No files matched your search
@@ -1,5 +1,13 @@
|
||||
package codechicken.nei;
|
||||
|
||||
import static codechicken.nei.NEIClientConfig.canCheatItem;
|
||||
import static codechicken.nei.NEIClientConfig.canPerformAction;
|
||||
import static codechicken.nei.NEIClientConfig.getStringArrSetting;
|
||||
import static codechicken.nei.NEIClientConfig.getStringSetting;
|
||||
import static codechicken.nei.NEIClientConfig.hasSMPCounterPart;
|
||||
import static codechicken.nei.NEIClientConfig.invCreativeMode;
|
||||
import static codechicken.nei.NEIClientConfig.world;
|
||||
|
||||
import codechicken.lib.inventory.InventoryRange;
|
||||
import codechicken.lib.inventory.InventoryUtils;
|
||||
import codechicken.lib.util.LangProxy;
|
||||
@@ -7,6 +15,14 @@ import codechicken.nei.api.GuiInfo;
|
||||
import codechicken.nei.api.IInfiniteItemHandler;
|
||||
import codechicken.nei.api.ItemInfo;
|
||||
import com.google.common.collect.Iterables;
|
||||
import java.text.MessageFormat;
|
||||
import java.text.NumberFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.audio.PositionedSoundRecord;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
@@ -19,26 +35,7 @@ import net.minecraft.util.IChatComponent;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import java.text.MessageFormat;
|
||||
import java.text.NumberFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static codechicken.nei.NEIClientConfig.canCheatItem;
|
||||
import static codechicken.nei.NEIClientConfig.canPerformAction;
|
||||
import static codechicken.nei.NEIClientConfig.getItemQuantity;
|
||||
import static codechicken.nei.NEIClientConfig.getStringArrSetting;
|
||||
import static codechicken.nei.NEIClientConfig.getStringSetting;
|
||||
import static codechicken.nei.NEIClientConfig.hasSMPCounterPart;
|
||||
import static codechicken.nei.NEIClientConfig.invCreativeMode;
|
||||
import static codechicken.nei.NEIClientConfig.world;
|
||||
|
||||
public class NEIClientUtils extends NEIServerUtils
|
||||
{
|
||||
public class NEIClientUtils extends NEIServerUtils {
|
||||
public static LangProxy lang = new LangProxy("nei");
|
||||
|
||||
public static Minecraft mc() {
|
||||
@@ -50,8 +47,7 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
}
|
||||
|
||||
public static void printChatMessage(IChatComponent msg) {
|
||||
if (mc().ingameGUI != null)
|
||||
mc().ingameGUI.getChatGUI().printChatMessage(msg);
|
||||
if (mc().ingameGUI != null) mc().ingameGUI.getChatGUI().printChatMessage(msg);
|
||||
}
|
||||
|
||||
public static void deleteHeldItem() {
|
||||
@@ -59,7 +55,8 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
}
|
||||
|
||||
public static void dropHeldItem() {
|
||||
mc().playerController.windowClick(((GuiContainer) mc().currentScreen).inventorySlots.windowId, -999, 0, 0, mc().thePlayer);
|
||||
mc().playerController
|
||||
.windowClick(((GuiContainer) mc().currentScreen).inventorySlots.windowId, -999, 0, 0, mc().thePlayer);
|
||||
}
|
||||
|
||||
public static void deleteSlotStack(int slotNumber) {
|
||||
@@ -67,12 +64,12 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
}
|
||||
|
||||
public static void decreaseSlotStack(int slotNumber) {
|
||||
ItemStack stack = slotNumber == -999 ? getHeldItem() : mc().thePlayer.openContainer.getSlot(slotNumber).getStack();
|
||||
if (stack == null)
|
||||
return;
|
||||
ItemStack stack = slotNumber == -999
|
||||
? getHeldItem()
|
||||
: mc().thePlayer.openContainer.getSlot(slotNumber).getStack();
|
||||
if (stack == null) return;
|
||||
|
||||
if (stack.stackSize == 1)
|
||||
deleteSlotStack(slotNumber);
|
||||
if (stack.stackSize == 1) deleteSlotStack(slotNumber);
|
||||
else {
|
||||
stack = stack.copy();
|
||||
stack.stackSize--;
|
||||
@@ -88,8 +85,7 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
Container c = getGuiContainer().inventorySlots;
|
||||
for (int i = 0; i < c.inventorySlots.size(); i++) {
|
||||
Slot slot = c.getSlot(i);
|
||||
if (slot == null)
|
||||
continue;
|
||||
if (slot == null) continue;
|
||||
|
||||
ItemStack stack = slot.getStack();
|
||||
if (stack != null && stack.getItem() == type.getItem() && stack.getItemDamage() == type.getItemDamage()) {
|
||||
@@ -106,21 +102,18 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
public static void setSlotContents(int slot, ItemStack item, boolean containerInv) {
|
||||
NEICPH.sendSetSlot(slot, item, containerInv);
|
||||
|
||||
if (slot == -999)
|
||||
mc().thePlayer.inventory.setItemStack(item);
|
||||
if (slot == -999) mc().thePlayer.inventory.setItemStack(item);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param mode -1 = normal cheats, 0 = no infinites, 1 = replenish stack
|
||||
*/
|
||||
public static void cheatItem(ItemStack stack, int button, int mode) {
|
||||
if (!canCheatItem(stack))
|
||||
return;
|
||||
if (!canCheatItem(stack)) return;
|
||||
|
||||
if (mode == -1 && button == 0 && shiftKey() && NEIClientConfig.hasSMPCounterPart()) {
|
||||
for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
|
||||
if (!handler.canHandleItem(stack))
|
||||
continue;
|
||||
if (!handler.canHandleItem(stack)) continue;
|
||||
|
||||
ItemStack inf = handler.getInfiniteItem(stack);
|
||||
if (inf != null) {
|
||||
@@ -152,25 +145,26 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
ItemStack stack = copyStack(base, i);
|
||||
if (hasSMPCounterPart()) {
|
||||
ItemStack typestack = copyStack(stack, 1);
|
||||
if (!infinite && !canItemFitInInventory(mc().thePlayer, stack) && (mc().currentScreen instanceof GuiContainer)) {
|
||||
if (!infinite
|
||||
&& !canItemFitInInventory(mc().thePlayer, stack)
|
||||
&& (mc().currentScreen instanceof GuiContainer)) {
|
||||
GuiContainer gui = getGuiContainer();
|
||||
final List<Iterable<Integer>> handlerSlots;
|
||||
try {
|
||||
GuiInfo.readLock.lock();
|
||||
handlerSlots = GuiInfo.guiHandlers.stream()
|
||||
.map(handler -> handler.getItemSpawnSlots(gui, typestack))
|
||||
.filter(x -> x != null)
|
||||
.collect(Collectors.toCollection(LinkedList::new));
|
||||
.map(handler -> handler.getItemSpawnSlots(gui, typestack))
|
||||
.filter(x -> x != null)
|
||||
.collect(Collectors.toCollection(LinkedList::new));
|
||||
} finally {
|
||||
GuiInfo.readLock.unlock();
|
||||
}
|
||||
|
||||
int increment = typestack.getMaxStackSize();
|
||||
int given = 0;
|
||||
for(int slotNo : Iterables.concat(handlerSlots)) {
|
||||
for (int slotNo : Iterables.concat(handlerSlots)) {
|
||||
Slot slot = gui.inventorySlots.getSlot(slotNo);
|
||||
if(!slot.isItemValid(typestack) || !InventoryUtils.canStack(slot.getStack(), typestack))
|
||||
continue;
|
||||
if (!slot.isItemValid(typestack) || !InventoryUtils.canStack(slot.getStack(), typestack)) continue;
|
||||
|
||||
int qty = Math.min(stack.stackSize - given, increment);
|
||||
int current = slot.getHasStack() ? slot.getStack().stackSize : 0;
|
||||
@@ -180,17 +174,15 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
slot.putStack(newStack);
|
||||
setSlotContents(slotNo, newStack, true);
|
||||
given += qty;
|
||||
if(given >= stack.stackSize)
|
||||
break;
|
||||
if (given >= stack.stackSize) break;
|
||||
}
|
||||
if(given > 0)
|
||||
NEICPH.sendGiveItem(copyStack(typestack, given), false, false);
|
||||
} else
|
||||
NEICPH.sendGiveItem(stack, infinite, true);
|
||||
if (given > 0) NEICPH.sendGiveItem(copyStack(typestack, given), false, false);
|
||||
} else NEICPH.sendGiveItem(stack, infinite, true);
|
||||
} else {
|
||||
for (int given = 0; given < stack.stackSize; ) {
|
||||
int qty = Math.min(stack.stackSize - given, stack.getMaxStackSize());
|
||||
sendCommand(getStringSetting("command.item"),
|
||||
sendCommand(
|
||||
getStringSetting("command.item"),
|
||||
mc().thePlayer.getCommandSenderName(),
|
||||
Item.getIdFromItem(stack.getItem()),
|
||||
qty,
|
||||
@@ -215,20 +207,17 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
}
|
||||
|
||||
public static int getGamemode() {
|
||||
if (invCreativeMode())
|
||||
return 2;
|
||||
else if (mc().playerController.isInCreativeMode())
|
||||
return 1;
|
||||
else if (mc().playerController.currentGameType.isAdventure())
|
||||
return 3;
|
||||
else
|
||||
return 0;
|
||||
if (invCreativeMode()) return 2;
|
||||
else if (mc().playerController.isInCreativeMode()) return 1;
|
||||
else if (mc().playerController.currentGameType.isAdventure()) return 3;
|
||||
else return 0;
|
||||
}
|
||||
|
||||
public static boolean isValidGamemode(String s) {
|
||||
return s.equals("survival") ||
|
||||
canPerformAction(s) &&
|
||||
Arrays.asList(getStringArrSetting("inventory.gamemodes")).contains(s);
|
||||
return s.equals("survival")
|
||||
|| canPerformAction(s)
|
||||
&& Arrays.asList(getStringArrSetting("inventory.gamemodes"))
|
||||
.contains(s);
|
||||
}
|
||||
|
||||
public static int getNextGamemode() {
|
||||
@@ -236,8 +225,7 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
int nmode = mode;
|
||||
while (true) {
|
||||
nmode = (nmode + 1) % NEIActions.gameModes.length;
|
||||
if (nmode == mode || isValidGamemode(NEIActions.gameModes[nmode]))
|
||||
break;
|
||||
if (nmode == mode || isValidGamemode(NEIActions.gameModes[nmode])) break;
|
||||
}
|
||||
return nmode;
|
||||
}
|
||||
@@ -245,13 +233,14 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
public static void cycleGamemode() {
|
||||
int mode = getGamemode();
|
||||
int nmode = getNextGamemode();
|
||||
if (mode == nmode)
|
||||
return;
|
||||
if (mode == nmode) return;
|
||||
|
||||
if (hasSMPCounterPart())
|
||||
NEICPH.sendGamemode(nmode);
|
||||
if (hasSMPCounterPart()) NEICPH.sendGamemode(nmode);
|
||||
else
|
||||
sendCommand(getStringSetting("command.creative"), getGameType(nmode), mc().thePlayer.getCommandSenderName());
|
||||
sendCommand(
|
||||
getStringSetting("command.creative"),
|
||||
getGameType(nmode),
|
||||
mc().thePlayer.getCommandSenderName());
|
||||
}
|
||||
|
||||
public static long getTime() {
|
||||
@@ -266,15 +255,12 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
long day = (getTime() / 24000L) * 24000L;
|
||||
long newTime = day + 24000L + hour * 1000;
|
||||
|
||||
if (hasSMPCounterPart())
|
||||
NEICPH.sendSetTime(hour);
|
||||
else
|
||||
sendCommand(getStringSetting("command.time"), newTime);
|
||||
if (hasSMPCounterPart()) NEICPH.sendSetTime(hour);
|
||||
else sendCommand(getStringSetting("command.time"), newTime);
|
||||
}
|
||||
|
||||
public static void sendCommand(String command, Object... args) {
|
||||
if (command.length() == 0)
|
||||
return;
|
||||
if (command.length() == 0) return;
|
||||
|
||||
NumberFormat numberformat = NumberFormat.getIntegerInstance();
|
||||
numberformat.setGroupingUsed(false);
|
||||
@@ -291,22 +277,17 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
}
|
||||
|
||||
public static void toggleRaining() {
|
||||
if (hasSMPCounterPart())
|
||||
NEICPH.sendToggleRain();
|
||||
else
|
||||
sendCommand(getStringSetting("command.rain"), isRaining() ? 0 : 1);
|
||||
if (hasSMPCounterPart()) NEICPH.sendToggleRain();
|
||||
else sendCommand(getStringSetting("command.rain"), isRaining() ? 0 : 1);
|
||||
}
|
||||
|
||||
public static void healPlayer() {
|
||||
if (hasSMPCounterPart())
|
||||
NEICPH.sendHeal();
|
||||
else
|
||||
sendCommand(getStringSetting("command.heal"), mc().thePlayer.getCommandSenderName());
|
||||
if (hasSMPCounterPart()) NEICPH.sendHeal();
|
||||
else sendCommand(getStringSetting("command.heal"), mc().thePlayer.getCommandSenderName());
|
||||
}
|
||||
|
||||
public static void toggleMagnetMode() {
|
||||
if (hasSMPCounterPart())
|
||||
NEICPH.sendToggleMagnetMode();
|
||||
if (hasSMPCounterPart()) NEICPH.sendToggleMagnetMode();
|
||||
}
|
||||
|
||||
public static ArrayList<int[]> concatIntegersToRanges(List<Integer> damages) {
|
||||
@@ -322,20 +303,18 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
continue;
|
||||
}
|
||||
if (next + 1 != i) {
|
||||
ranges.add(new int[]{start, next});
|
||||
ranges.add(new int[] {start, next});
|
||||
start = next = i;
|
||||
continue;
|
||||
}
|
||||
next = i;
|
||||
}
|
||||
ranges.add(new int[]{start, next});
|
||||
ranges.add(new int[] {start, next});
|
||||
return ranges;
|
||||
}
|
||||
|
||||
public static ArrayList<int[]> addIntegersToRanges(List<int[]> ranges, List<Integer> damages) {
|
||||
for (int[] range : ranges)
|
||||
for (int integer = range[0]; integer <= range[1]; integer++)
|
||||
damages.add(integer);
|
||||
for (int[] range : ranges) for (int integer = range[0]; integer <= range[1]; integer++) damages.add(integer);
|
||||
|
||||
return concatIntegersToRanges(damages);
|
||||
}
|
||||
@@ -354,8 +333,7 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
}
|
||||
|
||||
public static GuiContainer getGuiContainer() {
|
||||
if (mc().currentScreen instanceof GuiContainer)
|
||||
return (GuiContainer) mc().currentScreen;
|
||||
if (mc().currentScreen instanceof GuiContainer) return (GuiContainer) mc().currentScreen;
|
||||
|
||||
return null;
|
||||
}
|
||||
@@ -365,6 +343,7 @@ public class NEIClientUtils extends NEIServerUtils
|
||||
}
|
||||
|
||||
public static void playClickSound() {
|
||||
mc().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
|
||||
mc().getSoundHandler()
|
||||
.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user