Skip to content

Commit

Permalink
Merge pull request #323 from NOVA-Team/rename/wrapper-packages
Browse files Browse the repository at this point in the history
Rename Minecraft wrapper packages
  • Loading branch information
ExE-Boss authored Jun 27, 2018
2 parents 9fc6e96 + 1453b56 commit 59455b7
Show file tree
Hide file tree
Showing 234 changed files with 677 additions and 668 deletions.
2 changes: 1 addition & 1 deletion minecraft/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
!/.gitignore

!/1.8
!/1.7
!/1.7.10
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17;
package nova.core.wrapper.mc.forge.v1_7_10;

import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
import nova.core.wrapper.mc.forge.v17.asm.transformers.Transformers;
import nova.core.wrapper.mc.forge.v1_7_10.asm.transformers.Transformers;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17;
package nova.core.wrapper.mc.forge.v1_7_10;

import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe;
Expand All @@ -40,10 +40,10 @@
import net.minecraft.launchwrapper.LaunchClassLoader;
import nova.core.loader.Mod;
import nova.core.util.ClassLoaderUtil;
import nova.core.wrapper.mc.forge.v17.util.ReflectionUtil;
import nova.core.wrapper.mc.forge.v17.wrapper.assets.NovaFileResourcePack;
import nova.core.wrapper.mc.forge.v17.wrapper.assets.NovaFolderResourcePack;
import nova.core.wrapper.mc.forge.v17.wrapper.assets.NovaResourcePack;
import nova.core.wrapper.mc.forge.v1_7_10.util.ReflectionUtil;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.assets.NovaFileResourcePack;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.assets.NovaFolderResourcePack;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.assets.NovaResourcePack;
import nova.internal.core.Game;

import java.io.File;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.asm;
package nova.core.wrapper.mc.forge.v1_7_10.asm;

import net.minecraft.block.Block;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.chunk.Chunk;
import nova.core.component.misc.FactoryProvider;
import nova.core.event.BlockEvent;
import nova.core.wrapper.mc.forge.v17.launcher.NovaMinecraft;
import nova.core.wrapper.mc.forge.v17.wrapper.block.backward.BWBlock;
import nova.core.wrapper.mc.forge.v17.wrapper.block.forward.FWBlock;
import nova.core.wrapper.mc.forge.v17.wrapper.block.forward.FWTile;
import nova.core.wrapper.mc.forge.v17.wrapper.block.forward.FWTileLoader;
import nova.core.wrapper.mc.forge.v17.wrapper.block.forward.MCBlockTransform;
import nova.core.wrapper.mc.forge.v17.wrapper.block.world.WorldConverter;
import nova.core.wrapper.mc.forge.v1_7_10.launcher.NovaMinecraft;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.backward.BWBlock;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward.FWBlock;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward.FWTile;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward.FWTileLoader;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward.MCBlockTransform;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.world.WorldConverter;
import nova.internal.core.Game;
import nova.internal.core.launch.NovaLauncher;
import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.asm.lib;
package nova.core.wrapper.mc.forge.v1_7_10.asm.lib;

import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.asm.lib;
package nova.core.wrapper.mc.forge.v1_7_10.asm.lib;

import org.objectweb.asm.ClassWriter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.asm.lib;
package nova.core.wrapper.mc.forge.v1_7_10.asm.lib;

import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
import net.minecraft.launchwrapper.IClassTransformer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v18.asm.lib;
package nova.core.wrapper.mc.forge.v1_7_10.asm.lib;

import nova.core.component.Component;
import nova.core.component.ComponentMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.asm.lib;
package nova.core.wrapper.mc.forge.v1_7_10.asm.lib;

import org.objectweb.asm.Label;
import org.objectweb.asm.Opcodes;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.asm.lib;
package nova.core.wrapper.mc.forge.v1_7_10.asm.lib;

import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.FieldInsnNode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.asm.lib;
package nova.core.wrapper.mc.forge.v1_7_10.asm.lib;

import com.google.common.base.Objects;
import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.asm.lib;
package nova.core.wrapper.mc.forge.v1_7_10.asm.lib;

import com.google.common.collect.HashBiMap;
import org.objectweb.asm.tree.ClassNode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
* @author Calclavia
*/

package nova.core.wrapper.mc.forge.v17.asm.lib;
package nova.core.wrapper.mc.forge.v1_7_10.asm.lib;
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.asm.transformers;
package nova.core.wrapper.mc.forge.v1_7_10.asm.transformers;

import nova.core.wrapper.mc.forge.v17.asm.lib.ASMHelper;
import nova.core.wrapper.mc.forge.v17.asm.lib.ObfMapping;
import nova.core.wrapper.mc.forge.v1_7_10.asm.lib.ASMHelper;
import nova.core.wrapper.mc.forge.v1_7_10.asm.lib.ObfMapping;
import nova.internal.core.Game;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.ClassNode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
* You should have received a copy of the GNU General Public License
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/
package nova.core.wrapper.mc.forge.v17.asm.transformers;
package nova.core.wrapper.mc.forge.v1_7_10.asm.transformers;

import nova.core.wrapper.mc.forge.v17.asm.lib.ASMHelper;
import nova.core.wrapper.mc.forge.v17.asm.lib.ObfMapping;
import nova.core.wrapper.mc.forge.v1_7_10.asm.lib.ASMHelper;
import nova.core.wrapper.mc.forge.v1_7_10.asm.lib.ObfMapping;
import nova.internal.core.Game;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.InsnList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.asm.transformers;
package nova.core.wrapper.mc.forge.v1_7_10.asm.transformers;

import nova.core.wrapper.mc.forge.v17.asm.lib.ASMHelper;
import nova.core.wrapper.mc.forge.v17.asm.lib.InstructionComparator;
import nova.core.wrapper.mc.forge.v17.asm.lib.ObfMapping;
import nova.core.wrapper.mc.forge.v1_7_10.asm.lib.ASMHelper;
import nova.core.wrapper.mc.forge.v1_7_10.asm.lib.InstructionComparator;
import nova.core.wrapper.mc.forge.v1_7_10.asm.lib.ObfMapping;
import nova.internal.core.Game;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.InsnList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.asm.transformers;
package nova.core.wrapper.mc.forge.v1_7_10.asm.transformers;

import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.ClassNode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.asm.transformers;
package nova.core.wrapper.mc.forge.v1_7_10.asm.transformers;

import net.minecraft.launchwrapper.IClassTransformer;
import nova.core.wrapper.mc.forge.v17.asm.lib.ASMHelper;
import nova.core.wrapper.mc.forge.v1_7_10.asm.lib.ASMHelper;
import org.objectweb.asm.tree.ClassNode;

import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.depmodules;
package nova.core.wrapper.mc.forge.v1_7_10.depmodules;

import nova.core.game.ClientManager;
import nova.core.wrapper.mc.forge.v17.manager.FWClientManager;
import nova.core.wrapper.mc.forge.v1_7_10.manager.FWClientManager;
import se.jbee.inject.bind.BinderModule;

public class ClientModule extends BinderModule {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v18.depmodules;
package nova.core.wrapper.mc.forge.v1_7_10.depmodules;

import nova.core.entity.component.RigidBody;
import nova.core.wrapper.mc.forge.v18.wrapper.entity.forward.BWRigidBody;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.forward.BWRigidBody;
import se.jbee.inject.bind.BinderModule;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.depmodules;
package nova.core.wrapper.mc.forge.v1_7_10.depmodules;

import nova.core.game.GameInfo;
import se.jbee.inject.Dependency;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v18.depmodules;
package nova.core.wrapper.mc.forge.v1_7_10.depmodules;

import nova.core.game.InputManager;
import nova.core.wrapper.mc.forge.v18.util.MCInputManager;
import nova.core.wrapper.mc.forge.v1_7_10.util.MCInputManager;
import se.jbee.inject.bind.BinderModule;

public class KeyModule extends BinderModule {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.depmodules;
package nova.core.wrapper.mc.forge.v1_7_10.depmodules;

import nova.core.language.LanguageManager;
import nova.core.wrapper.mc.forge.v17.util.MCLanguageManager;
import nova.core.wrapper.mc.forge.v1_7_10.util.MCLanguageManager;
import se.jbee.inject.bind.BinderModule;

public class LanguageModule extends BinderModule {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v18.depmodules;
package nova.core.wrapper.mc.forge.v1_7_10.depmodules;

import nova.core.network.NetworkManager;
import nova.core.wrapper.mc.forge.v18.network.netty.MCNetworkManager;
import nova.core.wrapper.mc.forge.v1_7_10.network.netty.MCNetworkManager;
import se.jbee.inject.bind.BinderModule;

public class NetworkModule extends BinderModule {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.depmodules;
package nova.core.wrapper.mc.forge.v1_7_10.depmodules;

import nova.core.util.registry.RetentionManager;
import nova.core.wrapper.mc.forge.v17.manager.MCRetentionManager;
import nova.core.wrapper.mc.forge.v1_7_10.manager.MCRetentionManager;
import se.jbee.inject.bind.BinderModule;

public class SaveModule extends BinderModule {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v18.depmodules;
package nova.core.wrapper.mc.forge.v1_7_10.depmodules;

import nova.internal.core.tick.UpdateTicker;
import se.jbee.inject.Dependency;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.launcher;
package nova.core.wrapper.mc.forge.v1_7_10.launcher;

import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry;
Expand All @@ -37,17 +37,17 @@
import nova.core.entity.Entity;
import nova.core.entity.EntityFactory;
import nova.core.language.LanguageManager;
import nova.core.wrapper.mc.forge.v17.NovaMinecraftPreloader;
import nova.core.wrapper.mc.forge.v17.render.RenderUtility;
import nova.core.wrapper.mc.forge.v17.wrapper.block.forward.FWBlock;
import nova.core.wrapper.mc.forge.v17.wrapper.block.forward.FWTile;
import nova.core.wrapper.mc.forge.v17.wrapper.block.forward.FWTileRenderer;
import nova.core.wrapper.mc.forge.v17.wrapper.entity.EntityConverter;
import nova.core.wrapper.mc.forge.v17.wrapper.entity.backward.BWEntityFX;
import nova.core.wrapper.mc.forge.v17.wrapper.entity.forward.FWEntity;
import nova.core.wrapper.mc.forge.v17.wrapper.entity.forward.FWEntityFX;
import nova.core.wrapper.mc.forge.v17.wrapper.entity.forward.FWEntityRenderer;
import nova.core.wrapper.mc.forge.v17.wrapper.item.FWItem;
import nova.core.wrapper.mc.forge.v1_7_10.NovaMinecraftPreloader;
import nova.core.wrapper.mc.forge.v1_7_10.render.RenderUtility;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward.FWBlock;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward.FWTile;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward.FWTileRenderer;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.EntityConverter;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.backward.BWEntityFX;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.forward.FWEntity;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.forward.FWEntityFX;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.forward.FWEntityRenderer;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.FWItem;
import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;

import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.launcher;
package nova.core.wrapper.mc.forge.v1_7_10.launcher;

import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.registry.EntityRegistry;
Expand All @@ -27,10 +27,10 @@
import nova.core.entity.Entity;
import nova.core.entity.EntityFactory;
import nova.core.language.LanguageManager;
import nova.core.wrapper.mc.forge.v17.wrapper.block.forward.FWBlock;
import nova.core.wrapper.mc.forge.v17.wrapper.block.forward.FWTile;
import nova.core.wrapper.mc.forge.v17.wrapper.entity.forward.FWEntity;
import nova.core.wrapper.mc.forge.v17.wrapper.item.FWItem;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward.FWBlock;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward.FWTile;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.forward.FWEntity;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.FWItem;

import java.util.Set;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v17.launcher;
package nova.core.wrapper.mc.forge.v1_7_10.launcher;

import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import nova.core.event.PlayerEvent;
import nova.core.wrapper.mc.forge.v17.wrapper.entity.EntityConverter;
import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.EntityConverter;
import nova.internal.core.Game;

/**
Expand Down
Loading

0 comments on commit 59455b7

Please sign in to comment.