Skip to content

Commit

Permalink
MMPL-1.0 (#3)
Browse files Browse the repository at this point in the history
* MMPL-1.0

* maven

* update and fix

* additional cleanup
  • Loading branch information
bombcar authored Feb 10, 2022
1 parent b419f0a commit 4cece28
Show file tree
Hide file tree
Showing 9 changed files with 365 additions and 101 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/release-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,9 @@ jobs:
prerelease: false
title: "${{ env.RELEASE_VERSION }}"
files: build/libs/*.jar

- name: Publish to Maven
run: ./gradlew publish
env:
MAVEN_USER: ${{ secrets.MAVEN_USER }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
3 changes: 3 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Any Github changes require admin approval
/.github/** @GTNewHorizons/admin

File renamed without changes.
384 changes: 295 additions & 89 deletions build.gradle

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Add your dependencies here

dependencies {
compile("com.github.GTNewHorizons:ForestryMC:master-SNAPSHOT:dev")
compile("com.github.GTNewHorizons:waila:master-SNAPSHOT:dev")
api('com.github.GTNewHorizons:NotEnoughItems:2.2.6-GTNH:dev')

implementation('com.github.GTNewHorizons:ForestryMC:4.4.5:dev')
implementation('com.github.GTNewHorizons:waila:1.5.18:dev')
}
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ autoUpdateBuildScript = false
minecraftVersion = 1.7.10
forgeVersion = 10.13.4.1614

# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you
# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
# restart Minecraft in development. Choose this dependent on your mod:
# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
developmentEnvironmentUserName = "Developer"
developmentEnvironmentUserName = Developer

# Define a source file of your project with:
# public static final String VERSION = "GRADLETOKEN_VERSION";
# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
# version in @Mod([...], version = VERSION, [...])
# Leave these properties empty to skip individual token replacements
replaceGradleTokenInFile = NEIAddons.java
Expand All @@ -32,12 +32,12 @@ gradleTokenModName =
gradleTokenVersion = GRADLETOKEN_VERSION
gradleTokenGroupName =

# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
# leave this property empty.
# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
apiPackage =

# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
# Example value: mymodid_at.cfg
accessTransformersFile = neiaddons_at.cfg

Expand All @@ -48,7 +48,7 @@ mixinPlugin =
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
mixinsPackage =
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
# This parameter is for legacy compatability only
# This parameter is for legacy compatibility only
# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
coreModClass =
# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
Expand Down
7 changes: 7 additions & 0 deletions repositories.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
// Add any additional repositories for your dependencies here

repositories {
maven {
name = "GTNH Maven"
url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
}
maven {
name = "ic2"
url = "http://maven.ic2.player.to/"
Expand All @@ -9,6 +13,9 @@ repositories {
artifact()
}
}
maven {
url "https://cursemaven.com"
}
maven {
url = "https://jitpack.io"
}
Expand Down
44 changes: 42 additions & 2 deletions src/main/resources/mcmod.info
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,26 @@
"dependencies": [
]
},
{
"modid": "${modId}|Botany",
"name": "${modName}: Botany",
"description": "",
"version": "${modVersion}",
"mcversion": "${minecraftVersion}",
"url": "http://bdew.net/neiaddons/",
"updateUrl": "",
"authorList": [
"bdew"
],
"credits": "",
"logoFile": "",
"screenshots": [
],
"parent":"NEIAddons",
"dependencies": [
"NEIAddons"
]
},
{
"modid": "${modId}|Forestry",
"name": "${modName}: Forestry",
Expand Down Expand Up @@ -59,8 +79,28 @@
]
},
{
"modid": "${modId}|AE",
"name": "${modName}: Applied Energistics",
"modid": "${modId}|Developer",
"name": "${modName}: Developer Tools",
"description": "",
"version": "${modVersion}",
"mcversion": "${minecraftVersion}",
"url": "http://bdew.net/neiaddons/",
"updateUrl": "",
"authorList": [
"bdew"
],
"credits": "",
"logoFile": "",
"screenshots": [
],
"parent":"NEIAddons",
"dependencies": [
"NEIAddons"
]
},
{
"modid": "${modId}|AppEng",
"name": "${modName}: Applied Energistics 2",
"description": "",
"version": "${modVersion}",
"mcversion": "${minecraftVersion}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ class MutationDumper(root: ISpeciesRoot, suffix: String) extends ArrayDumper[IMu

import scala.collection.JavaConversions._

override def header() = Array("UID", "Name", "Allele0", "Allele1", "isSecret", "baseChance", "conditions")
override def header(): Array[String] = Array("UID", "Name", "Allele0", "Allele1", "isSecret", "baseChance", "conditions")

override def array(): Array[IMutation] = root.getMutations(false).toArray(Array.empty)

override def dump(mutation: IMutation, id: Int) = {
override def dump(mutation: IMutation, id: Int): Array[String] = {
val speciesKey = root.getKaryotypeKey.ordinal()
val conditions = try {
Option(mutation.getSpecialConditions) map (x => x.mkString("|")) getOrElse ""
Expand Down

0 comments on commit 4cece28

Please sign in to comment.