Update buildscript & apply automatic formatting rules

This commit is contained in:
Raven Szewczyk authored and Jason Mitchell committed 2022-06-27 10:23:18 -07:00
1 parent a7683b885d
commit f7a900e910
173 files changed
+4581 -5321

No files matched your search

@@ -1,11 +1,15 @@
package codechicken.nei;
import static codechicken.nei.NEIClientUtils.translate;
import codechicken.core.gui.GuiCCButton;
import codechicken.core.gui.GuiCCTextField;
import codechicken.core.gui.GuiScrollSlot;
import codechicken.core.inventory.GuiContainerWidget;
import codechicken.lib.render.CCRenderState;
import codechicken.lib.render.FontUtils;
import java.awt.Dimension;
import java.util.ArrayList;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagList;
@@ -14,24 +18,15 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
import java.awt.Dimension;
import java.util.ArrayList;
import static codechicken.nei.NEIClientUtils.translate;
public class GuiPotionCreator extends GuiContainerWidget
{
public class GuiSlotPotionEffects extends GuiScrollSlot
{
public class GuiPotionCreator extends GuiContainerWidget {
public class GuiSlotPotionEffects extends GuiScrollSlot {
public int selectedslot = -1;
public boolean enabled = true;
private final ArrayList<Potion> validPotions = new ArrayList<>();
public GuiSlotPotionEffects(int x, int y) {
super(x, y, 108, 76);
for (Potion p : Potion.potionTypes)
if (p != null)
validPotions.add(p);
for (Potion p : Potion.potionTypes) if (p != null) validPotions.add(p);
setSmoothScroll(false);
setMargins(0, 0, 0, 0);
}
@@ -48,8 +43,7 @@ public class GuiPotionCreator extends GuiContainerWidget
}
@Override
public void drawOverlay(float frame) {
}
public void drawOverlay(float frame) {}
@Override
public int scrollbarGuideAlignment() {
@@ -69,13 +63,13 @@ public class GuiPotionCreator extends GuiContainerWidget
Potion potion = validPotions.get(slot);
PotionEffect effect = getEffect(potion.id);
boolean blank = effect == null;
if (effect == null)
effect = new PotionEffect(potion.id, 1200, 0);
if (effect == null) effect = new PotionEffect(potion.id, 1200, 0);
int shade = selectedslot == slot ? 2 : blank ? 1 : 0;
CCRenderState.changeTexture("textures/gui/container/enchanting_table.png");
drawTexturedModalRect(x, y, 0, 166 + getSlotHeight(slot) * shade, width - 30, getSlotHeight(slot));
drawTexturedModalRect(x + width - 30, y, width - 23, 166 + getSlotHeight(slot) * shade, 30, getSlotHeight(slot));
drawTexturedModalRect(
x + width - 30, y, width - 23, 166 + getSlotHeight(slot) * shade, 30, getSlotHeight(slot));
if (potion.hasStatusIcon()) {
CCRenderState.changeTexture("textures/gui/container/inventory.png");
@@ -100,12 +94,13 @@ public class GuiPotionCreator extends GuiContainerWidget
private PotionEffect getEffect(int id) {
ItemStack potion = container.potionInv.getStackInSlot(0);
if (potion != null && potion.hasTagCompound() && potion.getTagCompound().hasKey("CustomPotionEffects")) {
if (potion != null
&& potion.hasTagCompound()
&& potion.getTagCompound().hasKey("CustomPotionEffects")) {
NBTTagList potionTagList = potion.getTagCompound().getTagList("CustomPotionEffects", 10);
for (int i = 0; i < potionTagList.tagCount(); i++) {
PotionEffect effect = PotionEffect.readCustomPotionEffectFromNBT(potionTagList.getCompoundTagAt(i));
if (effect.getPotionID() == id)
return effect;
if (effect.getPotionID() == id) return effect;
}
}
return null;
@@ -118,8 +113,7 @@ public class GuiPotionCreator extends GuiContainerWidget
@Override
protected void slotClicked(int slot, int button, int mx, int my, int count) {
if (!enabled)
return;
if (!enabled) return;
if (button == 0) {
select(slot);
@@ -145,19 +139,16 @@ public class GuiPotionCreator extends GuiContainerWidget
}
public void setEnabled(boolean b) {
if (b == enabled)
return;
if (b == enabled) return;
enabled = b;
if (!enabled)
deselect();
if (!enabled) deselect();
}
private void select(int slot) {
selectedslot = slot;
durationField.setEnabled(true);
PotionEffect effect = getEffect(validPotions.get(slot).id);
if (effect == null)
effect = new PotionEffect(validPotions.get(slot).id, 1200, 0);
if (effect == null) effect = new PotionEffect(validPotions.get(slot).id, 1200, 0);
durationField.setDurationTicks(effect.getDuration());
amplifier = effect.getAmplifier();
validateInputButtons();
@@ -175,8 +166,7 @@ public class GuiPotionCreator extends GuiContainerWidget
}
}
public class GuiDurationField extends GuiCCTextField
{
public class GuiDurationField extends GuiCCTextField {
private String baseValue;
public GuiDurationField(int x, int y, int width, int height) {
@@ -190,27 +180,22 @@ public class GuiPotionCreator extends GuiContainerWidget
i /= 20;
String minutes = Integer.toString(i / 60);
String seconds = Integer.toString(i % 60);
if (seconds.length() == 1)
seconds = '0' + seconds;
if (seconds.length() == 1) seconds = '0' + seconds;
setText(minutes + seconds);
}
@Override
public void setEnabled(boolean b) {
super.setEnabled(b);
if (!isEnabled())
setText("100");
if (!isEnabled()) setText("100");
}
@Override
public void onFocusChanged() {
if (isFocused())
baseValue = getText();
if (isFocused()) baseValue = getText();
else {
if (!validateValue())
setText(baseValue);
else
applyEffect();
if (!validateValue()) setText(baseValue);
else applyEffect();
}
}
@@ -231,7 +216,8 @@ public class GuiPotionCreator extends GuiContainerWidget
@Override
public void drawText() {
String s = getText();
String seconds = s.substring(Math.max(0, s.length() - 2), Math.max(0, s.length() - 2) + Math.min(s.length(), 2));
String seconds =
s.substring(Math.max(0, s.length() - 2), Math.max(0, s.length() - 2) + Math.min(s.length(), 2));
String minutes = s.length() < 3 ? "" : s.substring(0, s.length() - 2);
int ty = y + height / 2 - 4;
int tcolour = getTextColour();
@@ -316,10 +302,8 @@ public class GuiPotionCreator extends GuiContainerWidget
@Override
public void actionPerformed(String ident, Object... params) {
if (ident.equals("ampDown"))
amplifier--;
else if (ident.equals("ampUp"))
amplifier++;
if (ident.equals("ampDown")) amplifier--;
else if (ident.equals("ampUp")) amplifier++;
applyEffect();
validateInputButtons();
}