From 8fb41990bddd5f91afd742994aee14017bf8b884 Mon Sep 17 00:00:00 2001 From: ExE Boss Date: Mon, 19 Mar 2018 13:02:51 +0100 Subject: [PATCH 01/12] Migrate dependencies to the Java Library Gradle plugin --- build.gradle | 20 +++++++++---------- minecraft/1.7/build.gradle | 6 ++---- minecraft/1.8/build.gradle | 8 +++----- .../nova/core/component/ComponentMap.java | 1 - .../java/nova/core/util/registry/Factory.java | 2 -- 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 5a7c31c74..dd2b492de 100644 --- a/build.gradle +++ b/build.gradle @@ -9,16 +9,16 @@ plugins { apply from: "https://raw.githubusercontent.com/NOVA-Team/NOVA-Gradle/master/shared-scripts/java.gradle" dependencies { - compile 'com.google.guava:guava:18.0' - compile 'com.typesafe:config:1.2.1' - compile 'se.jbee:silk-di:0.6' - compile 'org.slf4j:slf4j-api:1.7.10' - compile 'org.apache.commons:commons-math3:3.5' - compile 'javax.json:javax.json-api:1.0' - compile 'net.jodah:typetools:0.4.9' - - runtime 'org.glassfish:javax.json:1.0.4' - testRuntime 'org.slf4j:slf4j-simple:1.7.10' + api 'com.google.guava:guava:18.0' + api 'com.typesafe:config:1.2.1' + api 'se.jbee:silk-di:0.6' + api 'org.slf4j:slf4j-api:1.7.10' + api 'org.apache.commons:commons-math3:3.5' + api 'javax.json:javax.json-api:1.0' + implementation 'net.jodah:typetools:0.4.9' + + runtimeOnly 'org.glassfish:javax.json:1.0.4' + testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.10' //checkstyle 'com.puppycrawl.tools:checkstyle:6.2' } diff --git a/minecraft/1.7/build.gradle b/minecraft/1.7/build.gradle index add6a3ab4..72ff1133e 100644 --- a/minecraft/1.7/build.gradle +++ b/minecraft/1.7/build.gradle @@ -18,11 +18,9 @@ configurations { dependencies { fatJar project(":") fatJar 'org.apache.logging.log4j:log4j-slf4j-impl:2.0-beta9' - testCompile project(path: ':', configuration: 'wrapperTests') + testImplementation project(path: ':', configuration: 'wrapperTests') - testCompile "junit:junit:4.12" - testCompile 'org.assertj:assertj-core:3.0.0' - testRuntime 'org.slf4j:slf4j-simple:1.7.10' + testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.10' } jar { diff --git a/minecraft/1.8/build.gradle b/minecraft/1.8/build.gradle index d2a755e6d..a9b5bed62 100644 --- a/minecraft/1.8/build.gradle +++ b/minecraft/1.8/build.gradle @@ -18,11 +18,9 @@ configurations { dependencies { fatJar project(":") fatJar 'org.apache.logging.log4j:log4j-slf4j-impl:2.0-beta9' - testCompile project(path: ':', configuration: 'wrapperTests') + testImplementation project(path: ':', configuration: 'wrapperTests') - testCompile "junit:junit:4.12" - testCompile 'org.assertj:assertj-core:3.0.0' - testRuntime 'org.slf4j:slf4j-simple:1.7.10' + testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.10' } jar { @@ -107,7 +105,7 @@ apply plugin: 'forge' minecraft { version = property("minecraft.version") + "-" + property("forge.version") - mappings = 'stable_nodoc_16' + mappings = 'stable_16' runDir = "run" } diff --git a/src/main/java/nova/core/component/ComponentMap.java b/src/main/java/nova/core/component/ComponentMap.java index 5ed0aad91..5058094a0 100644 --- a/src/main/java/nova/core/component/ComponentMap.java +++ b/src/main/java/nova/core/component/ComponentMap.java @@ -20,7 +20,6 @@ package nova.core.component; import nova.core.component.ComponentProvider.ComponentAdded; -import nova.core.component.ComponentProvider.ComponentRemoved; import nova.core.component.exception.ComponentException; import nova.internal.core.Game; import se.jbee.inject.Dependency; diff --git a/src/main/java/nova/core/util/registry/Factory.java b/src/main/java/nova/core/util/registry/Factory.java index fd615b168..66c21e51c 100644 --- a/src/main/java/nova/core/util/registry/Factory.java +++ b/src/main/java/nova/core/util/registry/Factory.java @@ -22,9 +22,7 @@ import net.jodah.typetools.TypeResolver; import nova.core.util.Identifiable; -import nova.internal.core.Game; import nova.internal.core.util.InjectionUtil; -import se.jbee.inject.Dependency; import java.util.Optional; import java.util.function.Function; From 84cb5359b6c4bc4b4f5cdfa15f08ca086aaf3c19 Mon Sep 17 00:00:00 2001 From: ExE Boss Date: Mon, 19 Mar 2018 14:12:10 +0100 Subject: [PATCH 02/12] Update Gradle Wrapper to 3.5 --- gradle/wrapper/gradle-wrapper.jar | Bin 53324 -> 54783 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 22 +++++++++++++++------- gradlew.bat | 6 ------ 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3baa851b28c65f87dd36a6748e1a85cf360c1301..88768bafdd1c0ea600b0309e6c578ecc5eda2bfe 100644 GIT binary patch delta 22344 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%0DiPtkFL$q#I2KkmPg51YY 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�)f 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 Date: Mon, 19 Mar 2018 14:52:36 +0100 Subject: [PATCH 03/12] Update README.md This makes the build status badge report on the build status of the master branch rather than on the status of a feature branch. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 50abece54..bc17b302b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://img.shields.io/travis/NOVA-Team/NOVA-Core.svg?style=flat-square)](https://travis-ci.org/NOVA-Team/NOVA-Core) +[![Build Status](https://img.shields.io/travis/NOVA-Team/NOVA-Core/master.svg?style=flat-square)](https://travis-ci.org/NOVA-Team/NOVA-Core) [![Coverage](https://img.shields.io/codecov/c/github/NOVA-Team/NOVA-Core.svg?style=flat-square)](https://codecov.io/github/NOVA-Team/NOVA-Core) [![Tests](https://img.shields.io/jenkins/t/http/ci.novaapi.net/NOVA-Core.svg?style=flat-square)](http://ci.novaapi.net/job/NOVA-Core/lastCompletedBuild/testReport/) [![waffle.io](https://img.shields.io/badge/tracker-waffle.io-blue.svg?style=flat-square)](https://waffle.io/NOVA-Team/NOVA-Core) From bd83445828b834f0b3a09d55dd528dfa968d4a40 Mon Sep 17 00:00:00 2001 From: ExE Boss Date: Mon, 19 Mar 2018 15:03:51 +0100 Subject: [PATCH 04/12] Update Typetools to 0.5.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index dd2b492de..e66c63087 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ dependencies { api 'org.slf4j:slf4j-api:1.7.10' api 'org.apache.commons:commons-math3:3.5' api 'javax.json:javax.json-api:1.0' - implementation 'net.jodah:typetools:0.4.9' + implementation 'net.jodah:typetools:0.5.0' runtimeOnly 'org.glassfish:javax.json:1.0.4' testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.10' From f2e290a258543d5d803381a12689684c02033180 Mon Sep 17 00:00:00 2001 From: Temmie19 Date: Mon, 4 Jun 2018 16:14:30 +0200 Subject: [PATCH 05/12] Add CircleCI integration to NOVA-Core --- .circleci/config.yml | 42 ++++++++++++++++++++++++++++++++++++++++++ .gitignore | 3 +++ 2 files changed, 45 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..4828d9584 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,42 @@ +# Java Gradle CircleCI 2.0 configuration file +# +# Check https://circleci.com/docs/2.0/language-java/ for more details +# +version: 2 +jobs: + build: + docker: + # specify the version you desire here + - image: circleci/openjdk:8-jdk + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + # - image: circleci/postgres:9.4 + + working_directory: ~/repo + + environment: + # Customize the JVM maximum heap limit + JVM_OPTS: -Xmx2048mb + TERM: dumb + + steps: + - checkout + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "build.gradle" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + - run: ./gradlew dependencies + + - save_cache: + paths: + - ~/gradle + key: v1-dependencies-{{ checksum "build.gradle" }} + + # run tests! + - run: ./gradlew check diff --git a/.gitignore b/.gitignore index aee4667e5..610aa80c3 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,9 @@ # Travis !/.travis.yml +# CircleCI +!/.circleci + # unwanted os-generated files .DS_Store .DS_Store? From e27ca961246f6c2b91cb067e1f500cc2d639b423 Mon Sep 17 00:00:00 2001 From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com> Date: Sat, 23 Jun 2018 04:30:00 +0200 Subject: [PATCH 06/12] Make used ForgeGradle version independently configurable --- minecraft/1.7/gradle.properties | 1 + minecraft/1.8/gradle.properties | 1 + minecraft/build.gradle | 28 ++++++++++++++++------------ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/minecraft/1.7/gradle.properties b/minecraft/1.7/gradle.properties index dd8f10841..a1a1710e1 100644 --- a/minecraft/1.7/gradle.properties +++ b/minecraft/1.7/gradle.properties @@ -2,6 +2,7 @@ group = nova.core minecraft.version = 1.7.10 forge.version = 10.13.4.1448-1.7.10 +forgeGradleVersion = 1.2-SNAPSHOT packaging = jar info.inceptionYear = 2015 diff --git a/minecraft/1.8/gradle.properties b/minecraft/1.8/gradle.properties index 0298ba764..086b9c89c 100644 --- a/minecraft/1.8/gradle.properties +++ b/minecraft/1.8/gradle.properties @@ -2,6 +2,7 @@ group = nova.core minecraft.version = 1.8 forge.version = 11.14.3.1491 +forgeGradleVersion = 1.2-SNAPSHOT packaging = jar info.inceptionYear = 2015 diff --git a/minecraft/build.gradle b/minecraft/build.gradle index 2f4e0648d..4b5a53779 100644 --- a/minecraft/build.gradle +++ b/minecraft/build.gradle @@ -1,16 +1,20 @@ -buildscript{ - repositories{ - mavenCentral() - maven { - name "forge" - url "http://files.minecraftforge.net/maven" +subprojects { + buildscript { + repositories { + mavenCentral() + maven { + name "forge" + url "http://files.minecraftforge.net/maven" + } + maven { + name "sonatype" + url "https://oss.sonatype.org/content/repositories/snapshots/" + } } - maven { - name "sonatype" - url "https://oss.sonatype.org/content/repositories/snapshots/" + dependencies { + // Minecraft Forge 11.14.3.1503 and newer requires ForgeGradle 2.x, + // whereas Minecraft Forge 11.14.3.1502 or older requires ForgeGradle 1.x. + classpath 'net.minecraftforge.gradle:ForgeGradle:' + property('forgeGradleVersion') } } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - } } From 65adbce39164302f0c77c43767ad9a492576ada2 Mon Sep 17 00:00:00 2001 From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com> Date: Sat, 23 Jun 2018 08:30:00 +0200 Subject: [PATCH 07/12] =?UTF-8?q?Fix=20compiler=20warnings=20in=20NOVA?= =?UTF-8?q?=E2=80=91Core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nova/core/component/ComponentManager.java | 4 ++ .../nova/core/component/ComponentMap.java | 22 +++++---- .../core/component/SidedComponentMap.java | 13 ++++++ .../java/nova/core/component/Updater.java | 2 +- .../java/nova/core/component/fluid/Fluid.java | 1 + .../nova/core/component/fluid/FluidBlock.java | 3 +- .../inventory/InventoryException.java | 2 + .../core/component/inventory/ItemFilter.java | 14 +++--- .../nova/core/component/misc/Collider.java | 4 +- .../core/component/transform/Orientation.java | 9 +++- .../nova/core/config/ConfigException.java | 2 + .../nova/core/deps/DependencyException.java | 2 + .../nova/core/entity/component/RigidBody.java | 45 ++++++++++++++++++- .../java/nova/core/event/bus/EventBus.java | 1 + .../core/event/bus/EventCancelException.java | 2 + .../nova/core/event/bus/EventException.java | 2 + .../java/nova/core/game/InputManager.java | 3 +- src/main/java/nova/core/item/Item.java | 1 + .../core/nativewrapper/NativeManager.java | 2 + .../nova/core/network/NetworkException.java | 3 ++ .../nova/core/network/NetworkManager.java | 6 ++- .../java/nova/core/network/NetworkTarget.java | 5 ++- src/main/java/nova/core/network/Packet.java | 22 ++++++--- .../recipes/ingredient/ItemIngredient.java | 4 +- .../nova/core/render/RenderException.java | 2 + .../render/pipeline/BlockRenderPipeline.java | 2 +- .../render/pipeline/ItemRenderPipeline.java | 4 +- src/main/java/nova/core/retention/Data.java | 5 ++- .../java/nova/core/retention/Storable.java | 2 +- .../java/nova/core/util/ClassLoaderUtil.java | 2 + .../java/nova/core/util/EnumSelector.java | 2 + src/main/java/nova/core/util/Pipeline.java | 2 + src/main/java/nova/core/util/ProgressBar.java | 2 + src/main/java/nova/core/util/RayTracer.java | 3 ++ .../java/nova/core/util/ReflectionUtil.java | 7 ++- .../core/util/collection/EvictingList.java | 2 + .../nova/core/util/collection/TreeNode.java | 5 ++- .../util/exception/RegistrationException.java | 2 + .../java/nova/core/util/math/MatrixStack.java | 2 +- .../java/nova/core/util/math/MatrixUtil.java | 2 + .../nova/core/util/math/RotationUtil.java | 17 +++++-- src/main/java/nova/core/world/World.java | 16 +++++++ src/main/java/nova/internal/core/Game.java | 12 +++-- .../nova/internal/core/di/DICoreModule.java | 6 +-- .../nova/internal/core/di/SupplierModule.java | 36 +++++++++------ .../core/launch/InitializationException.java | 2 + .../internal/core/util/InjectionUtil.java | 12 ++--- .../internal/core/util/TopologicalSort.java | 4 +- 48 files changed, 247 insertions(+), 78 deletions(-) diff --git a/src/main/java/nova/core/component/ComponentManager.java b/src/main/java/nova/core/component/ComponentManager.java index b0913a538..9d6722c80 100755 --- a/src/main/java/nova/core/component/ComponentManager.java +++ b/src/main/java/nova/core/component/ComponentManager.java @@ -70,6 +70,10 @@ public void registerNativePassthrough(Class componentClass) /** * Internal + * + * @deprecated Internal + * @param nativeObject The native object + * @return The pass-through components */ @Deprecated public Set> getPassthroughtComponents(Object nativeObject) { diff --git a/src/main/java/nova/core/component/ComponentMap.java b/src/main/java/nova/core/component/ComponentMap.java index 5058094a0..58e751642 100644 --- a/src/main/java/nova/core/component/ComponentMap.java +++ b/src/main/java/nova/core/component/ComponentMap.java @@ -46,9 +46,9 @@ public ComponentMap(ComponentProvider provider) { /** * Adds a new component based on its superclass or interface using dependency injection. + * @param The component type. * @param componentType The interface or abstract class associated with the new component. - * @param The node type. - * @return A new node of N type. + * @return The added component. */ public final C add(Class componentType) { return add(Game.injector().resolve(Dependency.dependency(componentType))); @@ -56,8 +56,9 @@ public final C add(Class componentType) { /** * Adds a component to the provider. + * @param The component type. * @param component The component to add. - * @return the component. + * @return The added component. * @throws ComponentException when the component already exists on the block. */ @SuppressWarnings("unchecked") @@ -79,16 +80,14 @@ public final C add(C component) { /** * Adds a component to the block if it is not present. + * @param The component type. * @param component The component to add. - * @return the component. + * @return The component present on this interface */ @SuppressWarnings("unchecked") public final C getOrAdd(C component) { - if (has(component.getClass())) { - return get((Class) component.getClass()); - } - - return add(component); + return getOp((Class) component.getClass()) + .orElseGet(() -> add(component)); } /** @@ -102,6 +101,7 @@ public final boolean has(Class componentType) { /** * Removes a component from the block. + * @param The component type. * @param component The component to remove. * @return the component removed. * @throws ComponentException when the component does not exist. @@ -120,6 +120,7 @@ public final C remove(C component) { /** * Removes the component from the provider. + * @param The component type. * @param componentType the component type. * @return the component removed. * @throws ComponentException when the component does not exist. @@ -142,6 +143,7 @@ public final C remove(Class componentType) { /** * Gets an optional of the component with the specified type. + * @param The component type. * @param componentType the type to get. * @return the optional of the component found or {@code Optional.empty()}. * if the component was not found. @@ -166,6 +168,7 @@ public final Optional getOp(Class componentType) { /** * Gets the component with the specified type. + * @param The component type. * @param componentType the type to get. * @return the component. * @throws ComponentException if the component doesn't exist. @@ -176,6 +179,7 @@ public final C get(Class componentType) { /** * Gets the set of the components with the specified type. + * @param The component type. * @param componentType the type to get. * @return the set of the components. */ diff --git a/src/main/java/nova/core/component/SidedComponentMap.java b/src/main/java/nova/core/component/SidedComponentMap.java index 1d5412ca7..27ab4f214 100644 --- a/src/main/java/nova/core/component/SidedComponentMap.java +++ b/src/main/java/nova/core/component/SidedComponentMap.java @@ -34,6 +34,11 @@ /** * A class that contains all sided components. + * + * This was implemented horribly poorly, so I intend to re‑implement + * it in a better way, which will also break backwards compatibility + * for the most part. + * * @author ExE Boss */ public class SidedComponentMap extends ComponentMap { @@ -102,6 +107,7 @@ public final C add(Class componentType, Direction... di /** * Adds a component to the provider. + * @param The component type. * @param direction The direction to add the component to. * @param component The component to add. * @return the component. @@ -113,6 +119,7 @@ public final C add(C component, Direction direction) { /** * Adds a component to the provider. + * @param The component type. * @param component The component to add. * @param directions The directions to add the component to. * @return the component. @@ -126,6 +133,7 @@ public final C add(C component, Direction... directions) { /** * Adds a component to the block if it is not present. + * @param The component type. * @param component The component to add. * @param direction The direction to get or add the component to. * @return the component. @@ -156,6 +164,7 @@ public final boolean canRemove(Class componentType, Direction direction) { /** * Removes the component from the block. + * @param The component type. * @param component the component type. * @param direction The direction to remove the component from. * @return the component removed. @@ -167,6 +176,7 @@ public final C remove(C component, Direction direction) { /** * Removes the component from the provider. + * @param The component type. * @param componentType the component type. * @param direction The direction to remove the component from. * @return the component removed. @@ -179,6 +189,7 @@ public final C remove(Class componentType, Direction di /** * Gets an optional of the component with the specified type. + * @param The component type. * @param componentType the type to get. * @param direction The direction to get the component from. * @return the optional of the component found or {@code Optional.empty()}. @@ -194,6 +205,7 @@ public final Optional getOp(Class componentType, Direction direction) /** * Gets the component with the specified type. + * @param The component type. * @param componentType the type to get. * @param direction The direction to get the component from. * @return the component. @@ -205,6 +217,7 @@ public final C get(Class componentType, Direction direction) { /** * Gets the set of the components with the specified type. + * @param The component type. * @param componentType the type to get. * @param direction The direction to get the component from. * @return the set of the components. diff --git a/src/main/java/nova/core/component/Updater.java b/src/main/java/nova/core/component/Updater.java index 8700da3a5..4aa0a5008 100644 --- a/src/main/java/nova/core/component/Updater.java +++ b/src/main/java/nova/core/component/Updater.java @@ -33,7 +33,7 @@ default void update(double deltaTime) { * Update components */ if (this instanceof ComponentProvider) { - ((ComponentProvider) this).components() + ((ComponentProvider) this).components() .stream() .filter(component -> component instanceof Updater) .forEach(component -> ((Updater) component).update(deltaTime)); diff --git a/src/main/java/nova/core/component/fluid/Fluid.java b/src/main/java/nova/core/component/fluid/Fluid.java index 809e968ca..65b850919 100644 --- a/src/main/java/nova/core/component/fluid/Fluid.java +++ b/src/main/java/nova/core/component/fluid/Fluid.java @@ -54,6 +54,7 @@ public int amount() { * Sets new size of this FluidStack * Note that there can never be fluid with "zero" amount. Use Optional.empty() instead. * @param amount New size + * @return {@code this} instance */ public Fluid setAmount(int amount) { this.amount = Math.max(amount, 1); diff --git a/src/main/java/nova/core/component/fluid/FluidBlock.java b/src/main/java/nova/core/component/fluid/FluidBlock.java index f9113d0aa..cae374ab4 100644 --- a/src/main/java/nova/core/component/fluid/FluidBlock.java +++ b/src/main/java/nova/core/component/fluid/FluidBlock.java @@ -29,6 +29,7 @@ public interface FluidBlock { /** * Returns the Fluid associated with this Block. + * @return The Fluid associated with this Block. */ Optional getFluid(); @@ -38,7 +39,7 @@ public interface FluidBlock { * NOTE: The block is intended to handle its own state changes. * * @param doDrain If false, the drain will only be simulated. - * @return + * @return The drained fluid amount. */ Optional drain(boolean doDrain); } diff --git a/src/main/java/nova/core/component/inventory/InventoryException.java b/src/main/java/nova/core/component/inventory/InventoryException.java index eb81bb8e3..6ce95f9ee 100644 --- a/src/main/java/nova/core/component/inventory/InventoryException.java +++ b/src/main/java/nova/core/component/inventory/InventoryException.java @@ -23,6 +23,8 @@ import nova.core.util.exception.NovaException; public class InventoryException extends NovaException { + private static final long serialVersionUID = 1L; + public InventoryException() { super(); } diff --git a/src/main/java/nova/core/component/inventory/ItemFilter.java b/src/main/java/nova/core/component/inventory/ItemFilter.java index 02447c66c..6569a73ec 100644 --- a/src/main/java/nova/core/component/inventory/ItemFilter.java +++ b/src/main/java/nova/core/component/inventory/ItemFilter.java @@ -34,10 +34,10 @@ public interface ItemFilter extends Predicate { /** * Returns an {@link ItemFilter} that accepts an {@link Item} of the same - * type as the provided. + * type as provided. * - * @param item - * @return ItemFilter + * @param item The item type + * @return The ItemFilter instance checking the item type */ static ItemFilter of(Item item) { return item::sameItemType; @@ -47,8 +47,8 @@ static ItemFilter of(Item item) { * Returns an {@link ItemFilter} that accepts an {@link Item} of the same * type as provided. * - * @param id - * @return ItemFilter + * @param id The item ID + * @return The ItemFilter instance checking the item ID */ static ItemFilter of(String id) { return (other) -> id.equals(other.getID()); @@ -57,8 +57,8 @@ static ItemFilter of(String id) { /** * Accepts any {@link Item} that has a >= stack size than provided. * - * @param amount - * @return + * @param amount The amount + * @return The ItemFilter instance checking the amount */ static ItemFilter of(int amount) { return (other) -> other.count() >= amount; diff --git a/src/main/java/nova/core/component/misc/Collider.java b/src/main/java/nova/core/component/misc/Collider.java index af7c1fd18..c84314a5b 100644 --- a/src/main/java/nova/core/component/misc/Collider.java +++ b/src/main/java/nova/core/component/misc/Collider.java @@ -40,7 +40,7 @@ @UnsidedComponent public class Collider extends Component { - public final ComponentProvider provider; + public final ComponentProvider provider; /** * A general cuboid that represents the bounds of this object. @@ -66,7 +66,7 @@ public class Collider extends Component { */ public Supplier isOpaqueCube = isCube; - public Collider(ComponentProvider provider) { + public Collider(ComponentProvider provider) { this.provider = provider; } diff --git a/src/main/java/nova/core/component/transform/Orientation.java b/src/main/java/nova/core/component/transform/Orientation.java index 1d9f21ab2..adf9ba132 100644 --- a/src/main/java/nova/core/component/transform/Orientation.java +++ b/src/main/java/nova/core/component/transform/Orientation.java @@ -43,7 +43,6 @@ import org.apache.commons.math3.util.FastMath; import java.util.Arrays; -import java.util.Optional; import java.util.function.Predicate; /** @@ -259,6 +258,10 @@ public boolean canRotate(Direction side) { /** * Rotatable Block + * + * @param side The hit side + * @param hit The hit vector + * @return If rotation is possible from this side */ public boolean rotate(int side, Vector3D hit) { int result = getSideToRotate(side, hit); @@ -274,6 +277,10 @@ public boolean rotate(int side, Vector3D hit) { /** * Determines the side to rotate based on the hit vector on the block. + * + * @param hitSide The hit side + * @param hit The hit vector + * @return The rotation axis */ public int getSideToRotate(int hitSide, Vector3D hit) { int tBack = hitSide ^ 1; diff --git a/src/main/java/nova/core/config/ConfigException.java b/src/main/java/nova/core/config/ConfigException.java index c8828caed..7fdee443a 100644 --- a/src/main/java/nova/core/config/ConfigException.java +++ b/src/main/java/nova/core/config/ConfigException.java @@ -23,6 +23,8 @@ import nova.core.util.exception.NovaException; public class ConfigException extends NovaException { + private static final long serialVersionUID = 1L; + public ConfigException() { super(); } diff --git a/src/main/java/nova/core/deps/DependencyException.java b/src/main/java/nova/core/deps/DependencyException.java index f6df616b5..f5f399288 100644 --- a/src/main/java/nova/core/deps/DependencyException.java +++ b/src/main/java/nova/core/deps/DependencyException.java @@ -23,6 +23,8 @@ import nova.core.util.exception.NovaException; public class DependencyException extends NovaException { + private static final long serialVersionUID = 1L; + public DependencyException() { super(); } diff --git a/src/main/java/nova/core/entity/component/RigidBody.java b/src/main/java/nova/core/entity/component/RigidBody.java index a7ca3817e..89e1e69ac 100644 --- a/src/main/java/nova/core/entity/component/RigidBody.java +++ b/src/main/java/nova/core/entity/component/RigidBody.java @@ -34,6 +34,8 @@ public abstract class RigidBody extends Component implements Updater { /** * Mass in kilograms. Default is 1 kg. + * + * @return The mass of this rigid body. */ public abstract double getMass(); @@ -41,6 +43,8 @@ public abstract class RigidBody extends Component implements Updater { /** * Velocity is how fast the body is moving + * + * @return The velocity vector of this rigid body. */ public abstract Vector3D getVelocity(); @@ -52,6 +56,8 @@ public abstract class RigidBody extends Component implements Updater { /** * Gravity is an acceleration. + * + * @return The gravity vector of this rigid body. */ public abstract Vector3D getGravity(); @@ -59,6 +65,8 @@ public abstract class RigidBody extends Component implements Updater { /** * Rotation Methods + * + * @return The angular drag of this rigid body. */ public abstract double getAngularDrag(); @@ -70,6 +78,8 @@ public abstract class RigidBody extends Component implements Updater { /** * Forces + * + * @param force The force to apply. */ public abstract void addForce(Vector3D force); @@ -78,28 +88,61 @@ public abstract class RigidBody extends Component implements Updater { public abstract void addTorque(Vector3D torque); /** - * Scala sugar coating + * Alias for {@link #getMass()}. + * + * @return The mass of this rigid body. + * @see #getMass() */ public final double mass() { return getMass(); } + /** + * Alias for {@link #getVelocity()}. + * + * @return The velocity vector of this rigid body. + * @see #getVelocity() + */ public final Vector3D velocity() { return getVelocity(); } + /** + * Alias for {@link #getDrag()}. + * + * @return The drag of this rigid body. + * @see #getDrag() + */ public final double drag() { return getDrag(); } + /** + * Alias for {@link #getGravity()}. + * + * @return The gravity vector of this rigid body. + * @see #getGravity() + */ public final Vector3D gravity() { return getGravity(); } + /** + * Alias for {@link #getAngularDrag()}. + * + * @return The angular drag of this rigid body. + * @see #getAngularDrag() + */ public final double angularDrag() { return getAngularDrag(); } + /** + * Alias for {@link #getAngularVelocity()}. + * + * @return The angular velocity of this rigid body. + * @see #getAngularVelocity() + */ public final Rotation angularVelocity() { return getAngularVelocity(); } diff --git a/src/main/java/nova/core/event/bus/EventBus.java b/src/main/java/nova/core/event/bus/EventBus.java index 41688decc..b399f2c7b 100644 --- a/src/main/java/nova/core/event/bus/EventBus.java +++ b/src/main/java/nova/core/event/bus/EventBus.java @@ -216,6 +216,7 @@ public EventBinder after(String name) { * @return The event handler */ public synchronized EventListenerHandle bind(EventListener list) { + @SuppressWarnings("unchecked") EventListener listener = clazz.isPresent() ? new TypedEventListener<>(list, clazz.get()) : (EventListener) list; if (name != null && unsortedListeners.stream().filter(node -> node.name != null).anyMatch(node -> node.name.equals(name))) { diff --git a/src/main/java/nova/core/event/bus/EventCancelException.java b/src/main/java/nova/core/event/bus/EventCancelException.java index 0a2be6967..234c0394f 100644 --- a/src/main/java/nova/core/event/bus/EventCancelException.java +++ b/src/main/java/nova/core/event/bus/EventCancelException.java @@ -21,6 +21,8 @@ package nova.core.event.bus; public class EventCancelException extends EventException { + private static final long serialVersionUID = 1L; + public EventCancelException(String message, Class event) { super(message, event); } diff --git a/src/main/java/nova/core/event/bus/EventException.java b/src/main/java/nova/core/event/bus/EventException.java index 34e6a97e1..9cc423ebe 100644 --- a/src/main/java/nova/core/event/bus/EventException.java +++ b/src/main/java/nova/core/event/bus/EventException.java @@ -23,6 +23,8 @@ import nova.core.util.exception.NovaException; public class EventException extends NovaException { + private static final long serialVersionUID = 1L; + public EventException() { super(); } diff --git a/src/main/java/nova/core/game/InputManager.java b/src/main/java/nova/core/game/InputManager.java index 80920b29a..66aace24b 100644 --- a/src/main/java/nova/core/game/InputManager.java +++ b/src/main/java/nova/core/game/InputManager.java @@ -57,7 +57,8 @@ public int getNativeKeyCode(Key key) { /** * Is the key current down? * - * @return + * @param key The {@link Key key} to check. + * @return The pressed state of the key. */ public abstract boolean isKeyDown(Key key); diff --git a/src/main/java/nova/core/item/Item.java b/src/main/java/nova/core/item/Item.java index f3770a9a8..5fe194840 100644 --- a/src/main/java/nova/core/item/Item.java +++ b/src/main/java/nova/core/item/Item.java @@ -81,6 +81,7 @@ public int count() { /** * Sets new size of this ItemStack * @param size New size + * @return {@code this} instance */ public Item setCount(int size) { count = Math.max(Math.min(getMaxCount(), size), 0); diff --git a/src/main/java/nova/core/nativewrapper/NativeManager.java b/src/main/java/nova/core/nativewrapper/NativeManager.java index df844740f..3cb100f8f 100644 --- a/src/main/java/nova/core/nativewrapper/NativeManager.java +++ b/src/main/java/nova/core/nativewrapper/NativeManager.java @@ -113,6 +113,7 @@ private > CONVERTE * Converts a native object to a nova object. This method has autocast, is DANGEROUS and may crash. * * @param nativeObject A game implementation object. + * @param The NOVA equivalent type. * @return The NOVA equivalent object. */ public T toNova(Object nativeObject) { @@ -129,6 +130,7 @@ public T toNova(Object nativeObject) { * Converts a nova object to a native object. This method has autocast, is DANGEROUS and may crash. * * @param novaObject A NOVA implementation object. + * @param The game equivalent type. * @return The game equivalent object. */ public T toNative(Object novaObject) { diff --git a/src/main/java/nova/core/network/NetworkException.java b/src/main/java/nova/core/network/NetworkException.java index d96aca679..96ba9a71f 100644 --- a/src/main/java/nova/core/network/NetworkException.java +++ b/src/main/java/nova/core/network/NetworkException.java @@ -22,7 +22,10 @@ import nova.core.util.exception.NovaException; + public class NetworkException extends NovaException { + private static final long serialVersionUID = 1L; + public NetworkException() { super(); } diff --git a/src/main/java/nova/core/network/NetworkManager.java b/src/main/java/nova/core/network/NetworkManager.java index 4adb356ce..86c663f7d 100644 --- a/src/main/java/nova/core/network/NetworkManager.java +++ b/src/main/java/nova/core/network/NetworkManager.java @@ -46,7 +46,8 @@ public NetworkManager() { * Register a packet type. A packet type handles * a specific packet handler type. * - * @param type An ID is assigned to the packet handler + * @param type The packet handler to register + * @return The ID of the packet handler */ public int register(PacketHandler type) { handlers.add(type); @@ -104,11 +105,12 @@ public void sendPacket(Object sender, Packet packet) { */ public abstract void sendPacket(Packet packet); + @SuppressWarnings("unchecked") public Packet writePacket(Object sender, Packet packet) { int packetTypeID = getPacketTypeID(getPacketType(sender)); packet.writeInt(packetTypeID); packet.writeInt(packet.getID()); - ((PacketHandler) getPacketType(sender)).write(sender, packet); + ((PacketHandler) getPacketType(sender)).write(sender, packet); return packet; } diff --git a/src/main/java/nova/core/network/NetworkTarget.java b/src/main/java/nova/core/network/NetworkTarget.java index 6e57ae613..fb16d12e1 100755 --- a/src/main/java/nova/core/network/NetworkTarget.java +++ b/src/main/java/nova/core/network/NetworkTarget.java @@ -52,7 +52,8 @@ * A side specifies the current scope of the execution environment. Use * {@link #get()} to check your current side in order to react differently * on the server or client side. Some methods may only be run on a specific - * side, see {@link #assertSide(Side)}. + * side, see {@link #assertSide(nova.core.network.NetworkTarget.Side) + * assertSide(Side)}. *

* *

@@ -195,7 +196,7 @@ public Side reduce() { /** * Shorthand for {@code Side.assertSide(this)} * - * @see #assertSide(Side) + * @see #assertSide(nova.core.network.NetworkTarget.Side) */ public void assertSide() { Side current = get(); diff --git a/src/main/java/nova/core/network/Packet.java b/src/main/java/nova/core/network/Packet.java index 2ad0c0484..16bf40ec1 100644 --- a/src/main/java/nova/core/network/Packet.java +++ b/src/main/java/nova/core/network/Packet.java @@ -47,12 +47,14 @@ public interface Packet { /** * Sets the ID of this packet, allowing it to be sent accordingly. + * @param id The packet ID * @return The packet itself. */ Packet setID(int id); /** * The player sending the packet + * @return The player sending the packet */ Player player(); @@ -193,7 +195,7 @@ default Packet write(Object data) { Packet writeString(String value); //TODO: Packet handler is bad at reading/writing enums for unknown reasons - default Packet writeEnum(Enum data) { + default Packet writeEnum(Enum data) { writeString(data.getClass().getName()); writeString(data.name()); return this; @@ -232,7 +234,7 @@ default Packet writeStorable(Storable storable) { return this; } - default Packet writeCollection(Collection col) { + default Packet writeCollection(Collection col) { writeInt(col.size()); col.forEach(obj -> { writeShort(getType(obj.getClass())); @@ -241,7 +243,7 @@ default Packet writeCollection(Collection col) { return this; } - default Packet writeOptional(Optional optional) { + default Packet writeOptional(Optional optional) { if (optional.isPresent()) { writeShort(getType(optional.get().getClass())); write(optional.get()); @@ -337,17 +339,18 @@ default Packet writeOptional(Optional optional) { String readString(); - default Enum readEnum() { + default > E readEnum() { try { String enumClassName = readString(); - Class className = (Class) Class.forName(enumClassName); + @SuppressWarnings("unchecked") + Class className = (Class) Class.forName(enumClassName); return readEnum(className); } catch (Exception e) { throw new NetworkException("Failed to read enum.", e); } } - default Enum readEnum(Class type) { + default > E readEnum(Class type) { return Enum.valueOf(type, readString()); } @@ -358,6 +361,7 @@ default Syncable readPacketHandler(Syncable handler) { /** * Reads a {@link Data} type. + * @return The data type */ default Data readData() { Data readData = new Data(); @@ -380,13 +384,14 @@ default Object readStorable() { } default List readList() { - ArrayList arrayList = new ArrayList(); + ArrayList arrayList = new ArrayList<>(); int size = readInt(); IntStream .range(0, size) .forEach(i -> { short type = readShort(); + @SuppressWarnings("unchecked") T value = (T) read(Data.dataTypes[type]); arrayList.add(value); }); @@ -402,6 +407,7 @@ default Set readSet() { .range(0, size) .forEach(i -> { short type = readShort(); + @SuppressWarnings("unchecked") T value = (T) read(Data.dataTypes[type]); set.add(value); }); @@ -409,6 +415,7 @@ default Set readSet() { return set; } + @SuppressWarnings("unchecked") default Optional readOptional() { short type = readShort(); if (type != -1) { @@ -426,6 +433,7 @@ default Vector3D readVector3D() { return new Vector3D(readDouble(), readDouble(), readDouble()); } + @SuppressWarnings("unchecked") default T read(Class clazz) { if (clazz == Boolean.class || clazz == boolean.class) { return (T) Boolean.valueOf(readBoolean()); diff --git a/src/main/java/nova/core/recipes/ingredient/ItemIngredient.java b/src/main/java/nova/core/recipes/ingredient/ItemIngredient.java index 9c37547f1..a86c320d4 100755 --- a/src/main/java/nova/core/recipes/ingredient/ItemIngredient.java +++ b/src/main/java/nova/core/recipes/ingredient/ItemIngredient.java @@ -118,8 +118,10 @@ static ItemIngredient forDictionary(String id) { Optional getTag(); /** - * Sets the ingredient tag. Ingredients can be tagged to make them easy to read from recipe functions. + * Sets the ingredient tag. Ingredients can be tagged to make them + * easy to read from recipe functions. * + * @param tag The ingredient tag * @return this instance */ public ItemIngredient withTag(String tag); diff --git a/src/main/java/nova/core/render/RenderException.java b/src/main/java/nova/core/render/RenderException.java index 8c6302c5e..a2c02138e 100644 --- a/src/main/java/nova/core/render/RenderException.java +++ b/src/main/java/nova/core/render/RenderException.java @@ -23,6 +23,8 @@ import nova.core.util.exception.NovaException; public class RenderException extends NovaException { + private static final long serialVersionUID = 1L; + public RenderException() { super(); } diff --git a/src/main/java/nova/core/render/pipeline/BlockRenderPipeline.java b/src/main/java/nova/core/render/pipeline/BlockRenderPipeline.java index 2873a8909..a6f4f7d6a 100644 --- a/src/main/java/nova/core/render/pipeline/BlockRenderPipeline.java +++ b/src/main/java/nova/core/render/pipeline/BlockRenderPipeline.java @@ -138,7 +138,7 @@ public BlockRenderPipeline withBounds(Cuboid bounds) { * * @param renderSide A predicate that takes a {@link nova.core.util.Direction} * and returns a boolean specifying whether or not the side should render. - * @return + * @return this */ public BlockRenderPipeline filter(Predicate renderSide) { this.renderSide = renderSide; diff --git a/src/main/java/nova/core/render/pipeline/ItemRenderPipeline.java b/src/main/java/nova/core/render/pipeline/ItemRenderPipeline.java index a1f915d4e..9af5a1ee4 100644 --- a/src/main/java/nova/core/render/pipeline/ItemRenderPipeline.java +++ b/src/main/java/nova/core/render/pipeline/ItemRenderPipeline.java @@ -43,7 +43,7 @@ */ public class ItemRenderPipeline extends RenderPipeline { - public final ComponentProvider componentProvider; + public final ComponentProvider componentProvider; /** * Called to get the texture of this item. @@ -64,7 +64,7 @@ public class ItemRenderPipeline extends RenderPipeline { */ public Supplier colorMultiplier = () -> Color.white; - public ItemRenderPipeline(ComponentProvider componentProvider) { + public ItemRenderPipeline(ComponentProvider componentProvider) { this.componentProvider = componentProvider; size = () -> new Vector2D(1, 1); consumer = model -> model.addChild(draw(new MeshModel())); diff --git a/src/main/java/nova/core/retention/Data.java b/src/main/java/nova/core/retention/Data.java index 1429771ff..a93fbeb02 100755 --- a/src/main/java/nova/core/retention/Data.java +++ b/src/main/java/nova/core/retention/Data.java @@ -219,11 +219,12 @@ public static T unserialize(Data data) { * Loads an object from its stored data, given its class. * @param clazz - The class to load * @param data - The data + * @param - The type * @return The object loaded with given data. */ public static T unserialize(Class clazz, Data data) { try { - T storable = clazz.newInstance(); + T storable = clazz.getDeclaredConstructor().newInstance(); storable.load(data); return storable; } catch (Exception e) { @@ -324,7 +325,7 @@ public T getStorable(String key) { try { @SuppressWarnings("unchecked") Class storableClass = (Class) Class.forName(storableData.className); - T obj = storableClass.newInstance(); + T obj = storableClass.getDeclaredConstructor().newInstance(); obj.load(storableData); return obj; } catch (Exception e) { diff --git a/src/main/java/nova/core/retention/Storable.java b/src/main/java/nova/core/retention/Storable.java index 3efa05639..28a0e3a7a 100644 --- a/src/main/java/nova/core/retention/Storable.java +++ b/src/main/java/nova/core/retention/Storable.java @@ -88,7 +88,7 @@ default void load(Data data) { if (List.class.isAssignableFrom(type)) { field.set(this, Data.unserialize((Data) value)); } else { - Collection collection = (Collection) type.newInstance(); + Collection collection = (Collection) type.getDeclaredConstructor().newInstance(); field.set(this, collection.addAll(Data.unserialize((Data) value))); } } else { diff --git a/src/main/java/nova/core/util/ClassLoaderUtil.java b/src/main/java/nova/core/util/ClassLoaderUtil.java index c3e4a8e1b..b9dffb23a 100644 --- a/src/main/java/nova/core/util/ClassLoaderUtil.java +++ b/src/main/java/nova/core/util/ClassLoaderUtil.java @@ -61,6 +61,8 @@ private static synchronized void setAddURL() { } public static class ClassLoaderException extends NovaException { + private static final long serialVersionUID = 1L; + public ClassLoaderException() { super(); } diff --git a/src/main/java/nova/core/util/EnumSelector.java b/src/main/java/nova/core/util/EnumSelector.java index a557110b8..40ca597b2 100644 --- a/src/main/java/nova/core/util/EnumSelector.java +++ b/src/main/java/nova/core/util/EnumSelector.java @@ -52,6 +52,8 @@ private EnumSelector(Class enumClass) { /** * Creates a new instance of EnumSelector for the given type. * + * @param The enum type + * @param enumClass The enum class for which to create an EnumSelector. * @return an instance of EnumSelector for the given type. */ public static > EnumSelector of(Class enumClass) { diff --git a/src/main/java/nova/core/util/Pipeline.java b/src/main/java/nova/core/util/Pipeline.java index dd8da422e..18cfc390a 100644 --- a/src/main/java/nova/core/util/Pipeline.java +++ b/src/main/java/nova/core/util/Pipeline.java @@ -6,6 +6,7 @@ /** * A series of methods that transform an object as it is passed through the {@link Pipeline}. * @author Calclavia + * @param The pipeline type. */ public class Pipeline { protected Optional> prev = Optional.empty(); @@ -29,6 +30,7 @@ public Pipeline(Consumer consumer) { /** * Sets the given pipeline to be piped after this render stream. * This method essentially allow you to switch between processes in the pipeline. + * @param The new pipeline type. * @param stream The stream to apply. * @return The new RenderStream */ diff --git a/src/main/java/nova/core/util/ProgressBar.java b/src/main/java/nova/core/util/ProgressBar.java index 6d5b68c9e..12239f69a 100644 --- a/src/main/java/nova/core/util/ProgressBar.java +++ b/src/main/java/nova/core/util/ProgressBar.java @@ -58,6 +58,8 @@ protected void stepImpl(String message) {} /** * Check if the progress bar has been finished. + * + * @return If the progress bar has finished. */ boolean isFinished(); diff --git a/src/main/java/nova/core/util/RayTracer.java b/src/main/java/nova/core/util/RayTracer.java index 79ac4d66e..69e4312f5 100644 --- a/src/main/java/nova/core/util/RayTracer.java +++ b/src/main/java/nova/core/util/RayTracer.java @@ -89,6 +89,7 @@ public Stream rayTraceAll(World world) { /** * Check all blocks that are in a line + * @param world The world to perform the ray trace in. * @return The blocks ray traced in the order from closest to furthest. */ public Stream rayTraceBlocks(World world) { @@ -171,7 +172,9 @@ public Optional rayTrace(Cuboid cuboid) { /** * Ray traces a cuboid + * @param the result type * @param cuboid The cuboid in absolute world coordinates + * @param resultMapper the {@link RayTraceResult} converter * @return The ray trace result if the ray intersects the cuboid */ public Optional rayTrace(Cuboid cuboid, BiFunction resultMapper) { diff --git a/src/main/java/nova/core/util/ReflectionUtil.java b/src/main/java/nova/core/util/ReflectionUtil.java index 4ffb81317..47c7a104c 100644 --- a/src/main/java/nova/core/util/ReflectionUtil.java +++ b/src/main/java/nova/core/util/ReflectionUtil.java @@ -267,7 +267,7 @@ public static T newInstanceMatching(Class clazz, Object... args) { if (args != null && args.length > 0) { return newInstanceMatching(findMatchingConstructor(clazz, types(args)).get(), args); } else { - return clazz.newInstance(); + return clazz.getDeclaredConstructor().newInstance(); } } catch (Exception e) { throw new ReflectionException(e); @@ -279,7 +279,7 @@ public static T newInstance(Class clazz, Object... args) { if (args != null && args.length > 0) { return clazz.getConstructor(types(args)).newInstance(args); } - return clazz.newInstance(); + return clazz.getDeclaredConstructor().newInstance(); } catch (Exception e) { throw new ReflectionException(e); } @@ -304,6 +304,7 @@ public static void forEachAnnotatedField(Class The annotation type * @param annotation Your annotation class. * @param clazz Class to search through. * @return An ordered map of annotated fields and their annotations from the @@ -329,6 +330,8 @@ public static void forEachRecursiveAnnotatedField(Class Type contained in the list */ public class EvictingList extends LinkedList { + private static final long serialVersionUID = 1L; + private final int limit; /** diff --git a/src/main/java/nova/core/util/collection/TreeNode.java b/src/main/java/nova/core/util/collection/TreeNode.java index 3a7b610cd..b63839889 100644 --- a/src/main/java/nova/core/util/collection/TreeNode.java +++ b/src/main/java/nova/core/util/collection/TreeNode.java @@ -36,7 +36,7 @@ * * @param - Self type */ -public class TreeNode implements Iterable { +public class TreeNode> implements Iterable { /** * The children of the node. @@ -71,9 +71,10 @@ public void setParent(Optional parent) { * @param node The childnode to add * @return The merged node */ + @SuppressWarnings("unchecked") public S addChild(S node) { children.add(node); - node.parent = Optional.of(this); + node.parent = Optional.of((S) this); return node; } diff --git a/src/main/java/nova/core/util/exception/RegistrationException.java b/src/main/java/nova/core/util/exception/RegistrationException.java index 320470054..6daa8bc63 100644 --- a/src/main/java/nova/core/util/exception/RegistrationException.java +++ b/src/main/java/nova/core/util/exception/RegistrationException.java @@ -24,6 +24,8 @@ * An exception thrown when registration in a manager, dictionary or registry fails. */ public class RegistrationException extends NovaException { + private static final long serialVersionUID = 1L; + public RegistrationException() { super(); } diff --git a/src/main/java/nova/core/util/math/MatrixStack.java b/src/main/java/nova/core/util/math/MatrixStack.java index de9db256f..addd37d89 100755 --- a/src/main/java/nova/core/util/math/MatrixStack.java +++ b/src/main/java/nova/core/util/math/MatrixStack.java @@ -42,8 +42,8 @@ public MatrixStack() { * Clone construcotr of MatrixStack * @param clone instance to be cloned */ + @SuppressWarnings("unchecked") public MatrixStack(MatrixStack clone) { - //noinspection unchecked this.stack = (Stack) clone.stack.clone(); this.current = clone.current.copy(); } diff --git a/src/main/java/nova/core/util/math/MatrixUtil.java b/src/main/java/nova/core/util/math/MatrixUtil.java index a4fbbeea7..8bf86032e 100755 --- a/src/main/java/nova/core/util/math/MatrixUtil.java +++ b/src/main/java/nova/core/util/math/MatrixUtil.java @@ -55,6 +55,8 @@ public static RealMatrix augmentWithIdentity(RealMatrix matrix, int dimensions) // Little cheat. private static Localizable of(String string) { return new Localizable() { + private static final long serialVersionUID = 1L; + @Override public String getSourceString() { return string; diff --git a/src/main/java/nova/core/util/math/RotationUtil.java b/src/main/java/nova/core/util/math/RotationUtil.java index eac0e92b4..45e9b1359 100755 --- a/src/main/java/nova/core/util/math/RotationUtil.java +++ b/src/main/java/nova/core/util/math/RotationUtil.java @@ -79,7 +79,10 @@ public static int rotateSide(int s, int r) { } /** - * Reverse of rotateSide + * Rotates a Direction global size into a relative side. + * @param s1 Side 1 + * @param s2 Side 2 + * @return The Direction ordinal from 0-5. */ public static int rotationTo(int s1, int s2) { if ((s1 & 6) == (s2 & 6)) { @@ -106,6 +109,11 @@ public static Direction getRelativeSide(Direction front, Direction side) { * Wrapper function that simply calls {@code slerp(a, b, t, true)}. *

* See {@link #slerp(Rotation, Rotation, double, boolean)} for details. + * + * @param a the first Rotation + * @param b the second Rotation + * @param t the temporal interpolation parameter + * @return The slerp interpolation of Rotations {@code a} and {@code b}, at time {@code t}. */ public static Rotation slerp(Rotation a, Rotation b, double t) { return slerp(a, b, t, true); @@ -123,11 +131,12 @@ public static Rotation slerp(Rotation a, Rotation b, double t) { * "flipping" the source Rotation if needed. * @param a the first Rotation * @param b the second Rotation - * @param t the t interpolation parameter + * @param t the temporal interpolation parameter * @param allowFlip tells whether or not the interpolation allows axis flip + * @return The slerp interpolation of Rotations {@code a} and {@code b}, at time {@code t}. */ public static Rotation slerp(Rotation a, Rotation b, double t, boolean allowFlip) { - // Warning: this method should not normalize the Rotation + // TODO: this method should not normalize the Rotation double cosAngle = dotProduct(a, b); double c1, c2; @@ -156,7 +165,9 @@ public static Rotation slerp(Rotation a, Rotation b, double t, boolean allowFlip * Returns the "dot" product of this Quaternion and {@code b}: *

* {@code this.x * b.x + this.y * b.y + this.z * b.z + this.w * b.w} + * @param a This * @param b the Quaternion + * @return The dot product */ public static double dotProduct(Rotation a, Rotation b) { return a.getQ0() * b.getQ0() + a.getQ1() * b.getQ1() + a.getQ2() * b.getQ2() + a.getQ3() * b.getQ3(); diff --git a/src/main/java/nova/core/world/World.java b/src/main/java/nova/core/world/World.java index d89565221..8b551f576 100644 --- a/src/main/java/nova/core/world/World.java +++ b/src/main/java/nova/core/world/World.java @@ -77,29 +77,45 @@ public boolean removeBlock(Vector3D position) { /** * Creates an entity * @param factory The entity factory + * @return The added entity */ public abstract Entity addEntity(EntityFactory factory); /** * Creates an entity that holds an item + * @param position The position to add the item to * @param item The item + * @return The added entity */ public abstract Entity addEntity(Vector3D position, Item item); /** * Creates an entity only on the client side. * For example, particle effects. + *

+ * TODO: Replace this with an actual particle system. + *

+ * @param factory The entity factory + * @return The added entity */ public abstract Entity addClientEntity(EntityFactory factory); /** * Creates an entity only on the client side. * For example, particle effects. + *

+ * TODO: Replace this with an actual particle system. + *

+ * @param The entity type + * @param entity The entity to add + * @return The added entity */ public abstract T addClientEntity(T entity); /** * Destroys an entity, removing it from the world. + * + * @param entity The entity to remove */ public abstract void removeEntity(Entity entity); diff --git a/src/main/java/nova/internal/core/Game.java b/src/main/java/nova/internal/core/Game.java index 68485291f..e2abc6b5d 100644 --- a/src/main/java/nova/internal/core/Game.java +++ b/src/main/java/nova/internal/core/Game.java @@ -75,15 +75,11 @@ public class Game { /** * The synchronized ticker that uses the same thread as the game. - * - * This is @deprecated, use syncTicker() instead. */ private final UpdateTicker.SynchronizedTicker syncTicker; /** * The thread ticker that runs on NOVA's thread. - * - * This is @deprecated, use threadTicker() instead. */ private final UpdateTicker.ThreadTicker threadTicker; @@ -224,6 +220,11 @@ public static FluidManager fluids() { /** * The synchronized ticker that uses the same thread as the game. + * + * @return The synchronous game ticker, which is synchronized + * with the game’s tick speed. + *

+ * For Minecraft, this is 20hz. */ public static UpdateTicker.SynchronizedTicker syncTicker() { return instance.syncTicker; @@ -231,6 +232,9 @@ public static UpdateTicker.SynchronizedTicker syncTicker() { /** * The thread ticker that runs on NOVA's thread. + * + * @return The asynchronous NOVA ticker, + * which runs as fast as possible. */ public static UpdateTicker.ThreadTicker threadTicker() { return instance.threadTicker; diff --git a/src/main/java/nova/internal/core/di/DICoreModule.java b/src/main/java/nova/internal/core/di/DICoreModule.java index 0ecefbfc9..fb8a77d82 100644 --- a/src/main/java/nova/internal/core/di/DICoreModule.java +++ b/src/main/java/nova/internal/core/di/DICoreModule.java @@ -25,13 +25,9 @@ import java.util.function.Supplier; public class DICoreModule extends BinderModule { - - @Override protected void declare() { - //install(BuildinBundle.PROVIDER); //To allow injection of providers - starbind(Supplier.class).to(new SupplierSupplier()); + starbind(Supplier.class).to(new SupplierModule.SupplierSupplier()); } - } diff --git a/src/main/java/nova/internal/core/di/SupplierModule.java b/src/main/java/nova/internal/core/di/SupplierModule.java index 8887984b0..0ebcd1b89 100644 --- a/src/main/java/nova/internal/core/di/SupplierModule.java +++ b/src/main/java/nova/internal/core/di/SupplierModule.java @@ -16,7 +16,9 @@ * * You should have received a copy of the GNU General Public License * along with NOVA. If not, see . - */package nova.internal.core.di; + */ + +package nova.internal.core.di; import se.jbee.inject.Dependency; import se.jbee.inject.Injector; @@ -25,20 +27,28 @@ import static se.jbee.inject.util.ToString.describe; -final class SupplierSupplier implements Supplier> { +/** + * A dummy class containing the {@link SupplierSupplier} to match + * the rest of the NOVA Dependency Injection setup. + * + * @author ExE Boss + */ +public final class SupplierModule { - @Override - public java.util.function.Supplier supply( Dependency> dependency, Injector injector ) { - Dependency providedType = dependency.onTypeParameter(); - if ( !dependency.getName().isDefault() ) { - providedType = providedType.named( dependency.getName() ); + public static final class SupplierSupplier implements Supplier> { + @Override + public java.util.function.Supplier supply(Dependency> dependency, Injector injector) { + Dependency providedType = dependency.onTypeParameter(); + if (!dependency.getName().isDefault()) { + providedType = providedType.named(dependency.getName()); + } + final Dependency finalProvidedType = providedType; + return () -> SuppliedBy.lazyProvider(finalProvidedType.uninject().ignoredExpiry(), injector).provide(); } - final Dependency finalProvidedType = providedType; - return () -> SuppliedBy.lazyProvider(finalProvidedType.uninject().ignoredExpiry(), injector).provide(); - } - @Override - public String toString() { - return describe( "supplies", java.util.function.Supplier.class ); + @Override + public String toString() { + return describe("supplies", java.util.function.Supplier.class); + } } } diff --git a/src/main/java/nova/internal/core/launch/InitializationException.java b/src/main/java/nova/internal/core/launch/InitializationException.java index 5c5676315..abc80a853 100644 --- a/src/main/java/nova/internal/core/launch/InitializationException.java +++ b/src/main/java/nova/internal/core/launch/InitializationException.java @@ -21,6 +21,8 @@ import nova.core.util.exception.NovaException; public class InitializationException extends NovaException { + private static final long serialVersionUID = 1L; + public InitializationException() { super(); } diff --git a/src/main/java/nova/internal/core/util/InjectionUtil.java b/src/main/java/nova/internal/core/util/InjectionUtil.java index 2340f891a..3deaea4ad 100644 --- a/src/main/java/nova/internal/core/util/InjectionUtil.java +++ b/src/main/java/nova/internal/core/util/InjectionUtil.java @@ -185,9 +185,9 @@ public static T newInstance(Class classToConstruct, boolean printStackTra * @param The object type * @param classToConstruct The class to construct * @return A new instance of the class - * @throws InstantiationException - * @throws IllegalAccessException - * @throws InvocationTargetException + * @throws InstantiationException If an {@link InstantiationException} occurs + * @throws IllegalAccessException If an {@link IllegalAccessException} occurs + * @throws InvocationTargetException If an {@link InvocationTargetException} occurs * @see Constructor#newInstance(java.lang.Object...) */ @SuppressWarnings("unchecked") @@ -204,9 +204,9 @@ public static T newInstanceOrThrow(Class classToConstruct) throws Instant * @param classToConstruct The class to construct * @param mapping Custom DI mapping * @return A new instance of the class - * @throws InstantiationException - * @throws IllegalAccessException - * @throws InvocationTargetException + * @throws InstantiationException If an {@link InstantiationException} occurs + * @throws IllegalAccessException If an {@link IllegalAccessException} occurs + * @throws InvocationTargetException If an {@link InvocationTargetException} occurs * @see Constructor#newInstance(java.lang.Object...) */ @SuppressWarnings("unchecked") diff --git a/src/main/java/nova/internal/core/util/TopologicalSort.java b/src/main/java/nova/internal/core/util/TopologicalSort.java index e1c65c78a..d6abcffe9 100644 --- a/src/main/java/nova/internal/core/util/TopologicalSort.java +++ b/src/main/java/nova/internal/core/util/TopologicalSort.java @@ -21,7 +21,8 @@ public class TopologicalSort { * Sort the input graph into a topologically sorted list * * Uses the reverse depth first search as outlined in ... - * @param graph + * @param The type + * @param graph The graph to sort * @return The sorted list. */ public static List topologicalSort(DirectedGraph graph) { @@ -64,6 +65,7 @@ public static void explore(T node, DirectedGraph graph, List sortedRes } throw new NovaException("There was a cycle detected in the input graph, sorting is not possible", node) { + private static final long serialVersionUID = 1L; }; } From add94f587b0051cdf6197d21115fbad7bacef5c8 Mon Sep 17 00:00:00 2001 From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com> Date: Sat, 23 Jun 2018 09:30:00 +0200 Subject: [PATCH 08/12] =?UTF-8?q?Fix=20compiler=20warnings=20in=20NOVA?= =?UTF-8?q?=E2=80=91Core=E2=80=91Wrapper=E2=80=91MC1.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mc/forge/v18/asm/StaticForwarder.java | 8 ++--- .../mc/forge/v18/asm/lib/ASMHelper.java | 6 ++-- .../v18/asm/lib/ClassHeirachyManager.java | 4 +-- .../forge/v18/asm/lib/ComponentInjector.java | 2 +- .../mc/forge/v18/asm/lib/InsnListPrinter.java | 1 + .../mc/forge/v18/asm/lib/ObfMapping.java | 2 ++ .../forge/v18/asm/lib/TemplateInjector.java | 6 ++-- .../mc/forge/v18/launcher/ClientProxy.java | 34 +++++++----------- .../mc/forge/v18/launcher/FMLProgressBar.java | 7 ++-- .../mc/forge/v18/launcher/ForgeLoadable.java | 16 ++++++++- .../mc/forge/v18/launcher/NovaMinecraft.java | 36 ++++++++++++------- .../mc/forge/v18/util/ReflectionUtil.java | 6 ++-- .../v18/wrapper/block/BlockConverter.java | 2 +- .../v18/wrapper/block/world/BWWorld.java | 4 +-- .../mc/forge/v18/wrapper/item/FWItem.java | 5 +-- .../forge/v18/wrapper/item/FWItemBlock.java | 5 +-- .../v18/wrapper/item/FWNBTTagCompound.java | 3 +- .../forge/v18/wrapper/item/ItemConverter.java | 8 ++++- .../v18/wrapper/item/ItemWrapperMethods.java | 14 +++++--- .../mc/forge/v18/wrapper/render/BWModel.java | 3 ++ .../v18/wrapper/render/FWSmartBlockModel.java | 11 +++--- .../v18/wrapper/render/FWSmartItemModel.java | 15 ++++---- .../v18/wrapper/render/FWSmartModel.java | 6 ++-- .../wrapper/render/backward/BWBakedModel.java | 7 ++-- 24 files changed, 126 insertions(+), 85 deletions(-) diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/StaticForwarder.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/StaticForwarder.java index 8f814952b..7b097d675 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/StaticForwarder.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/StaticForwarder.java @@ -79,10 +79,10 @@ public static void chunkSetBlockEvent(Chunk chunk, BlockPos pos, IBlockState old /** * Used to inject forwarded TileEntites - * @param data - * @param clazz - * @return - * @throws Exception + * @param data The TileEntity data + * @param clazz The TileEntity class + * @return The new TileEntity instance + * @throws Exception If an exception occurred */ public static TileEntity loadTileEntityHook(NBTTagCompound data, Class clazz) throws Exception { if (FWTile.class.isAssignableFrom(clazz)) { diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ASMHelper.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ASMHelper.java index da08b6d3b..4772928ba 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ASMHelper.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ASMHelper.java @@ -64,8 +64,8 @@ public class ASMHelper { static { try { - defineClass1 = ClassLoader.class.getDeclaredMethod("defineClass", new Class[] { String.class, byte[].class, int.class, int.class }); - defineClass2 = ClassLoader.class.getDeclaredMethod("defineClass", new Class[] { String.class, byte[].class, int.class, int.class, ProtectionDomain.class }); + defineClass1 = ClassLoader.class.getDeclaredMethod("defineClass", String.class, byte[].class, int.class, int.class); + defineClass2 = ClassLoader.class.getDeclaredMethod("defineClass", String.class, byte[].class, int.class, int.class, ProtectionDomain.class); } catch (Exception e) { throw new RuntimeException(e); } @@ -314,6 +314,7 @@ public static Class defineClass(ClassNode cn, int flags) { try { byte[] bytes = createBytes(cn, flags); defineClass1.setAccessible(true); + @SuppressWarnings("unchecked") Class clazz = (Class) defineClass1.invoke(Thread.currentThread().getContextClassLoader(), cn.name.replaceAll("/", "."), bytes, 0, bytes.length); defineClass1.setAccessible(false); return clazz; @@ -329,6 +330,7 @@ public static Class defineClass(ClassNode cn, int flags, ProtectionDomain try { byte[] bytes = createBytes(cn, flags); defineClass2.setAccessible(true); + @SuppressWarnings("unchecked") Class clazz = (Class) defineClass2.invoke(Thread.currentThread().getContextClassLoader(), cn.name.replaceAll("/", "."), bytes, 0, bytes.length, domain); defineClass2.setAccessible(false); return clazz; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ClassHeirachyManager.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ClassHeirachyManager.java index f3c50cba2..a1a2e4008 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ClassHeirachyManager.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ClassHeirachyManager.java @@ -59,10 +59,10 @@ public static String unKey(String name) { } /** - * Returns true if clazz extends, either directly or indirectly, superclass. + * Returns true if the class extends, either directly or indirectly, the superclass. * @param name The class in question * @param superclass The class being extended - * @return + * @return If the class extends or not */ public static boolean classExtends(String name, String superclass) { name = toKey(name); diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ComponentInjector.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ComponentInjector.java index ff63f377e..1fd3a1bb3 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ComponentInjector.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ComponentInjector.java @@ -46,7 +46,7 @@ * The ComponentInjector is capable of creating dynamic classes that implement a * specified super class and implement the interfaces specified by * {@link Component} and {@link Passthrough}. - * @param + * @param The component type * @author Vic Nightfall */ public class ComponentInjector implements Opcodes { diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/InsnListPrinter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/InsnListPrinter.java index 2de57f630..53227aa5c 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/InsnListPrinter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/InsnListPrinter.java @@ -123,6 +123,7 @@ public void visitInsn(AbstractInsnNode insn) { _visitInsn(insn); } + @SuppressWarnings("deprecation") private void _visitInsn(AbstractInsnNode insn) { switch (insn.getType()) { case 0: diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ObfMapping.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ObfMapping.java index 164afd384..6aac4be25 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ObfMapping.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ObfMapping.java @@ -118,6 +118,7 @@ public boolean matches(MethodInsnNode node) { return s_owner.equals(node.owner) && s_name.equals(node.name) && s_desc.equals(node.desc); } + @SuppressWarnings("deprecation") public AbstractInsnNode toInsn(int opcode) { if (isClass()) { return new TypeInsnNode(opcode, s_owner); @@ -132,6 +133,7 @@ public void visitTypeInsn(MethodVisitor mv, int opcode) { mv.visitTypeInsn(opcode, s_owner); } + @SuppressWarnings("deprecation") public void visitMethodInsn(MethodVisitor mv, int opcode) { mv.visitMethodInsn(opcode, s_owner, s_name, s_desc); } diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/TemplateInjector.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/TemplateInjector.java index d06fe6e8a..4c79fa9d7 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/TemplateInjector.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/TemplateInjector.java @@ -44,7 +44,7 @@ public class TemplateInjector { * @param className - Class that will be injected * @param template - Default interface used as a template to inject in the templateName */ - public void registerTemplate(String className, Class template) { + public void registerTemplate(String className, Class template) { templates.put(className, new InjectionTemplate(template.getName())); } @@ -83,8 +83,8 @@ public InjectionTemplate(String templateName) { /** * Patches the cnode withPriority the methods from this template. - * @param cnode - * @return + * @param cnode The ClassNode instance + * @return If the class node was modified */ public boolean inject(ClassNode cnode) { diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ClientProxy.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ClientProxy.java index e647cdef3..2d5b7a8a2 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ClientProxy.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ClientProxy.java @@ -23,20 +23,17 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.resources.IResource; import net.minecraft.client.resources.Language; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; -import net.minecraftforge.fml.common.ProgressManager; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import nova.core.entity.Entity; @@ -82,8 +79,9 @@ public void init(FMLInitializationEvent evt) { @SuppressWarnings({"unchecked", "deprecation"}) public void loadLanguage(LanguageManager languageManager) { super.loadLanguage(languageManager); - ProgressManager.ProgressBar progressBar = ProgressManager.push("Loading NOVA language files", - NovaMinecraftPreloader.novaResourcePacks.size() + 1); + net.minecraftforge.fml.common.ProgressManager.ProgressBar progressBar = + net.minecraftforge.fml.common.ProgressManager.push("Loading NOVA language files", + NovaMinecraftPreloader.novaResourcePacks.size() + 1); FMLProgressBar fmlProgressBar = new FMLProgressBar(progressBar); fmlProgressBar.step("nova"); SortedSet languages = Minecraft.getMinecraft().getLanguageManager().getLanguages(); @@ -116,7 +114,7 @@ public void loadLanguage(LanguageManager languageManager) { }); }); fmlProgressBar.finish(); - ProgressManager.pop(progressBar); + net.minecraftforge.fml.common.ProgressManager.pop(progressBar); } private void loadLanguage(LanguageManager languageManager, String langName, InputStream stream) { @@ -133,14 +131,10 @@ public void registerItem(FWItem item) { super.registerItem(item); //Hacks to inject custom item definition - ModelLoader.setCustomMeshDefinition(item, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - ResourceLocation itemRL = (ResourceLocation) Item.itemRegistry.getNameForObject(item); - return new ModelResourceLocation(itemRL, "inventory"); - } - } - ); + ModelLoader.setCustomMeshDefinition(item, stack -> { + ResourceLocation itemRL = (ResourceLocation) Item.itemRegistry.getNameForObject(item); + return new ModelResourceLocation(itemRL, "inventory"); + }); } @Override @@ -150,14 +144,10 @@ public void postRegisterBlock(FWBlock block) { //Hack to inject custom itemblock definition Item itemFromBlock = Item.getItemFromBlock(block); - ModelLoader.setCustomMeshDefinition(itemFromBlock, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - ResourceLocation itemRL = (ResourceLocation) Item.itemRegistry.getNameForObject(itemFromBlock); - return new ModelResourceLocation(itemRL, "inventory"); - } - } - ); + ModelLoader.setCustomMeshDefinition(itemFromBlock, stack -> { + ResourceLocation itemRL = (ResourceLocation) Item.itemRegistry.getNameForObject(itemFromBlock); + return new ModelResourceLocation(itemRL, "inventory"); + }); } @Override diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/FMLProgressBar.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/FMLProgressBar.java index 1927fc6cf..345b1daeb 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/FMLProgressBar.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/FMLProgressBar.java @@ -20,7 +20,6 @@ package nova.core.wrapper.mc.forge.v18.launcher; -import net.minecraftforge.fml.common.ProgressManager.ProgressBar; import nova.core.util.AbstractProgressBar; /** @@ -30,9 +29,11 @@ */ public class FMLProgressBar extends AbstractProgressBar { - private final ProgressBar progressBar; + @SuppressWarnings("deprecation") + private final net.minecraftforge.fml.common.ProgressManager.ProgressBar progressBar; - public FMLProgressBar(ProgressBar progressBar) { + public FMLProgressBar(@SuppressWarnings("deprecation") + net.minecraftforge.fml.common.ProgressManager.ProgressBar progressBar) { this.progressBar = progressBar; } diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ForgeLoadable.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ForgeLoadable.java index a76ddcbe7..d0c365319 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ForgeLoadable.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ForgeLoadable.java @@ -29,15 +29,29 @@ * * @author ExE Boss */ -// TODO Maybe replace with wrapper events. public interface ForgeLoadable { + /** + * Pre‑initialize the wrapper code. + * + * @param evt The Minecraft Forge pre-initialization event + */ default void preInit(FMLPreInitializationEvent evt) { } + /** + * Initialize the wrapper code. + * + * @param evt The Minecraft Forge initialization event + */ default void init(FMLInitializationEvent evt) { } + /** + * Post-initialize the wrapper code. + * + * @param evt The Minecraft Forge post-initialization event + */ default void postInit(FMLPostInitializationEvent evt) { } } diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/NovaMinecraft.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/NovaMinecraft.java index cec978b33..b0867754c 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/NovaMinecraft.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/NovaMinecraft.java @@ -20,11 +20,9 @@ package nova.core.wrapper.mc.forge.v18.launcher; -import com.typesafe.config.Config; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.ProgressManager; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; @@ -36,7 +34,6 @@ import nova.core.config.Configuration; import nova.core.deps.MavenDependency; import nova.core.event.ServerEvent; -import nova.core.event.bus.GlobalEvents; import nova.core.wrapper.mc.forge.v18.NovaMinecraftPreloader; import nova.core.wrapper.mc.forge.v18.depmodules.ClientModule; import nova.core.wrapper.mc.forge.v18.depmodules.ComponentModule; @@ -69,7 +66,6 @@ import java.io.File; import java.util.HashSet; import java.util.List; -import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -78,7 +74,7 @@ * @author Calclavia */ @Mod(modid = NovaMinecraft.id, name = NovaMinecraft.name, version = NovaMinecraftPreloader.version, acceptableRemoteVersions = "*") -public class NovaMinecraft { +public class NovaMinecraft implements ForgeLoadable { public static final String id = "nova"; public static final String name = "NOVA"; @@ -102,8 +98,12 @@ public static void registerWrapper(ForgeLoadable wrapper) { * ORDER OF LOADING. * * 1. Native Loaders 2. Native Converters 3. Mods + * + * @param evt {@inheritDoc} */ @Mod.EventHandler + @Override + @SuppressWarnings("deprecation") public void preInit(FMLPreInitializationEvent evt) { try { /** @@ -163,9 +163,10 @@ public void preInit(FMLPreInitializationEvent evt) { e.printStackTrace(); } - ProgressManager.ProgressBar progressBar = ProgressManager.push("Loading NOVA mods", modClasses.isEmpty() ? 1 : modClasses.size()); + net.minecraftforge.fml.common.ProgressManager.ProgressBar progressBar + = net.minecraftforge.fml.common.ProgressManager.push("Loading NOVA mods", modClasses.isEmpty() ? 1 : modClasses.size()); launcher.load(new FMLProgressBar(progressBar)); - ProgressManager.pop(progressBar); + net.minecraftforge.fml.common.ProgressManager.pop(progressBar); novaModWrappers = launcher.getOrdererdMods().stream().filter(mod -> mod instanceof ForgeLoadable).map(mod -> (ForgeLoadable) mod).collect(Collectors.toList()); novaWrappers.removeAll(novaModWrappers); @@ -187,7 +188,8 @@ public void preInit(FMLPreInitializationEvent evt) { Game.entities().init(); //Load preInit - progressBar = ProgressManager.push("Pre-initializing NOVA wrappers", (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size()); + progressBar = net.minecraftforge.fml.common.ProgressManager.push("Pre-initializing NOVA wrappers", + (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size()); FMLProgressBar fmlProgressBar = new FMLProgressBar(progressBar); novaModWrappers.stream().forEachOrdered(wrapper -> { fmlProgressBar.step(wrapper.getClass()); @@ -198,7 +200,7 @@ public void preInit(FMLPreInitializationEvent evt) { wrapper.preInit(evt); }); fmlProgressBar.finish(); - ProgressManager.pop(progressBar); + net.minecraftforge.fml.common.ProgressManager.pop(progressBar); proxy.preInit(evt); @@ -216,11 +218,15 @@ public void preInit(FMLPreInitializationEvent evt) { } @Mod.EventHandler + @Override + @SuppressWarnings("deprecation") public void init(FMLInitializationEvent evt) { try { proxy.init(evt); nativeConverters.stream().forEachOrdered(forgeLoadable -> forgeLoadable.init(evt)); - ProgressManager.ProgressBar progressBar = ProgressManager.push("Initializing NOVA wrappers", (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size()); + net.minecraftforge.fml.common.ProgressManager.ProgressBar progressBar + = net.minecraftforge.fml.common.ProgressManager.push("Initializing NOVA wrappers", + (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size()); FMLProgressBar fmlProgressBar = new FMLProgressBar(progressBar); novaModWrappers.stream().forEachOrdered(wrapper -> { fmlProgressBar.step(wrapper.getClass()); @@ -231,7 +237,7 @@ public void init(FMLInitializationEvent evt) { wrapper.init(evt); }); fmlProgressBar.finish(); - ProgressManager.pop(progressBar); + net.minecraftforge.fml.common.ProgressManager.pop(progressBar); } catch (Exception e) { Game.logger().error("Error during init", e); e.printStackTrace(); @@ -240,12 +246,16 @@ public void init(FMLInitializationEvent evt) { } @Mod.EventHandler + @Override + @SuppressWarnings("deprecation") public void postInit(FMLPostInitializationEvent evt) { try { proxy.postInit(evt); nativeConverters.stream().forEachOrdered(forgeLoadable -> forgeLoadable.postInit(evt)); Game.recipes().init(); - ProgressManager.ProgressBar progressBar = ProgressManager.push("Post-initializing NOVA wrappers", (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size()); + net.minecraftforge.fml.common.ProgressManager.ProgressBar progressBar + = net.minecraftforge.fml.common.ProgressManager.push("Post-initializing NOVA wrappers", + (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size()); FMLProgressBar fmlProgressBar = new FMLProgressBar(progressBar); novaModWrappers.stream().forEachOrdered(wrapper -> { fmlProgressBar.step(wrapper.getClass()); @@ -256,7 +266,7 @@ public void postInit(FMLPostInitializationEvent evt) { wrapper.postInit(evt); }); fmlProgressBar.finish(); - ProgressManager.pop(progressBar); + net.minecraftforge.fml.common.ProgressManager.pop(progressBar); } catch (Exception e) { Game.logger().error("Error during postInit", e); e.printStackTrace(); diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/ReflectionUtil.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/ReflectionUtil.java index 420b96808..d526afb11 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/ReflectionUtil.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/ReflectionUtil.java @@ -57,6 +57,7 @@ * adjustment - as such, those have been collected here. * @author Stan Hebben */ +@SuppressWarnings("unchecked") public class ReflectionUtil { private static final Field NBTTAGLIST_TAGLIST; private static final Field OREDICTIONARY_IDTOSTACK; @@ -129,6 +130,7 @@ public static List getTagList(NBTTagList list) { } } + @SuppressWarnings("rawtypes") public static List getSeeds() { return getPrivateStaticObject(ForgeHooks.class, "seedList"); } @@ -137,7 +139,7 @@ public static Map getChestLoot() { return getPrivateStaticObject(ChestGenHooks.class, "chestInfo"); } - public static Map getTranslations() { + public static Map getTranslations() { return getPrivateObject( getPrivateStaticObject(StatCollector.class, "localizedName", "field_74839_a"), "languageList", @@ -308,7 +310,7 @@ public static boolean setPrivateObject(Object object, Object value, String... na // ### Private Methods ### // ####################### - private static Field getField(Class cls, String... names) { + private static Field getField(Class cls, String... names) { for (String name : names) { try { Field field = cls.getDeclaredField(name); diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/BlockConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/BlockConverter.java index f40bef205..c85731b92 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/BlockConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/BlockConverter.java @@ -97,7 +97,7 @@ public net.minecraft.block.Block toNative(BlockFactory blockFactory) { /** * Register all Nova blocks * - * @param evt The Minecraft Forge pre-initialization event + * @param evt {@inheritDoc} */ @Override public void preInit(FMLPreInitializationEvent evt) { diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/world/BWWorld.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/world/BWWorld.java index 766fbac7e..b0695e41a 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/world/BWWorld.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/world/BWWorld.java @@ -129,8 +129,8 @@ public Entity addClientEntity(EntityFactory factory) { @Override @SuppressWarnings("unchecked") - public Entity addClientEntity(Entity entity) { - return NovaMinecraft.proxy.spawnParticle(world(), entity); + public T addClientEntity(T entity) { + return (T) NovaMinecraft.proxy.spawnParticle(world(), entity); } @Override diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItem.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItem.java index 98959ee54..9112cc6ec 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItem.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItem.java @@ -47,8 +47,9 @@ public ItemFactory getItemFactory() { } @Override - public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean p_77624_4_) { - ItemWrapperMethods.super.addInformation(itemStack, player, list, p_77624_4_); + @SuppressWarnings({"unchecked", "rawtypes"}) + public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { + ItemWrapperMethods.super.addInformation(itemStack, player, tooltip, advanced); } @Override diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItemBlock.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItemBlock.java index 8c35f97e3..e6a57cdb4 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItemBlock.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItemBlock.java @@ -45,8 +45,9 @@ public ItemFactory getItemFactory() { } @Override - public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean p_77624_4_) { - ItemWrapperMethods.super.addInformation(itemStack, player, list, p_77624_4_); + @SuppressWarnings({"unchecked", "rawtypes"}) + public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { + ItemWrapperMethods.super.addInformation(itemStack, player, tooltip, advanced); } @Override diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWNBTTagCompound.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWNBTTagCompound.java index 477ed78cc..c58f61be8 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWNBTTagCompound.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWNBTTagCompound.java @@ -41,9 +41,10 @@ public Item getItem() { } @Override + @SuppressWarnings("unchecked") public NBTBase copy() { FWNBTTagCompound result = new FWNBTTagCompound(item); - getKeySet().forEach(s -> result.setTag((String) s, getTag((String) s).copy())); + ((Iterable) getKeySet()).forEach(s -> result.setTag(s, getTag(s).copy())); return result; } } diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemConverter.java index c070f49f7..0b98d34ea 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemConverter.java @@ -150,6 +150,10 @@ public ItemFactory get(MinecraftItemMapping minecraftItem) { /** * Saves NOVA item into a Minecraft ItemStack. + * + * @param itemStack the Minecraft ItemStack instance + * @param item The NOVA item. + * @return The updated ItemStack instance */ public ItemStack updateMCItemStack(ItemStack itemStack, Item item) { itemStack.stackSize = item.count(); @@ -164,7 +168,9 @@ public ItemStack updateMCItemStack(ItemStack itemStack, Item item) { } /** - * Register all Nova blocks + * Register all Nova items + * + * @param evt {@inheritDoc} */ @Override public void preInit(FMLPreInitializationEvent evt) { diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemWrapperMethods.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemWrapperMethods.java index 62434be0b..959634123 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemWrapperMethods.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemWrapperMethods.java @@ -27,7 +27,6 @@ import nova.core.item.ItemFactory; import nova.core.util.Direction; import nova.core.wrapper.mc.forge.v18.wrapper.entity.backward.BWEntity; -import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import java.util.List; @@ -41,10 +40,17 @@ public interface ItemWrapperMethods { ItemFactory getItemFactory(); - @SuppressWarnings({"unchecked", "rawtypes"}) - default void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean p_77624_4_) { + /** + * Allows items to add custom lines of information to the mouseover description + * + * @param itemStack The ItemStack instance + * @param player The player entity + * @param tooltip All lines to display in the Item's tooltip. This is a List of Strings. + * @param advanced Whether the setting "Advanced tooltips" is enabled + */ + default void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { Item item = ItemConverter.instance().toNova(itemStack); - item.setCount(itemStack.stackSize).events.publish(new Item.TooltipEvent(Optional.of(new BWEntity(player)), list)); + item.setCount(itemStack.stackSize).events.publish(new Item.TooltipEvent(Optional.of(new BWEntity(player)), tooltip)); getItemFactory().save(item); } diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/BWModel.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/BWModel.java index d8abf65f4..c7dc41c87 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/BWModel.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/BWModel.java @@ -42,6 +42,9 @@ public class BWModel extends MeshModel { /** * Completes this rendering for a block. + * + * @param blockAccess The {@link IBlockAccess} instance. + * @throws NullPointerException If {@code blockAccess} is {@code null} */ public void render(IBlockAccess blockAccess) { render(Optional.of(blockAccess), Optional.empty()); diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartBlockModel.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartBlockModel.java index 0c9da02c2..4730e6ba0 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartBlockModel.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartBlockModel.java @@ -22,8 +22,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemTransformVec3f; import net.minecraft.item.ItemStack; import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.ISmartBlockModel; @@ -63,9 +61,12 @@ public FWSmartBlockModel(Block block, Optional item) { this.block = block; this.item = item; // Change the default transforms to the default full Block transforms - this.itemCameraTransforms = new ItemCameraTransforms( - new ItemTransformVec3f(new Vector3f(10, -45, 170), new Vector3f(0, 0.09375f, -0.171875f), new Vector3f(0.375f, 0.375f, 0.375f)), // Third Person - ItemTransformVec3f.DEFAULT, ItemTransformVec3f.DEFAULT, ItemTransformVec3f.DEFAULT); + this.itemCameraTransforms = new net.minecraft.client.renderer.block.model.ItemCameraTransforms( + new net.minecraft.client.renderer.block.model.ItemTransformVec3f( + new Vector3f(10, -45, 170), new Vector3f(0, 0.09375f, -0.171875f), new Vector3f(0.375f, 0.375f, 0.375f)), // Third Person + net.minecraft.client.renderer.block.model.ItemTransformVec3f.DEFAULT, + net.minecraft.client.renderer.block.model.ItemTransformVec3f.DEFAULT, + net.minecraft.client.renderer.block.model.ItemTransformVec3f.DEFAULT); } //Block rendering diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartItemModel.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartItemModel.java index 4c7108957..ee00f753c 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartItemModel.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartItemModel.java @@ -21,8 +21,6 @@ package nova.core.wrapper.mc.forge.v18.wrapper.render; import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemTransformVec3f; import net.minecraft.item.ItemStack; import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.ISmartItemModel; @@ -46,11 +44,14 @@ public FWSmartItemModel(Item item) { super(); this.item = item; // Change the default transforms to the default Item transforms - this.itemCameraTransforms = new ItemCameraTransforms( - new ItemTransformVec3f(new Vector3f(0, -90, 130), new Vector3f(0, 1f / 24f, -2.75f / 16f), new Vector3f(0.9f, 0.9f, 0.9f)), // Third Person - new ItemTransformVec3f(new Vector3f(0, -135, 25/*-135/*-25*/), new Vector3f(0, 0.25f, 0.125f/*0.5f, 0.25f*/), new Vector3f(1.7f, 1.7f, 1.7f)), // First Person - ItemTransformVec3f.DEFAULT, // Head - new ItemTransformVec3f(new Vector3f(-30, 135, 0), new Vector3f(), new Vector3f(1.6F, 1.6F, 1.6F))); // GUI + this.itemCameraTransforms = new net.minecraft.client.renderer.block.model.ItemCameraTransforms( + new net.minecraft.client.renderer.block.model.ItemTransformVec3f( + new Vector3f(0, -90, 130), new Vector3f(0, 1f / 24f, -2.75f / 16f), new Vector3f(0.9f, 0.9f, 0.9f)), // Third Person + new net.minecraft.client.renderer.block.model.ItemTransformVec3f( + new Vector3f(0, -135, 25/*-135/*-25*/), new Vector3f(0, 0.25f, 0.125f/*0.5f, 0.25f*/), new Vector3f(1.7f, 1.7f, 1.7f)), // First Person + net.minecraft.client.renderer.block.model.ItemTransformVec3f.DEFAULT, // Head + new net.minecraft.client.renderer.block.model.ItemTransformVec3f( + new Vector3f(-30, 135, 0), new Vector3f(), new Vector3f(1.6F, 1.6F, 1.6F))); // GUI } //Item rendering diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartModel.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartModel.java index f69d0f247..03dc58fed 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartModel.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartModel.java @@ -23,7 +23,6 @@ import com.google.common.primitives.Ints; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; @@ -55,7 +54,8 @@ public abstract class FWSmartModel implements IFlexibleBakedModel { protected final VertexFormat format; // Default item transforms. Can be changed in subclasses. @SuppressWarnings("deprecation") - protected ItemCameraTransforms itemCameraTransforms = ItemCameraTransforms.DEFAULT; + protected net.minecraft.client.renderer.block.model.ItemCameraTransforms itemCameraTransforms + = net.minecraft.client.renderer.block.model.ItemCameraTransforms.DEFAULT; protected FWSmartModel(VertexFormat format) { this.format = format; @@ -153,7 +153,7 @@ public TextureAtlasSprite getTexture() { @Override @SuppressWarnings("deprecation") - public ItemCameraTransforms getItemCameraTransforms() { + public net.minecraft.client.renderer.block.model.ItemCameraTransforms getItemCameraTransforms() { return itemCameraTransforms; } } diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/backward/BWBakedModel.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/backward/BWBakedModel.java index 38e89a224..2d3fc9781 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/backward/BWBakedModel.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/backward/BWBakedModel.java @@ -25,7 +25,6 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormatElement; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import nova.core.render.Color; @@ -59,16 +58,16 @@ public class BWBakedModel extends MeshModel { @SuppressWarnings("deprecation") - public final IBakedModel wrapped; + public final net.minecraft.client.resources.model.IBakedModel wrapped; public final VertexFormat format; - public BWBakedModel(@SuppressWarnings("deprecation") IBakedModel wrapped) { + public BWBakedModel(@SuppressWarnings("deprecation") net.minecraft.client.resources.model.IBakedModel wrapped) { this(wrapped, DefaultVertexFormats.ITEM); } @SuppressWarnings("unchecked") - public BWBakedModel(@SuppressWarnings("deprecation") IBakedModel wrapped, VertexFormat format) { + public BWBakedModel(@SuppressWarnings("deprecation") net.minecraft.client.resources.model.IBakedModel wrapped, VertexFormat format) { this.wrapped = wrapped; this.format = format; this.matrix.translate(-0.5, -0.5, -0.5); From bc6f1c9ecac6de5cc2ddd44c8f7e660ff6feb7bb Mon Sep 17 00:00:00 2001 From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com> Date: Sat, 23 Jun 2018 10:30:00 +0200 Subject: [PATCH 09/12] =?UTF-8?q?Fix=20compiler=20warnings=20in=20NOVA?= =?UTF-8?q?=E2=80=91Core=E2=80=91Wrapper=E2=80=91MC1.7.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mc/forge/v17/asm/StaticForwarder.java | 8 ++--- .../mc/forge/v17/asm/lib/ASMHelper.java | 8 +++-- .../v17/asm/lib/ClassHeirachyManager.java | 4 +-- .../forge/v17/asm/lib/ComponentInjector.java | 2 +- .../mc/forge/v17/asm/lib/InsnListPrinter.java | 1 + .../mc/forge/v17/asm/lib/ObfMapping.java | 2 ++ .../forge/v17/asm/lib/TemplateInjector.java | 6 ++-- .../mc/forge/v17/launcher/ClientProxy.java | 8 ++--- .../mc/forge/v17/launcher/FMLProgressBar.java | 7 ++-- .../mc/forge/v17/launcher/ForgeLoadable.java | 22 ++++++++++--- .../mc/forge/v17/launcher/NovaMinecraft.java | 33 +++++++++++++------ .../v17/manager/config/NovaGuiConfig.java | 3 +- .../mc/forge/v17/util/ReflectionUtil.java | 6 ++-- .../v17/wrapper/block/BlockConverter.java | 2 +- .../wrapper/block/forward/FWTileLoader.java | 4 +-- .../v17/wrapper/block/world/BWWorld.java | 4 +-- .../mc/forge/v17/wrapper/item/FWItem.java | 5 +-- .../forge/v17/wrapper/item/FWItemBlock.java | 5 +-- .../v17/wrapper/item/FWNBTTagCompound.java | 11 ++----- .../forge/v17/wrapper/item/ItemConverter.java | 13 ++++++-- .../v17/wrapper/item/ItemWrapperMethods.java | 17 ++++++---- .../mc/forge/v17/wrapper/render/BWModel.java | 4 +++ .../v17/wrapper/DirectionConverterTest.java | 2 +- 23 files changed, 111 insertions(+), 66 deletions(-) diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/StaticForwarder.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/StaticForwarder.java index 932c004db..f065f0124 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/StaticForwarder.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/StaticForwarder.java @@ -75,10 +75,10 @@ public static void chunkSetBlockEvent(Chunk chunk, int x, int y, int z, Block ol /** * Used to inject forwarded TileEntites - * @param data - * @param clazz - * @return - * @throws Exception + * @param data The TileEntity data + * @param clazz The TileEntity class + * @return The new TileEntity instance + * @throws Exception If an exception occurred */ public static TileEntity loadTileEntityHook(NBTTagCompound data, Class clazz) throws Exception { if (clazz.equals(FWTile.class)) { diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ASMHelper.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ASMHelper.java index fbf351a39..4867340b9 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ASMHelper.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ASMHelper.java @@ -64,8 +64,8 @@ public class ASMHelper { static { try { - defineClass1 = ClassLoader.class.getDeclaredMethod("defineClass", new Class[] { String.class, byte[].class, int.class, int.class }); - defineClass2 = ClassLoader.class.getDeclaredMethod("defineClass", new Class[] { String.class, byte[].class, int.class, int.class, ProtectionDomain.class }); + defineClass1 = ClassLoader.class.getDeclaredMethod("defineClass", String.class, byte[].class, int.class, int.class); + defineClass2 = ClassLoader.class.getDeclaredMethod("defineClass", String.class, byte[].class, int.class, int.class, ProtectionDomain.class); } catch (Exception e) { throw new RuntimeException(e); } @@ -135,7 +135,7 @@ public static byte[] injectMethods(String name, byte[] bytes, Multimap callNodes; if (injector.before) { @@ -314,6 +314,7 @@ public static Class defineClass(ClassNode cn, int flags) { try { byte[] bytes = createBytes(cn, flags); defineClass1.setAccessible(true); + @SuppressWarnings("unchecked") Class clazz = (Class) defineClass1.invoke(Thread.currentThread().getContextClassLoader(), cn.name.replaceAll("/", "."), bytes, 0, bytes.length); defineClass1.setAccessible(false); return clazz; @@ -329,6 +330,7 @@ public static Class defineClass(ClassNode cn, int flags, ProtectionDomain try { byte[] bytes = createBytes(cn, flags); defineClass2.setAccessible(true); + @SuppressWarnings("unchecked") Class clazz = (Class) defineClass2.invoke(Thread.currentThread().getContextClassLoader(), cn.name.replaceAll("/", "."), bytes, 0, bytes.length, domain); defineClass2.setAccessible(false); return clazz; diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ClassHeirachyManager.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ClassHeirachyManager.java index b384852ba..0452ab788 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ClassHeirachyManager.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ClassHeirachyManager.java @@ -59,10 +59,10 @@ public static String unKey(String name) { } /** - * Returns true if clazz extends, either directly or indirectly, superclass. + * Returns true if the class extends, either directly or indirectly, the superclass. * @param name The class in question * @param superclass The class being extended - * @return + * @return If the class extends or not */ public static boolean classExtends(String name, String superclass) { name = toKey(name); diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ComponentInjector.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ComponentInjector.java index 3ce2b8c00..d1e1ff1c7 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ComponentInjector.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ComponentInjector.java @@ -46,7 +46,7 @@ * The ComponentInjector is capable of creating dynamic classes that implement a * specified super class and implement the interfaces specified by * {@link Component} and {@link Passthrough}. - * @param + * @param The component type * @author Vic Nightfall */ public class ComponentInjector implements Opcodes { diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InsnListPrinter.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InsnListPrinter.java index 5add25c87..b6efb352d 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InsnListPrinter.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InsnListPrinter.java @@ -123,6 +123,7 @@ public void visitInsn(AbstractInsnNode insn) { _visitInsn(insn); } + @SuppressWarnings("deprecation") private void _visitInsn(AbstractInsnNode insn) { switch (insn.getType()) { case 0: diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ObfMapping.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ObfMapping.java index 95ce7466e..3b09d749c 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ObfMapping.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ObfMapping.java @@ -118,6 +118,7 @@ public boolean matches(MethodInsnNode node) { return s_owner.equals(node.owner) && s_name.equals(node.name) && s_desc.equals(node.desc); } + @SuppressWarnings("deprecation") public AbstractInsnNode toInsn(int opcode) { if (isClass()) { return new TypeInsnNode(opcode, s_owner); @@ -132,6 +133,7 @@ public void visitTypeInsn(MethodVisitor mv, int opcode) { mv.visitTypeInsn(opcode, s_owner); } + @SuppressWarnings("deprecation") public void visitMethodInsn(MethodVisitor mv, int opcode) { mv.visitMethodInsn(opcode, s_owner, s_name, s_desc); } diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/TemplateInjector.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/TemplateInjector.java index a68b466c0..ca5696979 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/TemplateInjector.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/TemplateInjector.java @@ -44,7 +44,7 @@ public class TemplateInjector { * @param className - Class that will be injected * @param template - Default interface used as a template to inject in the templateName */ - public void registerTemplate(String className, Class template) { + public void registerTemplate(String className, Class template) { templates.put(className, new InjectionTemplate(template.getName())); } @@ -83,8 +83,8 @@ public InjectionTemplate(String templateName) { /** * Patches the cnode withPriority the methods from this template. - * @param cnode - * @return + * @param cnode The ClassNode instance + * @return If the class node was modified */ public boolean inject(ClassNode cnode) { diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ClientProxy.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ClientProxy.java index e282016a5..651a5a549 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ClientProxy.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ClientProxy.java @@ -23,7 +23,6 @@ import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.ProgressManager; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -73,8 +72,9 @@ public void preInit(FMLPreInitializationEvent evt) { @SuppressWarnings({"unchecked", "deprecation"}) public void loadLanguage(LanguageManager languageManager) { super.loadLanguage(languageManager); - ProgressManager.ProgressBar progressBar = ProgressManager.push("Loading NOVA language files", - NovaMinecraftPreloader.novaResourcePacks.size() + 1); + cpw.mods.fml.common.ProgressManager.ProgressBar progressBar + = cpw.mods.fml.common.ProgressManager.push("Loading NOVA language files", + NovaMinecraftPreloader.novaResourcePacks.size() + 1); FMLProgressBar fmlProgressBar = new FMLProgressBar(progressBar); fmlProgressBar.step("nova"); SortedSet languages = Minecraft.getMinecraft().getLanguageManager().getLanguages(); @@ -107,7 +107,7 @@ public void loadLanguage(LanguageManager languageManager) { }); }); fmlProgressBar.finish(); - ProgressManager.pop(progressBar); + cpw.mods.fml.common.ProgressManager.pop(progressBar); } private void loadLanguage(LanguageManager languageManager, String langName, InputStream stream) { diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLProgressBar.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLProgressBar.java index 92418942a..44ca91399 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLProgressBar.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLProgressBar.java @@ -20,7 +20,6 @@ package nova.core.wrapper.mc.forge.v17.launcher; -import cpw.mods.fml.common.ProgressManager.ProgressBar; import nova.core.util.AbstractProgressBar; /** @@ -30,9 +29,11 @@ */ public class FMLProgressBar extends AbstractProgressBar { - private final ProgressBar progressBar; + @SuppressWarnings("deprecation") + private final cpw.mods.fml.common.ProgressManager.ProgressBar progressBar; - public FMLProgressBar(ProgressBar progressBar) { + public FMLProgressBar(@SuppressWarnings("deprecation") + cpw.mods.fml.common.ProgressManager.ProgressBar progressBar) { this.progressBar = progressBar; } diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeLoadable.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeLoadable.java index 599caf259..d902a29b9 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeLoadable.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeLoadable.java @@ -29,15 +29,29 @@ * * @author ExE Boss */ -// TODO Maybe replace with wrapper events. public interface ForgeLoadable { - default void preInit(FMLPreInitializationEvent event) { + /** + * Pre‑initialize the wrapper code. + * + * @param evt The Minecraft Forge pre-initialization event + */ + default void preInit(FMLPreInitializationEvent evt) { } - default void init(FMLInitializationEvent event) { + /** + * Initialize the wrapper code. + * + * @param evt The Minecraft Forge initialization event + */ + default void init(FMLInitializationEvent evt) { } - default void postInit(FMLPostInitializationEvent event) { + /** + * Post-initialize the wrapper code. + * + * @param evt The Minecraft Forge post-initialization event + */ + default void postInit(FMLPostInitializationEvent evt) { } } diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/NovaMinecraft.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/NovaMinecraft.java index 3e9c4f72c..7c12c6db6 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/NovaMinecraft.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/NovaMinecraft.java @@ -22,7 +22,6 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.ProgressManager; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -74,7 +73,7 @@ * @author Calclavia */ @Mod(modid = NovaMinecraft.id, name = NovaMinecraft.name, version = NovaMinecraftPreloader.version, acceptableRemoteVersions = "*") -public class NovaMinecraft { +public class NovaMinecraft implements ForgeLoadable { public static final String id = "nova"; public static final String name = "NOVA"; @@ -98,8 +97,12 @@ public static void registerWrapper(ForgeLoadable wrapper) { * ORDER OF LOADING. * * 1. Native Loaders 2. Native Converters 3. Mods + * + * @param evt {@inheritDoc} */ @Mod.EventHandler + @Override + @SuppressWarnings("deprecation") public void preInit(FMLPreInitializationEvent evt) { try { /** @@ -158,9 +161,10 @@ public void preInit(FMLPreInitializationEvent evt) { e.printStackTrace(); } - ProgressManager.ProgressBar progressBar = ProgressManager.push("Loading NOVA mods", modClasses.isEmpty() ? 1 : modClasses.size()); + cpw.mods.fml.common.ProgressManager.ProgressBar progressBar + = cpw.mods.fml.common.ProgressManager.push("Loading NOVA mods", modClasses.isEmpty() ? 1 : modClasses.size()); launcher.load(new FMLProgressBar(progressBar)); - ProgressManager.pop(progressBar); + cpw.mods.fml.common.ProgressManager.pop(progressBar); novaModWrappers = launcher.getOrdererdMods().stream().filter(mod -> mod instanceof ForgeLoadable).map(mod -> (ForgeLoadable) mod).collect(Collectors.toList()); novaWrappers.removeAll(novaModWrappers); @@ -182,7 +186,8 @@ public void preInit(FMLPreInitializationEvent evt) { Game.entities().init(); //Load preInit - progressBar = ProgressManager.push("Pre-initializing NOVA wrappers", (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size()); + progressBar = cpw.mods.fml.common.ProgressManager.push("Pre-initializing NOVA wrappers", + (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size()); FMLProgressBar fmlProgressBar = new FMLProgressBar(progressBar); novaModWrappers.stream().forEachOrdered(wrapper -> { fmlProgressBar.step(wrapper.getClass()); @@ -193,7 +198,7 @@ public void preInit(FMLPreInitializationEvent evt) { wrapper.preInit(evt); }); fmlProgressBar.finish(); - ProgressManager.pop(progressBar); + cpw.mods.fml.common.ProgressManager.pop(progressBar); proxy.preInit(evt); @@ -211,11 +216,15 @@ public void preInit(FMLPreInitializationEvent evt) { } @Mod.EventHandler + @Override + @SuppressWarnings("deprecation") public void init(FMLInitializationEvent evt) { try { proxy.init(evt); nativeConverters.stream().forEachOrdered(forgeLoadable -> forgeLoadable.init(evt)); - ProgressManager.ProgressBar progressBar = ProgressManager.push("Initializing NOVA wrappers", (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size()); + cpw.mods.fml.common.ProgressManager.ProgressBar progressBar + = cpw.mods.fml.common.ProgressManager.push("Initializing NOVA wrappers", + (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size()); FMLProgressBar fmlProgressBar = new FMLProgressBar(progressBar); novaModWrappers.stream().forEachOrdered(wrapper -> { fmlProgressBar.step(wrapper.getClass()); @@ -226,7 +235,7 @@ public void init(FMLInitializationEvent evt) { wrapper.init(evt); }); fmlProgressBar.finish(); - ProgressManager.pop(progressBar); + cpw.mods.fml.common.ProgressManager.pop(progressBar); } catch (Exception e) { Game.logger().error("Error during init", e); e.printStackTrace(); @@ -235,12 +244,16 @@ public void init(FMLInitializationEvent evt) { } @Mod.EventHandler + @Override + @SuppressWarnings("deprecation") public void postInit(FMLPostInitializationEvent evt) { try { proxy.postInit(evt); nativeConverters.stream().forEachOrdered(forgeLoadable -> forgeLoadable.postInit(evt)); Game.recipes().init(); - ProgressManager.ProgressBar progressBar = ProgressManager.push("Post-initializing NOVA wrappers", (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size()); + cpw.mods.fml.common.ProgressManager.ProgressBar progressBar + = cpw.mods.fml.common.ProgressManager.push("Post-initializing NOVA wrappers", + (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size()); FMLProgressBar fmlProgressBar = new FMLProgressBar(progressBar); novaModWrappers.stream().forEachOrdered(wrapper -> { fmlProgressBar.step(wrapper.getClass()); @@ -251,7 +264,7 @@ public void postInit(FMLPostInitializationEvent evt) { wrapper.postInit(evt); }); fmlProgressBar.finish(); - ProgressManager.pop(progressBar); + cpw.mods.fml.common.ProgressManager.pop(progressBar); } catch (Exception e) { Game.logger().error("Error during postInit", e); e.printStackTrace(); diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiConfig.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiConfig.java index d995fddbc..a99877c7e 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiConfig.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiConfig.java @@ -30,6 +30,7 @@ */ public class NovaGuiConfig extends GuiConfig { public NovaGuiConfig(GuiScreen parentScreen, Configuration config, String modID) { - super(parentScreen, new ConfigElement(config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), modID, false, false, GuiConfig.getAbridgedConfigPath(config.toString())); + super(parentScreen, new ConfigElement<>(config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), + modID, false, false, GuiConfig.getAbridgedConfigPath(config.toString())); } } diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/ReflectionUtil.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/ReflectionUtil.java index a58f132de..b33de7543 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/ReflectionUtil.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/ReflectionUtil.java @@ -57,6 +57,7 @@ * adjustment - as such, those have been collected here. * @author Stan Hebben */ +@SuppressWarnings("unchecked") public class ReflectionUtil { private static final Field NBTTAGLIST_TAGLIST; private static final Field OREDICTIONARY_IDTOSTACK; @@ -129,6 +130,7 @@ public static List getTagList(NBTTagList list) { } } + @SuppressWarnings("rawtypes") public static List getSeeds() { return getPrivateStaticObject(ForgeHooks.class, "seedList"); } @@ -137,7 +139,7 @@ public static Map getChestLoot() { return getPrivateStaticObject(ChestGenHooks.class, "chestInfo"); } - public static Map getTranslations() { + public static Map getTranslations() { return getPrivateObject( getPrivateStaticObject(StatCollector.class, "localizedName", "field_74839_a"), "languageList", @@ -308,7 +310,7 @@ public static boolean setPrivateObject(Object object, Object value, String... na // ### Private Methods ### // ####################### - private static Field getField(Class cls, String... names) { + private static Field getField(Class cls, String... names) { for (String name : names) { try { Field field = cls.getDeclaredField(name); diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/BlockConverter.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/BlockConverter.java index 33f91ceeb..39c3276ab 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/BlockConverter.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/BlockConverter.java @@ -97,7 +97,7 @@ public net.minecraft.block.Block toNative(BlockFactory blockFactory) { /** * Register all Nova blocks * - * @param evt The Minecraft Forge pre-initialization event + * @param evt {@inheritDoc} */ @Override public void preInit(FMLPreInitializationEvent evt) { diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileLoader.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileLoader.java index 8a25e7b0a..c76ec20c8 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileLoader.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileLoader.java @@ -43,7 +43,7 @@ public static FWTile loadTile(NBTTagCompound data) { try { String blockID = data.getString("novaID"); Block block = createBlock(blockID); - FWTile tile = injector.inject(block, new Class[0], new Object[0]); + FWTile tile = injector.inject(block, new Class[0], new Object[0]); tile.setBlock(block); WrapperEvent.FWTileCreate event = new WrapperEvent.FWTileCreate(block, tile); Game.events().publish(event); @@ -56,7 +56,7 @@ public static FWTile loadTile(NBTTagCompound data) { public static FWTile loadTile(String blockID) { try { Block block = createBlock(blockID); - FWTile tile = injector.inject(block, new Class[] { String.class }, new Object[] { blockID }); + FWTile tile = injector.inject(block, new Class[] { String.class }, new Object[] { blockID }); tile.setBlock(block); WrapperEvent.FWTileCreate event = new WrapperEvent.FWTileCreate(block, tile); Game.events().publish(event); diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java index 67945f0dc..311456757 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java @@ -121,8 +121,8 @@ public Entity addClientEntity(EntityFactory factory) { @Override @SuppressWarnings("unchecked") - public Entity addClientEntity(Entity entity) { - return NovaMinecraft.proxy.spawnParticle(world(), entity); + public T addClientEntity(T entity) { + return (T) NovaMinecraft.proxy.spawnParticle(world(), entity); } @Override diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItem.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItem.java index 3fe40567e..4e515ef46 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItem.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItem.java @@ -47,8 +47,9 @@ public ItemFactory getItemFactory() { } @Override - public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean p_77624_4_) { - ItemWrapperMethods.super.addInformation(itemStack, player, list, p_77624_4_); + @SuppressWarnings({"unchecked", "rawtypes"}) + public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { + ItemWrapperMethods.super.addInformation(itemStack, player, tooltip, advanced); } @Override diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItemBlock.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItemBlock.java index 66ade96cd..ba7750ab8 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItemBlock.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItemBlock.java @@ -45,8 +45,9 @@ public ItemFactory getItemFactory() { } @Override - public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean p_77624_4_) { - ItemWrapperMethods.super.addInformation(itemStack, player, list, p_77624_4_); + @SuppressWarnings({"unchecked", "rawtypes"}) + public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { + ItemWrapperMethods.super.addInformation(itemStack, player, tooltip, advanced); } @Override diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWNBTTagCompound.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWNBTTagCompound.java index 9bce8e09a..5b4fb7964 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWNBTTagCompound.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWNBTTagCompound.java @@ -24,8 +24,6 @@ import net.minecraft.nbt.NBTTagCompound; import nova.core.item.Item; -import java.util.Iterator; - /** * A wrapped NBTTagCompound object that references the item instance * @author Stan @@ -43,15 +41,10 @@ public Item getItem() { } @Override + @SuppressWarnings("unchecked") public NBTBase copy() { FWNBTTagCompound result = new FWNBTTagCompound(item); - Iterator iterator = this.func_150296_c().iterator(); - - while (iterator.hasNext()) { - String s = (String) iterator.next(); - result.setTag(s, getTag(s).copy()); - } - + ((Iterable) func_150296_c()).forEach(s -> result.setTag(s, getTag(s).copy())); return result; } } diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java index c37c9f7cd..384424462 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java @@ -149,8 +149,12 @@ public ItemFactory get(MinecraftItemMapping minecraftItem) { /** * Saves NOVA item into a Minecraft ItemStack. + * + * @param itemStack the Minecraft ItemStack instance + * @param item The NOVA item. + * @return The updated ItemStack instance */ - public net.minecraft.item.ItemStack updateMCItemStack(ItemStack itemStack, nova.core.item.Item item) { + public ItemStack updateMCItemStack(ItemStack itemStack, Item item) { itemStack.stackSize = item.count(); if (itemStack.stackSize <= 0) { return null; @@ -162,7 +166,9 @@ public net.minecraft.item.ItemStack updateMCItemStack(ItemStack itemStack, nova. } /** - * Register all Nova blocks + * Register all Nova items + * + * @param evt {@inheritDoc} */ @Override public void preInit(FMLPreInitializationEvent evt) { @@ -223,7 +229,8 @@ private void registerNOVAItem(ItemFactory itemFactory) { } private void registerMinecraftItemsToNOVA() { - Set itemIDs = (Set) net.minecraft.item.Item.itemRegistry.getKeys(); + @SuppressWarnings("unchecked") + Set itemIDs = net.minecraft.item.Item.itemRegistry.getKeys(); itemIDs.forEach(itemID -> { net.minecraft.item.Item item = (net.minecraft.item.Item) net.minecraft.item.Item.itemRegistry.getObject(itemID); registerMinecraftMapping(item, 0); diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemWrapperMethods.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemWrapperMethods.java index 7d043b9ce..20e088877 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemWrapperMethods.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemWrapperMethods.java @@ -26,16 +26,12 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; -import nova.core.component.renderer.DynamicRenderer; import nova.core.component.renderer.Renderer; -import nova.core.component.renderer.StaticRenderer; import nova.core.item.Item; import nova.core.item.ItemFactory; import nova.core.util.Direction; -import nova.core.wrapper.mc.forge.v17.render.RenderUtility; import nova.core.wrapper.mc.forge.v17.wrapper.entity.backward.BWEntity; import nova.core.wrapper.mc.forge.v17.wrapper.render.BWModel; -import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -53,10 +49,17 @@ public interface ItemWrapperMethods extends IItemRenderer { ItemFactory getItemFactory(); - @SuppressWarnings({"unchecked", "rawtypes"}) - default void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean p_77624_4_) { + /** + * Allows items to add custom lines of information to the mouseover description + * + * @param itemStack The ItemStack instance + * @param player The player entity + * @param tooltip All lines to display in the Item's tooltip. This is a List of Strings. + * @param advanced Whether the setting "Advanced tooltips" is enabled + */ + default void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { Item item = ItemConverter.instance().toNova(itemStack); - item.setCount(itemStack.stackSize).events.publish(new Item.TooltipEvent(Optional.of(new BWEntity(player)), list)); + item.setCount(itemStack.stackSize).events.publish(new Item.TooltipEvent(Optional.of(new BWEntity(player)), tooltip)); getItemFactory().save(item); } diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/render/BWModel.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/render/BWModel.java index a8cd9c070..84aeac31d 100644 --- a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/render/BWModel.java +++ b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/render/BWModel.java @@ -37,12 +37,16 @@ import java.util.Optional; /** + * BWModel for dynamic rendering * @author Calclavia */ public class BWModel extends MeshModel { /** * Completes this rendering for a block. + * + * @param blockAccess The {@link IBlockAccess} instance. + * @throws NullPointerException If {@code blockAccess} is {@code null} */ public void render(IBlockAccess blockAccess) { render(Optional.of(blockAccess), Optional.empty()); diff --git a/minecraft/1.7/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverterTest.java b/minecraft/1.7/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverterTest.java index 0a08fa08f..232142c66 100644 --- a/minecraft/1.7/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverterTest.java +++ b/minecraft/1.7/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverterTest.java @@ -22,7 +22,6 @@ import net.minecraft.util.EnumFacing; import nova.core.util.Direction; -import nova.internal.core.Game; import org.junit.Before; import org.junit.Test; @@ -60,6 +59,7 @@ public void testToNova() { } @Test + @SuppressWarnings("unchecked") public void testToNative() { assertThat(converter.toNative(Direction.DOWN)).isEqualTo(EnumFacing.DOWN); assertThat(converter.toNative(Direction.UP)).isEqualTo(EnumFacing.UP); From 8d5218da207bc0b83010e397a415a577b2aeee6a Mon Sep 17 00:00:00 2001 From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com> Date: Wed, 27 Jun 2018 12:20:00 +0200 Subject: [PATCH 10/12] Rename Minecraft 1.7.10 wrapper project folder --- minecraft/.gitignore | 2 +- minecraft/{1.7 => 1.7.10}/.gitignore | 0 minecraft/{1.7 => 1.7.10}/build.gradle | 0 minecraft/{1.7 => 1.7.10}/gradle.properties | 0 .../wrapper/mc/forge/v17/NovaMinecraftCore.java | 0 .../mc/forge/v17/NovaMinecraftPreloader.java | 0 .../wrapper/mc/forge/v17/asm/StaticForwarder.java | 0 .../wrapper/mc/forge/v17/asm/lib/ASMHelper.java | 0 .../mc/forge/v17/asm/lib/CC_ClassWriter.java | 0 .../mc/forge/v17/asm/lib/ClassHeirachyManager.java | 0 .../mc/forge/v17/asm/lib/ComponentInjector.java | 0 .../mc/forge/v17/asm/lib/InsnListPrinter.java | 0 .../mc/forge/v17/asm/lib/InstructionComparator.java | 0 .../wrapper/mc/forge/v17/asm/lib/ObfMapping.java | 0 .../mc/forge/v17/asm/lib/TemplateInjector.java | 0 .../wrapper/mc/forge/v17/asm/lib/package-info.java | 0 .../v17/asm/transformers/ChunkTransformer.java | 0 .../v17/asm/transformers/GameDataTransformer.java | 0 .../v17/asm/transformers/TileEntityTransformer.java | 0 .../mc/forge/v17/asm/transformers/Transformer.java | 0 .../mc/forge/v17/asm/transformers/Transformers.java | 0 .../mc/forge/v17/depmodules/ClientModule.java | 0 .../mc/forge/v17/depmodules/ComponentModule.java | 0 .../mc/forge/v17/depmodules/GameInfoModule.java | 0 .../wrapper/mc/forge/v17/depmodules/KeyModule.java | 0 .../mc/forge/v17/depmodules/LanguageModule.java | 0 .../mc/forge/v17/depmodules/NetworkModule.java | 0 .../wrapper/mc/forge/v17/depmodules/SaveModule.java | 0 .../mc/forge/v17/depmodules/TickerModule.java | 0 .../wrapper/mc/forge/v17/launcher/ClientProxy.java | 0 .../wrapper/mc/forge/v17/launcher/CommonProxy.java | 0 .../mc/forge/v17/launcher/FMLEventHandler.java | 0 .../mc/forge/v17/launcher/FMLProgressBar.java | 0 .../mc/forge/v17/launcher/ForgeEventHandler.java | 0 .../mc/forge/v17/launcher/ForgeLoadable.java | 0 .../mc/forge/v17/launcher/NovaMinecraft.java | 0 .../mc/forge/v17/manager/FWClientManager.java | 0 .../mc/forge/v17/manager/MCRetentionManager.java | 0 .../mc/forge/v17/manager/config/NovaGuiConfig.java | 0 .../mc/forge/v17/manager/config/NovaGuiFactory.java | 0 .../core/wrapper/mc/forge/v17/network/MCPacket.java | 0 .../forge/v17/network/discriminator/NovaPacket.java | 0 .../v17/network/discriminator/PacketAbstract.java | 0 .../v17/network/discriminator/PacketPlayerItem.java | 0 .../mc/forge/v17/network/netty/ChannelHandler.java | 0 .../forge/v17/network/netty/MCNetworkManager.java | 0 .../mc/forge/v17/network/netty/MCPacketHandler.java | 0 .../wrapper/mc/forge/v17/render/RenderUtility.java | 0 .../wrapper/mc/forge/v17/util/MCInputManager.java | 0 .../mc/forge/v17/util/MCLanguageManager.java | 0 .../wrapper/mc/forge/v17/util/ModCreativeTab.java | 0 .../mc/forge/v17/util/ObfuscationConstants.java | 0 .../wrapper/mc/forge/v17/util/ReflectionUtil.java | 0 .../core/wrapper/mc/forge/v17/util/WrapUtility.java | 0 .../wrapper/mc/forge/v17/util/WrapperEvent.java | 0 .../mc/forge/v17/wrapper/CategoryConverter.java | 0 .../mc/forge/v17/wrapper/DirectionConverter.java | 0 .../mc/forge/v17/wrapper/assets/AssetConverter.java | 0 .../v17/wrapper/assets/NovaFileResourcePack.java | 0 .../v17/wrapper/assets/NovaFolderResourcePack.java | 0 .../forge/v17/wrapper/assets/NovaResourcePack.java | 0 .../mc/forge/v17/wrapper/block/BlockConverter.java | 0 .../forge/v17/wrapper/block/backward/BWBlock.java | 0 .../v17/wrapper/block/backward/BWBlockFactory.java | 0 .../wrapper/block/backward/BWBlockTransform.java | 0 .../v17/wrapper/block/forward/BlockPosition.java | 0 .../mc/forge/v17/wrapper/block/forward/FWBlock.java | 0 .../v17/wrapper/block/forward/FWBlockSound.java | 0 .../mc/forge/v17/wrapper/block/forward/FWTile.java | 0 .../v17/wrapper/block/forward/FWTileLoader.java | 0 .../v17/wrapper/block/forward/FWTileRenderer.java | 0 .../v17/wrapper/block/forward/MCBlockTransform.java | 0 .../v17/wrapper/block/forward/ProxyMaterial.java | 0 .../v17/wrapper/block/forward/TEBlockTransform.java | 0 .../mc/forge/v17/wrapper/block/world/BWWorld.java | 0 .../v17/wrapper/block/world/WorldConverter.java | 0 .../forge/v17/wrapper/cuboid/CuboidConverter.java | 0 .../mc/forge/v17/wrapper/data/DataConverter.java | 0 .../forge/v17/wrapper/entity/EntityConverter.java | 0 .../forge/v17/wrapper/entity/backward/BWEntity.java | 0 .../v17/wrapper/entity/backward/BWEntityFX.java | 0 .../v17/wrapper/entity/forward/BWRigidBody.java | 0 .../forge/v17/wrapper/entity/forward/FWEntity.java | 0 .../v17/wrapper/entity/forward/FWEntityFX.java | 0 .../wrapper/entity/forward/FWEntityRenderer.java | 0 .../wrapper/entity/forward/MCEntityTransform.java | 0 .../mc/forge/v17/wrapper/inventory/BWInventory.java | 0 .../mc/forge/v17/wrapper/inventory/FWInventory.java | 0 .../v17/wrapper/inventory/InventoryConverter.java | 0 .../wrapper/mc/forge/v17/wrapper/item/BWItem.java | 0 .../mc/forge/v17/wrapper/item/BWItemFactory.java | 0 .../wrapper/mc/forge/v17/wrapper/item/FWItem.java | 0 .../mc/forge/v17/wrapper/item/FWItemBlock.java | 0 .../mc/forge/v17/wrapper/item/FWNBTTagCompound.java | 0 .../mc/forge/v17/wrapper/item/ItemConverter.java | 0 .../forge/v17/wrapper/item/ItemWrapperMethods.java | 0 .../v17/wrapper/item/OreDictionaryIntegration.java | 0 .../wrapper/recipes/MinecraftRecipeRegistry.java | 0 .../forge/v17/wrapper/recipes/RecipeConverter.java | 0 .../wrapper/recipes/backward/MCCraftingGrid.java | 0 .../wrapper/recipes/backward/MCCraftingRecipe.java | 0 .../wrapper/recipes/forward/NovaCraftingGrid.java | 0 .../recipes/forward/NovaCraftingGridContainer.java | 0 .../wrapper/recipes/forward/NovaCraftingRecipe.java | 0 .../wrapper/recipes/forward/ShapedRecipeBasic.java | 0 .../wrapper/recipes/forward/ShapedRecipeOre.java | 0 .../recipes/forward/ShapelessRecipeBasic.java | 0 .../wrapper/recipes/forward/ShapelessRecipeOre.java | 0 .../mc/forge/v17/wrapper/render/BWModel.java | 0 .../src/main/resources/META-INF/nova_at.cfg | 0 .../main/resources/assets/nova/textures/NOVA.png | Bin .../resources/assets/nova/textures/gui/controls.png | Bin .../src/main/resources/fmlbranding.properties | 0 .../{1.7 => 1.7.10}/src/main/resources/mcmod.info | 0 .../mc/forge/v17/launcher/NovaLauncherTest.java | 0 .../forge/v17/wrapper/DirectionConverterTest.java | 0 .../v17/wrapper/assets/AssetConverterTest.java | 0 settings.gradle | 4 ++-- 118 files changed, 3 insertions(+), 3 deletions(-) rename minecraft/{1.7 => 1.7.10}/.gitignore (100%) rename minecraft/{1.7 => 1.7.10}/build.gradle (100%) rename minecraft/{1.7 => 1.7.10}/gradle.properties (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftCore.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftPreloader.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/StaticForwarder.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ASMHelper.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/CC_ClassWriter.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ClassHeirachyManager.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ComponentInjector.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InsnListPrinter.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InstructionComparator.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ObfMapping.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/TemplateInjector.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/package-info.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/ChunkTransformer.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/GameDataTransformer.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/TileEntityTransformer.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformer.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformers.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ClientModule.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ComponentModule.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/GameInfoModule.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/KeyModule.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/LanguageModule.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/NetworkModule.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/SaveModule.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/TickerModule.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ClientProxy.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/CommonProxy.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLEventHandler.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLProgressBar.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeEventHandler.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeLoadable.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/NovaMinecraft.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/manager/FWClientManager.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/manager/MCRetentionManager.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiConfig.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiFactory.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/network/MCPacket.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/NovaPacket.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketAbstract.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketPlayerItem.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/ChannelHandler.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCNetworkManager.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCPacketHandler.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/render/RenderUtility.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCInputManager.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCLanguageManager.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/util/ModCreativeTab.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/util/ObfuscationConstants.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/util/ReflectionUtil.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapUtility.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapperEvent.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/CategoryConverter.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverter.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverter.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFileResourcePack.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFolderResourcePack.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaResourcePack.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/BlockConverter.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlock.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockFactory.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockTransform.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/BlockPosition.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlock.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlockSound.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTile.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileLoader.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileRenderer.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/MCBlockTransform.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/ProxyMaterial.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/TEBlockTransform.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/WorldConverter.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/cuboid/CuboidConverter.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/data/DataConverter.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/EntityConverter.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntity.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntityFX.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/BWRigidBody.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntity.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityFX.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityRenderer.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/MCEntityTransform.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/BWInventory.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/FWInventory.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/InventoryConverter.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItem.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItemFactory.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItem.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItemBlock.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWNBTTagCompound.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemWrapperMethods.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/OreDictionaryIntegration.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/MinecraftRecipeRegistry.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/RecipeConverter.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingGrid.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingRecipe.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGrid.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGridContainer.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingRecipe.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeBasic.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeOre.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeBasic.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeOre.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/render/BWModel.java (100%) rename minecraft/{1.7 => 1.7.10}/src/main/resources/META-INF/nova_at.cfg (100%) rename minecraft/{1.7 => 1.7.10}/src/main/resources/assets/nova/textures/NOVA.png (100%) rename minecraft/{1.7 => 1.7.10}/src/main/resources/assets/nova/textures/gui/controls.png (100%) rename minecraft/{1.7 => 1.7.10}/src/main/resources/fmlbranding.properties (100%) rename minecraft/{1.7 => 1.7.10}/src/main/resources/mcmod.info (100%) rename minecraft/{1.7 => 1.7.10}/src/test/java/nova/core/wrapper/mc/forge/v17/launcher/NovaLauncherTest.java (100%) rename minecraft/{1.7 => 1.7.10}/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverterTest.java (100%) rename minecraft/{1.7 => 1.7.10}/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverterTest.java (100%) diff --git a/minecraft/.gitignore b/minecraft/.gitignore index a4c6e69be..ef93a8127 100644 --- a/minecraft/.gitignore +++ b/minecraft/.gitignore @@ -4,4 +4,4 @@ !/.gitignore !/1.8 -!/1.7 +!/1.7.10 diff --git a/minecraft/1.7/.gitignore b/minecraft/1.7.10/.gitignore similarity index 100% rename from minecraft/1.7/.gitignore rename to minecraft/1.7.10/.gitignore diff --git a/minecraft/1.7/build.gradle b/minecraft/1.7.10/build.gradle similarity index 100% rename from minecraft/1.7/build.gradle rename to minecraft/1.7.10/build.gradle diff --git a/minecraft/1.7/gradle.properties b/minecraft/1.7.10/gradle.properties similarity index 100% rename from minecraft/1.7/gradle.properties rename to minecraft/1.7.10/gradle.properties diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftCore.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftCore.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftCore.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftCore.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftPreloader.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftPreloader.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftPreloader.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftPreloader.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/StaticForwarder.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/StaticForwarder.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/StaticForwarder.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/StaticForwarder.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ASMHelper.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ASMHelper.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ASMHelper.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ASMHelper.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/CC_ClassWriter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/CC_ClassWriter.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/CC_ClassWriter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/CC_ClassWriter.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ClassHeirachyManager.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ClassHeirachyManager.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ClassHeirachyManager.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ClassHeirachyManager.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ComponentInjector.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ComponentInjector.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ComponentInjector.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ComponentInjector.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InsnListPrinter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InsnListPrinter.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InsnListPrinter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InsnListPrinter.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InstructionComparator.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InstructionComparator.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InstructionComparator.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InstructionComparator.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ObfMapping.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ObfMapping.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ObfMapping.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ObfMapping.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/TemplateInjector.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/TemplateInjector.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/TemplateInjector.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/TemplateInjector.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/package-info.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/package-info.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/package-info.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/package-info.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/ChunkTransformer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/ChunkTransformer.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/ChunkTransformer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/ChunkTransformer.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/GameDataTransformer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/GameDataTransformer.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/GameDataTransformer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/GameDataTransformer.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/TileEntityTransformer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/TileEntityTransformer.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/TileEntityTransformer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/TileEntityTransformer.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformer.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformer.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformers.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformers.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformers.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformers.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ClientModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ClientModule.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ClientModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ClientModule.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ComponentModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ComponentModule.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ComponentModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ComponentModule.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/GameInfoModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/GameInfoModule.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/GameInfoModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/GameInfoModule.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/KeyModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/KeyModule.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/KeyModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/KeyModule.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/LanguageModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/LanguageModule.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/LanguageModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/LanguageModule.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/NetworkModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/NetworkModule.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/NetworkModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/NetworkModule.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/SaveModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/SaveModule.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/SaveModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/SaveModule.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/TickerModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/TickerModule.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/TickerModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/TickerModule.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ClientProxy.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ClientProxy.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ClientProxy.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ClientProxy.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/CommonProxy.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/CommonProxy.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/CommonProxy.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/CommonProxy.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLEventHandler.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLEventHandler.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLEventHandler.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLEventHandler.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLProgressBar.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLProgressBar.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLProgressBar.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLProgressBar.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeEventHandler.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeEventHandler.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeEventHandler.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeEventHandler.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeLoadable.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeLoadable.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeLoadable.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeLoadable.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/NovaMinecraft.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/NovaMinecraft.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/NovaMinecraft.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/NovaMinecraft.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/manager/FWClientManager.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/FWClientManager.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/manager/FWClientManager.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/FWClientManager.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/manager/MCRetentionManager.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/MCRetentionManager.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/manager/MCRetentionManager.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/MCRetentionManager.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiConfig.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiConfig.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiConfig.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiConfig.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiFactory.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiFactory.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiFactory.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiFactory.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/MCPacket.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/MCPacket.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/MCPacket.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/MCPacket.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/NovaPacket.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/NovaPacket.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/NovaPacket.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/NovaPacket.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketAbstract.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketAbstract.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketAbstract.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketAbstract.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketPlayerItem.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketPlayerItem.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketPlayerItem.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketPlayerItem.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/ChannelHandler.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/ChannelHandler.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/ChannelHandler.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/ChannelHandler.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCNetworkManager.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCNetworkManager.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCNetworkManager.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCNetworkManager.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCPacketHandler.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCPacketHandler.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCPacketHandler.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCPacketHandler.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/render/RenderUtility.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/render/RenderUtility.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/render/RenderUtility.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/render/RenderUtility.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCInputManager.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCInputManager.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCInputManager.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCInputManager.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCLanguageManager.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCLanguageManager.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCLanguageManager.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCLanguageManager.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/ModCreativeTab.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ModCreativeTab.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/ModCreativeTab.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ModCreativeTab.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/ObfuscationConstants.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ObfuscationConstants.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/ObfuscationConstants.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ObfuscationConstants.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/ReflectionUtil.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ReflectionUtil.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/ReflectionUtil.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ReflectionUtil.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapUtility.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapUtility.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapUtility.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapUtility.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapperEvent.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapperEvent.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapperEvent.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapperEvent.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/CategoryConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/CategoryConverter.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/CategoryConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/CategoryConverter.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverter.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverter.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverter.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverter.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFileResourcePack.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFileResourcePack.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFileResourcePack.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFileResourcePack.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFolderResourcePack.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFolderResourcePack.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFolderResourcePack.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFolderResourcePack.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaResourcePack.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaResourcePack.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaResourcePack.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaResourcePack.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/BlockConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/BlockConverter.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/BlockConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/BlockConverter.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlock.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlock.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlock.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlock.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockFactory.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockFactory.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockFactory.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockFactory.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockTransform.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockTransform.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockTransform.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockTransform.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/BlockPosition.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/BlockPosition.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/BlockPosition.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/BlockPosition.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlock.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlock.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlock.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlock.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlockSound.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlockSound.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlockSound.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlockSound.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTile.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTile.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTile.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTile.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileLoader.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileLoader.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileLoader.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileLoader.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileRenderer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileRenderer.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileRenderer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileRenderer.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/MCBlockTransform.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/MCBlockTransform.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/MCBlockTransform.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/MCBlockTransform.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/ProxyMaterial.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/ProxyMaterial.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/ProxyMaterial.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/ProxyMaterial.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/TEBlockTransform.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/TEBlockTransform.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/TEBlockTransform.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/TEBlockTransform.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/WorldConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/WorldConverter.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/WorldConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/WorldConverter.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/cuboid/CuboidConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/cuboid/CuboidConverter.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/cuboid/CuboidConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/cuboid/CuboidConverter.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/data/DataConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/data/DataConverter.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/data/DataConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/data/DataConverter.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/EntityConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/EntityConverter.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/EntityConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/EntityConverter.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntity.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntity.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntity.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntity.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntityFX.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntityFX.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntityFX.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntityFX.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/BWRigidBody.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/BWRigidBody.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/BWRigidBody.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/BWRigidBody.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntity.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntity.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntity.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntity.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityFX.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityFX.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityFX.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityFX.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityRenderer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityRenderer.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityRenderer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityRenderer.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/MCEntityTransform.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/MCEntityTransform.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/MCEntityTransform.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/MCEntityTransform.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/BWInventory.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/BWInventory.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/BWInventory.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/BWInventory.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/FWInventory.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/FWInventory.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/FWInventory.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/FWInventory.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/InventoryConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/InventoryConverter.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/InventoryConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/InventoryConverter.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItem.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItem.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItem.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItem.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItemFactory.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItemFactory.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItemFactory.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItemFactory.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItem.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItem.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItem.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItem.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItemBlock.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItemBlock.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItemBlock.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItemBlock.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWNBTTagCompound.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWNBTTagCompound.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWNBTTagCompound.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWNBTTagCompound.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemWrapperMethods.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemWrapperMethods.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemWrapperMethods.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemWrapperMethods.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/OreDictionaryIntegration.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/OreDictionaryIntegration.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/OreDictionaryIntegration.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/OreDictionaryIntegration.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/MinecraftRecipeRegistry.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/MinecraftRecipeRegistry.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/MinecraftRecipeRegistry.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/MinecraftRecipeRegistry.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/RecipeConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/RecipeConverter.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/RecipeConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/RecipeConverter.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingGrid.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingGrid.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingGrid.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingGrid.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingRecipe.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingRecipe.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingRecipe.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingRecipe.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGrid.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGrid.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGrid.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGrid.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGridContainer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGridContainer.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGridContainer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGridContainer.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingRecipe.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingRecipe.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingRecipe.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingRecipe.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeBasic.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeBasic.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeBasic.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeBasic.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeOre.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeOre.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeOre.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeOre.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeBasic.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeBasic.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeBasic.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeBasic.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeOre.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeOre.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeOre.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeOre.java diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/render/BWModel.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/render/BWModel.java similarity index 100% rename from minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/render/BWModel.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/render/BWModel.java diff --git a/minecraft/1.7/src/main/resources/META-INF/nova_at.cfg b/minecraft/1.7.10/src/main/resources/META-INF/nova_at.cfg similarity index 100% rename from minecraft/1.7/src/main/resources/META-INF/nova_at.cfg rename to minecraft/1.7.10/src/main/resources/META-INF/nova_at.cfg diff --git a/minecraft/1.7/src/main/resources/assets/nova/textures/NOVA.png b/minecraft/1.7.10/src/main/resources/assets/nova/textures/NOVA.png similarity index 100% rename from minecraft/1.7/src/main/resources/assets/nova/textures/NOVA.png rename to minecraft/1.7.10/src/main/resources/assets/nova/textures/NOVA.png diff --git a/minecraft/1.7/src/main/resources/assets/nova/textures/gui/controls.png b/minecraft/1.7.10/src/main/resources/assets/nova/textures/gui/controls.png similarity index 100% rename from minecraft/1.7/src/main/resources/assets/nova/textures/gui/controls.png rename to minecraft/1.7.10/src/main/resources/assets/nova/textures/gui/controls.png diff --git a/minecraft/1.7/src/main/resources/fmlbranding.properties b/minecraft/1.7.10/src/main/resources/fmlbranding.properties similarity index 100% rename from minecraft/1.7/src/main/resources/fmlbranding.properties rename to minecraft/1.7.10/src/main/resources/fmlbranding.properties diff --git a/minecraft/1.7/src/main/resources/mcmod.info b/minecraft/1.7.10/src/main/resources/mcmod.info similarity index 100% rename from minecraft/1.7/src/main/resources/mcmod.info rename to minecraft/1.7.10/src/main/resources/mcmod.info diff --git a/minecraft/1.7/src/test/java/nova/core/wrapper/mc/forge/v17/launcher/NovaLauncherTest.java b/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/launcher/NovaLauncherTest.java similarity index 100% rename from minecraft/1.7/src/test/java/nova/core/wrapper/mc/forge/v17/launcher/NovaLauncherTest.java rename to minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/launcher/NovaLauncherTest.java diff --git a/minecraft/1.7/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverterTest.java b/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverterTest.java similarity index 100% rename from minecraft/1.7/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverterTest.java rename to minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverterTest.java diff --git a/minecraft/1.7/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverterTest.java b/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverterTest.java similarity index 100% rename from minecraft/1.7/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverterTest.java rename to minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverterTest.java diff --git a/settings.gradle b/settings.gradle index 5880535a0..ddb6052d4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'NOVA-Core' +rootProject.name = "NOVA-Core" include "minecraft:1.8" -include "minecraft:1.7" +include "minecraft:1.7.10" From 8e4302bd00be422814b8f3c05febe13a1f628959 Mon Sep 17 00:00:00 2001 From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com> Date: Wed, 27 Jun 2018 12:30:00 +0200 Subject: [PATCH 11/12] Rename Minecraft 1.7.10 wrapper packages --- .../{v17 => v1_7_10}/NovaMinecraftCore.java | 4 +- .../NovaMinecraftPreloader.java | 10 ++-- .../{v17 => v1_7_10}/asm/StaticForwarder.java | 16 +++---- .../{v17 => v1_7_10}/asm/lib/ASMHelper.java | 2 +- .../asm/lib/CC_ClassWriter.java | 2 +- .../asm/lib/ClassHeirachyManager.java | 2 +- .../asm/lib/ComponentInjector.java | 2 +- .../asm/lib/InsnListPrinter.java | 2 +- .../asm/lib/InstructionComparator.java | 2 +- .../{v17 => v1_7_10}/asm/lib/ObfMapping.java | 2 +- .../asm/lib/TemplateInjector.java | 2 +- .../asm/lib/package-info.java | 2 +- .../asm/transformers/ChunkTransformer.java | 6 +-- .../asm/transformers/GameDataTransformer.java | 6 +-- .../transformers/TileEntityTransformer.java | 8 ++-- .../asm/transformers/Transformer.java | 2 +- .../asm/transformers/Transformers.java | 4 +- .../depmodules/ClientModule.java | 4 +- .../depmodules/ComponentModule.java | 4 +- .../depmodules/GameInfoModule.java | 2 +- .../depmodules/KeyModule.java | 4 +- .../depmodules/LanguageModule.java | 4 +- .../depmodules/NetworkModule.java | 4 +- .../depmodules/SaveModule.java | 4 +- .../depmodules/TickerModule.java | 2 +- .../launcher/ClientProxy.java | 24 +++++----- .../launcher/CommonProxy.java | 10 ++-- .../launcher/FMLEventHandler.java | 4 +- .../launcher/FMLProgressBar.java | 2 +- .../launcher/ForgeEventHandler.java | 8 ++-- .../launcher/ForgeLoadable.java | 2 +- .../launcher/NovaMinecraft.java | 46 +++++++++---------- .../manager/FWClientManager.java | 6 +-- .../manager/MCRetentionManager.java | 4 +- .../manager/config/NovaGuiConfig.java | 2 +- .../manager/config/NovaGuiFactory.java | 2 +- .../{v17 => v1_7_10}/network/MCPacket.java | 2 +- .../network/discriminator/NovaPacket.java | 8 ++-- .../network/discriminator/PacketAbstract.java | 4 +- .../discriminator/PacketPlayerItem.java | 4 +- .../network/netty/ChannelHandler.java | 8 ++-- .../network/netty/MCNetworkManager.java | 12 ++--- .../network/netty/MCPacketHandler.java | 6 +-- .../render/RenderUtility.java | 6 +-- .../{v17 => v1_7_10}/util/MCInputManager.java | 2 +- .../util/MCLanguageManager.java | 6 +-- .../{v17 => v1_7_10}/util/ModCreativeTab.java | 2 +- .../util/ObfuscationConstants.java | 2 +- .../{v17 => v1_7_10}/util/ReflectionUtil.java | 2 +- .../{v17 => v1_7_10}/util/WrapUtility.java | 7 +-- .../{v17 => v1_7_10}/util/WrapperEvent.java | 14 +++--- .../wrapper/CategoryConverter.java | 6 +-- .../wrapper/DirectionConverter.java | 2 +- .../wrapper/assets/AssetConverter.java | 2 +- .../wrapper/assets/NovaFileResourcePack.java | 4 +- .../assets/NovaFolderResourcePack.java | 4 +- .../wrapper/assets/NovaResourcePack.java | 2 +- .../wrapper/block/BlockConverter.java | 16 +++---- .../wrapper/block/backward/BWBlock.java | 14 +++--- .../block/backward/BWBlockFactory.java | 2 +- .../block/backward/BWBlockTransform.java | 4 +- .../wrapper/block/forward/BlockPosition.java | 2 +- .../wrapper/block/forward/FWBlock.java | 14 +++--- .../wrapper/block/forward/FWBlockSound.java | 2 +- .../wrapper/block/forward/FWTile.java | 6 +-- .../wrapper/block/forward/FWTileLoader.java | 6 +-- .../wrapper/block/forward/FWTileRenderer.java | 6 +-- .../block/forward/MCBlockTransform.java | 4 +- .../wrapper/block/forward/ProxyMaterial.java | 2 +- .../block/forward/TEBlockTransform.java | 4 +- .../wrapper/block/world/BWWorld.java | 22 ++++----- .../wrapper/block/world/WorldConverter.java | 2 +- .../wrapper/cuboid/CuboidConverter.java | 2 +- .../wrapper/data/DataConverter.java | 2 +- .../wrapper/entity/EntityConverter.java | 12 ++--- .../wrapper/entity/backward/BWEntity.java | 8 ++-- .../wrapper/entity/backward/BWEntityFX.java | 4 +- .../wrapper/entity/forward/BWRigidBody.java | 2 +- .../wrapper/entity/forward/FWEntity.java | 8 ++-- .../wrapper/entity/forward/FWEntityFX.java | 6 +-- .../entity/forward/FWEntityRenderer.java | 6 +-- .../entity/forward/MCEntityTransform.java | 4 +- .../wrapper/inventory/BWInventory.java | 4 +- .../wrapper/inventory/FWInventory.java | 4 +- .../wrapper/inventory/InventoryConverter.java | 2 +- .../{v17 => v1_7_10}/wrapper/item/BWItem.java | 2 +- .../wrapper/item/BWItemFactory.java | 6 +-- .../{v17 => v1_7_10}/wrapper/item/FWItem.java | 2 +- .../wrapper/item/FWItemBlock.java | 4 +- .../wrapper/item/FWNBTTagCompound.java | 2 +- .../wrapper/item/ItemConverter.java | 16 +++---- .../wrapper/item/ItemWrapperMethods.java | 6 +-- .../item/OreDictionaryIntegration.java | 4 +- .../recipes/MinecraftRecipeRegistry.java | 6 +-- .../wrapper/recipes/RecipeConverter.java | 22 ++++----- .../recipes/backward/MCCraftingGrid.java | 8 ++-- .../recipes/backward/MCCraftingRecipe.java | 8 ++-- .../recipes/forward/NovaCraftingGrid.java | 4 +- .../forward/NovaCraftingGridContainer.java | 2 +- .../recipes/forward/NovaCraftingRecipe.java | 6 +-- .../recipes/forward/ShapedRecipeBasic.java | 6 +-- .../recipes/forward/ShapedRecipeOre.java | 6 +-- .../recipes/forward/ShapelessRecipeBasic.java | 6 +-- .../recipes/forward/ShapelessRecipeOre.java | 6 +-- .../wrapper/render/BWModel.java | 6 +-- .../launcher/NovaLauncherTest.java | 14 +++--- .../wrapper/DirectionConverterTest.java | 3 +- .../wrapper/assets/AssetConverterTest.java | 3 +- 108 files changed, 319 insertions(+), 316 deletions(-) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/NovaMinecraftCore.java (92%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/NovaMinecraftPreloader.java (97%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/StaticForwarder.java (87%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/lib/ASMHelper.java (99%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/lib/CC_ClassWriter.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/lib/ClassHeirachyManager.java (99%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/lib/ComponentInjector.java (99%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/lib/InsnListPrinter.java (99%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/lib/InstructionComparator.java (99%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/lib/ObfMapping.java (99%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/lib/TemplateInjector.java (98%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/lib/package-info.java (95%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/transformers/ChunkTransformer.java (94%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/transformers/GameDataTransformer.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/transformers/TileEntityTransformer.java (90%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/transformers/Transformer.java (94%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/asm/transformers/Transformers.java (94%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/depmodules/ClientModule.java (89%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/depmodules/ComponentModule.java (88%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/depmodules/GameInfoModule.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/depmodules/KeyModule.java (89%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/depmodules/LanguageModule.java (89%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/depmodules/NetworkModule.java (89%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/depmodules/SaveModule.java (89%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/depmodules/TickerModule.java (97%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/launcher/ClientProxy.java (88%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/launcher/CommonProxy.java (86%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/launcher/FMLEventHandler.java (93%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/launcher/FMLProgressBar.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/launcher/ForgeEventHandler.java (92%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/launcher/ForgeLoadable.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/launcher/NovaMinecraft.java (85%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/manager/FWClientManager.java (86%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/manager/MCRetentionManager.java (97%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/manager/config/NovaGuiConfig.java (95%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/manager/config/NovaGuiFactory.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/network/MCPacket.java (98%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/network/discriminator/NovaPacket.java (88%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/network/discriminator/PacketAbstract.java (95%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/network/discriminator/PacketPlayerItem.java (94%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/network/netty/ChannelHandler.java (83%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/network/netty/MCNetworkManager.java (93%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/network/netty/MCPacketHandler.java (89%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/render/RenderUtility.java (97%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/util/MCInputManager.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/util/MCLanguageManager.java (93%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/util/ModCreativeTab.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/util/ObfuscationConstants.java (97%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/util/ReflectionUtil.java (99%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/util/WrapUtility.java (90%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/util/WrapperEvent.java (90%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/CategoryConverter.java (95%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/DirectionConverter.java (97%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/assets/AssetConverter.java (98%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/assets/NovaFileResourcePack.java (97%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/assets/NovaFolderResourcePack.java (97%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/assets/NovaResourcePack.java (97%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/BlockConverter.java (89%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/backward/BWBlock.java (93%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/backward/BWBlockFactory.java (95%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/backward/BWBlockTransform.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/forward/BlockPosition.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/forward/FWBlock.java (97%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/forward/FWBlockSound.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/forward/FWTile.java (94%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/forward/FWTileLoader.java (92%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/forward/FWTileRenderer.java (90%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/forward/MCBlockTransform.java (95%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/forward/ProxyMaterial.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/forward/TEBlockTransform.java (93%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/world/BWWorld.java (87%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/block/world/WorldConverter.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/cuboid/CuboidConverter.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/data/DataConverter.java (99%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/entity/EntityConverter.java (86%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/entity/backward/BWEntity.java (92%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/entity/backward/BWEntityFX.java (97%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/entity/forward/BWRigidBody.java (98%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/entity/forward/FWEntity.java (95%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/entity/forward/FWEntityFX.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/entity/forward/FWEntityRenderer.java (93%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/entity/forward/MCEntityTransform.java (95%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/inventory/BWInventory.java (93%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/inventory/FWInventory.java (95%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/inventory/InventoryConverter.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/item/BWItem.java (98%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/item/BWItemFactory.java (93%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/item/FWItem.java (98%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/item/FWItemBlock.java (95%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/item/FWNBTTagCompound.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/item/ItemConverter.java (95%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/item/ItemWrapperMethods.java (95%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/item/OreDictionaryIntegration.java (97%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/recipes/MinecraftRecipeRegistry.java (97%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/recipes/RecipeConverter.java (93%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/recipes/backward/MCCraftingGrid.java (96%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/recipes/backward/MCCraftingRecipe.java (88%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/recipes/forward/NovaCraftingGrid.java (94%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/recipes/forward/NovaCraftingGridContainer.java (95%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/recipes/forward/NovaCraftingRecipe.java (88%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/recipes/forward/ShapedRecipeBasic.java (88%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/recipes/forward/ShapedRecipeOre.java (89%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/recipes/forward/ShapelessRecipeBasic.java (88%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/recipes/forward/ShapelessRecipeOre.java (88%) rename minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/render/BWModel.java (97%) rename minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/launcher/NovaLauncherTest.java (81%) rename minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/DirectionConverterTest.java (95%) rename minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/{v17 => v1_7_10}/wrapper/assets/AssetConverterTest.java (96%) diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftCore.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/NovaMinecraftCore.java similarity index 92% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftCore.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/NovaMinecraftCore.java index 0b2237aa3..2a98c7d4a 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftCore.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/NovaMinecraftCore.java @@ -18,11 +18,11 @@ * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftPreloader.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/NovaMinecraftPreloader.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftPreloader.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/NovaMinecraftPreloader.java index 96b423b81..6b5e167d0 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/NovaMinecraftPreloader.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/NovaMinecraftPreloader.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -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; @@ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/StaticForwarder.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/StaticForwarder.java similarity index 87% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/StaticForwarder.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/StaticForwarder.java index f065f0124..062fe1986 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/StaticForwarder.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/StaticForwarder.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -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; @@ -26,13 +26,13 @@ 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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ASMHelper.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/ASMHelper.java similarity index 99% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ASMHelper.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/ASMHelper.java index 4867340b9..e0688b25f 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ASMHelper.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/ASMHelper.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/CC_ClassWriter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/CC_ClassWriter.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/CC_ClassWriter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/CC_ClassWriter.java index 6166586c0..fb687d210 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/CC_ClassWriter.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/CC_ClassWriter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ClassHeirachyManager.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/ClassHeirachyManager.java similarity index 99% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ClassHeirachyManager.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/ClassHeirachyManager.java index 0452ab788..f1eefb536 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ClassHeirachyManager.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/ClassHeirachyManager.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ComponentInjector.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/ComponentInjector.java similarity index 99% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ComponentInjector.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/ComponentInjector.java index d1e1ff1c7..5a93a780f 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ComponentInjector.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/ComponentInjector.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.asm.lib; +package nova.core.wrapper.mc.forge.v1_7_10.asm.lib; import nova.core.component.Component; import nova.core.component.ComponentMap; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InsnListPrinter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/InsnListPrinter.java similarity index 99% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InsnListPrinter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/InsnListPrinter.java index b6efb352d..f3d8aaecc 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InsnListPrinter.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/InsnListPrinter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InstructionComparator.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/InstructionComparator.java similarity index 99% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InstructionComparator.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/InstructionComparator.java index 4acd88c52..54ee099ef 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/InstructionComparator.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/InstructionComparator.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ObfMapping.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/ObfMapping.java similarity index 99% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ObfMapping.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/ObfMapping.java index 3b09d749c..cfdc6ae05 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/ObfMapping.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/ObfMapping.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/TemplateInjector.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/TemplateInjector.java similarity index 98% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/TemplateInjector.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/TemplateInjector.java index ca5696979..c607a051c 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/TemplateInjector.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/TemplateInjector.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/package-info.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/package-info.java similarity index 95% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/package-info.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/package-info.java index bb91bf3a9..3943f14c2 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/lib/package-info.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/lib/package-info.java @@ -24,4 +24,4 @@ * @author Calclavia */ -package nova.core.wrapper.mc.forge.v17.asm.lib; \ No newline at end of file +package nova.core.wrapper.mc.forge.v1_7_10.asm.lib; \ No newline at end of file diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/ChunkTransformer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/ChunkTransformer.java similarity index 94% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/ChunkTransformer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/ChunkTransformer.java index 454463d9d..dc8dfaf48 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/ChunkTransformer.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/ChunkTransformer.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/GameDataTransformer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/GameDataTransformer.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/GameDataTransformer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/GameDataTransformer.java index 1ae6e339a..eed86c7c0 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/GameDataTransformer.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/GameDataTransformer.java @@ -17,10 +17,10 @@ * You should have received a copy of the GNU General Public License * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/TileEntityTransformer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/TileEntityTransformer.java similarity index 90% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/TileEntityTransformer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/TileEntityTransformer.java index 2df4a91f4..275a23091 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/TileEntityTransformer.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/TileEntityTransformer.java @@ -18,11 +18,11 @@ * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/Transformer.java similarity index 94% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/Transformer.java index 1e24c7cdd..9d0712eeb 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformer.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/Transformer.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformers.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/Transformers.java similarity index 94% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformers.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/Transformers.java index 28f61630f..2a2193874 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/asm/transformers/Transformers.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/asm/transformers/Transformers.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ClientModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/ClientModule.java similarity index 89% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ClientModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/ClientModule.java index 7459af91e..598237f60 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ClientModule.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/ClientModule.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -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 { diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ComponentModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/ComponentModule.java similarity index 88% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ComponentModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/ComponentModule.java index 852a5a7c2..4642c3e14 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/ComponentModule.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/ComponentModule.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.depmodules; +package nova.core.wrapper.mc.forge.v1_7_10.depmodules; import nova.core.entity.component.RigidBody; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.forward.BWRigidBody; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.forward.BWRigidBody; import se.jbee.inject.bind.BinderModule; /** diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/GameInfoModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/GameInfoModule.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/GameInfoModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/GameInfoModule.java index 830cd33f9..6c0063aea 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/GameInfoModule.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/GameInfoModule.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/KeyModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/KeyModule.java similarity index 89% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/KeyModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/KeyModule.java index 9e5b25595..559201b23 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/KeyModule.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/KeyModule.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.depmodules; +package nova.core.wrapper.mc.forge.v1_7_10.depmodules; import nova.core.game.InputManager; -import nova.core.wrapper.mc.forge.v17.util.MCInputManager; +import nova.core.wrapper.mc.forge.v1_7_10.util.MCInputManager; import se.jbee.inject.bind.BinderModule; public class KeyModule extends BinderModule { diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/LanguageModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/LanguageModule.java similarity index 89% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/LanguageModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/LanguageModule.java index 7fb5745b8..220a5b247 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/LanguageModule.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/LanguageModule.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -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 { diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/NetworkModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/NetworkModule.java similarity index 89% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/NetworkModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/NetworkModule.java index e904d37af..561b152d2 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/NetworkModule.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/NetworkModule.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.depmodules; +package nova.core.wrapper.mc.forge.v1_7_10.depmodules; import nova.core.network.NetworkManager; -import nova.core.wrapper.mc.forge.v17.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 { diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/SaveModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/SaveModule.java similarity index 89% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/SaveModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/SaveModule.java index 334e89499..3e3eec37a 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/SaveModule.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/SaveModule.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -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 { diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/TickerModule.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/TickerModule.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/TickerModule.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/TickerModule.java index 1691707e3..edf25e751 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/depmodules/TickerModule.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/depmodules/TickerModule.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.depmodules; +package nova.core.wrapper.mc.forge.v1_7_10.depmodules; import nova.internal.core.tick.UpdateTicker; import se.jbee.inject.Dependency; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ClientProxy.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/ClientProxy.java similarity index 88% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ClientProxy.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/ClientProxy.java index 651a5a549..250490024 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ClientProxy.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/ClientProxy.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -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; @@ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/CommonProxy.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/CommonProxy.java similarity index 86% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/CommonProxy.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/CommonProxy.java index 838573d7e..ee803414c 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/CommonProxy.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/CommonProxy.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -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; @@ -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; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLEventHandler.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/FMLEventHandler.java similarity index 93% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLEventHandler.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/FMLEventHandler.java index ae03520b9..8ba318f8f 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLEventHandler.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/FMLEventHandler.java @@ -18,12 +18,12 @@ * along with NOVA. If not, see . */ -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; /** diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLProgressBar.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/FMLProgressBar.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLProgressBar.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/FMLProgressBar.java index 44ca91399..fb54dc163 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/FMLProgressBar.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/FMLProgressBar.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.launcher; +package nova.core.wrapper.mc.forge.v1_7_10.launcher; import nova.core.util.AbstractProgressBar; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeEventHandler.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/ForgeEventHandler.java similarity index 92% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeEventHandler.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/ForgeEventHandler.java index ee7533775..ca24b6fd2 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeEventHandler.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/ForgeEventHandler.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.launcher; +package nova.core.wrapper.mc.forge.v1_7_10.launcher; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -28,9 +28,9 @@ import nova.core.event.PlayerEvent; import nova.core.item.Item; import nova.core.item.ItemDictionary; -import nova.core.wrapper.mc.forge.v17.wrapper.block.world.WorldConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.EntityConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeLoadable.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/ForgeLoadable.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeLoadable.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/ForgeLoadable.java index d902a29b9..ddf556a22 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/ForgeLoadable.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/ForgeLoadable.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.launcher; +package nova.core.wrapper.mc.forge.v1_7_10.launcher; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/NovaMinecraft.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/NovaMinecraft.java similarity index 85% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/NovaMinecraft.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/NovaMinecraft.java index 7c12c6db6..4c7f86dcd 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/NovaMinecraft.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/NovaMinecraft.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.launcher; +package nova.core.wrapper.mc.forge.v1_7_10.launcher; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; @@ -34,28 +34,28 @@ import nova.core.config.Configuration; import nova.core.deps.MavenDependency; import nova.core.event.ServerEvent; -import nova.core.wrapper.mc.forge.v17.NovaMinecraftPreloader; -import nova.core.wrapper.mc.forge.v17.depmodules.ClientModule; -import nova.core.wrapper.mc.forge.v17.depmodules.ComponentModule; -import nova.core.wrapper.mc.forge.v17.depmodules.GameInfoModule; -import nova.core.wrapper.mc.forge.v17.depmodules.KeyModule; -import nova.core.wrapper.mc.forge.v17.depmodules.LanguageModule; -import nova.core.wrapper.mc.forge.v17.depmodules.NetworkModule; -import nova.core.wrapper.mc.forge.v17.depmodules.SaveModule; -import nova.core.wrapper.mc.forge.v17.depmodules.TickerModule; -import nova.core.wrapper.mc.forge.v17.wrapper.CategoryConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.DirectionConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.assets.AssetConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.block.BlockConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.block.world.WorldConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.cuboid.CuboidConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.data.DataConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.EntityConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.inventory.InventoryConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.item.OreDictionaryIntegration; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.MinecraftRecipeRegistry; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.RecipeConverter; +import nova.core.wrapper.mc.forge.v1_7_10.NovaMinecraftPreloader; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.ClientModule; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.ComponentModule; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.GameInfoModule; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.KeyModule; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.LanguageModule; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.NetworkModule; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.SaveModule; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.TickerModule; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.CategoryConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.DirectionConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.assets.AssetConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.BlockConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.cuboid.CuboidConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.inventory.InventoryConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.OreDictionaryIntegration; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.MinecraftRecipeRegistry; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.RecipeConverter; import nova.internal.core.Game; import nova.internal.core.bootstrap.DependencyInjectionEntryPoint; import nova.internal.core.deps.DepDownloader; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/FWClientManager.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/manager/FWClientManager.java similarity index 86% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/FWClientManager.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/manager/FWClientManager.java index d0b005e9a..b48cc5ecd 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/FWClientManager.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/manager/FWClientManager.java @@ -18,13 +18,13 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.manager; +package nova.core.wrapper.mc.forge.v1_7_10.manager; import net.minecraft.client.Minecraft; import nova.core.entity.Entity; import nova.core.game.ClientManager; -import nova.core.wrapper.mc.forge.v17.launcher.NovaMinecraft; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.backward.BWEntity; +import nova.core.wrapper.mc.forge.v1_7_10.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.backward.BWEntity; /** * @author Calclavia diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/MCRetentionManager.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/manager/MCRetentionManager.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/MCRetentionManager.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/manager/MCRetentionManager.java index 6c42d0f67..f7410d41d 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/MCRetentionManager.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/manager/MCRetentionManager.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.manager; +package nova.core.wrapper.mc.forge.v1_7_10.manager; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; @@ -30,7 +30,7 @@ import nova.core.retention.Data; import nova.core.retention.Storable; import nova.core.util.registry.RetentionManager; -import nova.core.wrapper.mc.forge.v17.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.data.DataConverter; import nova.internal.core.Game; import java.io.File; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiConfig.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/manager/config/NovaGuiConfig.java similarity index 95% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiConfig.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/manager/config/NovaGuiConfig.java index a99877c7e..0cc4755a7 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiConfig.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/manager/config/NovaGuiConfig.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.manager.config; +package nova.core.wrapper.mc.forge.v1_7_10.manager.config; import cpw.mods.fml.client.config.GuiConfig; import net.minecraft.client.gui.GuiScreen; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiFactory.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/manager/config/NovaGuiFactory.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiFactory.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/manager/config/NovaGuiFactory.java index 1dc4abd80..99b2ccdd2 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/manager/config/NovaGuiFactory.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/manager/config/NovaGuiFactory.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.manager.config; +package nova.core.wrapper.mc.forge.v1_7_10.manager.config; import cpw.mods.fml.client.IModGuiFactory; import net.minecraft.client.Minecraft; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/MCPacket.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/MCPacket.java similarity index 98% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/MCPacket.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/MCPacket.java index a363a90c3..ae3fa864e 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/MCPacket.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/MCPacket.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.network; +package nova.core.wrapper.mc.forge.v1_7_10.network; import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/NovaPacket.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/discriminator/NovaPacket.java similarity index 88% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/NovaPacket.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/discriminator/NovaPacket.java index e6c709938..d4d120d0c 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/NovaPacket.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/discriminator/NovaPacket.java @@ -18,16 +18,16 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.network.discriminator; +package nova.core.wrapper.mc.forge.v1_7_10.network.discriminator; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import nova.core.entity.component.Player; import nova.core.network.handler.PacketHandler; -import nova.core.wrapper.mc.forge.v17.network.MCPacket; -import nova.core.wrapper.mc.forge.v17.network.netty.MCNetworkManager; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_7_10.network.MCPacket; +import nova.core.wrapper.mc.forge.v1_7_10.network.netty.MCNetworkManager; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.EntityConverter; import nova.internal.core.Game; /** diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketAbstract.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/discriminator/PacketAbstract.java similarity index 95% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketAbstract.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/discriminator/PacketAbstract.java index cbb0a371b..04daf71b6 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketAbstract.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/discriminator/PacketAbstract.java @@ -18,13 +18,13 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.network.discriminator; +package nova.core.wrapper.mc.forge.v1_7_10.network.discriminator; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; -import nova.core.wrapper.mc.forge.v17.network.netty.MCNetworkManager; +import nova.core.wrapper.mc.forge.v1_7_10.network.netty.MCNetworkManager; /** * For custom packets extend this Class and register on Mod loading phase diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketPlayerItem.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/discriminator/PacketPlayerItem.java similarity index 94% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketPlayerItem.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/discriminator/PacketPlayerItem.java index 1ab27ae00..751d9a7b4 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/discriminator/PacketPlayerItem.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/discriminator/PacketPlayerItem.java @@ -18,14 +18,14 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.network.discriminator; +package nova.core.wrapper.mc.forge.v1_7_10.network.discriminator; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import nova.core.network.Syncable; -import nova.core.wrapper.mc.forge.v17.network.MCPacket; +import nova.core.wrapper.mc.forge.v1_7_10.network.MCPacket; /** * A packet handler for players who are currently holding their item. diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/ChannelHandler.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/netty/ChannelHandler.java similarity index 83% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/ChannelHandler.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/netty/ChannelHandler.java index ff269be55..f5088e6c7 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/ChannelHandler.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/netty/ChannelHandler.java @@ -18,14 +18,14 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.network.netty; +package nova.core.wrapper.mc.forge.v1_7_10.network.netty; import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import nova.core.wrapper.mc.forge.v17.network.discriminator.NovaPacket; -import nova.core.wrapper.mc.forge.v17.network.discriminator.PacketAbstract; -import nova.core.wrapper.mc.forge.v17.network.discriminator.PacketPlayerItem; +import nova.core.wrapper.mc.forge.v1_7_10.network.discriminator.NovaPacket; +import nova.core.wrapper.mc.forge.v1_7_10.network.discriminator.PacketAbstract; +import nova.core.wrapper.mc.forge.v1_7_10.network.discriminator.PacketPlayerItem; /** * Handles the channel and discriminators. diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCNetworkManager.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/netty/MCNetworkManager.java similarity index 93% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCNetworkManager.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/netty/MCNetworkManager.java index 8de151af9..18e9735ef 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCNetworkManager.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/netty/MCNetworkManager.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.network.netty; +package nova.core.wrapper.mc.forge.v1_7_10.network.netty; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.FMLEmbeddedChannel; @@ -35,11 +35,11 @@ import nova.core.entity.component.Player; import nova.core.network.NetworkManager; import nova.core.network.Syncable; -import nova.core.wrapper.mc.forge.v17.launcher.NovaMinecraft; -import nova.core.wrapper.mc.forge.v17.network.MCPacket; -import nova.core.wrapper.mc.forge.v17.network.discriminator.NovaPacket; -import nova.core.wrapper.mc.forge.v17.network.discriminator.PacketAbstract; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.backward.BWEntity; +import nova.core.wrapper.mc.forge.v1_7_10.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_7_10.network.MCPacket; +import nova.core.wrapper.mc.forge.v1_7_10.network.discriminator.NovaPacket; +import nova.core.wrapper.mc.forge.v1_7_10.network.discriminator.PacketAbstract; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.backward.BWEntity; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import java.util.EnumMap; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCPacketHandler.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/netty/MCPacketHandler.java similarity index 89% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCPacketHandler.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/netty/MCPacketHandler.java index ddd2f149a..12bb10e11 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/network/netty/MCPacketHandler.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/network/netty/MCPacketHandler.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.network.netty; +package nova.core.wrapper.mc.forge.v1_7_10.network.netty; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.NetworkRegistry; @@ -27,8 +27,8 @@ import io.netty.channel.SimpleChannelInboundHandler; import net.minecraft.network.INetHandler; import net.minecraft.network.NetHandlerPlayServer; -import nova.core.wrapper.mc.forge.v17.launcher.NovaMinecraft; -import nova.core.wrapper.mc.forge.v17.network.discriminator.PacketAbstract; +import nova.core.wrapper.mc.forge.v1_7_10.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_7_10.network.discriminator.PacketAbstract; /** * @author tgame14 diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/render/RenderUtility.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/render/RenderUtility.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/render/RenderUtility.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/render/RenderUtility.java index 26085bc67..0509a87a3 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/render/RenderUtility.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/render/RenderUtility.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.render; +package nova.core.wrapper.mc.forge.v1_7_10.render; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -33,8 +33,8 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.model.ModelFormatException; import nova.core.render.texture.Texture; -import nova.core.wrapper.mc.forge.v17.launcher.ForgeLoadable; -import nova.core.wrapper.mc.forge.v17.wrapper.assets.AssetConverter; +import nova.core.wrapper.mc.forge.v1_7_10.launcher.ForgeLoadable; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.assets.AssetConverter; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; import org.lwjgl.opengl.GL11; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCInputManager.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/MCInputManager.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCInputManager.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/MCInputManager.java index 6e4fcf086..7e89e17b9 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCInputManager.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/MCInputManager.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.util; +package nova.core.wrapper.mc.forge.v1_7_10.util; import nova.core.game.InputManager; import org.lwjgl.input.Keyboard; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCLanguageManager.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/MCLanguageManager.java similarity index 93% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCLanguageManager.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/MCLanguageManager.java index 398b6bb4d..ff62eaf23 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/MCLanguageManager.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/MCLanguageManager.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.util; +package nova.core.wrapper.mc.forge.v1_7_10.util; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @@ -27,8 +27,8 @@ import nova.core.event.LanguageEvent; import nova.core.event.bus.EventBus; import nova.core.language.LanguageManager; -import nova.core.wrapper.mc.forge.v17.launcher.ForgeLoadable; -import nova.core.wrapper.mc.forge.v17.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_7_10.launcher.ForgeLoadable; +import nova.core.wrapper.mc.forge.v1_7_10.launcher.NovaMinecraft; import nova.internal.core.Game; /** diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ModCreativeTab.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/ModCreativeTab.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ModCreativeTab.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/ModCreativeTab.java index 16f1f3fb7..51d528c76 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ModCreativeTab.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/ModCreativeTab.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.util; +package nova.core.wrapper.mc.forge.v1_7_10.util; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ObfuscationConstants.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/ObfuscationConstants.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ObfuscationConstants.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/ObfuscationConstants.java index 47ef9fce5..6d2aa05f1 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ObfuscationConstants.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/ObfuscationConstants.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.util; +package nova.core.wrapper.mc.forge.v1_7_10.util; /** * @author Stan Hebben diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ReflectionUtil.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/ReflectionUtil.java similarity index 99% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ReflectionUtil.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/ReflectionUtil.java index b33de7543..4669794ac 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/ReflectionUtil.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/ReflectionUtil.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.util; +package nova.core.wrapper.mc.forge.v1_7_10.util; import com.google.common.collect.BiMap; import cpw.mods.fml.common.registry.EntityRegistry; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapUtility.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/WrapUtility.java similarity index 90% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapUtility.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/WrapUtility.java index cb3534ec4..061c37981 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapUtility.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/WrapUtility.java @@ -18,16 +18,17 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.util; +package nova.core.wrapper.mc.forge.v1_7_10.util; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import nova.core.entity.Entity; import nova.core.entity.component.Player; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.EntityConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.backward.BWEntity; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.backward.BWEntity; import java.util.Optional; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapperEvent.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/WrapperEvent.java similarity index 90% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapperEvent.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/WrapperEvent.java index 1f84b8213..fc5a9569b 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/util/WrapperEvent.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/util/WrapperEvent.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.util; +package nova.core.wrapper.mc.forge.v1_7_10.util; import net.minecraft.item.ItemStack; import nova.core.block.Block; @@ -29,12 +29,12 @@ import nova.core.item.Item; import nova.core.util.Direction; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v17.wrapper.block.backward.BWBlock; -import nova.core.wrapper.mc.forge.v17.wrapper.block.forward.FWTile; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.backward.BWEntity; -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.item.BWItem; +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.FWTile; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.backward.BWEntity; +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.item.BWItem; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import java.util.Optional; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/CategoryConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/CategoryConverter.java similarity index 95% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/CategoryConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/CategoryConverter.java index 6b5cfb766..f5f42afb8 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/CategoryConverter.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/CategoryConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; @@ -26,8 +26,8 @@ import net.minecraft.item.ItemStack; import nova.core.component.Category; import nova.core.nativewrapper.NativeConverter; -import nova.core.wrapper.mc.forge.v17.util.ModCreativeTab; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.util.ModCreativeTab; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; import nova.internal.core.Game; import java.util.Arrays; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/DirectionConverter.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/DirectionConverter.java index 1a239d9c1..9ec4b8598 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverter.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/DirectionConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper; import net.minecraft.util.EnumFacing; import nova.core.nativewrapper.NativeConverter; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/AssetConverter.java similarity index 98% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/AssetConverter.java index c9dcbf627..2202aa7f4 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverter.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/AssetConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.assets; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.assets; import net.minecraft.util.ResourceLocation; import nova.core.nativewrapper.NativeConverter; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFileResourcePack.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/NovaFileResourcePack.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFileResourcePack.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/NovaFileResourcePack.java index 9e5d087c5..96b4d99ec 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFileResourcePack.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/NovaFileResourcePack.java @@ -18,12 +18,12 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.assets; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.assets; import com.google.common.base.Charsets; import net.minecraft.client.resources.FileResourcePack; import net.minecraft.util.ResourceLocation; -import nova.core.wrapper.mc.forge.v17.NovaMinecraftPreloader; +import nova.core.wrapper.mc.forge.v1_7_10.NovaMinecraftPreloader; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFolderResourcePack.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/NovaFolderResourcePack.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFolderResourcePack.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/NovaFolderResourcePack.java index 306ca3adc..4740e580d 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaFolderResourcePack.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/NovaFolderResourcePack.java @@ -18,12 +18,12 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.assets; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.assets; import com.google.common.base.Charsets; import net.minecraft.client.resources.FolderResourcePack; import net.minecraft.util.ResourceLocation; -import nova.core.wrapper.mc.forge.v17.NovaMinecraftPreloader; +import nova.core.wrapper.mc.forge.v1_7_10.NovaMinecraftPreloader; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaResourcePack.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/NovaResourcePack.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaResourcePack.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/NovaResourcePack.java index 59b9b02af..ac181bfa1 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/NovaResourcePack.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/NovaResourcePack.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.assets; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.assets; import net.minecraft.client.resources.IResourcePack; import net.minecraft.util.ResourceLocation; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/BlockConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/BlockConverter.java similarity index 89% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/BlockConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/BlockConverter.java index 39c3276ab..86ffbe86c 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/BlockConverter.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/BlockConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -33,13 +33,13 @@ import nova.core.event.BlockEvent; import nova.core.loader.Mod; import nova.core.nativewrapper.NativeConverter; -import nova.core.wrapper.mc.forge.v17.launcher.ForgeLoadable; -import nova.core.wrapper.mc.forge.v17.launcher.NovaMinecraft; -import nova.core.wrapper.mc.forge.v17.wrapper.CategoryConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.block.backward.BWBlock; -import nova.core.wrapper.mc.forge.v17.wrapper.block.backward.BWBlockFactory; -import nova.core.wrapper.mc.forge.v17.wrapper.block.forward.FWBlock; -import nova.core.wrapper.mc.forge.v17.wrapper.item.FWItemBlock; +import nova.core.wrapper.mc.forge.v1_7_10.launcher.ForgeLoadable; +import nova.core.wrapper.mc.forge.v1_7_10.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.CategoryConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.backward.BWBlock; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.backward.BWBlockFactory; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward.FWBlock; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.FWItemBlock; import nova.internal.core.Game; import nova.internal.core.launch.NovaLauncher; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlock.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/backward/BWBlock.java similarity index 93% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlock.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/backward/BWBlock.java index 284017c89..caab2dfa1 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlock.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/backward/BWBlock.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.backward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.backward; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; @@ -41,12 +41,12 @@ import nova.core.sound.Sound; import nova.core.util.shape.Cuboid; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v17.util.WrapperEvent; -import nova.core.wrapper.mc.forge.v17.wrapper.block.world.WorldConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.cuboid.CuboidConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.data.DataConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.EntityConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.cuboid.CuboidConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockFactory.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/backward/BWBlockFactory.java similarity index 95% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockFactory.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/backward/BWBlockFactory.java index f12922ba5..34ec1aecb 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockFactory.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/backward/BWBlockFactory.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.backward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.backward; import net.minecraft.block.Block; import nova.core.block.BlockFactory; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockTransform.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/backward/BWBlockTransform.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockTransform.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/backward/BWBlockTransform.java index 50f223589..a39559cd9 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlockTransform.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/backward/BWBlockTransform.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU General Public License * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.backward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.backward; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import nova.core.component.transform.BlockTransform; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v17.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.world.WorldConverter; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import java.util.Optional; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/BlockPosition.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/BlockPosition.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/BlockPosition.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/BlockPosition.java index 6218a37fc..ff2b3e2af 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/BlockPosition.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/BlockPosition.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward; import net.minecraft.world.World; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlock.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWBlock.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlock.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWBlock.java index 3b4e8bf29..9246023c2 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlock.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWBlock.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -55,12 +55,12 @@ import nova.core.util.math.MathUtil; import nova.core.util.math.MatrixStack; import nova.core.util.shape.Cuboid; -import nova.core.wrapper.mc.forge.v17.util.WrapperEvent; -import nova.core.wrapper.mc.forge.v17.wrapper.block.world.WorldConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.cuboid.CuboidConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.EntityConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.render.BWModel; +import nova.core.wrapper.mc.forge.v1_7_10.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.cuboid.CuboidConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.render.BWModel; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import org.lwjgl.opengl.GL11; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlockSound.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWBlockSound.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlockSound.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWBlockSound.java index 1c1a872e3..96f54d1c0 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWBlockSound.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWBlockSound.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward; import net.minecraft.block.Block; import nova.core.block.component.BlockProperty; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTile.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWTile.java similarity index 94% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTile.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWTile.java index 0f49fda76..0348f9505 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTile.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWTile.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; @@ -29,8 +29,8 @@ import nova.core.network.Syncable; import nova.core.retention.Data; import nova.core.retention.Storable; -import nova.core.wrapper.mc.forge.v17.network.netty.MCNetworkManager; -import nova.core.wrapper.mc.forge.v17.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_7_10.network.netty.MCNetworkManager; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.data.DataConverter; import nova.internal.core.Game; /** diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileLoader.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWTileLoader.java similarity index 92% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileLoader.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWTileLoader.java index c76ec20c8..7e89e81c6 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileLoader.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWTileLoader.java @@ -18,13 +18,13 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward; import net.minecraft.nbt.NBTTagCompound; import nova.core.block.Block; import nova.core.block.BlockFactory; -import nova.core.wrapper.mc.forge.v17.asm.lib.ComponentInjector; -import nova.core.wrapper.mc.forge.v17.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_7_10.asm.lib.ComponentInjector; +import nova.core.wrapper.mc.forge.v1_7_10.util.WrapperEvent; import nova.internal.core.Game; import java.util.Optional; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileRenderer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWTileRenderer.java similarity index 90% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileRenderer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWTileRenderer.java index abb893449..99ede1ea8 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/FWTileRenderer.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/FWTileRenderer.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -26,8 +26,8 @@ import net.minecraft.tileentity.TileEntity; import nova.core.block.Block; import nova.core.component.renderer.DynamicRenderer; -import nova.core.wrapper.mc.forge.v17.render.RenderUtility; -import nova.core.wrapper.mc.forge.v17.wrapper.render.BWModel; +import nova.core.wrapper.mc.forge.v1_7_10.render.RenderUtility; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.render.BWModel; import java.util.Optional; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/MCBlockTransform.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/MCBlockTransform.java similarity index 95% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/MCBlockTransform.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/MCBlockTransform.java index e720f2416..f323e91d8 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/MCBlockTransform.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/MCBlockTransform.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; @@ -27,7 +27,7 @@ import nova.core.retention.Data; import nova.core.retention.Storable; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v17.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.world.WorldConverter; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/ProxyMaterial.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/ProxyMaterial.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/ProxyMaterial.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/ProxyMaterial.java index 91361cbf3..e07236409 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/ProxyMaterial.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/ProxyMaterial.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/TEBlockTransform.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/TEBlockTransform.java similarity index 93% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/TEBlockTransform.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/TEBlockTransform.java index 4ca904bbf..7bef6838c 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/forward/TEBlockTransform.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/forward/TEBlockTransform.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU General Public License * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward; import net.minecraft.world.IBlockAccess; import nova.core.block.Block; import nova.core.component.transform.BlockTransform; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v17.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.world.WorldConverter; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; /** diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/world/BWWorld.java similarity index 87% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/world/BWWorld.java index 311456757..612554774 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/world/BWWorld.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.world; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.world; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; @@ -32,16 +32,16 @@ import nova.core.sound.Sound; import nova.core.util.shape.Cuboid; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v17.launcher.NovaMinecraft; -import nova.core.wrapper.mc.forge.v17.wrapper.block.BlockConverter; -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.MCBlockTransform; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.EntityConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.backward.BWEntity; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.forward.FWEntity; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.forward.MCEntityTransform; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.BlockConverter; +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.MCBlockTransform; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.backward.BWEntity; +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.MCEntityTransform; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/WorldConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/world/WorldConverter.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/WorldConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/world/WorldConverter.java index 9ad7e6d46..186e30f9a 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/WorldConverter.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/block/world/WorldConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.block.world; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.world; import net.minecraft.world.IBlockAccess; import nova.core.nativewrapper.NativeConverter; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/cuboid/CuboidConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/cuboid/CuboidConverter.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/cuboid/CuboidConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/cuboid/CuboidConverter.java index 3b706b847..b0e7476da 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/cuboid/CuboidConverter.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/cuboid/CuboidConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.cuboid; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.cuboid; import net.minecraft.util.AxisAlignedBB; import nova.core.nativewrapper.NativeConverter; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/data/DataConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/data/DataConverter.java similarity index 99% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/data/DataConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/data/DataConverter.java index a7e06780c..578917e58 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/data/DataConverter.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/data/DataConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.data; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.data; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagByte; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/EntityConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/EntityConverter.java similarity index 86% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/EntityConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/EntityConverter.java index 999af8554..184d0bda3 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/EntityConverter.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/EntityConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.entity; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.relauncher.Side; @@ -26,11 +26,11 @@ import nova.core.entity.Entity; import nova.core.entity.EntityFactory; import nova.core.nativewrapper.NativeConverter; -import nova.core.wrapper.mc.forge.v17.launcher.ForgeLoadable; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.backward.BWEntity; -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.MCEntityTransform; +import nova.core.wrapper.mc.forge.v1_7_10.launcher.ForgeLoadable; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.backward.BWEntity; +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.MCEntityTransform; import nova.internal.core.Game; import java.util.Optional; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntity.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/backward/BWEntity.java similarity index 92% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntity.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/backward/BWEntity.java index 8e2322cdb..94324bec6 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntity.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/backward/BWEntity.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.entity.backward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.backward; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -28,9 +28,9 @@ import nova.core.entity.Entity; import nova.core.entity.component.Living; import nova.core.entity.component.Player; -import nova.core.wrapper.mc.forge.v17.util.WrapperEvent; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.forward.MCEntityTransform; -import nova.core.wrapper.mc.forge.v17.wrapper.inventory.BWInventory; +import nova.core.wrapper.mc.forge.v1_7_10.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.forward.MCEntityTransform; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.inventory.BWInventory; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntityFX.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/backward/BWEntityFX.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntityFX.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/backward/BWEntityFX.java index 0ff27c305..f520dd315 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/backward/BWEntityFX.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/backward/BWEntityFX.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.entity.backward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.backward; import com.google.common.collect.HashBiMap; import cpw.mods.fml.client.FMLClientHandler; @@ -51,7 +51,7 @@ import net.minecraft.client.particle.EntitySpellParticleFX; import net.minecraft.client.particle.EntitySplashFX; import net.minecraft.client.particle.EntitySuspendFX; -import nova.core.wrapper.mc.forge.v17.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_7_10.util.WrapperEvent; import nova.internal.core.Game; /** diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/BWRigidBody.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/BWRigidBody.java similarity index 98% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/BWRigidBody.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/BWRigidBody.java index 55998f5fa..4e463c689 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/BWRigidBody.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/BWRigidBody.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.entity.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.forward; import nova.core.entity.Entity; import nova.core.entity.component.RigidBody; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntity.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/FWEntity.java similarity index 95% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntity.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/FWEntity.java index 2bcac5420..8390263ba 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntity.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/FWEntity.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.entity.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.forward; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import io.netty.buffer.ByteBuf; @@ -33,9 +33,9 @@ import nova.core.retention.Data; import nova.core.retention.Storable; import nova.core.util.shape.Cuboid; -import nova.core.wrapper.mc.forge.v17.util.WrapperEvent; -import nova.core.wrapper.mc.forge.v17.wrapper.cuboid.CuboidConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_7_10.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.cuboid.CuboidConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.data.DataConverter; import nova.internal.core.Game; /** diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityFX.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/FWEntityFX.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityFX.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/FWEntityFX.java index fe5c44288..db6555d85 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityFX.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/FWEntityFX.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.entity.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.forward; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; @@ -33,8 +33,8 @@ import nova.core.entity.Entity; import nova.core.entity.EntityFactory; import nova.core.util.shape.Cuboid; -import nova.core.wrapper.mc.forge.v17.render.RenderUtility; -import nova.core.wrapper.mc.forge.v17.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_7_10.render.RenderUtility; +import nova.core.wrapper.mc.forge.v1_7_10.util.WrapperEvent; import nova.internal.core.Game; /** diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityRenderer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/FWEntityRenderer.java similarity index 93% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityRenderer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/FWEntityRenderer.java index a113dcfd5..f7639945a 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/FWEntityRenderer.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/FWEntityRenderer.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.entity.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.forward; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; @@ -26,8 +26,8 @@ import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import nova.core.component.renderer.DynamicRenderer; -import nova.core.wrapper.mc.forge.v17.render.RenderUtility; -import nova.core.wrapper.mc.forge.v17.wrapper.render.BWModel; +import nova.core.wrapper.mc.forge.v1_7_10.render.RenderUtility; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.render.BWModel; import org.lwjgl.opengl.GL11; import java.util.Optional; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/MCEntityTransform.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/MCEntityTransform.java similarity index 95% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/MCEntityTransform.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/MCEntityTransform.java index 8e3835781..a35893cfe 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/entity/forward/MCEntityTransform.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/entity/forward/MCEntityTransform.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.entity.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.forward; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.common.DimensionManager; @@ -27,7 +27,7 @@ import nova.core.util.math.RotationUtil; import nova.core.util.math.Vector3DUtil; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v17.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.world.WorldConverter; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Rotation; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/BWInventory.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/inventory/BWInventory.java similarity index 93% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/BWInventory.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/inventory/BWInventory.java index 50fd3db23..07a51612e 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/BWInventory.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/inventory/BWInventory.java @@ -18,13 +18,13 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.inventory; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import nova.core.component.inventory.Inventory; import nova.core.item.Item; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; import nova.internal.core.Game; import java.util.Optional; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/FWInventory.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/inventory/FWInventory.java similarity index 95% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/FWInventory.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/inventory/FWInventory.java index 5f5034941..e4508f6da 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/FWInventory.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/inventory/FWInventory.java @@ -18,13 +18,13 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.inventory; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import nova.core.component.inventory.Inventory; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; public class FWInventory implements IInventory { diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/InventoryConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/inventory/InventoryConverter.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/InventoryConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/inventory/InventoryConverter.java index 2562fea38..cfc103670 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/inventory/InventoryConverter.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/inventory/InventoryConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.inventory; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.inventory; import net.minecraft.inventory.IInventory; import nova.core.component.inventory.Inventory; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItem.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/BWItem.java similarity index 98% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItem.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/BWItem.java index 76cc54d07..b66f809b3 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItem.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/BWItem.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.item; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.item; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItemFactory.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/BWItemFactory.java similarity index 93% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItemFactory.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/BWItemFactory.java index 57d1c0bcd..b76031627 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItemFactory.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/BWItemFactory.java @@ -18,15 +18,15 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.item; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.item; import net.minecraft.nbt.NBTTagCompound; import nova.core.component.misc.FactoryProvider; import nova.core.item.Item; import nova.core.item.ItemFactory; import nova.core.retention.Data; -import nova.core.wrapper.mc.forge.v17.util.WrapperEvent; -import nova.core.wrapper.mc.forge.v17.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_7_10.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.data.DataConverter; import nova.internal.core.Game; /** diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItem.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/FWItem.java similarity index 98% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItem.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/FWItem.java index 4e515ef46..216da79d3 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItem.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/FWItem.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.item; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.item; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItemBlock.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/FWItemBlock.java similarity index 95% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItemBlock.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/FWItemBlock.java index ba7750ab8..6d345edf8 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWItemBlock.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/FWItemBlock.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.item; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.item; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -26,7 +26,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import nova.core.item.ItemFactory; -import nova.core.wrapper.mc.forge.v17.wrapper.block.forward.FWBlock; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.forward.FWBlock; import java.util.List; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWNBTTagCompound.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/FWNBTTagCompound.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWNBTTagCompound.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/FWNBTTagCompound.java index 5b4fb7964..1d3a30611 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/FWNBTTagCompound.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/FWNBTTagCompound.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.item; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.item; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/ItemConverter.java similarity index 95% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/ItemConverter.java index 384424462..1b91809b6 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/ItemConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.item; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.item; import com.google.common.collect.HashBiMap; import cpw.mods.fml.common.FMLCommonHandler; @@ -34,13 +34,13 @@ import nova.core.loader.Mod; import nova.core.nativewrapper.NativeConverter; import nova.core.retention.Data; -import nova.core.wrapper.mc.forge.v17.launcher.ForgeLoadable; -import nova.core.wrapper.mc.forge.v17.launcher.NovaMinecraft; -import nova.core.wrapper.mc.forge.v17.util.WrapUtility; -import nova.core.wrapper.mc.forge.v17.util.WrapperEvent; -import nova.core.wrapper.mc.forge.v17.wrapper.CategoryConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.block.BlockConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_7_10.launcher.ForgeLoadable; +import nova.core.wrapper.mc.forge.v1_7_10.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_7_10.util.WrapUtility; +import nova.core.wrapper.mc.forge.v1_7_10.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.CategoryConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.BlockConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.data.DataConverter; import nova.internal.core.Game; import nova.internal.core.launch.InitializationException; import nova.internal.core.launch.NovaLauncher; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemWrapperMethods.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/ItemWrapperMethods.java similarity index 95% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemWrapperMethods.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/ItemWrapperMethods.java index 20e088877..3bafaf5f3 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemWrapperMethods.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/ItemWrapperMethods.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.item; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.item; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.player.EntityPlayer; @@ -30,8 +30,8 @@ import nova.core.item.Item; import nova.core.item.ItemFactory; import nova.core.util.Direction; -import nova.core.wrapper.mc.forge.v17.wrapper.entity.backward.BWEntity; -import nova.core.wrapper.mc.forge.v17.wrapper.render.BWModel; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.entity.backward.BWEntity; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.render.BWModel; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/OreDictionaryIntegration.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/OreDictionaryIntegration.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/OreDictionaryIntegration.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/OreDictionaryIntegration.java index 8e4b318f1..a8d46ca0e 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/OreDictionaryIntegration.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/item/OreDictionaryIntegration.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.item; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.item; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.item.ItemStack; @@ -27,7 +27,7 @@ import nova.core.event.DictionaryEvent; import nova.core.item.Item; import nova.core.item.ItemDictionary; -import nova.core.wrapper.mc.forge.v17.util.ReflectionUtil; +import nova.core.wrapper.mc.forge.v1_7_10.util.ReflectionUtil; import nova.internal.core.Game; import java.util.ArrayList; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/MinecraftRecipeRegistry.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/MinecraftRecipeRegistry.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/MinecraftRecipeRegistry.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/MinecraftRecipeRegistry.java index 78049baef..e565e0354 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/MinecraftRecipeRegistry.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/MinecraftRecipeRegistry.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.recipes; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; @@ -30,8 +30,8 @@ import nova.core.recipes.crafting.CraftingRecipe; import nova.core.recipes.ingredient.ItemIngredient; import nova.core.recipes.smelting.SmeltingRecipe; -import nova.core.wrapper.mc.forge.v17.util.ReflectionUtil; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.util.ReflectionUtil; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; import nova.internal.core.Game; import java.util.AbstractList; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/RecipeConverter.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/RecipeConverter.java similarity index 93% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/RecipeConverter.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/RecipeConverter.java index af3ad12c5..378d42dc4 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/RecipeConverter.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/RecipeConverter.java @@ -18,15 +18,15 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.recipes; - -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.backward.MCCraftingRecipe; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward.ShapedRecipeOre; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward.NovaCraftingRecipe; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward.NovaCraftingGrid; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward.ShapelessRecipeOre; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward.ShapedRecipeBasic; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward.ShapelessRecipeBasic; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes; + +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.backward.MCCraftingRecipe; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward.ShapedRecipeOre; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward.NovaCraftingRecipe; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward.NovaCraftingGrid; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward.ShapelessRecipeOre; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward.ShapedRecipeBasic; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward.ShapelessRecipeBasic; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; @@ -42,8 +42,8 @@ import nova.core.recipes.crafting.ShapedCraftingRecipe; import nova.core.recipes.crafting.ShapelessCraftingRecipe; import nova.core.recipes.ingredient.SpecificItemIngredient; -import nova.core.wrapper.mc.forge.v17.util.ReflectionUtil; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.util.ReflectionUtil; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; import nova.internal.core.Game; import java.util.ArrayList; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingGrid.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/backward/MCCraftingGrid.java similarity index 96% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingGrid.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/backward/MCCraftingGrid.java index 35415f410..769737d72 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingGrid.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/backward/MCCraftingGrid.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.recipes.backward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.backward; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -29,9 +29,9 @@ import net.minecraft.item.ItemStack; import nova.core.entity.component.Player; import nova.core.recipes.crafting.CraftingGrid; -import nova.core.wrapper.mc.forge.v17.util.ReflectionUtil; -import nova.core.wrapper.mc.forge.v17.util.WrapUtility; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.util.ReflectionUtil; +import nova.core.wrapper.mc.forge.v1_7_10.util.WrapUtility; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; import java.util.List; import java.util.Optional; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingRecipe.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/backward/MCCraftingRecipe.java similarity index 88% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingRecipe.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/backward/MCCraftingRecipe.java index d10874460..fec9f79d2 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/backward/MCCraftingRecipe.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/backward/MCCraftingRecipe.java @@ -18,17 +18,17 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.recipes.backward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.backward; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward.NovaCraftingGrid; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward.NovaCraftingGrid; import net.minecraft.item.crafting.IRecipe; import nova.core.entity.Entity; import nova.core.entity.component.Player; import nova.core.item.Item; import nova.core.recipes.crafting.CraftingGrid; import nova.core.recipes.crafting.CraftingRecipe; -import nova.core.wrapper.mc.forge.v17.wrapper.block.world.WorldConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; import java.util.Optional; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGrid.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/NovaCraftingGrid.java similarity index 94% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGrid.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/NovaCraftingGrid.java index 8b5a81a0c..66f0ca949 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGrid.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/NovaCraftingGrid.java @@ -18,13 +18,13 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import nova.core.item.Item; import nova.core.recipes.crafting.CraftingGrid; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; import java.util.Optional; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGridContainer.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/NovaCraftingGridContainer.java similarity index 95% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGridContainer.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/NovaCraftingGridContainer.java index 81fef68b8..c9cf2bc3c 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingGridContainer.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/NovaCraftingGridContainer.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingRecipe.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/NovaCraftingRecipe.java similarity index 88% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingRecipe.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/NovaCraftingRecipe.java index dcaaebf56..5ae010de9 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/NovaCraftingRecipe.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/NovaCraftingRecipe.java @@ -18,15 +18,15 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import nova.core.recipes.crafting.CraftingRecipe; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.backward.MCCraftingGrid; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.backward.MCCraftingGrid; public class NovaCraftingRecipe implements IRecipe { private final CraftingRecipe recipe; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeBasic.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/ShapedRecipeBasic.java similarity index 88% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeBasic.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/ShapedRecipeBasic.java index 81baadc80..2d5619e00 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeBasic.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/ShapedRecipeBasic.java @@ -18,15 +18,15 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.world.World; import nova.core.recipes.crafting.ShapedCraftingRecipe; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.backward.MCCraftingGrid; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.backward.MCCraftingGrid; /** * @author Stan Hebben diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeOre.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/ShapedRecipeOre.java similarity index 89% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeOre.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/ShapedRecipeOre.java index b28ab7ce1..2f3029919 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapedRecipeOre.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/ShapedRecipeOre.java @@ -24,15 +24,15 @@ * and open the template in the editor. */ -package nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.oredict.ShapedOreRecipe; import nova.core.recipes.crafting.ShapedCraftingRecipe; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.backward.MCCraftingGrid; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.backward.MCCraftingGrid; /** * @author Stan diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeBasic.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/ShapelessRecipeBasic.java similarity index 88% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeBasic.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/ShapelessRecipeBasic.java index 9a42d4f1d..91fab7f68 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeBasic.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/ShapelessRecipeBasic.java @@ -18,15 +18,15 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.world.World; import nova.core.recipes.crafting.ShapelessCraftingRecipe; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.backward.MCCraftingGrid; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.backward.MCCraftingGrid; import java.util.Arrays; diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeOre.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/ShapelessRecipeOre.java similarity index 88% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeOre.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/ShapelessRecipeOre.java index e86dc6a29..6951188d4 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/recipes/forward/ShapelessRecipeOre.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/recipes/forward/ShapelessRecipeOre.java @@ -18,15 +18,15 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.forward; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.oredict.ShapelessOreRecipe; import nova.core.recipes.crafting.ShapelessCraftingRecipe; -import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v17.wrapper.recipes.backward.MCCraftingGrid; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.recipes.backward.MCCraftingGrid; /** * @author Stan Hebben diff --git a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/render/BWModel.java b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/render/BWModel.java similarity index 97% rename from minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/render/BWModel.java rename to minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/render/BWModel.java index 84aeac31d..c25bd972b 100644 --- a/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/render/BWModel.java +++ b/minecraft/1.7.10/src/main/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/render/BWModel.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.render; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.Tessellator; @@ -30,8 +30,8 @@ import nova.core.render.texture.EntityTexture; import nova.core.render.texture.Texture; import nova.core.util.math.Vector3DUtil; -import nova.core.wrapper.mc.forge.v17.render.RenderUtility; -import nova.core.wrapper.mc.forge.v17.wrapper.assets.AssetConverter; +import nova.core.wrapper.mc.forge.v1_7_10.render.RenderUtility; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.assets.AssetConverter; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import java.util.Optional; diff --git a/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/launcher/NovaLauncherTest.java b/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/NovaLauncherTest.java similarity index 81% rename from minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/launcher/NovaLauncherTest.java rename to minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/NovaLauncherTest.java index ba977ff23..09526cc59 100644 --- a/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/launcher/NovaLauncherTest.java +++ b/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v1_7_10/launcher/NovaLauncherTest.java @@ -18,14 +18,14 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.launcher; +package nova.core.wrapper.mc.forge.v1_7_10.launcher; -import nova.core.wrapper.mc.forge.v17.depmodules.ClientModule; -import nova.core.wrapper.mc.forge.v17.depmodules.GameInfoModule; -import nova.core.wrapper.mc.forge.v17.depmodules.KeyModule; -import nova.core.wrapper.mc.forge.v17.depmodules.LanguageModule; -import nova.core.wrapper.mc.forge.v17.depmodules.SaveModule; -import nova.core.wrapper.mc.forge.v17.depmodules.TickerModule; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.ClientModule; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.GameInfoModule; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.KeyModule; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.LanguageModule; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.SaveModule; +import nova.core.wrapper.mc.forge.v1_7_10.depmodules.TickerModule; import nova.internal.core.Game; import nova.internal.core.bootstrap.DependencyInjectionEntryPoint; import nova.wrappertests.AbstractNovaLauncherTest; diff --git a/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverterTest.java b/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/DirectionConverterTest.java similarity index 95% rename from minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverterTest.java rename to minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/DirectionConverterTest.java index 232142c66..3f2c8a698 100644 --- a/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/DirectionConverterTest.java +++ b/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/DirectionConverterTest.java @@ -18,8 +18,9 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.DirectionConverter; import net.minecraft.util.EnumFacing; import nova.core.util.Direction; import org.junit.Before; diff --git a/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverterTest.java b/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/AssetConverterTest.java similarity index 96% rename from minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverterTest.java rename to minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/AssetConverterTest.java index c1c1c5089..5b52a848d 100644 --- a/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v17/wrapper/assets/AssetConverterTest.java +++ b/minecraft/1.7.10/src/test/java/nova/core/wrapper/mc/forge/v1_7_10/wrapper/assets/AssetConverterTest.java @@ -18,8 +18,9 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v17.wrapper.assets; +package nova.core.wrapper.mc.forge.v1_7_10.wrapper.assets; +import nova.core.wrapper.mc.forge.v1_7_10.wrapper.assets.AssetConverter; import net.minecraft.util.ResourceLocation; import nova.core.render.texture.BlockTexture; import nova.core.render.texture.EntityTexture; From 1453b566777fc03c2aa3b868fb187cd6ff509394 Mon Sep 17 00:00:00 2001 From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com> Date: Wed, 27 Jun 2018 12:40:00 +0200 Subject: [PATCH 12/12] Rename Minecraft 1.8 wrapper packages --- .../{v18 => v1_8}/NovaMinecraftCore.java | 4 +- .../{v18 => v1_8}/NovaMinecraftPreloader.java | 10 ++-- .../{v18 => v1_8}/asm/StaticForwarder.java | 16 +++---- .../{v18 => v1_8}/asm/lib/ASMHelper.java | 2 +- .../{v18 => v1_8}/asm/lib/CC_ClassWriter.java | 2 +- .../asm/lib/ClassHeirachyManager.java | 2 +- .../asm/lib/ComponentInjector.java | 2 +- .../asm/lib/InsnListPrinter.java | 2 +- .../asm/lib/InstructionComparator.java | 2 +- .../{v18 => v1_8}/asm/lib/ObfMapping.java | 2 +- .../asm/lib/TemplateInjector.java | 2 +- .../{v18 => v1_8}/asm/lib/package-info.java | 2 +- .../asm/transformers/ChunkTransformer.java | 6 +-- .../asm/transformers/GameDataTransformer.java | 6 +-- .../transformers/TileEntityTransformer.java | 8 ++-- .../asm/transformers/Transformer.java | 2 +- .../asm/transformers/Transformers.java | 4 +- .../depmodules/ClientModule.java | 4 +- .../depmodules/ComponentModule.java | 4 +- .../depmodules/GameInfoModule.java | 2 +- .../{v18 => v1_8}/depmodules/KeyModule.java | 4 +- .../depmodules/LanguageModule.java | 4 +- .../depmodules/NetworkModule.java | 4 +- .../{v18 => v1_8}/depmodules/SaveModule.java | 4 +- .../depmodules/TickerModule.java | 2 +- .../{v18 => v1_8}/launcher/ClientProxy.java | 24 +++++----- .../{v18 => v1_8}/launcher/CommonProxy.java | 12 ++--- .../launcher/FMLEventHandler.java | 4 +- .../launcher/FMLProgressBar.java | 2 +- .../launcher/ForgeEventHandler.java | 10 ++-- .../{v18 => v1_8}/launcher/ForgeLoadable.java | 2 +- .../{v18 => v1_8}/launcher/NovaMinecraft.java | 48 +++++++++---------- .../manager/FWClientManager.java | 6 +-- .../manager/MCRetentionManager.java | 4 +- .../manager/config/NovaGuiConfig.java | 2 +- .../manager/config/NovaGuiFactory.java | 2 +- .../forge/{v18 => v1_8}/network/MCPacket.java | 2 +- .../network/discriminator/NovaPacket.java | 8 ++-- .../network/discriminator/PacketAbstract.java | 4 +- .../discriminator/PacketPlayerItem.java | 4 +- .../network/netty/ChannelHandler.java | 8 ++-- .../network/netty/MCNetworkManager.java | 12 ++--- .../network/netty/MCPacketHandler.java | 6 +-- .../{v18 => v1_8}/render/RenderUtility.java | 22 ++++----- .../{v18 => v1_8}/util/MCInputManager.java | 2 +- .../{v18 => v1_8}/util/MCLanguageManager.java | 6 +-- .../{v18 => v1_8}/util/ModCreativeTab.java | 2 +- .../util/ObfuscationConstants.java | 2 +- .../{v18 => v1_8}/util/ReflectionUtil.java | 2 +- .../forge/{v18 => v1_8}/util/WrapUtility.java | 7 +-- .../{v18 => v1_8}/util/WrapperEvent.java | 14 +++--- .../wrapper/CategoryConverter.java | 6 +-- .../wrapper/DirectionConverter.java | 2 +- .../wrapper/VectorConverter.java | 2 +- .../wrapper/assets/AssetConverter.java | 2 +- .../wrapper/assets/NovaFileResourcePack.java | 4 +- .../assets/NovaFolderResourcePack.java | 4 +- .../wrapper/assets/NovaResourcePack.java | 2 +- .../wrapper/block/BlockConverter.java | 16 +++---- .../wrapper/block/backward/BWBlock.java | 18 +++---- .../block/backward/BWBlockFactory.java | 2 +- .../block/backward/BWBlockTransform.java | 6 +-- .../wrapper/block/forward/BlockPosition.java | 2 +- .../wrapper/block/forward/FWBlock.java | 16 +++---- .../wrapper/block/forward/FWBlockSound.java | 2 +- .../wrapper/block/forward/FWTile.java | 6 +-- .../wrapper/block/forward/FWTileLoader.java | 6 +-- .../wrapper/block/forward/FWTileRenderer.java | 6 +-- .../wrapper/block/forward/FWTileUpdater.java | 2 +- .../block/forward/MCBlockTransform.java | 6 +-- .../wrapper/block/forward/ProxyMaterial.java | 2 +- .../block/forward/TEBlockTransform.java | 6 +-- .../wrapper/block/world/BWWorld.java | 22 ++++----- .../wrapper/block/world/WorldConverter.java | 2 +- .../wrapper/cuboid/CuboidConverter.java | 2 +- .../wrapper/data/DataConverter.java | 2 +- .../wrapper/entity/EntityConverter.java | 12 ++--- .../wrapper/entity/backward/BWEntity.java | 8 ++-- .../wrapper/entity/backward/BWEntityFX.java | 4 +- .../wrapper/entity/forward/BWRigidBody.java | 2 +- .../wrapper/entity/forward/FWEntity.java | 8 ++-- .../wrapper/entity/forward/FWEntityFX.java | 6 +-- .../entity/forward/FWEntityRenderer.java | 6 +-- .../entity/forward/MCEntityTransform.java | 4 +- .../wrapper/inventory/BWInventory.java | 4 +- .../wrapper/inventory/FWInventory.java | 4 +- .../wrapper/inventory/InventoryConverter.java | 2 +- .../{v18 => v1_8}/wrapper/item/BWItem.java | 4 +- .../wrapper/item/BWItemFactory.java | 6 +-- .../{v18 => v1_8}/wrapper/item/FWItem.java | 2 +- .../wrapper/item/FWItemBlock.java | 4 +- .../wrapper/item/FWNBTTagCompound.java | 2 +- .../wrapper/item/ItemConverter.java | 16 +++---- .../wrapper/item/ItemWrapperMethods.java | 4 +- .../item/OreDictionaryIntegration.java | 4 +- .../recipes/MinecraftRecipeRegistry.java | 6 +-- .../wrapper/recipes/RecipeConverter.java | 20 ++++---- .../recipes/backward/MCCraftingGrid.java | 8 ++-- .../recipes/backward/MCCraftingRecipe.java | 8 ++-- .../recipes/forward/NovaCraftingGrid.java | 4 +- .../forward/NovaCraftingGridContainer.java | 2 +- .../recipes/forward/NovaCraftingRecipe.java | 6 +-- .../recipes/forward/ShapedRecipeBasic.java | 6 +-- .../recipes/forward/ShapedRecipeOre.java | 6 +-- .../recipes/forward/ShapelessRecipeBasic.java | 6 +-- .../recipes/forward/ShapelessRecipeOre.java | 6 +-- .../{v18 => v1_8}/wrapper/render/BWModel.java | 6 +-- .../wrapper/render/FWEmptyModel.java | 2 +- .../wrapper/render/FWSmartBlockModel.java | 9 ++-- .../wrapper/render/FWSmartItemModel.java | 5 +- .../wrapper/render/FWSmartModel.java | 6 +-- .../wrapper/render/backward/BWBakedModel.java | 6 +-- .../launcher/NovaLauncherTest.java | 14 +++--- .../wrapper/DirectionConverterTest.java | 3 +- .../wrapper/VectorConverterTest.java | 3 +- .../wrapper/assets/AssetConverterTest.java | 3 +- 116 files changed, 354 insertions(+), 348 deletions(-) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/NovaMinecraftCore.java (93%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/NovaMinecraftPreloader.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/StaticForwarder.java (88%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/lib/ASMHelper.java (99%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/lib/CC_ClassWriter.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/lib/ClassHeirachyManager.java (99%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/lib/ComponentInjector.java (99%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/lib/InsnListPrinter.java (99%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/lib/InstructionComparator.java (99%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/lib/ObfMapping.java (99%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/lib/TemplateInjector.java (98%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/lib/package-info.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/transformers/ChunkTransformer.java (94%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/transformers/GameDataTransformer.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/transformers/TileEntityTransformer.java (91%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/transformers/Transformer.java (94%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/asm/transformers/Transformers.java (94%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/depmodules/ClientModule.java (89%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/depmodules/ComponentModule.java (89%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/depmodules/GameInfoModule.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/depmodules/KeyModule.java (90%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/depmodules/LanguageModule.java (90%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/depmodules/NetworkModule.java (89%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/depmodules/SaveModule.java (89%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/depmodules/TickerModule.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/launcher/ClientProxy.java (90%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/launcher/CommonProxy.java (85%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/launcher/FMLEventHandler.java (93%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/launcher/FMLProgressBar.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/launcher/ForgeEventHandler.java (89%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/launcher/ForgeLoadable.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/launcher/NovaMinecraft.java (86%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/manager/FWClientManager.java (86%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/manager/MCRetentionManager.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/manager/config/NovaGuiConfig.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/manager/config/NovaGuiFactory.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/network/MCPacket.java (98%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/network/discriminator/NovaPacket.java (89%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/network/discriminator/PacketAbstract.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/network/discriminator/PacketPlayerItem.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/network/netty/ChannelHandler.java (84%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/network/netty/MCNetworkManager.java (93%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/network/netty/MCPacketHandler.java (91%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/render/RenderUtility.java (92%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/util/MCInputManager.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/util/MCLanguageManager.java (93%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/util/ModCreativeTab.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/util/ObfuscationConstants.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/util/ReflectionUtil.java (99%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/util/WrapUtility.java (91%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/util/WrapperEvent.java (91%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/CategoryConverter.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/DirectionConverter.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/VectorConverter.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/assets/AssetConverter.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/assets/NovaFileResourcePack.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/assets/NovaFolderResourcePack.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/assets/NovaResourcePack.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/BlockConverter.java (89%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/backward/BWBlock.java (92%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/backward/BWBlockFactory.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/backward/BWBlockTransform.java (94%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/forward/BlockPosition.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/forward/FWBlock.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/forward/FWBlockSound.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/forward/FWTile.java (93%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/forward/FWTileLoader.java (93%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/forward/FWTileRenderer.java (91%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/forward/FWTileUpdater.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/forward/MCBlockTransform.java (93%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/forward/ProxyMaterial.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/forward/TEBlockTransform.java (91%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/world/BWWorld.java (88%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/block/world/WorldConverter.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/cuboid/CuboidConverter.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/data/DataConverter.java (99%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/entity/EntityConverter.java (87%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/entity/backward/BWEntity.java (92%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/entity/backward/BWEntityFX.java (98%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/entity/forward/BWRigidBody.java (98%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/entity/forward/FWEntity.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/entity/forward/FWEntityFX.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/entity/forward/FWEntityRenderer.java (93%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/entity/forward/MCEntityTransform.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/inventory/BWInventory.java (93%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/inventory/FWInventory.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/inventory/InventoryConverter.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/item/BWItem.java (94%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/item/BWItemFactory.java (93%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/item/FWItem.java (98%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/item/FWItemBlock.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/item/FWNBTTagCompound.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/item/ItemConverter.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/item/ItemWrapperMethods.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/item/OreDictionaryIntegration.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/recipes/MinecraftRecipeRegistry.java (98%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/recipes/RecipeConverter.java (93%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/recipes/backward/MCCraftingGrid.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/recipes/backward/MCCraftingRecipe.java (89%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/recipes/forward/NovaCraftingGrid.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/recipes/forward/NovaCraftingGridContainer.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/recipes/forward/NovaCraftingRecipe.java (89%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/recipes/forward/ShapedRecipeBasic.java (89%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/recipes/forward/ShapedRecipeOre.java (89%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/recipes/forward/ShapelessRecipeBasic.java (89%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/recipes/forward/ShapelessRecipeOre.java (89%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/render/BWModel.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/render/FWEmptyModel.java (97%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/render/FWSmartBlockModel.java (93%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/render/FWSmartItemModel.java (95%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/render/FWSmartModel.java (96%) rename minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/render/backward/BWBakedModel.java (97%) rename minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/launcher/NovaLauncherTest.java (81%) rename minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/DirectionConverterTest.java (95%) rename minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/VectorConverterTest.java (94%) rename minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/{v18 => v1_8}/wrapper/assets/AssetConverterTest.java (96%) diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/NovaMinecraftCore.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/NovaMinecraftCore.java similarity index 93% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/NovaMinecraftCore.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/NovaMinecraftCore.java index 93c58a073..50efbed79 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/NovaMinecraftCore.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/NovaMinecraftCore.java @@ -18,11 +18,11 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18; +package nova.core.wrapper.mc.forge.v1_8; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.MCVersion; -import nova.core.wrapper.mc.forge.v18.asm.transformers.Transformers; +import nova.core.wrapper.mc.forge.v1_8.asm.transformers.Transformers; import java.util.Map; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/NovaMinecraftPreloader.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/NovaMinecraftPreloader.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/NovaMinecraftPreloader.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/NovaMinecraftPreloader.java index b15ec6494..57bef4151 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/NovaMinecraftPreloader.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/NovaMinecraftPreloader.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18; +package nova.core.wrapper.mc.forge.v1_8; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; @@ -40,10 +40,10 @@ import net.minecraftforge.fml.relauncher.Side; import nova.core.loader.Mod; import nova.core.util.ClassLoaderUtil; -import nova.core.wrapper.mc.forge.v18.util.ReflectionUtil; -import nova.core.wrapper.mc.forge.v18.wrapper.assets.NovaFileResourcePack; -import nova.core.wrapper.mc.forge.v18.wrapper.assets.NovaFolderResourcePack; -import nova.core.wrapper.mc.forge.v18.wrapper.assets.NovaResourcePack; +import nova.core.wrapper.mc.forge.v1_8.util.ReflectionUtil; +import nova.core.wrapper.mc.forge.v1_8.wrapper.assets.NovaFileResourcePack; +import nova.core.wrapper.mc.forge.v1_8.wrapper.assets.NovaFolderResourcePack; +import nova.core.wrapper.mc.forge.v1_8.wrapper.assets.NovaResourcePack; import nova.internal.core.Game; import java.io.File; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/StaticForwarder.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/StaticForwarder.java similarity index 88% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/StaticForwarder.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/StaticForwarder.java index 7b097d675..1eea7ea3f 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/StaticForwarder.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/StaticForwarder.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm; +package nova.core.wrapper.mc.forge.v1_8.asm; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; @@ -28,13 +28,13 @@ import nova.core.block.Block; import nova.core.component.misc.FactoryProvider; import nova.core.event.BlockEvent; -import nova.core.wrapper.mc.forge.v18.launcher.NovaMinecraft; -import nova.core.wrapper.mc.forge.v18.wrapper.block.backward.BWBlock; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWBlock; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWTile; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWTileLoader; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.MCBlockTransform; -import nova.core.wrapper.mc.forge.v18.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_8.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.backward.BWBlock; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWBlock; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWTile; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWTileLoader; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.MCBlockTransform; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.world.WorldConverter; import nova.internal.core.Game; import nova.internal.core.launch.NovaLauncher; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ASMHelper.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/ASMHelper.java similarity index 99% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ASMHelper.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/ASMHelper.java index 4772928ba..02691f225 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ASMHelper.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/ASMHelper.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm.lib; +package nova.core.wrapper.mc.forge.v1_8.asm.lib; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/CC_ClassWriter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/CC_ClassWriter.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/CC_ClassWriter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/CC_ClassWriter.java index 965c67000..f9ad5cc89 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/CC_ClassWriter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/CC_ClassWriter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm.lib; +package nova.core.wrapper.mc.forge.v1_8.asm.lib; import org.objectweb.asm.ClassWriter; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ClassHeirachyManager.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/ClassHeirachyManager.java similarity index 99% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ClassHeirachyManager.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/ClassHeirachyManager.java index a1a2e4008..39cf49952 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ClassHeirachyManager.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/ClassHeirachyManager.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm.lib; +package nova.core.wrapper.mc.forge.v1_8.asm.lib; import net.minecraft.launchwrapper.IClassTransformer; import net.minecraft.launchwrapper.LaunchClassLoader; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ComponentInjector.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/ComponentInjector.java similarity index 99% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ComponentInjector.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/ComponentInjector.java index 1fd3a1bb3..3de014638 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ComponentInjector.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/ComponentInjector.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm.lib; +package nova.core.wrapper.mc.forge.v1_8.asm.lib; import nova.core.component.Component; import nova.core.component.ComponentMap; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/InsnListPrinter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/InsnListPrinter.java similarity index 99% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/InsnListPrinter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/InsnListPrinter.java index 53227aa5c..dcaf44825 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/InsnListPrinter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/InsnListPrinter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm.lib; +package nova.core.wrapper.mc.forge.v1_8.asm.lib; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/InstructionComparator.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/InstructionComparator.java similarity index 99% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/InstructionComparator.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/InstructionComparator.java index c453db33a..985afc0d2 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/InstructionComparator.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/InstructionComparator.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm.lib; +package nova.core.wrapper.mc.forge.v1_8.asm.lib; import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.FieldInsnNode; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ObfMapping.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/ObfMapping.java similarity index 99% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ObfMapping.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/ObfMapping.java index 6aac4be25..f0ecd4cde 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/ObfMapping.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/ObfMapping.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm.lib; +package nova.core.wrapper.mc.forge.v1_8.asm.lib; import com.google.common.base.Objects; import net.minecraft.launchwrapper.LaunchClassLoader; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/TemplateInjector.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/TemplateInjector.java similarity index 98% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/TemplateInjector.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/TemplateInjector.java index 4c79fa9d7..840597c50 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/TemplateInjector.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/TemplateInjector.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm.lib; +package nova.core.wrapper.mc.forge.v1_8.asm.lib; import com.google.common.collect.HashBiMap; import org.objectweb.asm.tree.ClassNode; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/package-info.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/package-info.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/package-info.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/package-info.java index c92e79069..fe2fdb5cf 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/lib/package-info.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/lib/package-info.java @@ -24,4 +24,4 @@ * @author Calclavia */ -package nova.core.wrapper.mc.forge.v18.asm.lib; \ No newline at end of file +package nova.core.wrapper.mc.forge.v1_8.asm.lib; \ No newline at end of file diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/ChunkTransformer.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/ChunkTransformer.java similarity index 94% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/ChunkTransformer.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/ChunkTransformer.java index 3b3196705..6813ef6e8 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/ChunkTransformer.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/ChunkTransformer.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm.transformers; +package nova.core.wrapper.mc.forge.v1_8.asm.transformers; -import nova.core.wrapper.mc.forge.v18.asm.lib.ASMHelper; -import nova.core.wrapper.mc.forge.v18.asm.lib.ObfMapping; +import nova.core.wrapper.mc.forge.v1_8.asm.lib.ASMHelper; +import nova.core.wrapper.mc.forge.v1_8.asm.lib.ObfMapping; import nova.internal.core.Game; import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.ClassNode; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/GameDataTransformer.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/GameDataTransformer.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/GameDataTransformer.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/GameDataTransformer.java index 2d1fd8f75..a69a8ca66 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/GameDataTransformer.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/GameDataTransformer.java @@ -17,10 +17,10 @@ * You should have received a copy of the GNU General Public License * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm.transformers; +package nova.core.wrapper.mc.forge.v1_8.asm.transformers; -import nova.core.wrapper.mc.forge.v18.asm.lib.ASMHelper; -import nova.core.wrapper.mc.forge.v18.asm.lib.ObfMapping; +import nova.core.wrapper.mc.forge.v1_8.asm.lib.ASMHelper; +import nova.core.wrapper.mc.forge.v1_8.asm.lib.ObfMapping; import nova.internal.core.Game; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.InsnList; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/TileEntityTransformer.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/TileEntityTransformer.java similarity index 91% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/TileEntityTransformer.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/TileEntityTransformer.java index 6d54b730b..2d0426f59 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/TileEntityTransformer.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/TileEntityTransformer.java @@ -18,11 +18,11 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm.transformers; +package nova.core.wrapper.mc.forge.v1_8.asm.transformers; -import nova.core.wrapper.mc.forge.v18.asm.lib.ASMHelper; -import nova.core.wrapper.mc.forge.v18.asm.lib.InstructionComparator; -import nova.core.wrapper.mc.forge.v18.asm.lib.ObfMapping; +import nova.core.wrapper.mc.forge.v1_8.asm.lib.ASMHelper; +import nova.core.wrapper.mc.forge.v1_8.asm.lib.InstructionComparator; +import nova.core.wrapper.mc.forge.v1_8.asm.lib.ObfMapping; import nova.internal.core.Game; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.InsnList; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/Transformer.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/Transformer.java similarity index 94% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/Transformer.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/Transformer.java index 57306a8e8..3b1f9a5d2 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/Transformer.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/Transformer.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm.transformers; +package nova.core.wrapper.mc.forge.v1_8.asm.transformers; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.ClassNode; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/Transformers.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/Transformers.java similarity index 94% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/Transformers.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/Transformers.java index f182e822c..a7411d64c 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/asm/transformers/Transformers.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/asm/transformers/Transformers.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.asm.transformers; +package nova.core.wrapper.mc.forge.v1_8.asm.transformers; import net.minecraft.launchwrapper.IClassTransformer; -import nova.core.wrapper.mc.forge.v18.asm.lib.ASMHelper; +import nova.core.wrapper.mc.forge.v1_8.asm.lib.ASMHelper; import org.objectweb.asm.tree.ClassNode; import java.util.ArrayList; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/ClientModule.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/ClientModule.java similarity index 89% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/ClientModule.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/ClientModule.java index 3064e72b9..34b8fb61c 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/ClientModule.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/ClientModule.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.depmodules; +package nova.core.wrapper.mc.forge.v1_8.depmodules; import nova.core.game.ClientManager; -import nova.core.wrapper.mc.forge.v18.manager.FWClientManager; +import nova.core.wrapper.mc.forge.v1_8.manager.FWClientManager; import se.jbee.inject.bind.BinderModule; public class ClientModule extends BinderModule { diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/ComponentModule.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/ComponentModule.java similarity index 89% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/ComponentModule.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/ComponentModule.java index f099f4f68..ef531f3ca 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/ComponentModule.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/ComponentModule.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.depmodules; +package nova.core.wrapper.mc.forge.v1_8.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_8.wrapper.entity.forward.BWRigidBody; import se.jbee.inject.bind.BinderModule; /** diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/GameInfoModule.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/GameInfoModule.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/GameInfoModule.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/GameInfoModule.java index 109350e4e..1a310c311 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/GameInfoModule.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/GameInfoModule.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.depmodules; +package nova.core.wrapper.mc.forge.v1_8.depmodules; import nova.core.game.GameInfo; import se.jbee.inject.Dependency; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/KeyModule.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/KeyModule.java similarity index 90% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/KeyModule.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/KeyModule.java index d4f139321..96074ed30 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/KeyModule.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/KeyModule.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.depmodules; +package nova.core.wrapper.mc.forge.v1_8.depmodules; import nova.core.game.InputManager; -import nova.core.wrapper.mc.forge.v18.util.MCInputManager; +import nova.core.wrapper.mc.forge.v1_8.util.MCInputManager; import se.jbee.inject.bind.BinderModule; public class KeyModule extends BinderModule { diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/LanguageModule.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/LanguageModule.java similarity index 90% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/LanguageModule.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/LanguageModule.java index efc271808..6997188ed 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/LanguageModule.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/LanguageModule.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.depmodules; +package nova.core.wrapper.mc.forge.v1_8.depmodules; import nova.core.language.LanguageManager; -import nova.core.wrapper.mc.forge.v18.util.MCLanguageManager; +import nova.core.wrapper.mc.forge.v1_8.util.MCLanguageManager; import se.jbee.inject.bind.BinderModule; public class LanguageModule extends BinderModule { diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/NetworkModule.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/NetworkModule.java similarity index 89% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/NetworkModule.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/NetworkModule.java index e7eb1ef60..6a97ebdf6 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/NetworkModule.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/NetworkModule.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.depmodules; +package nova.core.wrapper.mc.forge.v1_8.depmodules; import nova.core.network.NetworkManager; -import nova.core.wrapper.mc.forge.v18.network.netty.MCNetworkManager; +import nova.core.wrapper.mc.forge.v1_8.network.netty.MCNetworkManager; import se.jbee.inject.bind.BinderModule; public class NetworkModule extends BinderModule { diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/SaveModule.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/SaveModule.java similarity index 89% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/SaveModule.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/SaveModule.java index 4e89b7efa..d7fdfd270 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/SaveModule.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/SaveModule.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.depmodules; +package nova.core.wrapper.mc.forge.v1_8.depmodules; import nova.core.util.registry.RetentionManager; -import nova.core.wrapper.mc.forge.v18.manager.MCRetentionManager; +import nova.core.wrapper.mc.forge.v1_8.manager.MCRetentionManager; import se.jbee.inject.bind.BinderModule; public class SaveModule extends BinderModule { diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/TickerModule.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/TickerModule.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/TickerModule.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/TickerModule.java index 296747ef0..0307ea455 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/depmodules/TickerModule.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/depmodules/TickerModule.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.depmodules; +package nova.core.wrapper.mc.forge.v1_8.depmodules; import nova.internal.core.tick.UpdateTicker; import se.jbee.inject.Dependency; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ClientProxy.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/ClientProxy.java similarity index 90% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ClientProxy.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/ClientProxy.java index 2d5b7a8a2..41ef845ff 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ClientProxy.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/ClientProxy.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.launcher; +package nova.core.wrapper.mc.forge.v1_8.launcher; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -39,17 +39,17 @@ import nova.core.entity.Entity; import nova.core.entity.EntityFactory; import nova.core.language.LanguageManager; -import nova.core.wrapper.mc.forge.v18.NovaMinecraftPreloader; -import nova.core.wrapper.mc.forge.v18.render.RenderUtility; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWBlock; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWTile; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWTileRenderer; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.EntityConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.backward.BWEntityFX; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.forward.FWEntity; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.forward.FWEntityFX; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.forward.FWEntityRenderer; -import nova.core.wrapper.mc.forge.v18.wrapper.item.FWItem; +import nova.core.wrapper.mc.forge.v1_8.NovaMinecraftPreloader; +import nova.core.wrapper.mc.forge.v1_8.render.RenderUtility; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWBlock; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWTile; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWTileRenderer; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.backward.BWEntityFX; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward.FWEntity; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward.FWEntityFX; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward.FWEntityRenderer; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.FWItem; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import java.io.IOException; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/CommonProxy.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/CommonProxy.java similarity index 85% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/CommonProxy.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/CommonProxy.java index 01f86db9e..d85d4bed6 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/CommonProxy.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/CommonProxy.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.launcher; +package nova.core.wrapper.mc.forge.v1_8.launcher; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @@ -27,11 +27,11 @@ import nova.core.entity.Entity; import nova.core.entity.EntityFactory; import nova.core.language.LanguageManager; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWBlock; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWTile; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWTileUpdater; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.forward.FWEntity; -import nova.core.wrapper.mc.forge.v18.wrapper.item.FWItem; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWBlock; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWTile; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWTileUpdater; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward.FWEntity; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.FWItem; import java.util.Set; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/FMLEventHandler.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/FMLEventHandler.java similarity index 93% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/FMLEventHandler.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/FMLEventHandler.java index f742b0362..f3011ffa8 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/FMLEventHandler.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/FMLEventHandler.java @@ -18,12 +18,12 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.launcher; +package nova.core.wrapper.mc.forge.v1_8.launcher; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import nova.core.event.PlayerEvent; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.EntityConverter; import nova.internal.core.Game; /** diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/FMLProgressBar.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/FMLProgressBar.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/FMLProgressBar.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/FMLProgressBar.java index 345b1daeb..ccb631087 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/FMLProgressBar.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/FMLProgressBar.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.launcher; +package nova.core.wrapper.mc.forge.v1_8.launcher; import nova.core.util.AbstractProgressBar; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ForgeEventHandler.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/ForgeEventHandler.java similarity index 89% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ForgeEventHandler.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/ForgeEventHandler.java index fe12d68d4..5a4a44742 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ForgeEventHandler.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/ForgeEventHandler.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.launcher; +package nova.core.wrapper.mc.forge.v1_8.launcher; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.WorldEvent; @@ -27,10 +27,10 @@ import net.minecraftforge.oredict.OreDictionary; import nova.core.item.Item; import nova.core.item.ItemDictionary; -import nova.core.wrapper.mc.forge.v18.wrapper.VectorConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.world.WorldConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.EntityConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.VectorConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ForgeLoadable.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/ForgeLoadable.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ForgeLoadable.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/ForgeLoadable.java index d0c365319..ec4f568f6 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/ForgeLoadable.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/ForgeLoadable.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.launcher; +package nova.core.wrapper.mc.forge.v1_8.launcher; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/NovaMinecraft.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/NovaMinecraft.java similarity index 86% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/NovaMinecraft.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/NovaMinecraft.java index b0867754c..b095d6dbb 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/NovaMinecraft.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/launcher/NovaMinecraft.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.launcher; +package nova.core.wrapper.mc.forge.v1_8.launcher; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -34,29 +34,29 @@ import nova.core.config.Configuration; import nova.core.deps.MavenDependency; import nova.core.event.ServerEvent; -import nova.core.wrapper.mc.forge.v18.NovaMinecraftPreloader; -import nova.core.wrapper.mc.forge.v18.depmodules.ClientModule; -import nova.core.wrapper.mc.forge.v18.depmodules.ComponentModule; -import nova.core.wrapper.mc.forge.v18.depmodules.GameInfoModule; -import nova.core.wrapper.mc.forge.v18.depmodules.KeyModule; -import nova.core.wrapper.mc.forge.v18.depmodules.LanguageModule; -import nova.core.wrapper.mc.forge.v18.depmodules.NetworkModule; -import nova.core.wrapper.mc.forge.v18.depmodules.SaveModule; -import nova.core.wrapper.mc.forge.v18.depmodules.TickerModule; -import nova.core.wrapper.mc.forge.v18.wrapper.CategoryConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.DirectionConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.VectorConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.assets.AssetConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.BlockConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.world.WorldConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.cuboid.CuboidConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.data.DataConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.EntityConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.inventory.InventoryConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.item.OreDictionaryIntegration; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.MinecraftRecipeRegistry; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.RecipeConverter; +import nova.core.wrapper.mc.forge.v1_8.NovaMinecraftPreloader; +import nova.core.wrapper.mc.forge.v1_8.depmodules.ClientModule; +import nova.core.wrapper.mc.forge.v1_8.depmodules.ComponentModule; +import nova.core.wrapper.mc.forge.v1_8.depmodules.GameInfoModule; +import nova.core.wrapper.mc.forge.v1_8.depmodules.KeyModule; +import nova.core.wrapper.mc.forge.v1_8.depmodules.LanguageModule; +import nova.core.wrapper.mc.forge.v1_8.depmodules.NetworkModule; +import nova.core.wrapper.mc.forge.v1_8.depmodules.SaveModule; +import nova.core.wrapper.mc.forge.v1_8.depmodules.TickerModule; +import nova.core.wrapper.mc.forge.v1_8.wrapper.CategoryConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.DirectionConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.VectorConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.assets.AssetConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.BlockConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.cuboid.CuboidConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.inventory.InventoryConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.OreDictionaryIntegration; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.MinecraftRecipeRegistry; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.RecipeConverter; import nova.internal.core.Game; import nova.internal.core.bootstrap.DependencyInjectionEntryPoint; import nova.internal.core.deps.DepDownloader; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/manager/FWClientManager.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/manager/FWClientManager.java similarity index 86% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/manager/FWClientManager.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/manager/FWClientManager.java index a22075300..a5568213b 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/manager/FWClientManager.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/manager/FWClientManager.java @@ -18,13 +18,13 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.manager; +package nova.core.wrapper.mc.forge.v1_8.manager; import net.minecraft.client.Minecraft; import nova.core.entity.Entity; import nova.core.game.ClientManager; -import nova.core.wrapper.mc.forge.v18.launcher.NovaMinecraft; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.backward.BWEntity; +import nova.core.wrapper.mc.forge.v1_8.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.backward.BWEntity; /** * @author Calclavia diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/manager/MCRetentionManager.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/manager/MCRetentionManager.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/manager/MCRetentionManager.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/manager/MCRetentionManager.java index 8be291465..c5852773c 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/manager/MCRetentionManager.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/manager/MCRetentionManager.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.manager; +package nova.core.wrapper.mc.forge.v1_8.manager; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; @@ -30,7 +30,7 @@ import nova.core.retention.Data; import nova.core.retention.Storable; import nova.core.util.registry.RetentionManager; -import nova.core.wrapper.mc.forge.v18.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.data.DataConverter; import nova.internal.core.Game; import java.io.File; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/manager/config/NovaGuiConfig.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/manager/config/NovaGuiConfig.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/manager/config/NovaGuiConfig.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/manager/config/NovaGuiConfig.java index af389fa09..b65d85d16 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/manager/config/NovaGuiConfig.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/manager/config/NovaGuiConfig.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.manager.config; +package nova.core.wrapper.mc.forge.v1_8.manager.config; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/manager/config/NovaGuiFactory.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/manager/config/NovaGuiFactory.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/manager/config/NovaGuiFactory.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/manager/config/NovaGuiFactory.java index 199cb0534..b67f41d83 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/manager/config/NovaGuiFactory.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/manager/config/NovaGuiFactory.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.manager.config; +package nova.core.wrapper.mc.forge.v1_8.manager.config; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/MCPacket.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/MCPacket.java similarity index 98% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/MCPacket.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/MCPacket.java index 930405dc4..d131a1ed0 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/MCPacket.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/MCPacket.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.network; +package nova.core.wrapper.mc.forge.v1_8.network; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.common.network.ByteBufUtils; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/discriminator/NovaPacket.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/discriminator/NovaPacket.java similarity index 89% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/discriminator/NovaPacket.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/discriminator/NovaPacket.java index 6e6cceb02..34c5b1a46 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/discriminator/NovaPacket.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/discriminator/NovaPacket.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.network.discriminator; +package nova.core.wrapper.mc.forge.v1_8.network.discriminator; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; @@ -26,9 +26,9 @@ import nova.core.entity.Entity; import nova.core.entity.component.Player; import nova.core.network.handler.PacketHandler; -import nova.core.wrapper.mc.forge.v18.network.MCPacket; -import nova.core.wrapper.mc.forge.v18.network.netty.MCNetworkManager; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_8.network.MCPacket; +import nova.core.wrapper.mc.forge.v1_8.network.netty.MCNetworkManager; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.EntityConverter; import nova.internal.core.Game; /** diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/discriminator/PacketAbstract.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/discriminator/PacketAbstract.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/discriminator/PacketAbstract.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/discriminator/PacketAbstract.java index 4f4d05f9d..fbdc14455 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/discriminator/PacketAbstract.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/discriminator/PacketAbstract.java @@ -18,13 +18,13 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.network.discriminator; +package nova.core.wrapper.mc.forge.v1_8.network.discriminator; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; -import nova.core.wrapper.mc.forge.v18.network.netty.MCNetworkManager; +import nova.core.wrapper.mc.forge.v1_8.network.netty.MCNetworkManager; /** * For custom packets extend this Class and register on Mod loading phase diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/discriminator/PacketPlayerItem.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/discriminator/PacketPlayerItem.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/discriminator/PacketPlayerItem.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/discriminator/PacketPlayerItem.java index b7b9d64de..2716d8432 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/discriminator/PacketPlayerItem.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/discriminator/PacketPlayerItem.java @@ -18,14 +18,14 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.network.discriminator; +package nova.core.wrapper.mc.forge.v1_8.network.discriminator; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import nova.core.network.Syncable; -import nova.core.wrapper.mc.forge.v18.network.MCPacket; +import nova.core.wrapper.mc.forge.v1_8.network.MCPacket; /** * A packet handler for players who are currently holding their item. diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/netty/ChannelHandler.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/netty/ChannelHandler.java similarity index 84% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/netty/ChannelHandler.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/netty/ChannelHandler.java index c09631e69..fe2924dac 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/netty/ChannelHandler.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/netty/ChannelHandler.java @@ -18,14 +18,14 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.network.netty; +package nova.core.wrapper.mc.forge.v1_8.network.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraftforge.fml.common.network.FMLIndexedMessageToMessageCodec; -import nova.core.wrapper.mc.forge.v18.network.discriminator.NovaPacket; -import nova.core.wrapper.mc.forge.v18.network.discriminator.PacketAbstract; -import nova.core.wrapper.mc.forge.v18.network.discriminator.PacketPlayerItem; +import nova.core.wrapper.mc.forge.v1_8.network.discriminator.NovaPacket; +import nova.core.wrapper.mc.forge.v1_8.network.discriminator.PacketAbstract; +import nova.core.wrapper.mc.forge.v1_8.network.discriminator.PacketPlayerItem; /** * Handles the channel and discriminators. diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/netty/MCNetworkManager.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/netty/MCNetworkManager.java similarity index 93% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/netty/MCNetworkManager.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/netty/MCNetworkManager.java index 16ce4b8d4..0309df7c0 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/netty/MCNetworkManager.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/netty/MCNetworkManager.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.network.netty; +package nova.core.wrapper.mc.forge.v1_8.network.netty; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayerMP; @@ -35,11 +35,11 @@ import nova.core.entity.component.Player; import nova.core.network.NetworkManager; import nova.core.network.Syncable; -import nova.core.wrapper.mc.forge.v18.launcher.NovaMinecraft; -import nova.core.wrapper.mc.forge.v18.network.MCPacket; -import nova.core.wrapper.mc.forge.v18.network.discriminator.NovaPacket; -import nova.core.wrapper.mc.forge.v18.network.discriminator.PacketAbstract; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.backward.BWEntity; +import nova.core.wrapper.mc.forge.v1_8.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_8.network.MCPacket; +import nova.core.wrapper.mc.forge.v1_8.network.discriminator.NovaPacket; +import nova.core.wrapper.mc.forge.v1_8.network.discriminator.PacketAbstract; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.backward.BWEntity; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import java.util.EnumMap; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/netty/MCPacketHandler.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/netty/MCPacketHandler.java similarity index 91% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/netty/MCPacketHandler.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/netty/MCPacketHandler.java index ee3b83155..c8802e17c 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/network/netty/MCPacketHandler.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/network/netty/MCPacketHandler.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.network.netty; +package nova.core.wrapper.mc.forge.v1_8.network.netty; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; @@ -28,8 +28,8 @@ import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.NetworkRegistry; -import nova.core.wrapper.mc.forge.v18.launcher.NovaMinecraft; -import nova.core.wrapper.mc.forge.v18.network.discriminator.PacketAbstract; +import nova.core.wrapper.mc.forge.v1_8.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_8.network.discriminator.PacketAbstract; /** * @author tgame14 diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/render/RenderUtility.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/render/RenderUtility.java similarity index 92% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/render/RenderUtility.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/render/RenderUtility.java index 8a1467d5e..e29372241 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/render/RenderUtility.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/render/RenderUtility.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.render; +package nova.core.wrapper.mc.forge.v1_8.render; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; @@ -38,16 +38,16 @@ import nova.core.component.renderer.StaticRenderer; import nova.core.item.ItemFactory; import nova.core.render.texture.Texture; -import nova.core.wrapper.mc.forge.v18.launcher.ForgeLoadable; -import nova.core.wrapper.mc.forge.v18.wrapper.assets.AssetConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.BlockConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWBlock; -import nova.core.wrapper.mc.forge.v18.wrapper.item.FWItem; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemWrapperMethods; -import nova.core.wrapper.mc.forge.v18.wrapper.render.FWEmptyModel; -import nova.core.wrapper.mc.forge.v18.wrapper.render.FWSmartBlockModel; -import nova.core.wrapper.mc.forge.v18.wrapper.render.FWSmartItemModel; +import nova.core.wrapper.mc.forge.v1_8.launcher.ForgeLoadable; +import nova.core.wrapper.mc.forge.v1_8.wrapper.assets.AssetConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.BlockConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWBlock; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.FWItem; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemWrapperMethods; +import nova.core.wrapper.mc.forge.v1_8.wrapper.render.FWEmptyModel; +import nova.core.wrapper.mc.forge.v1_8.wrapper.render.FWSmartBlockModel; +import nova.core.wrapper.mc.forge.v1_8.wrapper.render.FWSmartItemModel; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; import org.lwjgl.opengl.GL11; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/MCInputManager.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/MCInputManager.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/MCInputManager.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/MCInputManager.java index 1be35c1f1..cfd04dc4a 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/MCInputManager.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/MCInputManager.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.util; +package nova.core.wrapper.mc.forge.v1_8.util; import nova.core.game.InputManager; import org.lwjgl.input.Keyboard; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/MCLanguageManager.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/MCLanguageManager.java similarity index 93% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/MCLanguageManager.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/MCLanguageManager.java index a12154233..bacfe4737 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/MCLanguageManager.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/MCLanguageManager.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.util; +package nova.core.wrapper.mc.forge.v1_8.util; import net.minecraft.util.StatCollector; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -27,8 +27,8 @@ import nova.core.event.LanguageEvent; import nova.core.event.bus.EventBus; import nova.core.language.LanguageManager; -import nova.core.wrapper.mc.forge.v18.launcher.ForgeLoadable; -import nova.core.wrapper.mc.forge.v18.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_8.launcher.ForgeLoadable; +import nova.core.wrapper.mc.forge.v1_8.launcher.NovaMinecraft; import nova.internal.core.Game; /** diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/ModCreativeTab.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/ModCreativeTab.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/ModCreativeTab.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/ModCreativeTab.java index 4dd428ca1..632217129 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/ModCreativeTab.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/ModCreativeTab.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.util; +package nova.core.wrapper.mc.forge.v1_8.util; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/ObfuscationConstants.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/ObfuscationConstants.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/ObfuscationConstants.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/ObfuscationConstants.java index 34b640d12..a17c716b7 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/ObfuscationConstants.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/ObfuscationConstants.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.util; +package nova.core.wrapper.mc.forge.v1_8.util; /** * @author Stan Hebben diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/ReflectionUtil.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/ReflectionUtil.java similarity index 99% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/ReflectionUtil.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/ReflectionUtil.java index d526afb11..cb71fd1c6 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/ReflectionUtil.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/ReflectionUtil.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.util; +package nova.core.wrapper.mc.forge.v1_8.util; import com.google.common.collect.BiMap; import net.minecraft.entity.Entity; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/WrapUtility.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/WrapUtility.java similarity index 91% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/WrapUtility.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/WrapUtility.java index 4accd367c..8861d4393 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/WrapUtility.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/WrapUtility.java @@ -18,16 +18,17 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.util; +package nova.core.wrapper.mc.forge.v1_8.util; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import nova.core.entity.Entity; import nova.core.entity.component.Player; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.EntityConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.backward.BWEntity; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.backward.BWEntity; import java.util.Optional; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/WrapperEvent.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/WrapperEvent.java similarity index 91% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/WrapperEvent.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/WrapperEvent.java index d06aa6b82..76966139c 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/util/WrapperEvent.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/util/WrapperEvent.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.util; +package nova.core.wrapper.mc.forge.v1_8.util; import net.minecraft.item.ItemStack; import nova.core.block.Block; @@ -29,12 +29,12 @@ import nova.core.item.Item; import nova.core.util.Direction; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v18.wrapper.block.backward.BWBlock; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWTile; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.backward.BWEntity; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.forward.FWEntity; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.forward.FWEntityFX; -import nova.core.wrapper.mc.forge.v18.wrapper.item.BWItem; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.backward.BWBlock; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWTile; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.backward.BWEntity; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward.FWEntity; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward.FWEntityFX; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.BWItem; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import java.util.Optional; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/CategoryConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/CategoryConverter.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/CategoryConverter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/CategoryConverter.java index f549e0ea5..57acef3da 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/CategoryConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/CategoryConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper; +package nova.core.wrapper.mc.forge.v1_8.wrapper; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; @@ -26,8 +26,8 @@ import net.minecraft.item.ItemStack; import nova.core.component.Category; import nova.core.nativewrapper.NativeConverter; -import nova.core.wrapper.mc.forge.v18.util.ModCreativeTab; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.util.ModCreativeTab; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; import nova.internal.core.Game; import java.util.Arrays; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/DirectionConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/DirectionConverter.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/DirectionConverter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/DirectionConverter.java index 6054b0909..cc46019b2 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/DirectionConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/DirectionConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper; +package nova.core.wrapper.mc.forge.v1_8.wrapper; import net.minecraft.util.EnumFacing; import nova.core.nativewrapper.NativeConverter; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/VectorConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/VectorConverter.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/VectorConverter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/VectorConverter.java index 802de4f90..440b2a3c8 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/VectorConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/VectorConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper; +package nova.core.wrapper.mc.forge.v1_8.wrapper; import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/AssetConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/AssetConverter.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/AssetConverter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/AssetConverter.java index f79b656b5..d4c6e2ca4 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/AssetConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/AssetConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.assets; +package nova.core.wrapper.mc.forge.v1_8.wrapper.assets; import net.minecraft.util.ResourceLocation; import nova.core.nativewrapper.NativeConverter; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/NovaFileResourcePack.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/NovaFileResourcePack.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/NovaFileResourcePack.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/NovaFileResourcePack.java index ab1065a35..c619e46cf 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/NovaFileResourcePack.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/NovaFileResourcePack.java @@ -18,12 +18,12 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.assets; +package nova.core.wrapper.mc.forge.v1_8.wrapper.assets; import com.google.common.base.Charsets; import net.minecraft.client.resources.FileResourcePack; import net.minecraft.util.ResourceLocation; -import nova.core.wrapper.mc.forge.v18.NovaMinecraftPreloader; +import nova.core.wrapper.mc.forge.v1_8.NovaMinecraftPreloader; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/NovaFolderResourcePack.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/NovaFolderResourcePack.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/NovaFolderResourcePack.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/NovaFolderResourcePack.java index 95a47ea96..9789affd6 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/NovaFolderResourcePack.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/NovaFolderResourcePack.java @@ -18,12 +18,12 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.assets; +package nova.core.wrapper.mc.forge.v1_8.wrapper.assets; import com.google.common.base.Charsets; import net.minecraft.client.resources.FolderResourcePack; import net.minecraft.util.ResourceLocation; -import nova.core.wrapper.mc.forge.v18.NovaMinecraftPreloader; +import nova.core.wrapper.mc.forge.v1_8.NovaMinecraftPreloader; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/NovaResourcePack.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/NovaResourcePack.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/NovaResourcePack.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/NovaResourcePack.java index b41ac8865..fe144b229 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/NovaResourcePack.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/NovaResourcePack.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.assets; +package nova.core.wrapper.mc.forge.v1_8.wrapper.assets; import net.minecraft.client.resources.IResourcePack; import net.minecraft.util.ResourceLocation; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/BlockConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/BlockConverter.java similarity index 89% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/BlockConverter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/BlockConverter.java index c85731b92..ed930a3fc 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/BlockConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/BlockConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -33,13 +33,13 @@ import nova.core.event.BlockEvent; import nova.core.loader.Mod; import nova.core.nativewrapper.NativeConverter; -import nova.core.wrapper.mc.forge.v18.launcher.ForgeLoadable; -import nova.core.wrapper.mc.forge.v18.launcher.NovaMinecraft; -import nova.core.wrapper.mc.forge.v18.wrapper.block.backward.BWBlock; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWBlock; -import nova.core.wrapper.mc.forge.v18.wrapper.CategoryConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.backward.BWBlockFactory; -import nova.core.wrapper.mc.forge.v18.wrapper.item.FWItemBlock; +import nova.core.wrapper.mc.forge.v1_8.launcher.ForgeLoadable; +import nova.core.wrapper.mc.forge.v1_8.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.backward.BWBlock; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWBlock; +import nova.core.wrapper.mc.forge.v1_8.wrapper.CategoryConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.backward.BWBlockFactory; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.FWItemBlock; import nova.internal.core.Game; import nova.internal.core.launch.NovaLauncher; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/backward/BWBlock.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/backward/BWBlock.java similarity index 92% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/backward/BWBlock.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/backward/BWBlock.java index a8c34fc54..68200e0e5 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/backward/BWBlock.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/backward/BWBlock.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.backward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.backward; import net.minecraft.block.BlockSnow; import net.minecraft.block.state.IBlockState; @@ -44,14 +44,14 @@ import nova.core.sound.Sound; import nova.core.util.shape.Cuboid; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v18.util.WrapperEvent; -import nova.core.wrapper.mc.forge.v18.wrapper.VectorConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.world.WorldConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.cuboid.CuboidConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.data.DataConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.EntityConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.render.backward.BWBakedModel; +import nova.core.wrapper.mc.forge.v1_8.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_8.wrapper.VectorConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.cuboid.CuboidConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.render.backward.BWBakedModel; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/backward/BWBlockFactory.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/backward/BWBlockFactory.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/backward/BWBlockFactory.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/backward/BWBlockFactory.java index bda71dd7d..bf3dc818f 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/backward/BWBlockFactory.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/backward/BWBlockFactory.java @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.backward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.backward; import net.minecraft.block.Block; import nova.core.block.BlockFactory; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/backward/BWBlockTransform.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/backward/BWBlockTransform.java similarity index 94% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/backward/BWBlockTransform.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/backward/BWBlockTransform.java index 7ccfa2781..54bf5bcf2 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/backward/BWBlockTransform.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/backward/BWBlockTransform.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.backward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.backward; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -25,8 +25,8 @@ import net.minecraft.world.IBlockAccess; import nova.core.component.transform.BlockTransform; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v18.wrapper.VectorConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.VectorConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.world.WorldConverter; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import java.util.Optional; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/BlockPosition.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/BlockPosition.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/BlockPosition.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/BlockPosition.java index 9be5ef340..8785155f4 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/BlockPosition.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/BlockPosition.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward; import net.minecraft.world.World; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWBlock.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWBlock.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWBlock.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWBlock.java index 1417d0e38..996af32d2 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWBlock.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWBlock.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -47,13 +47,13 @@ import nova.core.util.Direction; import nova.core.util.math.MathUtil; import nova.core.util.shape.Cuboid; -import nova.core.wrapper.mc.forge.v18.util.WrapperEvent; -import nova.core.wrapper.mc.forge.v18.wrapper.DirectionConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.VectorConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.world.WorldConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.cuboid.CuboidConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.EntityConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_8.wrapper.DirectionConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.VectorConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.cuboid.CuboidConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWBlockSound.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWBlockSound.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWBlockSound.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWBlockSound.java index 072c8e599..5c36dcd69 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWBlockSound.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWBlockSound.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward; import net.minecraft.block.Block; import nova.core.block.component.BlockProperty; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWTile.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWTile.java similarity index 93% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWTile.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWTile.java index 296a79561..1442b1b6a 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWTile.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWTile.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; @@ -28,8 +28,8 @@ import nova.core.network.Syncable; import nova.core.retention.Data; import nova.core.retention.Storable; -import nova.core.wrapper.mc.forge.v18.network.netty.MCNetworkManager; -import nova.core.wrapper.mc.forge.v18.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_8.network.netty.MCNetworkManager; +import nova.core.wrapper.mc.forge.v1_8.wrapper.data.DataConverter; import nova.internal.core.Game; /** diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWTileLoader.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWTileLoader.java similarity index 93% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWTileLoader.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWTileLoader.java index bd375d28b..3cc8a71b3 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWTileLoader.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWTileLoader.java @@ -18,14 +18,14 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward; import net.minecraft.nbt.NBTTagCompound; import nova.core.block.Block; import nova.core.block.BlockFactory; import nova.core.component.Updater; -import nova.core.wrapper.mc.forge.v18.asm.lib.ComponentInjector; -import nova.core.wrapper.mc.forge.v18.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_8.asm.lib.ComponentInjector; +import nova.core.wrapper.mc.forge.v1_8.util.WrapperEvent; import nova.internal.core.Game; import java.util.Optional; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWTileRenderer.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWTileRenderer.java similarity index 91% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWTileRenderer.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWTileRenderer.java index d470b2d9e..e463a841d 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWTileRenderer.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWTileRenderer.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -26,8 +26,8 @@ import net.minecraft.tileentity.TileEntity; import nova.core.block.Block; import nova.core.component.renderer.DynamicRenderer; -import nova.core.wrapper.mc.forge.v18.render.RenderUtility; -import nova.core.wrapper.mc.forge.v18.wrapper.render.BWModel; +import nova.core.wrapper.mc.forge.v1_8.render.RenderUtility; +import nova.core.wrapper.mc.forge.v1_8.wrapper.render.BWModel; import java.util.Optional; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWTileUpdater.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWTileUpdater.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWTileUpdater.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWTileUpdater.java index f0a46a1a9..453bfed93 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/FWTileUpdater.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/FWTileUpdater.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward; import net.minecraft.server.gui.IUpdatePlayerListBox; import nova.core.component.Updater; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/MCBlockTransform.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/MCBlockTransform.java similarity index 93% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/MCBlockTransform.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/MCBlockTransform.java index cc5eaf0be..d2d436a9c 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/MCBlockTransform.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/MCBlockTransform.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; @@ -28,8 +28,8 @@ import nova.core.retention.Data; import nova.core.retention.Storable; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v18.wrapper.VectorConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.VectorConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.world.WorldConverter; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import java.util.Optional; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/ProxyMaterial.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/ProxyMaterial.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/ProxyMaterial.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/ProxyMaterial.java index f47888372..953865812 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/ProxyMaterial.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/ProxyMaterial.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/TEBlockTransform.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/TEBlockTransform.java similarity index 91% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/TEBlockTransform.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/TEBlockTransform.java index 0d93251b4..e26301fd6 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/forward/TEBlockTransform.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/forward/TEBlockTransform.java @@ -17,15 +17,15 @@ * You should have received a copy of the GNU General Public License * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import nova.core.block.Block; import nova.core.component.transform.BlockTransform; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v18.wrapper.VectorConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.VectorConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.world.WorldConverter; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; /** diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/world/BWWorld.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/world/BWWorld.java similarity index 88% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/world/BWWorld.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/world/BWWorld.java index b0695e41a..8f58d916c 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/world/BWWorld.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/world/BWWorld.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.world; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.world; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -34,16 +34,16 @@ import nova.core.sound.Sound; import nova.core.util.shape.Cuboid; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v18.launcher.NovaMinecraft; -import nova.core.wrapper.mc.forge.v18.wrapper.VectorConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.BlockConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.backward.BWBlock; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWBlock; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.MCBlockTransform; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.EntityConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.forward.FWEntity; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.forward.MCEntityTransform; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_8.wrapper.VectorConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.BlockConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.backward.BWBlock; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWBlock; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.MCBlockTransform; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.EntityConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward.FWEntity; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward.MCEntityTransform; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/world/WorldConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/world/WorldConverter.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/world/WorldConverter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/world/WorldConverter.java index afb76665e..d12977ad6 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/world/WorldConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/block/world/WorldConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.block.world; +package nova.core.wrapper.mc.forge.v1_8.wrapper.block.world; import net.minecraft.world.IBlockAccess; import nova.core.nativewrapper.NativeConverter; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/cuboid/CuboidConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/cuboid/CuboidConverter.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/cuboid/CuboidConverter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/cuboid/CuboidConverter.java index 3d897944e..84f5d24eb 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/cuboid/CuboidConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/cuboid/CuboidConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.cuboid; +package nova.core.wrapper.mc.forge.v1_8.wrapper.cuboid; import net.minecraft.util.AxisAlignedBB; import nova.core.nativewrapper.NativeConverter; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/data/DataConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/data/DataConverter.java similarity index 99% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/data/DataConverter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/data/DataConverter.java index 9b0a7a85c..0cd81e4d3 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/data/DataConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/data/DataConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.data; +package nova.core.wrapper.mc.forge.v1_8.wrapper.data; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagByte; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/EntityConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/EntityConverter.java similarity index 87% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/EntityConverter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/EntityConverter.java index a3c727132..f88d98c99 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/EntityConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/EntityConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.entity; +package nova.core.wrapper.mc.forge.v1_8.wrapper.entity; import net.minecraft.util.EnumParticleTypes; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @@ -27,11 +27,11 @@ import nova.core.entity.Entity; import nova.core.entity.EntityFactory; import nova.core.nativewrapper.NativeConverter; -import nova.core.wrapper.mc.forge.v18.launcher.ForgeLoadable; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.backward.BWEntity; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.backward.BWEntityFX; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.forward.FWEntity; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.forward.MCEntityTransform; +import nova.core.wrapper.mc.forge.v1_8.launcher.ForgeLoadable; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.backward.BWEntity; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.backward.BWEntityFX; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward.FWEntity; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward.MCEntityTransform; import nova.internal.core.Game; import java.util.Optional; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/backward/BWEntity.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/backward/BWEntity.java similarity index 92% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/backward/BWEntity.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/backward/BWEntity.java index 73bc918fb..a3f03babb 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/backward/BWEntity.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/backward/BWEntity.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.entity.backward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.entity.backward; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -28,9 +28,9 @@ import nova.core.entity.Entity; import nova.core.entity.component.Living; import nova.core.entity.component.Player; -import nova.core.wrapper.mc.forge.v18.util.WrapperEvent; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.forward.MCEntityTransform; -import nova.core.wrapper.mc.forge.v18.wrapper.inventory.BWInventory; +import nova.core.wrapper.mc.forge.v1_8.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward.MCEntityTransform; +import nova.core.wrapper.mc.forge.v1_8.wrapper.inventory.BWInventory; import nova.internal.core.Game; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/backward/BWEntityFX.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/backward/BWEntityFX.java similarity index 98% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/backward/BWEntityFX.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/backward/BWEntityFX.java index bffc6268c..4aac482a6 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/backward/BWEntityFX.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/backward/BWEntityFX.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.entity.backward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.entity.backward; import com.google.common.collect.HashBiMap; import net.minecraft.client.particle.Barrier; @@ -56,7 +56,7 @@ import net.minecraft.client.particle.MobAppearance; import net.minecraft.util.EnumParticleTypes; import net.minecraftforge.fml.client.FMLClientHandler; -import nova.core.wrapper.mc.forge.v18.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_8.util.WrapperEvent; import nova.internal.core.Game; import java.util.HashMap; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/BWRigidBody.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/BWRigidBody.java similarity index 98% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/BWRigidBody.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/BWRigidBody.java index 5572a62fd..6fa215c8b 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/BWRigidBody.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/BWRigidBody.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.entity.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward; import nova.core.entity.Entity; import nova.core.entity.component.RigidBody; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/FWEntity.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/FWEntity.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/FWEntity.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/FWEntity.java index 0a72773ad..e8c375e70 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/FWEntity.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/FWEntity.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.entity.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; @@ -33,9 +33,9 @@ import nova.core.retention.Data; import nova.core.retention.Storable; import nova.core.util.shape.Cuboid; -import nova.core.wrapper.mc.forge.v18.util.WrapperEvent; -import nova.core.wrapper.mc.forge.v18.wrapper.cuboid.CuboidConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_8.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_8.wrapper.cuboid.CuboidConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.data.DataConverter; import nova.internal.core.Game; /** diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/FWEntityFX.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/FWEntityFX.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/FWEntityFX.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/FWEntityFX.java index c5ed00c67..c2b4dae65 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/FWEntityFX.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/FWEntityFX.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.entity.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; @@ -34,8 +34,8 @@ import nova.core.entity.Entity; import nova.core.entity.EntityFactory; import nova.core.util.shape.Cuboid; -import nova.core.wrapper.mc.forge.v18.render.RenderUtility; -import nova.core.wrapper.mc.forge.v18.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_8.render.RenderUtility; +import nova.core.wrapper.mc.forge.v1_8.util.WrapperEvent; import nova.internal.core.Game; /** diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/FWEntityRenderer.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/FWEntityRenderer.java similarity index 93% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/FWEntityRenderer.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/FWEntityRenderer.java index 75a85749a..230c22924 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/FWEntityRenderer.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/FWEntityRenderer.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.entity.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; @@ -27,8 +27,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.FMLClientHandler; import nova.core.component.renderer.DynamicRenderer; -import nova.core.wrapper.mc.forge.v18.render.RenderUtility; -import nova.core.wrapper.mc.forge.v18.wrapper.render.BWModel; +import nova.core.wrapper.mc.forge.v1_8.render.RenderUtility; +import nova.core.wrapper.mc.forge.v1_8.wrapper.render.BWModel; import org.lwjgl.opengl.GL11; import java.util.Optional; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/MCEntityTransform.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/MCEntityTransform.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/MCEntityTransform.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/MCEntityTransform.java index 0fc8e5469..90d834c82 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/entity/forward/MCEntityTransform.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/entity/forward/MCEntityTransform.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.entity.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.entity.forward; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.common.DimensionManager; @@ -27,7 +27,7 @@ import nova.core.util.math.RotationUtil; import nova.core.util.math.Vector3DUtil; import nova.core.world.World; -import nova.core.wrapper.mc.forge.v18.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.world.WorldConverter; import org.apache.commons.math3.geometry.euclidean.threed.Rotation; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/inventory/BWInventory.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/inventory/BWInventory.java similarity index 93% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/inventory/BWInventory.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/inventory/BWInventory.java index 53a57f887..719b6a631 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/inventory/BWInventory.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/inventory/BWInventory.java @@ -18,13 +18,13 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.inventory; +package nova.core.wrapper.mc.forge.v1_8.wrapper.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import nova.core.component.inventory.Inventory; import nova.core.item.Item; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; import nova.internal.core.Game; import java.util.Optional; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/inventory/FWInventory.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/inventory/FWInventory.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/inventory/FWInventory.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/inventory/FWInventory.java index da7af08ad..0ebd67776 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/inventory/FWInventory.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/inventory/FWInventory.java @@ -18,14 +18,14 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.inventory; +package nova.core.wrapper.mc.forge.v1_8.wrapper.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.IChatComponent; import nova.core.component.inventory.Inventory; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; public class FWInventory implements IInventory { diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/inventory/InventoryConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/inventory/InventoryConverter.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/inventory/InventoryConverter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/inventory/InventoryConverter.java index 716459ef8..32ce5bd85 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/inventory/InventoryConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/inventory/InventoryConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.inventory; +package nova.core.wrapper.mc.forge.v1_8.wrapper.inventory; import net.minecraft.inventory.IInventory; import nova.core.component.inventory.Inventory; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/BWItem.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/BWItem.java similarity index 94% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/BWItem.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/BWItem.java index 44f79f05d..b852e312a 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/BWItem.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/BWItem.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.item; +package nova.core.wrapper.mc.forge.v1_8.wrapper.item; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -26,7 +26,7 @@ import nova.core.component.renderer.StaticRenderer; import nova.core.item.Item; import nova.core.retention.Storable; -import nova.core.wrapper.mc.forge.v18.wrapper.render.backward.BWBakedModel; +import nova.core.wrapper.mc.forge.v1_8.wrapper.render.backward.BWBakedModel; /** diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/BWItemFactory.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/BWItemFactory.java similarity index 93% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/BWItemFactory.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/BWItemFactory.java index 9c8b5c0af..3dcc268f0 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/BWItemFactory.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/BWItemFactory.java @@ -18,15 +18,15 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.item; +package nova.core.wrapper.mc.forge.v1_8.wrapper.item; import net.minecraft.nbt.NBTTagCompound; import nova.core.component.misc.FactoryProvider; import nova.core.item.Item; import nova.core.item.ItemFactory; import nova.core.retention.Data; -import nova.core.wrapper.mc.forge.v18.util.WrapperEvent; -import nova.core.wrapper.mc.forge.v18.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_8.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_8.wrapper.data.DataConverter; import nova.internal.core.Game; /** diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItem.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/FWItem.java similarity index 98% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItem.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/FWItem.java index 9112cc6ec..7c4132c51 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItem.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/FWItem.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.item; +package nova.core.wrapper.mc.forge.v1_8.wrapper.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItemBlock.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/FWItemBlock.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItemBlock.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/FWItemBlock.java index e6a57cdb4..8d7705381 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWItemBlock.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/FWItemBlock.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.item; +package nova.core.wrapper.mc.forge.v1_8.wrapper.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -26,7 +26,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import nova.core.item.ItemFactory; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWBlock; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWBlock; import java.util.List; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWNBTTagCompound.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/FWNBTTagCompound.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWNBTTagCompound.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/FWNBTTagCompound.java index c58f61be8..026bac59e 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/FWNBTTagCompound.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/FWNBTTagCompound.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.item; +package nova.core.wrapper.mc.forge.v1_8.wrapper.item; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/ItemConverter.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemConverter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/ItemConverter.java index 0b98d34ea..e42c75294 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/ItemConverter.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.item; +package nova.core.wrapper.mc.forge.v1_8.wrapper.item; import com.google.common.collect.HashBiMap; import net.minecraft.item.ItemStack; @@ -35,13 +35,13 @@ import nova.core.loader.Mod; import nova.core.nativewrapper.NativeConverter; import nova.core.retention.Data; -import nova.core.wrapper.mc.forge.v18.launcher.ForgeLoadable; -import nova.core.wrapper.mc.forge.v18.launcher.NovaMinecraft; -import nova.core.wrapper.mc.forge.v18.util.WrapUtility; -import nova.core.wrapper.mc.forge.v18.util.WrapperEvent; -import nova.core.wrapper.mc.forge.v18.wrapper.CategoryConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.BlockConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.data.DataConverter; +import nova.core.wrapper.mc.forge.v1_8.launcher.ForgeLoadable; +import nova.core.wrapper.mc.forge.v1_8.launcher.NovaMinecraft; +import nova.core.wrapper.mc.forge.v1_8.util.WrapUtility; +import nova.core.wrapper.mc.forge.v1_8.util.WrapperEvent; +import nova.core.wrapper.mc.forge.v1_8.wrapper.CategoryConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.BlockConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.data.DataConverter; import nova.internal.core.Game; import nova.internal.core.launch.InitializationException; import nova.internal.core.launch.NovaLauncher; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemWrapperMethods.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/ItemWrapperMethods.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemWrapperMethods.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/ItemWrapperMethods.java index 959634123..25ea68c18 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemWrapperMethods.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/ItemWrapperMethods.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.item; +package nova.core.wrapper.mc.forge.v1_8.wrapper.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -26,7 +26,7 @@ import nova.core.item.Item; import nova.core.item.ItemFactory; import nova.core.util.Direction; -import nova.core.wrapper.mc.forge.v18.wrapper.entity.backward.BWEntity; +import nova.core.wrapper.mc.forge.v1_8.wrapper.entity.backward.BWEntity; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import java.util.List; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/OreDictionaryIntegration.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/OreDictionaryIntegration.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/OreDictionaryIntegration.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/OreDictionaryIntegration.java index 108766422..24ca1d645 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/OreDictionaryIntegration.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/item/OreDictionaryIntegration.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.item; +package nova.core.wrapper.mc.forge.v1_8.wrapper.item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @@ -27,7 +27,7 @@ import nova.core.event.DictionaryEvent; import nova.core.item.Item; import nova.core.item.ItemDictionary; -import nova.core.wrapper.mc.forge.v18.util.ReflectionUtil; +import nova.core.wrapper.mc.forge.v1_8.util.ReflectionUtil; import nova.internal.core.Game; import java.util.ArrayList; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/MinecraftRecipeRegistry.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/MinecraftRecipeRegistry.java similarity index 98% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/MinecraftRecipeRegistry.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/MinecraftRecipeRegistry.java index 5a5ae8598..c4b74cb51 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/MinecraftRecipeRegistry.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/MinecraftRecipeRegistry.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.recipes; +package nova.core.wrapper.mc.forge.v1_8.wrapper.recipes; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; @@ -30,8 +30,8 @@ import nova.core.recipes.crafting.CraftingRecipe; import nova.core.recipes.ingredient.ItemIngredient; import nova.core.recipes.smelting.SmeltingRecipe; -import nova.core.wrapper.mc.forge.v18.util.ReflectionUtil; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.util.ReflectionUtil; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; import nova.internal.core.Game; import java.util.AbstractList; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/RecipeConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/RecipeConverter.java similarity index 93% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/RecipeConverter.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/RecipeConverter.java index 87aa9ddfe..027cc1453 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/RecipeConverter.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/RecipeConverter.java @@ -18,10 +18,10 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.recipes; +package nova.core.wrapper.mc.forge.v1_8.wrapper.recipes; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.backward.MCCraftingRecipe; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward.NovaCraftingGrid; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.backward.MCCraftingRecipe; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward.NovaCraftingGrid; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; @@ -37,13 +37,13 @@ import nova.core.recipes.ingredient.ItemIngredient; import nova.core.recipes.ingredient.OreItemIngredient; import nova.core.recipes.ingredient.SpecificItemIngredient; -import nova.core.wrapper.mc.forge.v18.util.ReflectionUtil; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward.NovaCraftingRecipe; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward.ShapedRecipeBasic; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward.ShapedRecipeOre; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward.ShapelessRecipeBasic; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward.ShapelessRecipeOre; +import nova.core.wrapper.mc.forge.v1_8.util.ReflectionUtil; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward.NovaCraftingRecipe; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward.ShapedRecipeBasic; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward.ShapedRecipeOre; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward.ShapelessRecipeBasic; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward.ShapelessRecipeOre; import nova.internal.core.Game; import java.util.ArrayList; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/backward/MCCraftingGrid.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/backward/MCCraftingGrid.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/backward/MCCraftingGrid.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/backward/MCCraftingGrid.java index bb21ed62e..52ca19295 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/backward/MCCraftingGrid.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/backward/MCCraftingGrid.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.recipes.backward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.backward; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -29,9 +29,9 @@ import net.minecraft.item.ItemStack; import nova.core.entity.component.Player; import nova.core.recipes.crafting.CraftingGrid; -import nova.core.wrapper.mc.forge.v18.util.ReflectionUtil; -import nova.core.wrapper.mc.forge.v18.util.WrapUtility; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.util.ReflectionUtil; +import nova.core.wrapper.mc.forge.v1_8.util.WrapUtility; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; import java.util.List; import java.util.Optional; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/backward/MCCraftingRecipe.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/backward/MCCraftingRecipe.java similarity index 89% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/backward/MCCraftingRecipe.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/backward/MCCraftingRecipe.java index 218983c90..29fdf45ee 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/backward/MCCraftingRecipe.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/backward/MCCraftingRecipe.java @@ -18,9 +18,9 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.recipes.backward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.backward; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward.NovaCraftingGrid; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward.NovaCraftingGrid; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import nova.core.entity.Entity; @@ -28,8 +28,8 @@ import nova.core.item.Item; import nova.core.recipes.crafting.CraftingGrid; import nova.core.recipes.crafting.CraftingRecipe; -import nova.core.wrapper.mc.forge.v18.wrapper.block.world.WorldConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.world.WorldConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; import java.util.Optional; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/NovaCraftingGrid.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/NovaCraftingGrid.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/NovaCraftingGrid.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/NovaCraftingGrid.java index 9c054d1be..5afcf7d35 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/NovaCraftingGrid.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/NovaCraftingGrid.java @@ -18,13 +18,13 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import nova.core.item.Item; import nova.core.recipes.crafting.CraftingGrid; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; import java.util.Optional; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/NovaCraftingGridContainer.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/NovaCraftingGridContainer.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/NovaCraftingGridContainer.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/NovaCraftingGridContainer.java index 2529df1c7..69e847471 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/NovaCraftingGridContainer.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/NovaCraftingGridContainer.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/NovaCraftingRecipe.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/NovaCraftingRecipe.java similarity index 89% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/NovaCraftingRecipe.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/NovaCraftingRecipe.java index 43006d424..19d4df589 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/NovaCraftingRecipe.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/NovaCraftingRecipe.java @@ -18,15 +18,15 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import nova.core.recipes.crafting.CraftingRecipe; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.backward.MCCraftingGrid; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.backward.MCCraftingGrid; public class NovaCraftingRecipe implements IRecipe { private final CraftingRecipe recipe; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/ShapedRecipeBasic.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/ShapedRecipeBasic.java similarity index 89% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/ShapedRecipeBasic.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/ShapedRecipeBasic.java index 6ec1be283..641473101 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/ShapedRecipeBasic.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/ShapedRecipeBasic.java @@ -18,15 +18,15 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.world.World; import nova.core.recipes.crafting.ShapedCraftingRecipe; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.backward.MCCraftingGrid; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.backward.MCCraftingGrid; /** * @author Stan Hebben diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/ShapedRecipeOre.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/ShapedRecipeOre.java similarity index 89% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/ShapedRecipeOre.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/ShapedRecipeOre.java index 7f3e64e0b..a36db7a79 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/ShapedRecipeOre.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/ShapedRecipeOre.java @@ -24,15 +24,15 @@ * and open the template in the editor. */ -package nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.oredict.ShapedOreRecipe; import nova.core.recipes.crafting.ShapedCraftingRecipe; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.backward.MCCraftingGrid; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.backward.MCCraftingGrid; /** * @author Stan diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/ShapelessRecipeBasic.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/ShapelessRecipeBasic.java similarity index 89% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/ShapelessRecipeBasic.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/ShapelessRecipeBasic.java index 24a362d3b..7ee510d6e 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/ShapelessRecipeBasic.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/ShapelessRecipeBasic.java @@ -18,15 +18,15 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.world.World; import nova.core.recipes.crafting.ShapelessCraftingRecipe; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.backward.MCCraftingGrid; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.backward.MCCraftingGrid; import java.util.Arrays; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/ShapelessRecipeOre.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/ShapelessRecipeOre.java similarity index 89% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/ShapelessRecipeOre.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/ShapelessRecipeOre.java index 182c28c18..b0a4cbed6 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/recipes/forward/ShapelessRecipeOre.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/recipes/forward/ShapelessRecipeOre.java @@ -18,15 +18,15 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.recipes.forward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.forward; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.oredict.ShapelessOreRecipe; import nova.core.recipes.crafting.ShapelessCraftingRecipe; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.recipes.backward.MCCraftingGrid; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.recipes.backward.MCCraftingGrid; /** * @author Stan Hebben diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/BWModel.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/BWModel.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/BWModel.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/BWModel.java index c7dc41c87..591c76c09 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/BWModel.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/BWModel.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.render; +package nova.core.wrapper.mc.forge.v1_8.wrapper.render; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; @@ -29,8 +29,8 @@ import nova.core.render.model.MeshModel; import nova.core.render.texture.EntityTexture; import nova.core.render.texture.Texture; -import nova.core.wrapper.mc.forge.v18.render.RenderUtility; -import nova.core.wrapper.mc.forge.v18.wrapper.assets.AssetConverter; +import nova.core.wrapper.mc.forge.v1_8.render.RenderUtility; +import nova.core.wrapper.mc.forge.v1_8.wrapper.assets.AssetConverter; import java.util.Optional; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWEmptyModel.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/FWEmptyModel.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWEmptyModel.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/FWEmptyModel.java index 2ba60ef6e..5cdff9445 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWEmptyModel.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/FWEmptyModel.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.render; +package nova.core.wrapper.mc.forge.v1_8.wrapper.render; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartBlockModel.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/FWSmartBlockModel.java similarity index 93% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartBlockModel.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/FWSmartBlockModel.java index 4730e6ba0..73d820112 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartBlockModel.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/FWSmartBlockModel.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.render; +package nova.core.wrapper.mc.forge.v1_8.wrapper.render; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -30,12 +30,13 @@ import nova.core.component.renderer.Renderer; import nova.core.component.renderer.StaticRenderer; import nova.core.item.Item; -import nova.core.wrapper.mc.forge.v18.wrapper.VectorConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.block.forward.FWBlock; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.VectorConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.block.forward.FWBlock; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; import java.util.List; import java.util.Optional; + import javax.vecmath.Vector3f; /** diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartItemModel.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/FWSmartItemModel.java similarity index 95% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartItemModel.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/FWSmartItemModel.java index ee00f753c..d93dbcada 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartItemModel.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/FWSmartItemModel.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.render; +package nova.core.wrapper.mc.forge.v1_8.wrapper.render; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.item.ItemStack; @@ -26,9 +26,10 @@ import net.minecraftforge.client.model.ISmartItemModel; import nova.core.component.renderer.Renderer; import nova.core.item.Item; -import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.item.ItemConverter; import java.util.List; + import javax.vecmath.Vector3f; /** diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartModel.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/FWSmartModel.java similarity index 96% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartModel.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/FWSmartModel.java index 03dc58fed..4dc8a3a47 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/FWSmartModel.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/FWSmartModel.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.render; +package nova.core.wrapper.mc.forge.v1_8.wrapper.render; import com.google.common.primitives.Ints; import net.minecraft.client.Minecraft; @@ -33,8 +33,8 @@ import nova.core.render.model.Vertex; import nova.core.util.Direction; import nova.core.util.math.MathUtil; -import nova.core.wrapper.mc.forge.v18.render.RenderUtility; -import nova.core.wrapper.mc.forge.v18.wrapper.DirectionConverter; +import nova.core.wrapper.mc.forge.v1_8.render.RenderUtility; +import nova.core.wrapper.mc.forge.v1_8.wrapper.DirectionConverter; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import java.util.Arrays; diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/backward/BWBakedModel.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/backward/BWBakedModel.java similarity index 97% rename from minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/backward/BWBakedModel.java rename to minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/backward/BWBakedModel.java index 2d3fc9781..9bcf528ea 100644 --- a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/render/backward/BWBakedModel.java +++ b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v1_8/wrapper/render/backward/BWBakedModel.java @@ -18,7 +18,7 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.render.backward; +package nova.core.wrapper.mc.forge.v1_8.wrapper.render.backward; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -36,8 +36,8 @@ import nova.core.util.math.MatrixStack; import nova.core.util.math.TransformUtil; import nova.core.util.math.Vector3DUtil; -import nova.core.wrapper.mc.forge.v18.wrapper.DirectionConverter; -import nova.core.wrapper.mc.forge.v18.wrapper.assets.AssetConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.DirectionConverter; +import nova.core.wrapper.mc.forge.v1_8.wrapper.assets.AssetConverter; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; import org.apache.commons.math3.linear.LUDecomposition; diff --git a/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v18/launcher/NovaLauncherTest.java b/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v1_8/launcher/NovaLauncherTest.java similarity index 81% rename from minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v18/launcher/NovaLauncherTest.java rename to minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v1_8/launcher/NovaLauncherTest.java index ab347d454..c58ecdbd7 100644 --- a/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v18/launcher/NovaLauncherTest.java +++ b/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v1_8/launcher/NovaLauncherTest.java @@ -18,14 +18,14 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.launcher; +package nova.core.wrapper.mc.forge.v1_8.launcher; -import nova.core.wrapper.mc.forge.v18.depmodules.ClientModule; -import nova.core.wrapper.mc.forge.v18.depmodules.GameInfoModule; -import nova.core.wrapper.mc.forge.v18.depmodules.KeyModule; -import nova.core.wrapper.mc.forge.v18.depmodules.LanguageModule; -import nova.core.wrapper.mc.forge.v18.depmodules.SaveModule; -import nova.core.wrapper.mc.forge.v18.depmodules.TickerModule; +import nova.core.wrapper.mc.forge.v1_8.depmodules.ClientModule; +import nova.core.wrapper.mc.forge.v1_8.depmodules.GameInfoModule; +import nova.core.wrapper.mc.forge.v1_8.depmodules.KeyModule; +import nova.core.wrapper.mc.forge.v1_8.depmodules.LanguageModule; +import nova.core.wrapper.mc.forge.v1_8.depmodules.SaveModule; +import nova.core.wrapper.mc.forge.v1_8.depmodules.TickerModule; import nova.internal.core.Game; import nova.internal.core.bootstrap.DependencyInjectionEntryPoint; import nova.wrappertests.AbstractNovaLauncherTest; diff --git a/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v18/wrapper/DirectionConverterTest.java b/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v1_8/wrapper/DirectionConverterTest.java similarity index 95% rename from minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v18/wrapper/DirectionConverterTest.java rename to minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v1_8/wrapper/DirectionConverterTest.java index cc9c550ba..a92624628 100644 --- a/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v18/wrapper/DirectionConverterTest.java +++ b/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v1_8/wrapper/DirectionConverterTest.java @@ -18,8 +18,9 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper; +package nova.core.wrapper.mc.forge.v1_8.wrapper; +import nova.core.wrapper.mc.forge.v1_8.wrapper.DirectionConverter; import net.minecraft.util.EnumFacing; import nova.core.util.Direction; import org.junit.Before; diff --git a/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v18/wrapper/VectorConverterTest.java b/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v1_8/wrapper/VectorConverterTest.java similarity index 94% rename from minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v18/wrapper/VectorConverterTest.java rename to minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v1_8/wrapper/VectorConverterTest.java index 88c68d734..946a82d77 100644 --- a/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v18/wrapper/VectorConverterTest.java +++ b/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v1_8/wrapper/VectorConverterTest.java @@ -18,8 +18,9 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper; +package nova.core.wrapper.mc.forge.v1_8.wrapper; +import nova.core.wrapper.mc.forge.v1_8.wrapper.VectorConverter; import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; diff --git a/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/AssetConverterTest.java b/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/AssetConverterTest.java similarity index 96% rename from minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/AssetConverterTest.java rename to minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/AssetConverterTest.java index 24a7a04cb..f8df4f84b 100644 --- a/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v18/wrapper/assets/AssetConverterTest.java +++ b/minecraft/1.8/src/test/java/nova/core/wrapper/mc/forge/v1_8/wrapper/assets/AssetConverterTest.java @@ -18,8 +18,9 @@ * along with NOVA. If not, see . */ -package nova.core.wrapper.mc.forge.v18.wrapper.assets; +package nova.core.wrapper.mc.forge.v1_8.wrapper.assets; +import nova.core.wrapper.mc.forge.v1_8.wrapper.assets.AssetConverter; import net.minecraft.util.ResourceLocation; import nova.core.render.texture.Texture; import nova.core.util.Asset;