Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
70493f6
Remove BlockProperties
SoniEx2 Oct 23, 2016
5e56559
String -> Identifier. WIP.
SoniEx2 Oct 27, 2016
8780ae7
Merge pull request #1 from SoniEx2/refact-2
ExE-Boss Dec 17, 2016
f1b3aa6
Begin work on Minecraft 1.11 wrappers.
ExE-Boss Dec 17, 2016
634a2b0
Fix Travis build
ExE-Boss Dec 17, 2016
f4e8350
Made it so that different Minecraft wrappers can use different ForgeG…
ExE-Boss Dec 17, 2016
e355264
Created Access Transformer
ExE-Boss Dec 18, 2016
f8e32b0
Ported utilities to 1.11.
ExE-Boss Dec 18, 2016
19e4f95
Almost complete
ExE-Boss Dec 19, 2016
ca1645f
Added mcmod.info + Minecraft 1.11 now launches and is playable (curre…
ExE-Boss Dec 20, 2016
bb9cfd3
Rendering fixes
ExE-Boss Dec 20, 2016
ee78a62
Scale particles
ExE-Boss Dec 20, 2016
9a67921
Use https in mcmod.info
ExE-Boss Dec 20, 2016
bc236eb
Mods can now be loaded + IDs are now properly namespaced.
ExE-Boss Dec 21, 2016
7fbf8a2
Backported fixes to 1.7 and 1.8
ExE-Boss Dec 21, 2016
24dd99f
Rendering fixes + Progress bar
ExE-Boss Dec 22, 2016
a7ee930
Merge remote-tracking branch 'refs/remotes/NOVA-Team/master' into mc1.11
ExE-Boss Dec 22, 2016
f1437b0
Fix Travis build + extra method in ProgressBar
ExE-Boss Dec 22, 2016
5b6c418
Moved Factory.addPrefix to Identifiable.addPrefix + Display NOVA vers…
ExE-Boss Dec 23, 2016
c78d83d
Backport ProgressBar functionality to 1.7 and 1.8
ExE-Boss Dec 25, 2016
e3ffa06
Added ability for wrappers to register their custom FWTileLoaders
ExE-Boss Dec 25, 2016
379ff5c
Simplified the way FWCustomTileLoaders are registered.
ExE-Boss Dec 25, 2016
59978d0
Fix Travis build
ExE-Boss Dec 25, 2016
9e1cf48
Made private methods in BWBlock protected.
ExE-Boss Dec 25, 2016
9e68b64
Update to latest MCP mapping + Fix bug in MCCraftingGrid
ExE-Boss Dec 26, 2016
9802e12
Merge remote-tracking branch 'refs/remotes/NOVA-Team/master'
ExE-Boss Dec 26, 2016
4330d28
Move EnumSelector from Worldgen to Core
ExE-Boss Dec 26, 2016
2b548b4
Make test for EnumSelector
ExE-Boss Dec 26, 2016
b066dbc
Added test for EnumSelector.allowAll()
ExE-Boss Dec 26, 2016
9d0049d
Added ability for custom wrappers to handle component registration on…
ExE-Boss Jan 2, 2017
9b622d3
Merge remote-tracking branch 'refs/remotes/origin/master' into mc1.11
ExE-Boss Jan 2, 2017
e61b06a
Changed component handlers and custom tile loaders to events
ExE-Boss Jan 3, 2017
7dd5bf3
Changed WrapperEvent.FWTileLoad.data to Optional
ExE-Boss Jan 3, 2017
cd3646f
Backport new Wrapper Events to 1.7 and 1.8
ExE-Boss Jan 3, 2017
a1fec79
Make EnumSelector an Iterable + Additional Methods
ExE-Boss Jan 4, 2017
74efbaa
Merge remote-tracking branch 'refs/remotes/origin/master' into mc1.11
ExE-Boss Jan 4, 2017
442e25d
Begin the switch to Forge Capabilities
ExE-Boss Jan 4, 2017
4a33e49
Removed a WIP static initializer (FWFluidTank doesn’t exist yet)
ExE-Boss Jan 4, 2017
19910a4
Rename checkLocked to checkWritable and add checkReadable
ExE-Boss Jan 4, 2017
27bda04
Added EnumSelector.toEnumSet()
ExE-Boss Jan 4, 2017
4f7dc00
Add javadoc
ExE-Boss Jan 4, 2017
58fcf51
Add throws annotations to JavaDoc
ExE-Boss Jan 4, 2017
1c8e103
Remove registerNovaWrapper method in NovaMinecraft
ExE-Boss Jan 4, 2017
2689f22
Merge remote-tracking branch 'refs/remotes/origin/master' into mc1.11
ExE-Boss Jan 4, 2017
d2adfc6
Clean up rawtypes + Clean up some deprecation + Get rid of Identifiab…
ExE-Boss Jan 5, 2017
ef77313
Get rid of TileEntity pos hack
ExE-Boss Jan 5, 2017
ca019d9
Merge remote-tracking branch 'refs/remotes/NOVA-Team/master' into mc1.11
ExE-Boss Jan 6, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions minecraft/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
!/build.gradle
!/.gitignore

!/1.11
!/1.8
!/1.7
17 changes: 17 additions & 0 deletions minecraft/1.11/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Ignore All
/*

# Sources
!/src

# github
!/.gitignore
!/README.md

# gradle
!/build.gradle
!/build.properties
!/settings.gradle
!/gradle.properties
!/gradlew*
!/gradle
135 changes: 135 additions & 0 deletions minecraft/1.11/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
apply from: "https://raw.githubusercontent.com/NOVA-Team/NOVA-Gradle/master/shared-scripts/java.gradle"

apply plugin: "com.jfrog.artifactory"
apply plugin: "com.github.johnrengelman.shadow"
apply plugin: "maven-publish"

idea.module.name = "Core-MC-1.11"
archivesBaseName = "NOVA-Core-Wrapper-MC1.11"

configurations {
fatJar
compile.extendsFrom fatJar
}

dependencies {
fatJar project(":")
testCompile 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'
}

jar {
manifest {
attributes 'FMLCorePlugin': 'nova.core.wrapper.mc.forge.v1_11.NovaMinecraftCore'
attributes 'FMLCorePluginContainsFMLMod': 'true'
attributes 'FMLAT': 'nova_at.cfg'
}
}

task deobfJar(type: Jar) {
from sourceSets.main.output
classifier = 'deobf'
manifest {
attributes 'FMLCorePlugin': 'nova.core.wrapper.mc.forge.v1_11.NovaMinecraftCore'
attributes 'FMLCorePluginContainsFMLMod': 'true'
attributes 'FMLAT': 'nova_at.cfg'
}
}

/**
* Create fat jar file with all dependencies included.
*/
task fatJar(type: Jar) {
configurations.fatJar.each {dep ->
from(project.zipTree(dep)) {
exclude 'META-INF', 'META-INF/**'
}
}
with jar

manifest {
attributes 'FMLCorePlugin': 'nova.core.wrapper.mc.forge.v1_11.NovaMinecraftCore'
attributes 'FMLCorePluginContainsFMLMod': 'true'
attributes 'FMLAT': 'nova_at.cfg'
}
classifier = 'fat'
}

artifacts {
archives deobfJar
archives fatJar
}

publishing {
publications {
main(MavenPublication) {
from components.java

artifactId archivesBaseName

artifact sourcesJar
artifact javadocJar
artifact deobfJar
artifact fatJar

pom.withXml(writePom(project.properties))
pom.withXml {xml ->
def children = xml.asNode().get("dependencies")[0]
for (child in children) {
def artifactId = child.get("artifactId")[0].value()[0]
if (artifactId.equals("forgeSrc") || artifactId.equals("forgeBin")) {
children.remove(child)
break;
}
}
}
}
}
}

artifactory {
publish {
defaults {
publications("main")
publishPom = true
}
}
}

apply plugin: 'net.minecraftforge.gradle.forge'

minecraft {
version = property("minecraft.version") + "-" + property("forge.version")
mappings = 'snapshot_20161220'
runDir = "run"
}

reobfJar {
// TODO Figure out what this was replaced by in ForgeGrade 2.2
//reobf(fatJar) {spec -> spec.classpath = configurations.compile}
}

runClient {
jvmArgs '-Dfml.coreMods.load=nova.core.wrapper.mc.forge.v1_11.NovaMinecraftCore'
}

runServer {
jvmArgs '-Dfml.coreMods.load=nova.core.wrapper.mc.forge.v1_11.NovaMinecraftCore'
}

processResources {
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version

from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
expand 'version': project.version, 'mcversion': project.minecraft.version
}

from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
10 changes: 10 additions & 0 deletions minecraft/1.11/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
group = nova.core

minecraft.version = 1.11
forge.version = 13.19.1.2189
forgeGradleVersion = 2.2-SNAPSHOT

packaging = jar
info.inceptionYear = 2016
info.description = The wrapper of the Nova API to the MinecraftForge 1.11 modding system.
info.organization.name = NOVA
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* Copyright (c) 2015 NOVA, All rights reserved.
* This library is free software, licensed under GNU Lesser General Public License version 3
*
* This file is part of NOVA.
*
* NOVA is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* NOVA is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with NOVA. If not, see <http://www.gnu.org/licenses/>.
*/

package nova.core.wrapper.mc.forge.v1_11;

import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.MCVersion;
import nova.core.wrapper.mc.forge.v1_11.asm.transformers.Transformers;

import java.util.Map;

@MCVersion(value = "1.11")
public class NovaMinecraftCore implements IFMLLoadingPlugin {
@Override
public String[] getASMTransformerClass() {
return new String[] { Transformers.class.getName() };
}

@Override
public String getModContainerClass() {
return "nova.core.wrapper.mc.forge.v1_11.NovaMinecraftPreloader";
}

@Override
public String getSetupClass() {
return null;
}

@Override
public void injectData(Map<String, Object> data) {

}

@Override
public String getAccessTransformerClass() {
return null;
}
}
Loading