sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

change package names

Browse source
This commit is contained in:
Sen 2025-05-07 18:19:24 +02:00
parent 3e70accb76
commit d08d0e11fc
1246 changed files with 9285 additions and 9272 deletions
Download patch file Download diff file Expand all files Collapse all files

162
client/src/client/Game.java
View file

@ -70,6 +70,22 @@ import client.renderer.texture.ColormapLoader;
import client.renderer.texture.EntityTexManager;
import client.renderer.texture.TextureManager;
import client.renderer.texture.TextureMap;
import client.vars.BoolVar;
import client.vars.CVar;
import client.vars.CVarCategory;
import client.vars.ColorVar;
import client.vars.EnumVar;
import client.vars.FloatVar;
import client.vars.IntVar;
import client.vars.StringVar;
import client.vars.Variable;
import client.vars.BaseVar.VarFunction;
import client.vars.BoolVar.BoolFunction;
import client.vars.EnumVar.EnumFunction;
import client.vars.FloatVar.FloatFunction;
import client.vars.IntVar.IntFunction;
import client.vars.StringVar.StringFunction;
import client.vars.Variable.IntType;
import client.window.Bind;
import client.window.Button;
import client.window.DisplayMode;
@ -78,87 +94,71 @@ import client.window.Keysym;
import client.window.Wheel;
import client.window.Window;
import client.window.WindowEvent;
import game.IClient;
import game.biome.Biome;
import game.block.Block;
import game.collect.Lists;
import game.collect.Maps;
import game.color.TextColor;
import game.entity.Entity;
import game.entity.animal.EntityHorse;
import game.entity.npc.Energy;
import game.entity.npc.EntityNPC;
import game.entity.types.EntityLiving;
import game.entity.types.IEntityFX;
import game.future.Futures;
import game.future.ListenableFuture;
import game.future.ListenableFutureTask;
import game.init.BlockRegistry;
import game.init.Config;
import game.init.EntityRegistry;
import game.init.ItemRegistry;
import game.init.Items;
import game.init.Registry;
import game.init.SoundEvent;
import game.inventory.InventoryPlayer;
import game.item.Item;
import game.item.ItemBlock;
import game.item.ItemControl;
import game.item.ItemStack;
import game.log.Log;
import game.log.LogLevel;
import game.log.Message;
import game.material.Material;
import game.model.ParticleType;
import game.nbt.NBTTagCompound;
import game.network.IThreadListener;
import game.network.NetConnection;
import game.network.NetHandler.ThreadQuickExitException;
import game.packet.CPacketAction;
import game.packet.CPacketAction.Action;
import game.packet.CPacketCheat;
import game.packet.CPacketMessage;
import game.packet.HPacketHandshake;
import game.packet.LPacketPasswordResponse;
import game.potion.Potion;
import game.potion.PotionEffect;
import game.potion.PotionHelper;
import game.properties.IProperty;
import game.rng.Random;
import game.sound.EventType;
import game.sound.PositionedSound;
import game.sound.Sound;
import game.util.CharValidator;
import game.util.ExtMath;
import game.util.FileUtils;
import game.util.Util;
import game.vars.BaseVar.VarFunction;
import game.vars.BoolVar;
import game.vars.BoolVar.BoolFunction;
import game.vars.CVar;
import game.vars.CVarCategory;
import game.vars.ColorVar;
import game.vars.EnumVar;
import game.vars.EnumVar.EnumFunction;
import game.vars.FloatVar;
import game.vars.FloatVar.FloatFunction;
import game.vars.IntVar;
import game.vars.IntVar.IntFunction;
import game.vars.StringVar;
import game.vars.StringVar.StringFunction;
import game.vars.Variable;
import game.vars.Variable.IntType;
import game.world.BlockPos;
import game.world.BoundingBox;
import game.world.Chunk;
import game.world.Facing;
import game.world.HitPosition;
import game.world.HitPosition.ObjectType;
import game.world.LightType;
import game.world.Region;
import game.world.State;
import game.world.World;
import game.world.WorldClient;
import common.IClient;
import common.biome.Biome;
import common.block.Block;
import common.collect.Lists;
import common.collect.Maps;
import common.color.TextColor;
import common.entity.Entity;
import common.entity.animal.EntityHorse;
import common.entity.npc.Energy;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving;
import common.entity.types.IEntityFX;
import common.future.Futures;
import common.future.ListenableFuture;
import common.future.ListenableFutureTask;
import common.init.BlockRegistry;
import common.init.Config;
import common.init.EntityRegistry;
import common.init.ItemRegistry;
import common.init.Items;
import common.init.Registry;
import common.init.SoundEvent;
import common.inventory.InventoryPlayer;
import common.item.Item;
import common.item.ItemBlock;
import common.item.ItemControl;
import common.item.ItemStack;
import common.log.Log;
import common.log.LogLevel;
import common.log.Message;
import common.material.Material;
import common.model.ParticleType;
import common.nbt.NBTTagCompound;
import common.network.IThreadListener;
import common.network.NetConnection;
import common.network.NetHandler.ThreadQuickExitException;
import common.packet.CPacketAction;
import common.packet.CPacketCheat;
import common.packet.CPacketMessage;
import common.packet.HPacketHandshake;
import common.packet.LPacketPasswordResponse;
import common.packet.CPacketAction.Action;
import common.potion.Potion;
import common.potion.PotionEffect;
import common.potion.PotionHelper;
import common.properties.IProperty;
import common.rng.Random;
import common.sound.EventType;
import common.sound.PositionedSound;
import common.sound.Sound;
import common.util.CharValidator;
import common.util.ExtMath;
import common.util.FileUtils;
import common.util.Util;
import common.world.BlockPos;
import common.world.BoundingBox;
import common.world.Chunk;
import common.world.Facing;
import common.world.HitPosition;
import common.world.LightType;
import common.world.Region;
import common.world.State;
import common.world.World;
import common.world.WorldClient;
import common.world.HitPosition.ObjectType;
/*
Een net ganz funktionierndes Programm ...

2
client/src/client/PerfSection.java
View file

@ -1,6 +1,6 @@
package client;
import game.util.Util;
import common.util.Util;
public enum PerfSection {
TIMING("Timing"),

40
client/src/client/PlayerController.java
View file

@ -1,26 +1,26 @@
package client;
import client.network.ClientPlayer;
import game.block.Block;
import game.entity.Entity;
import game.entity.npc.EntityNPC;
import game.init.BlockRegistry;
import game.init.EntityRegistry;
import game.item.ItemBlock;
import game.item.ItemControl;
import game.item.ItemStack;
import game.material.Material;
import game.packet.CPacketAction;
import game.packet.CPacketBreak;
import game.packet.CPacketClick;
import game.packet.CPacketPlace;
import game.sound.PositionedSound;
import game.world.BlockPos;
import game.world.Facing;
import game.world.State;
import game.world.Vec3;
import game.world.World;
import game.world.WorldClient;
import common.block.Block;
import common.entity.Entity;
import common.entity.npc.EntityNPC;
import common.init.BlockRegistry;
import common.init.EntityRegistry;
import common.item.ItemBlock;
import common.item.ItemControl;
import common.item.ItemStack;
import common.material.Material;
import common.packet.CPacketAction;
import common.packet.CPacketBreak;
import common.packet.CPacketClick;
import common.packet.CPacketPlace;
import common.sound.PositionedSound;
import common.world.BlockPos;
import common.world.Facing;
import common.world.State;
import common.world.Vec3;
import common.world.World;
import common.world.WorldClient;
public class PlayerController
{

2
client/src/client/SkinConverter.java
View file

@ -9,7 +9,7 @@ import java.io.IOException;
import javax.imageio.ImageIO;
import game.log.Log;
import common.log.Log;
public abstract class SkinConverter {
private static BufferedImage convertSkin(BufferedImage image) {

7
client/src/client/audio/AudioInterface.java
View file

@ -7,12 +7,13 @@ import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioFormat.Encoding;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.DataLine.Info;
import common.collect.Lists;
import common.log.Log;
import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.SourceDataLine;
import game.collect.Lists;
import game.log.Log;
public class AudioInterface implements Runnable {
private static class Channel {
short[] buffer;

24
client/src/client/audio/SoundManager.java
View file

@ -11,18 +11,18 @@ import java.util.Map;
import java.util.Map.Entry;
import client.Game;
import game.collect.BiMap;
import game.collect.HashBiMap;
import game.collect.Lists;
import game.collect.Maps;
import game.entity.npc.EntityNPC;
import game.init.SoundEvent;
import game.log.Log;
import game.rng.Random;
import game.sound.MovingSound;
import game.sound.Sound;
import game.util.ExtMath;
import game.util.FileUtils;
import common.collect.BiMap;
import common.collect.HashBiMap;
import common.collect.Lists;
import common.collect.Maps;
import common.entity.npc.EntityNPC;
import common.init.SoundEvent;
import common.log.Log;
import common.rng.Random;
import common.sound.MovingSound;
import common.sound.Sound;
import common.util.ExtMath;
import common.util.FileUtils;
public class SoundManager {
private class Source {

8
client/src/client/audio/Volume.java
View file

@ -2,10 +2,10 @@ package client.audio;
import client.Game;
import client.gui.element.Slider;
import game.color.TextColor;
import game.sound.EventType;
import game.vars.CVar;
import game.vars.CVarCategory;
import client.vars.CVar;
import client.vars.CVarCategory;
import common.color.TextColor;
import common.sound.EventType;
public enum Volume implements CVar {
MASTER("master", "Gesamt"),

4
client/src/client/gui/Font.java
View file

@ -8,8 +8,8 @@ import org.lwjgl.opengl.GL11;
import client.renderer.GlState;
import client.renderer.texture.TextureUtil;
import game.log.Log;
import game.util.FileUtils;
import common.log.Log;
import common.util.FileUtils;
public class Font {
public static final FontChar[] SIZES = new FontChar[256];

2
client/src/client/gui/Gui.java
View file

@ -13,7 +13,7 @@ import client.renderer.GlState;
import client.window.Bind;
import client.window.Button;
import client.window.Keysym;
import game.collect.Lists;
import common.collect.Lists;
public abstract class Gui {
public static final String DIRT_BACKGROUND = "textures/background.png";

14
client/src/client/gui/GuiConnect.java
View file

@ -11,13 +11,13 @@ import client.gui.element.GuiList;
import client.gui.element.ListEntry;
import client.gui.element.NavButton;
import client.renderer.Drawing;
import game.color.TextColor;
import game.init.Config;
import game.log.Log;
import game.network.IPlayer;
import game.util.FileUtils;
import game.util.Tuple;
import game.util.Util;
import common.color.TextColor;
import common.init.Config;
import common.log.Log;
import common.network.IPlayer;
import common.util.FileUtils;
import common.util.Tuple;
import common.util.Util;
public class GuiConnect extends GuiList<GuiConnect.ServerInfo> implements ActButton.Callback {
public class ServerInfo implements Comparable<ServerInfo>, ListEntry {

18
client/src/client/gui/GuiConsole.java
View file

@ -8,17 +8,17 @@ import client.gui.element.Fill;
import client.gui.element.Textbox;
import client.gui.element.Textbox.Action;
import client.network.ClientPlayer;
import client.vars.BoolVar;
import client.vars.CVar;
import client.gui.element.TransparentBox;
import client.window.Keysym;
import game.collect.Lists;
import game.color.TextColor;
import game.network.IPlayer;
import game.packet.CPacketComplete;
import game.util.ExtMath;
import game.vars.BoolVar;
import game.vars.CVar;
import game.world.BlockPos;
import game.world.HitPosition;
import common.collect.Lists;
import common.color.TextColor;
import common.network.IPlayer;
import common.packet.CPacketComplete;
import common.util.ExtMath;
import common.world.BlockPos;
import common.world.HitPosition;
public class GuiConsole extends Gui implements Textbox.Callback {
public static final GuiConsole INSTANCE = new GuiConsole();

16
client/src/client/gui/GuiConvert.java
View file

@ -13,14 +13,14 @@ import client.gui.element.GuiList;
import client.gui.element.ListEntry;
import client.gui.element.NavButton;
import client.renderer.Drawing;
import game.color.TextColor;
import game.dimension.Space;
import game.log.Log;
import game.world.Converter;
import game.world.Region;
import game.world.Region.FolderInfo;
import game.world.Region.SaveVersion;
import game.world.World;
import client.world.Converter;
import common.color.TextColor;
import common.dimension.Space;
import common.log.Log;
import common.world.Region;
import common.world.World;
import common.world.Region.FolderInfo;
import common.world.Region.SaveVersion;
public class GuiConvert extends GuiList<GuiConvert.SaveInfo> implements ActButton.Callback
{

6
client/src/client/gui/GuiInfo.java
View file

@ -2,9 +2,9 @@ package client.gui;
import client.gui.element.NavButton;
import client.gui.element.TransparentBox;
import game.color.TextColor;
import game.init.Config;
import game.log.Log;
import common.color.TextColor;
import common.init.Config;
import common.log.Log;
public class GuiInfo extends Gui {
private static final String VER =

8
client/src/client/gui/GuiMenu.java
View file

@ -11,10 +11,10 @@ import client.gui.element.Textbox;
import client.gui.options.GuiOptions;
import client.renderer.Drawing;
import client.window.Keysym;
import game.color.TextColor;
import game.init.Config;
import game.rng.Random;
import game.util.ExtMath;
import common.color.TextColor;
import common.init.Config;
import common.rng.Random;
import common.util.ExtMath;
public class GuiMenu extends Gui {
public static final GuiMenu INSTANCE = new GuiMenu();

10
client/src/client/gui/GuiServer.java
View file

@ -6,11 +6,11 @@ import client.gui.element.Label;
import client.gui.element.NavButton;
import client.gui.element.Textbox;
import client.gui.element.Textbox.Action;
import game.color.TextColor;
import game.init.Config;
import game.network.IPlayer;
import game.vars.CVarCategory;
import game.vars.Variable;
import client.vars.CVarCategory;
import client.vars.Variable;
import common.color.TextColor;
import common.init.Config;
import common.network.IPlayer;
public class GuiServer extends Gui implements Textbox.Callback {
public static final GuiServer INSTANCE = new GuiServer(null);

10
client/src/client/gui/Style.java
View file

@ -1,10 +1,10 @@
package client.gui;
import game.util.Displayable;
import game.util.Identifyable;
import game.vars.CVarCategory;
import game.vars.Variable;
import game.vars.Variable.IntType;
import client.vars.CVarCategory;
import client.vars.Variable;
import client.vars.Variable.IntType;
import common.util.Displayable;
import common.util.Identifyable;
public enum Style implements Identifyable, Displayable {
DEFAULT("default", "Standard"), SHINY("shiny", "Glänzend"), GRAY("gray", "Grau"), BLUE("blue", "Blau"), CUSTOM("custom", "Angepasst");

56
client/src/client/gui/character/GuiChar.java
View file

@ -35,35 +35,35 @@ import client.renderer.GlState;
import client.renderer.ItemRenderer;
import client.renderer.entity.RenderManager;
import client.renderer.texture.EntityTexManager;
import client.vars.CVarCategory;
import client.vars.EnumVar;
import client.vars.Variable;
import client.vars.EnumVar.EnumFunction;
import client.window.Button;
import game.collect.Lists;
import game.dimension.DimType;
import game.dimension.Dimension;
import game.entity.npc.Alignment;
import game.entity.npc.CharacterInfo;
import game.entity.npc.EntityHuman;
import game.entity.npc.EntityNPC;
import game.entity.npc.SpeciesInfo;
import game.entity.types.EntityLiving;
import game.init.EntityEggInfo;
import game.init.EntityRegistry;
import game.init.SpeciesRegistry;
import game.init.SpeciesRegistry.ModelType;
import game.init.UniverseRegistry;
import game.log.Log;
import game.network.IPlayer;
import game.packet.CPacketAction;
import game.packet.CPacketMessage;
import game.packet.CPacketSkin;
import game.rng.Random;
import game.util.Displayable;
import game.util.FileUtils;
import game.util.Identifyable;
import game.util.Util;
import game.vars.CVarCategory;
import game.vars.EnumVar;
import game.vars.EnumVar.EnumFunction;
import game.vars.Variable;
import common.collect.Lists;
import common.dimension.DimType;
import common.dimension.Dimension;
import common.entity.npc.Alignment;
import common.entity.npc.CharacterInfo;
import common.entity.npc.EntityHuman;
import common.entity.npc.EntityNPC;
import common.entity.npc.SpeciesInfo;
import common.entity.types.EntityLiving;
import common.init.EntityEggInfo;
import common.init.EntityRegistry;
import common.init.SpeciesRegistry;
import common.init.UniverseRegistry;
import common.init.SpeciesRegistry.ModelType;
import common.log.Log;
import common.network.IPlayer;
import common.packet.CPacketAction;
import common.packet.CPacketMessage;
import common.packet.CPacketSkin;
import common.rng.Random;
import common.util.Displayable;
import common.util.FileUtils;
import common.util.Identifyable;
import common.util.Util;
public class GuiChar extends GuiList<GuiChar.SkinEntry>
{

6
client/src/client/gui/character/GuiCharacters.java
View file

@ -9,9 +9,9 @@ import client.gui.element.ListEntry;
import client.gui.element.NavButton;
import client.gui.element.TransparentBox;
import client.renderer.Drawing;
import game.color.TextColor;
import game.entity.npc.PlayerCharacter;
import game.packet.CPacketAction;
import common.color.TextColor;
import common.entity.npc.PlayerCharacter;
import common.packet.CPacketAction;
public class GuiCharacters extends GuiList<GuiCharacters.CharacterEntry> implements ActButton.Callback
{

2
client/src/client/gui/character/GuiClass.java
View file

@ -6,7 +6,7 @@ import client.gui.element.GuiList;
import client.gui.element.ListEntry;
import client.gui.element.NavButton;
import client.renderer.Drawing;
import game.packet.CPacketAction;
import common.packet.CPacketAction;
public class GuiClass extends GuiList<GuiClass.ClassEntry> implements ActButton.Callback
{

8
client/src/client/gui/character/GuiSpecies.java
View file

@ -6,10 +6,10 @@ import client.gui.element.GuiList;
import client.gui.element.ListEntry;
import client.gui.element.NavButton;
import client.renderer.Drawing;
import game.entity.npc.SpeciesInfo;
import game.init.EntityRegistry;
import game.init.SpeciesRegistry;
import game.packet.CPacketAction;
import common.entity.npc.SpeciesInfo;
import common.init.EntityRegistry;
import common.init.SpeciesRegistry;
import common.packet.CPacketAction;
public class GuiSpecies extends GuiList<GuiSpecies.SpeciesEntry> implements ActButton.Callback
{

6
client/src/client/gui/container/GuiBrewing.java
View file

@ -1,8 +1,8 @@
package client.gui.container;
import game.inventory.ContainerBrewingStand;
import game.inventory.IInventory;
import game.inventory.InventoryPlayer;
import common.inventory.ContainerBrewingStand;
import common.inventory.IInventory;
import common.inventory.InventoryPlayer;
public class GuiBrewing extends GuiContainer

4
client/src/client/gui/container/GuiChest.java
View file

@ -1,8 +1,8 @@
package client.gui.container;
import client.Game;
import game.inventory.ContainerChest;
import game.inventory.IInventory;
import common.inventory.ContainerChest;
import common.inventory.IInventory;
public class GuiChest extends GuiContainer

20
client/src/client/gui/container/GuiContainer.java
View file

@ -13,16 +13,16 @@ import client.renderer.GlState;
import client.renderer.ItemRenderer;
import client.renderer.entity.RenderItem;
import client.window.Button;
import game.collect.Lists;
import game.collect.Sets;
import game.color.TextColor;
import game.inventory.Container;
import game.inventory.InventoryPlayer;
import game.inventory.Slot;
import game.item.CheatTab;
import game.item.ItemStack;
import game.packet.CPacketCheat;
import game.util.ExtMath;
import common.collect.Lists;
import common.collect.Sets;
import common.color.TextColor;
import common.inventory.Container;
import common.inventory.InventoryPlayer;
import common.inventory.Slot;
import common.item.CheatTab;
import common.item.ItemStack;
import common.packet.CPacketCheat;
import common.util.ExtMath;
public abstract class GuiContainer extends Gui
{

8
client/src/client/gui/container/GuiCrafting.java
View file

@ -1,9 +1,9 @@
package client.gui.container;
import game.inventory.ContainerWorkbench;
import game.inventory.InventoryPlayer;
import game.world.BlockPos;
import game.world.World;
import common.inventory.ContainerWorkbench;
import common.inventory.InventoryPlayer;
import common.world.BlockPos;
import common.world.World;
public class GuiCrafting extends GuiContainer
{

6
client/src/client/gui/container/GuiDispenser.java
View file

@ -1,8 +1,8 @@
package client.gui.container;
import game.inventory.ContainerDispenser;
import game.inventory.IInventory;
import game.inventory.InventoryPlayer;
import common.inventory.ContainerDispenser;
import common.inventory.IInventory;
import common.inventory.InventoryPlayer;
public class GuiDispenser extends GuiContainer

14
client/src/client/gui/container/GuiEnchant.java
View file

@ -1,12 +1,12 @@
package client.gui.container;
import game.color.TextColor;
import game.enchantment.Enchantment;
import game.inventory.ContainerEnchantment;
import game.inventory.InventoryPlayer;
import game.rng.Random;
import game.tileentity.IWorldNameable;
import game.world.World;
import common.color.TextColor;
import common.enchantment.Enchantment;
import common.inventory.ContainerEnchantment;
import common.inventory.InventoryPlayer;
import common.rng.Random;
import common.tileentity.IWorldNameable;
import common.world.World;
public class GuiEnchant extends GuiContainer
{

8
client/src/client/gui/container/GuiFurnace.java
View file

@ -1,9 +1,9 @@
package client.gui.container;
import game.inventory.ContainerFurnace;
import game.inventory.IInventory;
import game.inventory.InventoryPlayer;
import game.tileentity.TileEntityFurnace;
import common.inventory.ContainerFurnace;
import common.inventory.IInventory;
import common.inventory.InventoryPlayer;
import common.tileentity.TileEntityFurnace;
public class GuiFurnace extends GuiContainer

6
client/src/client/gui/container/GuiHopper.java
View file

@ -1,9 +1,9 @@
package client.gui.container;
import client.Game;
import game.inventory.ContainerHopper;
import game.inventory.IInventory;
import game.inventory.InventoryPlayer;
import common.inventory.ContainerHopper;
import common.inventory.IInventory;
import common.inventory.InventoryPlayer;
public class GuiHopper extends GuiContainer

6
client/src/client/gui/container/GuiHorse.java
View file

@ -1,9 +1,9 @@
package client.gui.container;
import client.Game;
import game.entity.animal.EntityHorse;
import game.inventory.ContainerHorseInventory;
import game.inventory.IInventory;
import common.entity.animal.EntityHorse;
import common.inventory.ContainerHorseInventory;
import common.inventory.IInventory;
public class GuiHorse extends GuiContainer

2
client/src/client/gui/container/GuiInventory.java
View file

@ -1,6 +1,6 @@
package client.gui.container;
import game.entity.npc.EntityNPC;
import common.entity.npc.EntityNPC;
public class GuiInventory extends GuiContainer
{

8
client/src/client/gui/container/GuiMachine.java
View file

@ -1,10 +1,10 @@
package client.gui.container;
import client.Game;
import game.inventory.ContainerMachine;
import game.inventory.IInventory;
import game.inventory.InventoryPlayer;
import game.tileentity.TileEntityMachine;
import common.inventory.ContainerMachine;
import common.inventory.IInventory;
import common.inventory.InventoryPlayer;
import common.tileentity.TileEntityMachine;
public class GuiMachine extends GuiContainer

14
client/src/client/gui/container/GuiMerchant.java
View file

@ -4,13 +4,13 @@ import org.lwjgl.opengl.GL11;
import client.renderer.GlState;
import client.renderer.ItemRenderer;
import game.inventory.ContainerMerchant;
import game.inventory.InventoryPlayer;
import game.item.ItemStack;
import game.packet.CPacketAction;
import game.village.MerchantRecipe;
import game.village.MerchantRecipeList;
import game.world.World;
import common.inventory.ContainerMerchant;
import common.inventory.InventoryPlayer;
import common.item.ItemStack;
import common.packet.CPacketAction;
import common.village.MerchantRecipe;
import common.village.MerchantRecipeList;
import common.world.World;
public class GuiMerchant extends GuiContainer
{

14
client/src/client/gui/container/GuiRepair.java
View file

@ -3,13 +3,13 @@ package client.gui.container;
import java.util.List;
import client.Game;
import game.inventory.Container;
import game.inventory.ContainerRepair;
import game.inventory.ICrafting;
import game.inventory.IInventory;
import game.inventory.InventoryPlayer;
import game.item.ItemStack;
import game.world.World;
import common.inventory.Container;
import common.inventory.ContainerRepair;
import common.inventory.ICrafting;
import common.inventory.IInventory;
import common.inventory.InventoryPlayer;
import common.item.ItemStack;
import common.world.World;
public class GuiRepair extends GuiContainer implements ICrafting
{

4
client/src/client/gui/element/Bar.java
View file

@ -1,8 +1,8 @@
package client.gui.element;
import client.renderer.Drawing;
import game.util.ExtMath;
import game.util.Util;
import common.util.ExtMath;
import common.util.Util;
public class Bar extends Fill {
private int color = 0x00ff00;

6
client/src/client/gui/element/Dropdown.java
View file

@ -5,9 +5,9 @@ import client.gui.Formatter;
import client.gui.Gui;
import client.renderer.Drawing;
import client.window.Button;
import game.util.Displayable;
import game.util.ExtMath;
import game.util.Util;
import common.util.Displayable;
import common.util.ExtMath;
import common.util.Util;
public class Dropdown<T> extends Element {
public class Handle extends Element {

8
client/src/client/gui/element/Element.java
View file

@ -9,10 +9,10 @@ import client.renderer.Drawing;
import client.renderer.Drawing.Vec2i;
import client.window.Button;
import client.window.Keysym;
import game.init.SoundEvent;
import game.sound.EventType;
import game.sound.PositionedSound;
import game.util.Util;
import common.init.SoundEvent;
import common.sound.EventType;
import common.sound.PositionedSound;
import common.util.Util;
public abstract class Element {
protected final Game gm = Game.getGame();

4
client/src/client/gui/element/GuiList.java
View file

@ -11,8 +11,8 @@ import client.renderer.GlState;
import client.renderer.RenderBuffer;
import client.renderer.Tessellator;
import client.window.Button;
import game.collect.Lists;
import game.util.ExtMath;
import common.collect.Lists;
import common.util.ExtMath;
public abstract class GuiList<T extends ListEntry> extends Gui
{

2
client/src/client/gui/element/Label.java
View file

@ -1,7 +1,7 @@
package client.gui.element;
import client.renderer.Drawing;
import game.util.Util;
import common.util.Util;
public class Label extends Fill {
public Label(int x, int y, int w, int h, String text, boolean top, boolean left) {

2
client/src/client/gui/element/NavButton.java
View file

@ -3,7 +3,7 @@ package client.gui.element;
import client.Game;
import client.gui.Gui;
import client.renderer.Drawing;
import game.util.Util;
import common.util.Util;
public class NavButton extends ActButton {
private final Gui navGui;

2
client/src/client/gui/element/SelectableButton.java
View file

@ -1,7 +1,7 @@
package client.gui.element;
import client.renderer.Drawing;
import game.util.Util;
import common.util.Util;
public class SelectableButton extends ActButton {
private boolean selected;

4
client/src/client/gui/element/Slider.java
View file

@ -3,8 +3,8 @@ package client.gui.element;
import client.gui.Formatter;
import client.renderer.Drawing;
import client.window.Button;
import game.util.ExtMath;
import game.util.Util;
import common.util.ExtMath;
import common.util.Util;
public class Slider extends Element {
public static interface Callback {

4
client/src/client/gui/element/Switch.java
View file

@ -2,8 +2,8 @@ package client.gui.element;
import client.gui.Formatter;
import client.window.Button;
import game.util.Displayable;
import game.util.Util;
import common.util.Displayable;
import common.util.Util;
public class Switch<T> extends Element {
public static interface Callback<T> {

6
client/src/client/gui/element/Textbox.java
View file

@ -10,9 +10,9 @@ import client.renderer.Drawing.Vec2i;
import client.window.Button;
import client.window.Keysym;
import client.window.Window;
import game.util.CharValidator;
import game.util.ExtMath;
import game.util.Util;
import common.util.CharValidator;
import common.util.ExtMath;
import common.util.Util;
public class Textbox extends Element {
public static enum Action {

2
client/src/client/gui/element/Toggle.java
View file

@ -3,7 +3,7 @@ package client.gui.element;
import client.gui.Formatter;
import client.renderer.Drawing;
import client.window.Button;
import game.util.Util;
import common.util.Util;
public class Toggle extends Element {
public static interface Callback {

2
client/src/client/gui/ingame/GuiGameOver.java
View file

@ -3,8 +3,8 @@ package client.gui.ingame;
import client.gui.Gui;
import client.gui.element.ActButton;
import client.gui.element.ActButton.Mode;
import common.color.TextColor;
import client.gui.element.Label;
import game.color.TextColor;
public class GuiGameOver extends Gui {
public static final GuiGameOver INSTANCE = new GuiGameOver();

4
client/src/client/gui/ingame/GuiSign.java
View file

@ -5,8 +5,8 @@ import client.gui.element.NavButton;
import client.gui.element.Textbox;
import client.gui.element.Textbox.Action;
import client.network.ClientPlayer;
import game.packet.CPacketSign;
import game.world.BlockPos;
import common.packet.CPacketSign;
import common.world.BlockPos;
public class GuiSign extends Gui implements Textbox.Callback {
private final BlockPos position;

2
client/src/client/gui/options/GuiBinds.java
View file

@ -5,7 +5,7 @@ import client.gui.element.ActButton;
import client.gui.element.ActButton.Mode;
import client.gui.element.Label;
import client.window.Bind;
import game.color.TextColor;
import common.color.TextColor;
public class GuiBinds extends GuiOptions {
protected GuiBinds() {

2
client/src/client/gui/options/GuiDisplay.java
View file

@ -9,7 +9,7 @@ import client.gui.element.Toggle;
import client.window.Button;
import client.window.DisplayMode;
import client.window.Window;
import game.color.TextColor;
import common.color.TextColor;
public class GuiDisplay extends GuiOptions {
private static final String[] DISTANCES = new String[] {"Gruselig", "Winzig", "Gering", "Normal", "Weit"};

4
client/src/client/gui/options/GuiStyle.java
View file

@ -10,9 +10,9 @@ import client.gui.element.Slider;
import client.gui.element.Switch;
import client.gui.element.Textbox;
import client.gui.element.Textbox.Action;
import client.vars.CVar;
import client.vars.ColorVar;
import client.gui.element.Toggle;
import game.vars.CVar;
import game.vars.ColorVar;
public class GuiStyle extends GuiOptions implements Dropdown.Callback<String>, ActButton.Callback, Toggle.Callback, Switch.Callback<String>, Slider.Callback, Textbox.Callback {
private static final String[] STYLE_CVARS = {

88
client/src/client/init/EntityRenderRegistry.java
View file

@ -54,50 +54,50 @@ import client.renderer.model.ModelRabbit;
import client.renderer.model.ModelSheep2;
import client.renderer.model.ModelSquid;
import client.renderer.model.ModelWolf;
import game.entity.Entity;
import game.entity.animal.EntityBat;
import game.entity.animal.EntityChicken;
import game.entity.animal.EntityCow;
import game.entity.animal.EntityDragon;
import game.entity.animal.EntityHorse;
import game.entity.animal.EntityMooshroom;
import game.entity.animal.EntityMouse;
import game.entity.animal.EntityOcelot;
import game.entity.animal.EntityPig;
import game.entity.animal.EntityRabbit;
import game.entity.animal.EntitySheep;
import game.entity.animal.EntitySquid;
import game.entity.animal.EntityWolf;
import game.entity.effect.EntityLightning;
import game.entity.item.EntityBoat;
import game.entity.item.EntityCart;
import game.entity.item.EntityCrystal;
import game.entity.item.EntityFalling;
import game.entity.item.EntityFireworks;
import game.entity.item.EntityItem;
import game.entity.item.EntityLeashKnot;
import game.entity.item.EntityNuke;
import game.entity.item.EntityOrb;
import game.entity.item.EntityTnt;
import game.entity.item.EntityTntCart;
import game.entity.item.EntityXp;
import game.entity.item.EntityXpBottle;
import game.entity.npc.SpeciesInfo;
import game.entity.projectile.EntityArrow;
import game.entity.projectile.EntityBox;
import game.entity.projectile.EntityBullet;
import game.entity.projectile.EntityDie;
import game.entity.projectile.EntityDynamite;
import game.entity.projectile.EntityEgg;
import game.entity.projectile.EntityFireCharge;
import game.entity.projectile.EntityFireball;
import game.entity.projectile.EntityHook;
import game.entity.projectile.EntityPotion;
import game.entity.projectile.EntitySnowball;
import game.init.Blocks;
import game.init.Items;
import game.init.SpeciesRegistry;
import game.init.SpeciesRegistry.ModelType;
import common.entity.Entity;
import common.entity.animal.EntityBat;
import common.entity.animal.EntityChicken;
import common.entity.animal.EntityCow;
import common.entity.animal.EntityDragon;
import common.entity.animal.EntityHorse;
import common.entity.animal.EntityMooshroom;
import common.entity.animal.EntityMouse;
import common.entity.animal.EntityOcelot;
import common.entity.animal.EntityPig;
import common.entity.animal.EntityRabbit;
import common.entity.animal.EntitySheep;
import common.entity.animal.EntitySquid;
import common.entity.animal.EntityWolf;
import common.entity.effect.EntityLightning;
import common.entity.item.EntityBoat;
import common.entity.item.EntityCart;
import common.entity.item.EntityCrystal;
import common.entity.item.EntityFalling;
import common.entity.item.EntityFireworks;
import common.entity.item.EntityItem;
import common.entity.item.EntityLeashKnot;
import common.entity.item.EntityNuke;
import common.entity.item.EntityOrb;
import common.entity.item.EntityTnt;
import common.entity.item.EntityTntCart;
import common.entity.item.EntityXp;
import common.entity.item.EntityXpBottle;
import common.entity.npc.SpeciesInfo;
import common.entity.projectile.EntityArrow;
import common.entity.projectile.EntityBox;
import common.entity.projectile.EntityBullet;
import common.entity.projectile.EntityDie;
import common.entity.projectile.EntityDynamite;
import common.entity.projectile.EntityEgg;
import common.entity.projectile.EntityFireCharge;
import common.entity.projectile.EntityFireball;
import common.entity.projectile.EntityHook;
import common.entity.projectile.EntityPotion;
import common.entity.projectile.EntitySnowball;
import common.init.Blocks;
import common.init.Items;
import common.init.SpeciesRegistry;
import common.init.SpeciesRegistry.ModelType;
public abstract class EntityRenderRegistry {
public static void registerRenderers(Map<Class<? extends Entity>, Render<? extends Entity>> map,

14
client/src/client/network/ClientLoginHandler.java
View file

@ -1,13 +1,13 @@
package client.network;
import client.Game;
import game.network.IClientLoginHandler;
import game.network.NetConnection;
import game.network.NetHandler;
import game.network.PacketRegistry;
import game.packet.RPacketDisconnect;
import game.packet.RPacketEnableCompression;
import game.packet.RPacketLoginSuccess;
import common.network.IClientLoginHandler;
import common.network.NetConnection;
import common.network.NetHandler;
import common.network.PacketRegistry;
import common.packet.RPacketDisconnect;
import common.packet.RPacketEnableCompression;
import common.packet.RPacketLoginSuccess;
public class ClientLoginHandler extends NetHandler implements IClientLoginHandler {
private final Game gm;

222
client/src/client/network/ClientPlayer.java
View file

@ -27,117 +27,117 @@ import client.gui.container.GuiRepair;
import client.gui.ingame.GuiSign;
import client.renderer.particle.EntityPickupFX;
import client.renderer.texture.EntityTexManager;
import game.collect.Lists;
import game.collect.Maps;
import game.dimension.Dimension;
import game.entity.DataWatcher;
import game.entity.Entity;
import game.entity.animal.EntityHorse;
import game.entity.attributes.Attribute;
import game.entity.attributes.AttributeInstance;
import game.entity.attributes.AttributeMap;
import game.entity.attributes.AttributeModifier;
import game.entity.effect.EntityLightning;
import game.entity.item.EntityBoat;
import game.entity.item.EntityXp;
import game.entity.npc.EntityNPC;
import game.entity.npc.PlayerCharacter;
import game.entity.projectile.EntityProjectile;
import game.entity.types.EntityLiving;
import game.init.EntityRegistry;
import game.init.ItemRegistry;
import game.init.SoundEvent;
import game.inventory.AnimalChest;
import game.inventory.Container;
import game.inventory.ContainerLocalMenu;
import game.inventory.IInventory;
import game.inventory.InventoryBasic;
import game.inventory.InventoryPlayer;
import game.item.ItemStack;
import game.log.Log;
import game.model.ParticleType;
import game.network.IClientPlayer;
import game.network.NetConnection;
import game.network.NetHandler;
import game.network.Packet;
import game.packet.CPacketAction;
import game.packet.CPacketKeepAlive;
import game.packet.CPacketPlayer;
import game.packet.S14PacketEntity;
import game.packet.S18PacketEntityTeleport;
import game.packet.S19PacketEntityHeadLook;
import game.packet.S1APacketEntityStatus;
import game.packet.S1BPacketEntityAttach;
import game.packet.S1CPacketEntityMetadata;
import game.packet.S1DPacketEntityEffect;
import game.packet.S1EPacketRemoveEntityEffect;
import game.packet.S20PacketEntityProperties;
import game.packet.S27PacketExplosion;
import game.packet.S28PacketEffect;
import game.packet.S29PacketSoundEffect;
import game.packet.S2APacketParticles;
import game.packet.S2BPacketChangeGameState;
import game.packet.S2CPacketSpawnGlobalEntity;
import game.packet.S2DPacketOpenWindow;
import game.packet.S2EPacketCloseWindow;
import game.packet.S2FPacketSetSlot;
import game.packet.S30PacketWindowItems;
import game.packet.S31PacketWindowProperty;
import game.packet.S32PacketConfirmTransaction;
import game.packet.S33PacketUpdateSign;
import game.packet.S35PacketUpdateTileEntity;
import game.packet.S36PacketSignEditorOpen;
import game.packet.S38PacketPlayerListItem;
import game.packet.S39PacketPlayerAbilities;
import game.packet.S3APacketTabComplete;
import game.packet.S43PacketUpdateEntityNBT;
import game.packet.SPacketAnimation;
import game.packet.SPacketBiomes;
import game.packet.SPacketBlockAction;
import game.packet.SPacketBlockBreakAnim;
import game.packet.SPacketBlockChange;
import game.packet.SPacketCamera;
import game.packet.SPacketCharacterList;
import game.packet.SPacketChunkData;
import game.packet.SPacketCollectItem;
import game.packet.SPacketDestroyEntities;
import game.packet.SPacketDimensionName;
import game.packet.SPacketDisconnect;
import game.packet.SPacketEntityEquipment;
import game.packet.SPacketEntityVelocity;
import game.packet.SPacketHeldItemChange;
import game.packet.SPacketJoinGame;
import game.packet.SPacketKeepAlive;
import game.packet.SPacketLoading;
import game.packet.SPacketMapChunkBulk;
import game.packet.SPacketMessage;
import game.packet.SPacketMultiBlockChange;
import game.packet.SPacketPlayerPosLook;
import game.packet.SPacketRespawn;
import game.packet.SPacketServerTick;
import game.packet.SPacketSetExperience;
import game.packet.SPacketSkin;
import game.packet.SPacketSpawnMob;
import game.packet.SPacketSpawnObject;
import game.packet.SPacketSpawnPlayer;
import game.packet.SPacketTimeUpdate;
import game.packet.SPacketTrades;
import game.packet.SPacketUpdateHealth;
import game.packet.SPacketWorld;
import game.potion.PotionEffect;
import game.rng.Random;
import game.tileentity.IInteractionObject;
import game.tileentity.LocalBlockIntercommunication;
import game.tileentity.TileEntity;
import game.tileentity.TileEntityMachine;
import game.tileentity.TileEntitySign;
import game.village.MerchantRecipeList;
import game.world.BlockPos;
import game.world.Chunk;
import game.world.Explosion;
import game.world.Weather;
import game.world.World;
import game.world.WorldClient;
import common.collect.Lists;
import common.collect.Maps;
import common.dimension.Dimension;
import common.entity.DataWatcher;
import common.entity.Entity;
import common.entity.animal.EntityHorse;
import common.entity.attributes.Attribute;
import common.entity.attributes.AttributeInstance;
import common.entity.attributes.AttributeMap;
import common.entity.attributes.AttributeModifier;
import common.entity.effect.EntityLightning;
import common.entity.item.EntityBoat;
import common.entity.item.EntityXp;
import common.entity.npc.EntityNPC;
import common.entity.npc.PlayerCharacter;
import common.entity.projectile.EntityProjectile;
import common.entity.types.EntityLiving;
import common.init.EntityRegistry;
import common.init.ItemRegistry;
import common.init.SoundEvent;
import common.inventory.AnimalChest;
import common.inventory.Container;
import common.inventory.ContainerLocalMenu;
import common.inventory.IInventory;
import common.inventory.InventoryBasic;
import common.inventory.InventoryPlayer;
import common.item.ItemStack;
import common.log.Log;
import common.model.ParticleType;
import common.network.IClientPlayer;
import common.network.NetConnection;
import common.network.NetHandler;
import common.network.Packet;
import common.packet.CPacketAction;
import common.packet.CPacketKeepAlive;
import common.packet.CPacketPlayer;
import common.packet.S14PacketEntity;
import common.packet.S18PacketEntityTeleport;
import common.packet.S19PacketEntityHeadLook;
import common.packet.S1APacketEntityStatus;
import common.packet.S1BPacketEntityAttach;
import common.packet.S1CPacketEntityMetadata;
import common.packet.S1DPacketEntityEffect;
import common.packet.S1EPacketRemoveEntityEffect;
import common.packet.S20PacketEntityProperties;
import common.packet.S27PacketExplosion;
import common.packet.S28PacketEffect;
import common.packet.S29PacketSoundEffect;
import common.packet.S2APacketParticles;
import common.packet.S2BPacketChangeGameState;
import common.packet.S2CPacketSpawnGlobalEntity;
import common.packet.S2DPacketOpenWindow;
import common.packet.S2EPacketCloseWindow;
import common.packet.S2FPacketSetSlot;
import common.packet.S30PacketWindowItems;
import common.packet.S31PacketWindowProperty;
import common.packet.S32PacketConfirmTransaction;
import common.packet.S33PacketUpdateSign;
import common.packet.S35PacketUpdateTileEntity;
import common.packet.S36PacketSignEditorOpen;
import common.packet.S38PacketPlayerListItem;
import common.packet.S39PacketPlayerAbilities;
import common.packet.S3APacketTabComplete;
import common.packet.S43PacketUpdateEntityNBT;
import common.packet.SPacketAnimation;
import common.packet.SPacketBiomes;
import common.packet.SPacketBlockAction;
import common.packet.SPacketBlockBreakAnim;
import common.packet.SPacketBlockChange;
import common.packet.SPacketCamera;
import common.packet.SPacketCharacterList;
import common.packet.SPacketChunkData;
import common.packet.SPacketCollectItem;
import common.packet.SPacketDestroyEntities;
import common.packet.SPacketDimensionName;
import common.packet.SPacketDisconnect;
import common.packet.SPacketEntityEquipment;
import common.packet.SPacketEntityVelocity;
import common.packet.SPacketHeldItemChange;
import common.packet.SPacketJoinGame;
import common.packet.SPacketKeepAlive;
import common.packet.SPacketLoading;
import common.packet.SPacketMapChunkBulk;
import common.packet.SPacketMessage;
import common.packet.SPacketMultiBlockChange;
import common.packet.SPacketPlayerPosLook;
import common.packet.SPacketRespawn;
import common.packet.SPacketServerTick;
import common.packet.SPacketSetExperience;
import common.packet.SPacketSkin;
import common.packet.SPacketSpawnMob;
import common.packet.SPacketSpawnObject;
import common.packet.SPacketSpawnPlayer;
import common.packet.SPacketTimeUpdate;
import common.packet.SPacketTrades;
import common.packet.SPacketUpdateHealth;
import common.packet.SPacketWorld;
import common.potion.PotionEffect;
import common.rng.Random;
import common.tileentity.IInteractionObject;
import common.tileentity.LocalBlockIntercommunication;
import common.tileentity.TileEntity;
import common.tileentity.TileEntityMachine;
import common.tileentity.TileEntitySign;
import common.village.MerchantRecipeList;
import common.world.BlockPos;
import common.world.Chunk;
import common.world.Explosion;
import common.world.Weather;
import common.world.World;
import common.world.WorldClient;
public class ClientPlayer extends NetHandler implements IClientPlayer
{

18
client/src/client/renderer/ActiveRenderInfo.java
View file

@ -7,15 +7,15 @@ import java.nio.IntBuffer;
import org.lwjgl.opengl.GL11;
import game.block.Block;
import game.block.BlockLiquid;
import game.entity.Entity;
import game.entity.npc.EntityNPC;
import game.util.ExtMath;
import game.world.BlockPos;
import game.world.State;
import game.world.Vec3;
import game.world.World;
import common.block.Block;
import common.block.BlockLiquid;
import common.entity.Entity;
import common.entity.npc.EntityNPC;
import common.util.ExtMath;
import common.world.BlockPos;
import common.world.State;
import common.world.Vec3;
import common.world.World;
public class ActiveRenderInfo
{

28
client/src/client/renderer/BlockRenderer.java
View file

@ -14,20 +14,20 @@ import client.renderer.blockmodel.ModelManager;
import client.renderer.texture.TextureAtlasSprite;
import client.renderer.texture.TextureMap;
import client.renderer.tileentity.TileEntityItemStackRenderer;
import game.block.Block;
import game.block.BlockLiquid;
import game.collect.Maps;
import game.init.BlockRegistry;
import game.init.FluidRegistry;
import game.item.ItemStack;
import game.material.Material;
import game.util.ExtMath;
import game.world.BlockPos;
import game.world.Facing;
import game.world.IBlockAccess;
import game.world.IWorldAccess;
import game.world.State;
import game.world.Vec3i;
import common.block.Block;
import common.block.BlockLiquid;
import common.collect.Maps;
import common.init.BlockRegistry;
import common.init.FluidRegistry;
import common.item.ItemStack;
import common.material.Material;
import common.util.ExtMath;
import common.world.BlockPos;
import common.world.Facing;
import common.world.IBlockAccess;
import common.world.IWorldAccess;
import common.world.State;
import common.world.Vec3i;
public class BlockRenderer
{

6
client/src/client/renderer/Drawing.java
View file

@ -5,9 +5,9 @@ import org.lwjgl.opengl.GL11;
import client.Game;
import client.gui.Font;
import client.gui.FontChar;
import game.color.TextColor;
import game.log.Log;
import game.util.Util;
import common.color.TextColor;
import common.log.Log;
import common.util.Util;
public abstract class Drawing {
public static class Vec2i {

40
client/src/client/renderer/EntityRenderer.java
View file

@ -13,26 +13,26 @@ import client.Game;
import client.renderer.particle.EffectRenderer;
import client.renderer.texture.DynamicTexture;
import client.renderer.texture.TextureMap;
import game.biome.Biome;
import game.block.Block;
import game.entity.Entity;
import game.entity.npc.EntityNPC;
import game.entity.types.EntityAnimal;
import game.entity.types.EntityLiving;
import game.init.Items;
import game.init.SoundEvent;
import game.material.Material;
import game.model.BlockLayer;
import game.model.ParticleType;
import game.potion.Potion;
import game.rng.Random;
import game.util.ExtMath;
import game.world.BlockPos;
import game.world.BoundingBox;
import game.world.HitPosition;
import game.world.Vec3;
import game.world.World;
import game.world.WorldClient;
import common.biome.Biome;
import common.block.Block;
import common.entity.Entity;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal;
import common.entity.types.EntityLiving;
import common.init.Items;
import common.init.SoundEvent;
import common.material.Material;
import common.model.BlockLayer;
import common.model.ParticleType;
import common.potion.Potion;
import common.rng.Random;
import common.util.ExtMath;
import common.world.BlockPos;
import common.world.BoundingBox;
import common.world.HitPosition;
import common.world.Vec3;
import common.world.World;
import common.world.WorldClient;
public class EntityRenderer {
private static final String locationMoltenPng = "textures/world/molten.png";

4
client/src/client/renderer/Frustum.java
View file

@ -6,8 +6,8 @@ import java.nio.FloatBuffer;
import org.lwjgl.opengl.GL11;
import game.util.ExtMath;
import game.world.BoundingBox;
import common.util.ExtMath;
import common.world.BoundingBox;
public class Frustum {
private static class ClippingHelper {

12
client/src/client/renderer/ItemModelMesher.java
View file

@ -6,12 +6,12 @@ import java.util.Map;
import client.renderer.blockmodel.IBakedModel;
import client.renderer.blockmodel.ModelManager;
import client.renderer.texture.TextureAtlasSprite;
import game.collect.Lists;
import game.collect.Maps;
import game.init.ItemRegistry;
import game.item.Item;
import game.item.ItemStack;
import game.model.ItemMeshDefinition;
import common.collect.Lists;
import common.collect.Maps;
import common.init.ItemRegistry;
import common.item.Item;
import common.item.ItemStack;
import common.model.ItemMeshDefinition;
public class ItemModelMesher
{

24
client/src/client/renderer/ItemRenderer.java
View file

@ -14,18 +14,18 @@ import client.renderer.entity.RenderNpc;
import client.renderer.texture.EntityTexManager;
import client.renderer.texture.TextureAtlasSprite;
import client.renderer.texture.TextureMap;
import game.block.Block;
import game.entity.npc.EntityNPC;
import game.entity.types.EntityLiving;
import game.item.Item;
import game.item.ItemAction;
import game.item.ItemStack;
import game.model.BlockLayer;
import game.model.Transforms;
import game.util.ExtMath;
import game.world.BlockPos;
import game.world.State;
import game.world.Vec3;
import common.block.Block;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving;
import common.item.Item;
import common.item.ItemAction;
import common.item.ItemStack;
import common.model.BlockLayer;
import common.model.Transforms;
import common.util.ExtMath;
import common.world.BlockPos;
import common.world.State;
import common.world.Vec3;
public class ItemRenderer

24
client/src/client/renderer/RegionRenderCache.java
View file

@ -2,18 +2,18 @@ package client.renderer;
import java.util.Arrays;
import game.biome.Biome;
import game.init.Blocks;
import game.tileentity.TileEntity;
import game.world.BlockPos;
import game.world.Chunk;
import game.world.ChunkCache;
import game.world.Facing;
import game.world.IWorldAccess;
import game.world.LightType;
import game.world.State;
import game.world.Vec3i;
import game.world.World;
import common.biome.Biome;
import common.init.Blocks;
import common.tileentity.TileEntity;
import common.world.BlockPos;
import common.world.Chunk;
import common.world.ChunkCache;
import common.world.Facing;
import common.world.IWorldAccess;
import common.world.LightType;
import common.world.State;
import common.world.Vec3i;
import common.world.World;
public class RegionRenderCache extends ChunkCache implements IWorldAccess
{

2
client/src/client/renderer/RegionRenderCacheBuilder.java
View file

@ -1,6 +1,6 @@
package client.renderer;
import game.model.BlockLayer;
import common.model.BlockLayer;
public class RegionRenderCacheBuilder
{

4
client/src/client/renderer/RenderBuffer.java
View file

@ -9,8 +9,8 @@ import java.util.Arrays;
import java.util.BitSet;
import java.util.Comparator;
import game.log.Log;
import game.util.ExtMath;
import common.log.Log;
import common.util.ExtMath;
public class RenderBuffer
{

56
client/src/client/renderer/RenderGlobal.java
View file

@ -25,34 +25,34 @@ import client.renderer.texture.TextureAtlasSprite;
import client.renderer.texture.TextureManager;
import client.renderer.texture.TextureMap;
import client.renderer.tileentity.TileEntityRendererDispatcher;
import game.block.Block;
import game.block.BlockChest;
import game.block.BlockSign;
import game.block.BlockSkull;
import game.collect.Lists;
import game.collect.Maps;
import game.collect.Sets;
import game.entity.Entity;
import game.entity.npc.EntityNPC;
import game.entity.projectile.EntityBox;
import game.entity.types.EntityLiving;
import game.material.Material;
import game.model.BlockLayer;
import game.rng.Random;
import game.sound.Sound;
import game.tileentity.TileEntity;
import game.tileentity.TileEntityChest;
import game.util.ExtMath;
import game.util.Vector3f;
import game.world.BlockPos;
import game.world.BoundingBox;
import game.world.Chunk;
import game.world.ClassInheritanceMultiMap;
import game.world.Facing;
import game.world.HitPosition;
import game.world.State;
import game.world.Vec3;
import game.world.WorldClient;
import common.block.Block;
import common.block.BlockChest;
import common.block.BlockSign;
import common.block.BlockSkull;
import common.collect.Lists;
import common.collect.Maps;
import common.collect.Sets;
import common.entity.Entity;
import common.entity.npc.EntityNPC;
import common.entity.projectile.EntityBox;
import common.entity.types.EntityLiving;
import common.material.Material;
import common.model.BlockLayer;
import common.rng.Random;
import common.sound.Sound;
import common.tileentity.TileEntity;
import common.tileentity.TileEntityChest;
import common.util.ExtMath;
import common.util.Vector3f;
import common.world.BlockPos;
import common.world.BoundingBox;
import common.world.Chunk;
import common.world.ClassInheritanceMultiMap;
import common.world.Facing;
import common.world.HitPosition;
import common.world.State;
import common.world.Vec3;
import common.world.WorldClient;
public class RenderGlobal
{

4
client/src/client/renderer/VertexFormat.java
View file

@ -2,8 +2,8 @@ package client.renderer;
import java.util.List;
import game.collect.Lists;
import game.log.Log;
import common.collect.Lists;
import common.log.Log;
public class VertexFormat
{

2
client/src/client/renderer/VertexFormatElement.java
View file

@ -2,7 +2,7 @@ package client.renderer;
import org.lwjgl.opengl.GL11;
import game.log.Log;
import common.log.Log;
public class VertexFormatElement
{

6
client/src/client/renderer/ViewFrustum.java
View file

@ -1,9 +1,9 @@
package client.renderer;
import client.renderer.chunk.RenderChunk;
import game.util.ExtMath;
import game.world.BlockPos;
import game.world.World;
import common.util.ExtMath;
import common.world.BlockPos;
import common.world.World;
public class ViewFrustum
{

6
client/src/client/renderer/blockmodel/BakedModel.java
View file

@ -4,9 +4,9 @@ import java.util.ArrayList;
import java.util.List;
import client.renderer.texture.TextureAtlasSprite;
import game.collect.Lists;
import game.model.Transforms;
import game.world.Facing;
import common.collect.Lists;
import common.model.Transforms;
import common.world.Facing;
public class BakedModel implements IBakedModel
{

2
client/src/client/renderer/blockmodel/BakedQuad.java
View file

@ -1,6 +1,6 @@
package client.renderer.blockmodel;
import game.world.Facing;
import common.world.Facing;
public class BakedQuad {
protected final int[] data;

4
client/src/client/renderer/blockmodel/BlockPart.java
View file

@ -2,8 +2,8 @@ package client.renderer.blockmodel;
import java.util.Map;
import game.util.Vector3f;
import game.world.Facing;
import common.util.Vector3f;
import common.world.Facing;
public class BlockPart
{

2
client/src/client/renderer/blockmodel/BlockPartFace.java
View file

@ -1,7 +1,7 @@
package client.renderer.blockmodel;
import client.renderer.texture.TextureMap;
import game.world.Facing;
import common.world.Facing;
public class BlockPartFace {
public Facing cull;

4
client/src/client/renderer/blockmodel/BlockPartRotation.java
View file

@ -1,7 +1,7 @@
package client.renderer.blockmodel;
import game.util.Vector3f;
import game.world.Facing;
import common.util.Vector3f;
import common.world.Facing;
public class BlockPartRotation {
public final Vector3f origin;

4
client/src/client/renderer/blockmodel/BuiltInModel.java
View file

@ -3,8 +3,8 @@ package client.renderer.blockmodel;
import java.util.List;
import client.renderer.texture.TextureAtlasSprite;
import game.model.Transforms;
import game.world.Facing;
import common.model.Transforms;
import common.world.Facing;
public class BuiltInModel implements IBakedModel
{

14
client/src/client/renderer/blockmodel/FaceBakery.java
View file

@ -1,13 +1,13 @@
package client.renderer.blockmodel;
import client.renderer.texture.TextureAtlasSprite;
import game.model.ModelRotation;
import game.util.ExtMath;
import game.util.Matrix4f;
import game.util.Vector3f;
import game.util.Vector4f;
import game.world.Facing;
import game.world.Vec3i;
import common.model.ModelRotation;
import common.util.ExtMath;
import common.util.Matrix4f;
import common.util.Vector3f;
import common.util.Vector4f;
import common.world.Facing;
import common.world.Vec3i;
public class FaceBakery
{

4
client/src/client/renderer/blockmodel/IBakedModel.java
View file

@ -3,8 +3,8 @@ package client.renderer.blockmodel;
import java.util.List;
import client.renderer.texture.TextureAtlasSprite;
import game.model.Transforms;
import game.world.Facing;
import common.model.Transforms;
import common.world.Facing;
public interface IBakedModel
{

26
client/src/client/renderer/blockmodel/ModelBakery.java
View file

@ -10,19 +10,19 @@ import java.util.Set;
import client.renderer.texture.IIconCreator;
import client.renderer.texture.TextureAtlasSprite;
import client.renderer.texture.TextureMap;
import game.collect.Lists;
import game.collect.Maps;
import game.collect.Sets;
import game.init.BlockRegistry;
import game.init.FluidRegistry;
import game.init.IRegistry;
import game.init.ItemRegistry;
import game.init.RegistrySimple;
import game.item.Item;
import game.item.ItemStack;
import game.model.ModelRotation;
import game.world.Facing;
import game.world.State;
import common.collect.Lists;
import common.collect.Maps;
import common.collect.Sets;
import common.init.BlockRegistry;
import common.init.FluidRegistry;
import common.init.IRegistry;
import common.init.ItemRegistry;
import common.init.RegistrySimple;
import common.item.Item;
import common.item.ItemStack;
import common.model.ModelRotation;
import common.world.Facing;
import common.world.State;
public abstract class ModelBakery
{

16
client/src/client/renderer/blockmodel/ModelBlock.java
View file

@ -3,14 +3,14 @@ package client.renderer.blockmodel;
import java.util.List;
import client.renderer.texture.TextureMap;
import game.collect.Lists;
import game.collect.Maps;
import game.model.Model;
import game.model.ModelProvider;
import game.model.ModelRotation;
import game.model.Transforms;
import game.util.Vector3f;
import game.world.Facing;
import common.collect.Lists;
import common.collect.Maps;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;
import common.model.Transforms;
import common.util.Vector3f;
import common.world.Facing;
public class ModelBlock extends Model {
static final ModelProvider PROVIDER = new ModelProvider() {

10
client/src/client/renderer/blockmodel/ModelGenerator.java
View file

@ -8,11 +8,11 @@ import client.renderer.model.ModelBox;
import client.renderer.texture.TextureAtlasSprite;
import client.renderer.texture.TextureMap;
import client.renderer.texture.TextureUtil;
import game.collect.Lists;
import game.collect.Maps;
import game.log.Log;
import game.util.Vector3f;
import game.world.Facing;
import common.collect.Lists;
import common.collect.Maps;
import common.log.Log;
import common.util.Vector3f;
import common.world.Facing;
public abstract class ModelGenerator {
// public static final List<String> LAYERS = Lists.newArrayList("layer0", "layer1", "layer2", "layer3", "layer4");

18
client/src/client/renderer/blockmodel/ModelManager.java
View file

@ -7,15 +7,15 @@ import java.util.Set;
import client.renderer.texture.TextureAtlasSprite;
import client.renderer.texture.TextureMap;
import game.block.Block;
import game.block.BlockLiquid;
import game.collect.Maps;
import game.init.BlockRegistry;
import game.init.Blocks;
import game.init.FluidRegistry;
import game.init.IRegistry;
import game.properties.IProperty;
import game.world.State;
import common.block.Block;
import common.block.BlockLiquid;
import common.collect.Maps;
import common.init.BlockRegistry;
import common.init.Blocks;
import common.init.FluidRegistry;
import common.init.IRegistry;
import common.properties.IProperty;
import common.world.State;
public class ModelManager
{

10
client/src/client/renderer/blockmodel/MultiStateMap.java
View file

@ -4,11 +4,11 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import game.collect.Lists;
import game.collect.Maps;
import game.init.BlockRegistry;
import game.properties.IProperty;
import game.world.State;
import common.collect.Lists;
import common.collect.Maps;
import common.init.BlockRegistry;
import common.properties.IProperty;
import common.world.State;
public class MultiStateMap extends StateMap
{

4
client/src/client/renderer/blockmodel/SingleStateMap.java
View file

@ -1,7 +1,7 @@
package client.renderer.blockmodel;
import game.init.BlockRegistry;
import game.world.State;
import common.init.BlockRegistry;
import common.world.State;
public class SingleStateMap extends StateMap

8
client/src/client/renderer/blockmodel/StateMap.java
View file

@ -3,10 +3,10 @@ package client.renderer.blockmodel;
import java.util.Map;
import java.util.Map.Entry;
import game.block.Block;
import game.collect.Maps;
import game.properties.IProperty;
import game.world.State;
import common.block.Block;
import common.collect.Maps;
import common.properties.IProperty;
import common.world.State;
public abstract class StateMap
{

2
client/src/client/renderer/chunk/ChunkCompileTaskGenerator.java
View file

@ -4,7 +4,7 @@ import java.util.List;
import java.util.concurrent.locks.ReentrantLock;
import client.renderer.RegionRenderCacheBuilder;
import game.collect.Lists;
import common.collect.Lists;
public class ChunkCompileTaskGenerator
{

12
client/src/client/renderer/chunk/ChunkRenderDispatcher.java
View file

@ -11,12 +11,12 @@ import client.Game;
import client.renderer.RegionRenderCacheBuilder;
import client.renderer.RenderBuffer;
import client.renderer.VertexBuffer;
import game.collect.Lists;
import game.future.Futures;
import game.future.ListenableFuture;
import game.future.ListenableFutureTask;
import game.future.ThreadFactoryBuilder;
import game.model.BlockLayer;
import common.collect.Lists;
import common.future.Futures;
import common.future.ListenableFuture;
import common.future.ListenableFutureTask;
import common.future.ThreadFactoryBuilder;
import common.model.BlockLayer;
public class ChunkRenderDispatcher
{

14
client/src/client/renderer/chunk/ChunkRenderWorker.java
View file

@ -6,13 +6,13 @@ import java.util.concurrent.CancellationException;
import client.Game;
import client.renderer.RegionRenderCacheBuilder;
import game.collect.Lists;
import game.entity.Entity;
import game.future.FutureCallback;
import game.future.Futures;
import game.future.ListenableFuture;
import game.log.Log;
import game.model.BlockLayer;
import common.collect.Lists;
import common.entity.Entity;
import common.future.FutureCallback;
import common.future.Futures;
import common.future.ListenableFuture;
import common.log.Log;
import common.model.BlockLayer;
public class ChunkRenderWorker implements Runnable
{

8
client/src/client/renderer/chunk/CompiledChunk.java
View file

@ -3,10 +3,10 @@ package client.renderer.chunk;
import java.util.List;
import client.renderer.RenderBuffer;
import game.collect.Lists;
import game.model.BlockLayer;
import game.tileentity.TileEntity;
import game.world.Facing;
import common.collect.Lists;
import common.model.BlockLayer;
import common.tileentity.TileEntity;
import common.world.Facing;
public class CompiledChunk
{

20
client/src/client/renderer/chunk/RenderChunk.java
View file

@ -19,16 +19,16 @@ import client.renderer.RenderGlobal;
import client.renderer.VertexBuffer;
import client.renderer.tileentity.TileEntityRendererDispatcher;
import client.renderer.tileentity.TileEntitySpecialRenderer;
import game.block.Block;
import game.collect.Maps;
import game.collect.Sets;
import game.model.BlockLayer;
import game.tileentity.TileEntity;
import game.world.BlockPos;
import game.world.BoundingBox;
import game.world.Facing;
import game.world.State;
import game.world.World;
import common.block.Block;
import common.collect.Maps;
import common.collect.Sets;
import common.model.BlockLayer;
import common.tileentity.TileEntity;
import common.world.BlockPos;
import common.world.BoundingBox;
import common.world.Facing;
import common.world.State;
import common.world.World;
public class RenderChunk
{

2
client/src/client/renderer/chunk/SetVisibility.java
View file

@ -3,7 +3,7 @@ package client.renderer.chunk;
import java.util.BitSet;
import java.util.Set;
import game.world.Facing;
import common.world.Facing;
public class SetVisibility
{

4
client/src/client/renderer/chunk/VisGraph.java
View file

@ -6,8 +6,8 @@ import java.util.LinkedList;
import java.util.Queue;
import java.util.Set;
import game.world.BlockPos;
import game.world.Facing;
import common.world.BlockPos;
import common.world.Facing;
public class VisGraph
{

10
client/src/client/renderer/entity/Render.java
View file

@ -11,11 +11,11 @@ import client.renderer.RenderBuffer;
import client.renderer.Tessellator;
import client.renderer.texture.TextureAtlasSprite;
import client.renderer.texture.TextureMap;
import game.block.Block;
import game.entity.Entity;
import game.world.BlockPos;
import game.world.BoundingBox;
import game.world.World;
import common.block.Block;
import common.entity.Entity;
import common.world.BlockPos;
import common.world.BoundingBox;
import common.world.World;
public abstract class Render<T extends Entity>
{

2
client/src/client/renderer/entity/RenderArachnoid.java
View file

@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11;
import client.renderer.layers.LayerArachnoidArmor;
import client.renderer.model.ModelArachnoid;
import game.entity.npc.EntityNPC;
import common.entity.npc.EntityNPC;
public class RenderArachnoid extends RenderHumanoid

4
client/src/client/renderer/entity/RenderArrow.java
View file

@ -6,8 +6,8 @@ import client.renderer.DefaultVertexFormats;
import client.renderer.GlState;
import client.renderer.RenderBuffer;
import client.renderer.Tessellator;
import game.entity.projectile.EntityArrow;
import game.util.ExtMath;
import common.entity.projectile.EntityArrow;
import common.util.ExtMath;
public class RenderArrow extends Render<EntityArrow>

4
client/src/client/renderer/entity/RenderBat.java
View file

@ -3,8 +3,8 @@ package client.renderer.entity;
import org.lwjgl.opengl.GL11;
import client.renderer.model.ModelBat;
import game.entity.animal.EntityBat;
import game.util.ExtMath;
import common.entity.animal.EntityBat;
import common.util.ExtMath;
public class RenderBat extends RenderLiving<EntityBat>

4
client/src/client/renderer/entity/RenderBlockEntity.java
View file

@ -5,8 +5,8 @@ import org.lwjgl.opengl.GL11;
import client.Game;
import client.renderer.BlockRenderer;
import client.renderer.texture.TextureMap;
import game.entity.Entity;
import game.world.State;
import common.entity.Entity;
import common.world.State;
public class RenderBlockEntity extends Render<Entity>

4
client/src/client/renderer/entity/RenderBoat.java
View file

@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
import client.renderer.model.ModelBase;
import client.renderer.model.ModelBoat;
import game.entity.item.EntityBoat;
import game.util.ExtMath;
import common.entity.item.EntityBoat;
import common.util.ExtMath;
public class RenderBoat extends Render<EntityBoat>

2
client/src/client/renderer/entity/RenderBullet.java
View file

@ -6,7 +6,7 @@ import client.renderer.DefaultVertexFormats;
import client.renderer.GlState;
import client.renderer.RenderBuffer;
import client.renderer.Tessellator;
import game.entity.projectile.EntityBullet;
import common.entity.projectile.EntityBullet;
public class RenderBullet extends Render<EntityBullet>

4
client/src/client/renderer/entity/RenderChicken.java
View file

@ -1,8 +1,8 @@
package client.renderer.entity;
import client.renderer.model.ModelBase;
import game.entity.animal.EntityChicken;
import game.util.ExtMath;
import common.entity.animal.EntityChicken;
import common.util.ExtMath;
public class RenderChicken extends RenderLiving<EntityChicken>

2
client/src/client/renderer/entity/RenderCow.java
View file

@ -1,7 +1,7 @@
package client.renderer.entity;
import client.renderer.model.ModelBase;
import game.entity.animal.EntityCow;
import common.entity.animal.EntityCow;
public class RenderCow extends RenderLiving<EntityCow>

4
client/src/client/renderer/entity/RenderCrystal.java
View file

@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
import client.renderer.model.ModelBase;
import client.renderer.model.ModelCrystal;
import game.entity.item.EntityCrystal;
import game.util.ExtMath;
import common.entity.item.EntityCrystal;
import common.util.ExtMath;
public class RenderCrystal extends Render<EntityCrystal>

4
client/src/client/renderer/entity/RenderDie.java
View file

@ -5,8 +5,8 @@ import org.lwjgl.opengl.GL11;
import client.Game;
import client.renderer.model.ModelDie;
import client.renderer.texture.TextureMap;
import game.entity.projectile.EntityDie;
import game.model.Transforms.Camera;
import common.entity.projectile.EntityDie;
import common.model.Transforms.Camera;
public class RenderDie extends Render<EntityDie>
{

4
client/src/client/renderer/entity/RenderDragon.java
View file

@ -5,8 +5,8 @@ import org.lwjgl.opengl.GL11;
import client.renderer.GlState;
import client.renderer.layers.LayerEnderDragonEyes;
import client.renderer.model.ModelDragon;
import game.entity.animal.EntityDragon;
import game.util.ExtMath;
import common.entity.animal.EntityDragon;
import common.util.ExtMath;
public class RenderDragon extends RenderLiving<EntityDragon>

Some files were not shown because too many files have changed in this diff Show more