Update buildscript & spotlessApply

This commit is contained in:
DianeXD committed 2022-07-03 12:17:51 +08:00
1 parent e4329e2b8f
commit 8683a345c3
818 files changed
+51123 -49403

No files matched your search

@@ -10,51 +10,51 @@ import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.IIcon;
public class BinnieModProxy implements IBinnieModProxy {
private AbstractMod mod;
private AbstractMod mod;
public BinnieModProxy(AbstractMod mod) {
this.mod = mod;
}
public BinnieModProxy(AbstractMod mod) {
this.mod = mod;
}
@Override
public void openGui(IBinnieGUID ID, EntityPlayer player, int x, int y, int z) {
BinnieCore.proxy.openGui(mod, ID.ordinal(), player, x, y, z);
}
@Override
public void openGui(IBinnieGUID ID, EntityPlayer player, int x, int y, int z) {
BinnieCore.proxy.openGui(mod, ID.ordinal(), player, x, y, z);
}
@Override
public void sendToAll(MessageBase packet) {
mod.getNetworkWrapper().sendToAll(packet.getMessage());
}
@Override
public void sendToAll(MessageBase packet) {
mod.getNetworkWrapper().sendToAll(packet.getMessage());
}
@Override
public void sendToPlayer(MessageBase packet, EntityPlayer entityplayer) {
if (entityplayer instanceof EntityPlayerMP) {
mod.getNetworkWrapper().sendTo(packet.getMessage(), (EntityPlayerMP) entityplayer);
}
}
@Override
public void sendToPlayer(MessageBase packet, EntityPlayer entityplayer) {
if (entityplayer instanceof EntityPlayerMP) {
mod.getNetworkWrapper().sendTo(packet.getMessage(), (EntityPlayerMP) entityplayer);
}
}
@Override
public void sendToServer(MessageBase packet) {
mod.getNetworkWrapper().sendToServer(packet.getMessage());
}
@Override
public void sendToServer(MessageBase packet) {
mod.getNetworkWrapper().sendToServer(packet.getMessage());
}
@Override
public IIcon getIcon(IIconRegister register, String string) {
return BinnieCore.proxy.getIcon(register, mod.getModID(), string);
}
@Override
public IIcon getIcon(IIconRegister register, String string) {
return BinnieCore.proxy.getIcon(register, mod.getModID(), string);
}
@Override
public void preInit() {
// ignored
}
@Override
public void preInit() {
// ignored
}
@Override
public void init() {
// ignored
}
@Override
public void init() {
// ignored
}
@Override
public void postInit() {
// ignored
}
@Override
public void postInit() {
// ignored
}
}
+120 -122
View File
@@ -9,6 +9,7 @@ import binnie.core.resource.BinnieResource;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.registry.GameRegistry;
import java.io.File;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
@@ -20,158 +21,155 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.IItemRenderer;
import java.io.File;
public class BinnieProxy extends BinnieModProxy implements IBinnieProxy {
private short uniqueTextureUID;
private short uniqueTextureUID;
public BinnieProxy() {
super(BinnieCore.instance);
uniqueTextureUID = 1200;
}
public BinnieProxy() {
super(BinnieCore.instance);
uniqueTextureUID = 1200;
}
@Override
public void preInit() {
// ignored
}
@Override
public void preInit() {
// ignored
}
@Override
public void init() {
// ignored
}
@Override
public void init() {
// ignored
}
@Override
public void postInit() {
// ignored
}
@Override
public void postInit() {
// ignored
}
@Override
public void bindTexture(BinnieResource texture) {
// ignored
}
@Override
public void bindTexture(BinnieResource texture) {
// ignored
}
public boolean checkTexture(BinnieResource location) {
return false;
}
public boolean checkTexture(BinnieResource location) {
return false;
}
@Override
public int getUniqueRenderID() {
return RenderingRegistry.getNextAvailableRenderId();
}
@Override
public int getUniqueRenderID() {
return RenderingRegistry.getNextAvailableRenderId();
}
@Override
public void openGui(AbstractMod mod, int id, EntityPlayer player, int x, int y, int z) {
player.openGui(mod, id, player.worldObj, x, y, z);
}
@Override
public void openGui(AbstractMod mod, int id, EntityPlayer player, int x, int y, int z) {
player.openGui(mod, id, player.worldObj, x, y, z);
}
@Override
public boolean isSimulating(World world) {
return true;
}
@Override
public boolean isSimulating(World world) {
return true;
}
@Override
public void registerCustomItemRenderer(Item item, IItemRenderer itemRenderer) {
}
@Override
public void registerCustomItemRenderer(Item item, IItemRenderer itemRenderer) {}
@Override
public boolean needsTagCompoundSynched(Item item) {
return item.getShareTag();
}
@Override
public boolean needsTagCompoundSynched(Item item) {
return item.getShareTag();
}
@Override
public World getWorld() {
return null;
}
@Override
public World getWorld() {
return null;
}
// TODO unused method?
public void throwException(String message, Throwable e) {
FMLCommonHandler.instance().raiseException(e, message, true);
}
// TODO unused method?
public void throwException(String message, Throwable e) {
FMLCommonHandler.instance().raiseException(e, message, true);
}
@Override
public Minecraft getMinecraftInstance() {
return null;
}
@Override
public Minecraft getMinecraftInstance() {
return null;
}
@Override
public boolean isClient() {
return false;
}
@Override
public boolean isClient() {
return false;
}
@Override
public boolean isServer() {
return true;
}
@Override
public boolean isServer() {
return true;
}
@Override
public File getDirectory() {
return new File("./");
}
@Override
public File getDirectory() {
return new File("./");
}
@Override
public void registerTileEntity(Class<? extends TileEntity> tile, String id, Object renderer) {
GameRegistry.registerTileEntity(tile, id);
}
@Override
public void registerTileEntity(Class<? extends TileEntity> tile, String id, Object renderer) {
GameRegistry.registerTileEntity(tile, id);
}
@Override
public void createPipe(Item pipe) {
// ignored
}
@Override
public void createPipe(Item pipe) {
// ignored
}
@Override
public boolean isDebug() {
return System.getenv().containsKey("BINNIE_DEBUG");
}
@Override
public boolean isDebug() {
return System.getenv().containsKey("BINNIE_DEBUG");
}
@Override
public void registerBlockRenderer(Object renderer) {
// ignored
}
@Override
public void registerBlockRenderer(Object renderer) {
// ignored
}
@Override
public Object createObject(String renderer) {
return null;
}
@Override
public Object createObject(String renderer) {
return null;
}
public void sendNetworkEntityPacket(INetworkedEntity entity) {
MessageUpdate packet = new MessageUpdate(BinnieCorePacketID.NetworkEntityUpdate.ordinal(), entity);
sendToAll(packet);
}
public void sendNetworkEntityPacket(INetworkedEntity entity) {
MessageUpdate packet = new MessageUpdate(BinnieCorePacketID.NetworkEntityUpdate.ordinal(), entity);
sendToAll(packet);
}
@Override
public IIcon getIcon(IIconRegister register, String mod, String name) {
return null;
}
@Override
public IIcon getIcon(IIconRegister register, String mod, String name) {
return null;
}
// TODO unused method?
public void handleTextureRefresh(IIconRegister register, int type) {
// ignored
}
// TODO unused method?
public void handleTextureRefresh(IIconRegister register, int type) {
// ignored
}
// TODO unused method?
public void handlePostTextureRefresh(IIconRegister register, int type) {
// ignored
}
// TODO unused method?
public void handlePostTextureRefresh(IIconRegister register, int type) {
// ignored
}
public short getUniqueTextureUID() {
uniqueTextureUID++;
return uniqueTextureUID;
}
public short getUniqueTextureUID() {
uniqueTextureUID++;
return uniqueTextureUID;
}
@Override
public void bindTexture(ResourceLocation location) {
// ignored
}
@Override
public void bindTexture(ResourceLocation location) {
// ignored
}
public boolean isShiftDown() {
return false;
}
public boolean isShiftDown() {
return false;
}
public EntityPlayer getPlayer() {
return null;
}
public EntityPlayer getPlayer() {
return null;
}
public MinecraftServer getServer() {
return MinecraftServer.getServer();
}
public MinecraftServer getServer() {
return MinecraftServer.getServer();
}
}
@@ -8,6 +8,8 @@ import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import java.io.File;
import java.io.IOException;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.renderer.texture.SimpleTexture;
@@ -25,129 +27,126 @@ import net.minecraftforge.client.MinecraftForgeClient;
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;
import java.io.File;
import java.io.IOException;
public class BinnieProxyClient extends BinnieProxy implements IBinnieProxy {
@Override
public void bindTexture(BinnieResource texture) {
GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
bindTexture(texture.getResourceLocation());
}
@Override
public void bindTexture(BinnieResource texture) {
GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
bindTexture(texture.getResourceLocation());
}
@Override
public void bindTexture(ResourceLocation location) {
getMinecraftInstance().getTextureManager().bindTexture(location);
}
@Override
public void bindTexture(ResourceLocation location) {
getMinecraftInstance().getTextureManager().bindTexture(location);
}
@Override
public boolean checkTexture(BinnieResource location) {
SimpleTexture texture = new SimpleTexture(location.getResourceLocation());
try {
texture.loadTexture(getMinecraftInstance().getResourceManager());
} catch (IOException e) {
return false;
}
return true;
}
@Override
public boolean checkTexture(BinnieResource location) {
SimpleTexture texture = new SimpleTexture(location.getResourceLocation());
try {
texture.loadTexture(getMinecraftInstance().getResourceManager());
} catch (IOException e) {
return false;
}
return true;
}
@Override
public boolean isSimulating(World world) {
return !world.isRemote;
}
@Override
public boolean isSimulating(World world) {
return !world.isRemote;
}
@Override
public void registerCustomItemRenderer(Item item, IItemRenderer itemRenderer) {
MinecraftForgeClient.registerItemRenderer(item, itemRenderer);
}
@Override
public void registerCustomItemRenderer(Item item, IItemRenderer itemRenderer) {
MinecraftForgeClient.registerItemRenderer(item, itemRenderer);
}
@Override
public World getWorld() {
return getMinecraftInstance().theWorld;
}
@Override
public World getWorld() {
return getMinecraftInstance().theWorld;
}
@Override
public Minecraft getMinecraftInstance() {
return FMLClientHandler.instance().getClient();
}
@Override
public Minecraft getMinecraftInstance() {
return FMLClientHandler.instance().getClient();
}
@Override
public boolean isClient() {
return true;
}
@Override
public boolean isClient() {
return true;
}
@Override
public boolean isServer() {
return false;
}
@Override
public boolean isServer() {
return false;
}
@Override
public File getDirectory() {
return new File(".");
}
@Override
public File getDirectory() {
return new File(".");
}
@Override
public void registerTileEntity(Class<? extends TileEntity> tile, String id, Object renderer) {
if (renderer != null && renderer instanceof TileEntitySpecialRenderer) {
ClientRegistry.registerTileEntity(tile, id, (TileEntitySpecialRenderer) renderer);
} else {
GameRegistry.registerTileEntity(tile, id);
}
}
@Override
public void registerTileEntity(Class<? extends TileEntity> tile, String id, Object renderer) {
if (renderer != null && renderer instanceof TileEntitySpecialRenderer) {
ClientRegistry.registerTileEntity(tile, id, (TileEntitySpecialRenderer) renderer);
} else {
GameRegistry.registerTileEntity(tile, id);
}
}
@Override
public void registerBlockRenderer(Object renderer) {
if (renderer != null && renderer instanceof ISimpleBlockRenderingHandler) {
RenderingRegistry.registerBlockHandler((ISimpleBlockRenderingHandler) renderer);
}
}
@Override
public void registerBlockRenderer(Object renderer) {
if (renderer != null && renderer instanceof ISimpleBlockRenderingHandler) {
RenderingRegistry.registerBlockHandler((ISimpleBlockRenderingHandler) renderer);
}
}
@Override
public void createPipe(Item pipe) {
// ignored
}
@Override
public void createPipe(Item pipe) {
// ignored
}
@Override
public Object createObject(String renderer) {
Object object = null;
try {
Class<?> rendererClass = Class.forName(renderer);
if (rendererClass != null) {
object = rendererClass.newInstance();
}
} catch (Exception ex) {
// ignored
}
return object;
}
@Override
public Object createObject(String renderer) {
Object object = null;
try {
Class<?> rendererClass = Class.forName(renderer);
if (rendererClass != null) {
object = rendererClass.newInstance();
}
} catch (Exception ex) {
// ignored
}
return object;
}
@Override
public IIcon getIcon(IIconRegister register, String mod, String name) {
return register.registerIcon(mod + ":" + name);
}
@Override
public IIcon getIcon(IIconRegister register, String mod, String name) {
return register.registerIcon(mod + ":" + name);
}
@Override
public boolean isShiftDown() {
return Keyboard.isKeyDown(42) || Keyboard.isKeyDown(54);
}
@Override
public boolean isShiftDown() {
return Keyboard.isKeyDown(42) || Keyboard.isKeyDown(54);
}
@Override
public EntityPlayer getPlayer() {
return Minecraft.getMinecraft().thePlayer;
}
@Override
public EntityPlayer getPlayer() {
return Minecraft.getMinecraft().thePlayer;
}
// TODO unused method?
public void handlePreTextureRefresh(IIconRegister register, int type) {
if (type == 0) {
Binnie.Liquid.reloadIcons(register);
}
}
// TODO unused method?
public void handlePreTextureRefresh(IIconRegister register, int type) {
if (type == 0) {
Binnie.Liquid.reloadIcons(register);
}
}
@Override
public void preInit() {
IResourceManager manager = Minecraft.getMinecraft().getResourceManager();
if (manager instanceof IReloadableResourceManager) {
((IReloadableResourceManager) manager).registerReloadListener(new CraftGUIResourceManager());
}
}
@Override
public void preInit() {
IResourceManager manager = Minecraft.getMinecraft().getResourceManager();
if (manager instanceof IReloadableResourceManager) {
((IReloadableResourceManager) manager).registerReloadListener(new CraftGUIResourceManager());
}
}
}
@@ -1,4 +1,3 @@
package binnie.core.proxy;
public class BinnieProxyServer extends BinnieProxy implements IBinnieProxy {
}
public class BinnieProxyServer extends BinnieProxy implements IBinnieProxy {}
@@ -7,13 +7,13 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.IIcon;
interface IBinnieModProxy extends IProxyCore {
void openGui(IBinnieGUID mod, EntityPlayer player, int x, int y, int z);
void openGui(IBinnieGUID mod, EntityPlayer player, int x, int y, int z);
void sendToAll(MessageBase p0);
void sendToAll(MessageBase p0);
void sendToPlayer(MessageBase p0, EntityPlayer p1);
void sendToPlayer(MessageBase p0, EntityPlayer p1);
void sendToServer(MessageBase p0);
void sendToServer(MessageBase p0);
IIcon getIcon(IIconRegister p0, String p1);
IIcon getIcon(IIconRegister p0, String p1);
}
@@ -2,6 +2,7 @@ package binnie.core.proxy;
import binnie.core.AbstractMod;
import binnie.core.resource.BinnieResource;
import java.io.File;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
@@ -12,42 +13,40 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.IItemRenderer;
import java.io.File;
public interface IBinnieProxy extends IProxyCore {
boolean isClient();
boolean isClient();
boolean isServer();
boolean isServer();
File getDirectory();
File getDirectory();
void bindTexture(BinnieResource texture);
void bindTexture(BinnieResource texture);
void bindTexture(ResourceLocation location);
void bindTexture(ResourceLocation location);
int getUniqueRenderID();
int getUniqueRenderID();
void registerCustomItemRenderer(Item item, IItemRenderer itemRenderer);
void registerCustomItemRenderer(Item item, IItemRenderer itemRenderer);
void openGui(AbstractMod mod, int id, EntityPlayer player, int x, int y, int z);
void openGui(AbstractMod mod, int id, EntityPlayer player, int x, int y, int z);
boolean isSimulating(World world);
boolean isSimulating(World world);
World getWorld();
World getWorld();
Minecraft getMinecraftInstance();
Minecraft getMinecraftInstance();
boolean needsTagCompoundSynched(Item item);
boolean needsTagCompoundSynched(Item item);
Object createObject(String renderer);
Object createObject(String renderer);
void registerTileEntity(Class<? extends TileEntity> tile, String id, Object renderer);
void registerTileEntity(Class<? extends TileEntity> tile, String id, Object renderer);
void createPipe(Item pipe);
void createPipe(Item pipe);
boolean isDebug();
boolean isDebug();
void registerBlockRenderer(Object renderer);
void registerBlockRenderer(Object renderer);
IIcon getIcon(IIconRegister register, String mod, String name);
IIcon getIcon(IIconRegister register, String mod, String name);
}
@@ -2,5 +2,4 @@ package binnie.core.proxy;
import binnie.core.IInitializable;
public interface IProxyCore extends IInitializable {
}
public interface IProxyCore extends IInitializable {}