Skip to content
Permalink
Browse files

Changes to match client side refactorization of MDX

  • Loading branch information...
Ri5ux committed Feb 18, 2019
1 parent da89024 commit 2e2805f1e5224d1c99b0f173609b48b498defe64
Showing 321 changed files with 653 additions and 612 deletions.
@@ -5,9 +5,9 @@
import org.avp.world.playermode.LevelData;
import org.avp.world.playermode.PlayerMode;

import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.render.model.Model;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;
import com.arisux.mdx.lib.client.util.models.Model;
import com.arisux.mdx.lib.game.IInitEvent;
import com.arisux.mdx.lib.world.entity.player.Players;

@@ -5,9 +5,9 @@

import org.avp.AliensVsPredator;

import com.arisux.mdx.lib.client.render.Draw;
import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Screen;
import com.arisux.mdx.lib.client.util.Draw;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Screen;

import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.GlStateManager;
@@ -6,9 +6,9 @@
import org.avp.item.ItemMaintenanceJack;
import org.avp.tile.TileEntityBlastdoor;

import com.arisux.mdx.lib.client.Notification;
import com.arisux.mdx.lib.client.Notification.DynamicNotification;
import com.arisux.mdx.lib.client.Notifications;
import com.arisux.mdx.lib.client.gui.notifications.Notification;
import com.arisux.mdx.lib.client.gui.notifications.Notifications;
import com.arisux.mdx.lib.client.gui.notifications.Notification.DynamicNotification;
import com.arisux.mdx.lib.world.entity.Entities;

import net.minecraft.block.Block;
@@ -5,8 +5,8 @@
import org.avp.tile.TileEntitySkull;
import org.avp.tile.TileEntitySkull.EnumOrientation;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.world.entity.Entities;

import net.minecraft.block.Block;
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.tile.skulls.ModelBiomaskBerserker;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.tile.skulls.ModelBiomaskClassic;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.tile.skulls.ModelBiomaskFalconer;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.tile.skulls.ModelBiomaskTracker;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.tile.skulls.ModelAethonHead;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.tile.skulls.ModelGigerAlienHead;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -4,8 +4,8 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.entities.living.ModelEngineer;

import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.tile.skulls.ModelQueenSkull;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.block.state.IBlockState;
import net.minecraft.client.model.ModelRenderer;
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.tile.skulls.ModelNeomorphSkull;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.tile.skulls.ModelProtomorphSkull;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -4,8 +4,8 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.entities.living.ModelEngineer;

import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.entities.living.ModelWarrior;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.entities.living.ModelWarrior;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.entities.living.ModelYautja;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;

import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -269,7 +269,7 @@
import org.avp.tile.plants.TileEntityGroundFern;
import org.avp.tile.plants.TileEntityTreeFern;

import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;
import com.arisux.mdx.lib.game.IInitEvent;
import com.arisux.mdx.lib.game.IPreInitEvent;
import com.arisux.mdx.lib.game.Renderers;
@@ -103,12 +103,12 @@
import org.avp.client.model.tile.skulls.ModelProtomorphSkull;
import org.avp.client.model.tile.skulls.ModelQueenSkull;

import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.client.render.model.Model;
import com.arisux.mdx.lib.client.render.model.SpecialModelBiped;
import com.arisux.mdx.lib.client.render.model.WavefrontModelLoader;
import com.arisux.mdx.lib.client.render.wavefront.TriangulatedWavefrontModel;
import com.arisux.mdx.lib.client.model.SpecialModelBiped;
import com.arisux.mdx.lib.client.model.loaders.WavefrontModelLoader;
import com.arisux.mdx.lib.client.util.Texture;
import com.arisux.mdx.lib.client.util.models.MapModelTexture;
import com.arisux.mdx.lib.client.util.models.Model;
import com.arisux.mdx.lib.client.util.models.wavefront.TriangulatedWavefrontModel;

import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -1,6 +1,6 @@
package org.avp.client.entityfx;

import com.arisux.mdx.lib.client.render.Draw;
import com.arisux.mdx.lib.client.util.Draw;

import net.minecraft.client.particle.Particle;
import net.minecraft.client.renderer.BufferBuilder;
@@ -14,8 +14,8 @@
import com.arisux.mdx.lib.client.gui.GuiCustomButton;
import com.arisux.mdx.lib.client.gui.IAction;
import com.arisux.mdx.lib.client.gui.IGuiElement;
import com.arisux.mdx.lib.client.render.Draw;
import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.util.Draw;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.game.Game;

import net.minecraft.client.gui.GuiButton;
@@ -12,7 +12,7 @@
import com.arisux.mdx.lib.client.gui.GuiCustomTextbox;
import com.arisux.mdx.lib.client.gui.IAction;
import com.arisux.mdx.lib.client.gui.IGuiElement;
import com.arisux.mdx.lib.client.render.Draw;
import com.arisux.mdx.lib.client.util.Draw;
import com.arisux.mdx.lib.game.Game;

import net.minecraft.client.renderer.GlStateManager;
@@ -19,10 +19,10 @@
import com.arisux.mdx.lib.client.gui.GuiCustomTextbox;
import com.arisux.mdx.lib.client.gui.IAction;
import com.arisux.mdx.lib.client.gui.IGuiElement;
import com.arisux.mdx.lib.client.render.Draw;
import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.ScaledResolution;
import com.arisux.mdx.lib.client.render.Screen;
import com.arisux.mdx.lib.client.util.Draw;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.ScaledResolution;
import com.arisux.mdx.lib.client.util.Screen;
import com.arisux.mdx.lib.game.Chat;
import com.arisux.mdx.lib.util.SystemInfo;

@@ -3,8 +3,8 @@
import org.avp.AliensVsPredator;
import org.avp.tile.TileEntityNetworkRack;

import com.arisux.mdx.lib.client.render.Draw;
import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.util.Draw;
import com.arisux.mdx.lib.client.util.OpenGL;

import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.EntityPlayer;
@@ -3,7 +3,7 @@
import org.avp.AliensVsPredator;
import org.avp.tile.TileEntityRepulsionGenerator;

import com.arisux.mdx.lib.client.render.Draw;
import com.arisux.mdx.lib.client.util.Draw;

import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.EntityPlayer;
@@ -11,9 +11,9 @@
import com.arisux.mdx.lib.client.gui.GuiCustomTextbox;
import com.arisux.mdx.lib.client.gui.IAction;
import com.arisux.mdx.lib.client.gui.IGuiElement;
import com.arisux.mdx.lib.client.render.Draw;
import com.arisux.mdx.lib.client.render.ScaledResolution;
import com.arisux.mdx.lib.client.render.Screen;
import com.arisux.mdx.lib.client.util.Draw;
import com.arisux.mdx.lib.client.util.ScaledResolution;
import com.arisux.mdx.lib.client.util.Screen;
import com.arisux.mdx.lib.game.Game;

import net.minecraft.client.gui.GuiScreen;
@@ -16,9 +16,9 @@
import com.arisux.mdx.lib.client.gui.GuiCustomSlider;
import com.arisux.mdx.lib.client.gui.IAction;
import com.arisux.mdx.lib.client.gui.IGuiElement;
import com.arisux.mdx.lib.client.render.Color;
import com.arisux.mdx.lib.client.render.Draw;
import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.util.Color;
import com.arisux.mdx.lib.client.util.Draw;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.game.Game;
import com.arisux.mdx.lib.world.entity.Entities;

@@ -12,8 +12,8 @@
import com.arisux.mdx.lib.client.gui.GuiCustomButton;
import com.arisux.mdx.lib.client.gui.IAction;
import com.arisux.mdx.lib.client.gui.IGuiElement;
import com.arisux.mdx.lib.client.render.Draw;
import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.util.Draw;
import com.arisux.mdx.lib.client.util.OpenGL;

import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer;
@@ -1,6 +1,6 @@
package org.avp.client.model.entities;

import com.arisux.mdx.lib.client.render.model.Model;
import com.arisux.mdx.lib.client.util.models.Model;

import net.minecraft.client.model.ModelRenderer;

@@ -1,6 +1,6 @@
package org.avp.client.model.entities;

import com.arisux.mdx.lib.client.render.model.Model;
import com.arisux.mdx.lib.client.util.models.Model;

import net.minecraft.client.model.ModelRenderer;

@@ -2,11 +2,11 @@

import org.lwjgl.opengl.GL11;

import com.arisux.mdx.lib.client.render.Color;
import com.arisux.mdx.lib.client.render.Draw;
import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Vertex;
import com.arisux.mdx.lib.client.render.model.Model;
import com.arisux.mdx.lib.client.util.Color;
import com.arisux.mdx.lib.client.util.Draw;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.Vertex;
import com.arisux.mdx.lib.client.util.models.Model;

public class ModelPlasma extends Model
{
@@ -2,8 +2,8 @@

import org.lwjgl.opengl.GL11;

import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.model.Model;
import com.arisux.mdx.lib.client.util.OpenGL;
import com.arisux.mdx.lib.client.util.models.Model;

import net.minecraft.client.gui.Gui;

Oops, something went wrong.

0 comments on commit 2e2805f

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.