Minor class changes to fix / refactor for GTNH Gradle

This commit is contained in:
Kam committed 2024-02-13 01:25:55 -05:00
1 parent fd7db84eb7
commit 8a4e4760bb
8 files changed
+34 -46

No files matched your search

@@ -117,7 +117,6 @@ public class ImageDownloadAlt extends SimpleTexture
{
this.imageThread = new Thread("Texture Downloader #" + threadDownloadCounter.incrementAndGet())
{
private static final String __OBFID = "CL_00001050";
public void run()
{
HttpURLConnection connection = null;
@@ -35,8 +35,6 @@ public class GuiMerchantAdd extends GuiContainer
private MerchantButton previousRecipeButtonIndex;
private int currentRecipeIndex;
private String field_94082_v;
public GuiMerchantAdd()
{
super(new ContainerMerchantAdd(Minecraft.getMinecraft().thePlayer, ServerEventsHandler.Merchant, Minecraft.getMinecraft().theWorld));
@@ -50,7 +48,7 @@ public class GuiMerchantAdd extends GuiContainer
public void initGui()
{
super.initGui();
int i = (this.width - this.xSize) / 2;
int j = (this.height - this.ySize) / 2;
this.buttonList.add(this.nextRecipeButtonIndex = new MerchantButton(1, i + 120 + 27, j + 24 - 1, true));
@@ -104,7 +102,7 @@ public class GuiMerchantAdd extends GuiContainer
--this.currentRecipeIndex;
flag = true;
}
if(par1GuiButton.id == 4){
MerchantRecipeList merchantrecipelist = this.theIMerchant.getRecipes(mc.thePlayer);
if(currentRecipeIndex < merchantrecipelist.size()){
@@ -114,7 +112,7 @@ public class GuiMerchantAdd extends GuiContainer
Client.sendData(EnumPacketServer.MerchantUpdate, ServerEventsHandler.Merchant.getEntityId(), merchantrecipelist);
}
}
if(par1GuiButton.id == 5){
ItemStack item1 = this.inventorySlots.getSlot(0).getStack();
ItemStack item2 = this.inventorySlots.getSlot(1).getStack();
@@ -123,7 +121,7 @@ public class GuiMerchantAdd extends GuiContainer
item1 = item2;
item2 = null;
}
if(item1 != null && sold != null){
item1 = item1.copy();
sold = sold.copy();
@@ -136,7 +134,7 @@ public class GuiMerchantAdd extends GuiContainer
merchantrecipelist.add(recipe);
Client.sendData(EnumPacketServer.MerchantUpdate, ServerEventsHandler.Merchant.getEntityId(), merchantrecipelist);
}
}
if (flag)
@@ -266,7 +264,6 @@ public class GuiMerchantAdd extends GuiContainer
static class MerchantButton extends GuiButton
{
private final boolean field_146157_o;
private static final String __OBFID = "CL_00000763";
public MerchantButton(int par1, int par2, int par3, boolean par4)
{
@@ -23,7 +23,7 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene
private DataDisplay display;
public GuiNpcTextField nameText;
public GuiNpcDisplay(EntityNPCInterface npc) {
super(npc,1);
display = npc.display;
@@ -205,7 +205,7 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene
mc.renderGlobal.onEntityDestroy(npc);
mc.renderGlobal.onEntityCreate(npc);
Client.sendData(EnumPacketServer.MainmenuDisplaySave, display.writeToNBT(new NBTTagCompound()));
}
@Override
@@ -57,9 +57,9 @@ public class GuiBook extends GuiScreen
private GuiButton buttonSign;
private GuiButton buttonFinalize;
private GuiButton buttonCancel;
private int x, y, z;
public GuiBook(EntityPlayer par1EntityPlayer, ItemStack item, int x, int y, int z){
this.x = x;
this.y = y;
@@ -177,9 +177,9 @@ public class GuiBook extends GuiScreen
this.bookObj.setTagInfo("title", new NBTTagString(this.bookTitle.trim()));
this.bookObj.func_150996_a(Items.written_book);
}
NoppesUtilPlayer.sendData(EnumPlayerPacket.SaveBook, x, y, z, sign, bookObj.writeToNBT(new NBTTagCompound()));
}
}
}
@@ -426,7 +426,6 @@ public class GuiBook extends GuiScreen
static class NextPageButton extends GuiButton
{
private final boolean field_146151_o;
private static final String __OBFID = "CL_00000745";
public NextPageButton(int par1, int par2, int par3, boolean par4)
{
@@ -461,4 +460,4 @@ public class GuiBook extends GuiScreen
}
}
}
}
}
@@ -6,7 +6,6 @@ import org.lwjgl.opengl.GL11;
public class GuiButtonNextPage extends GuiNpcButton{
private final boolean field_146151_o;
private static final String __OBFID = "CL_00000745";
private static final ResourceLocation field_110405_a = new ResourceLocation("textures/gui/book.png");
public GuiButtonNextPage(int par1, int par2, int par3, boolean par4)
@@ -10,11 +10,10 @@ import noppes.npcs.controllers.data.PlayerMailData;
import java.util.Iterator;
public class ContainerMail extends ContainerNpcInterface{
private static final String __OBFID = "CL_00001742";
public static PlayerMail staticmail = new PlayerMail();
public PlayerMail mail = new PlayerMail();
private boolean canEdit, canSend;
public ContainerMail(EntityPlayer player, boolean canEdit, boolean canSend){
super(player);
@@ -29,7 +28,7 @@ public class ContainerMail extends ContainerNpcInterface{
{
this.addSlotToContainer(new SlotValid(mail, k , 179 + k * 24, 138, canEdit));
}
for (int j = 0; j < 3; ++j)
{
@@ -4,9 +4,6 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.client.renderer.entity.RendererLivingEntity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.controllers.data.AnimationData;
import noppes.npcs.client.ClientCacheHandler;
import noppes.npcs.constants.EnumAnimationPart;