Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Buuz135/Thaumic-JEI
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.5.4
Choose a base ref
...
head repository: Buuz135/Thaumic-JEI
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Oct 14, 2018

  1. Fix aspect count being capped at 127

    Due to how ItemStack reads/writes the count to NBT (byte value),
    Some ItemStacks with > 127 of an aspect will get handled wrongly.
    
    If the byte representing the count in NBT was negative,
    then ThaumicJEI didn't display those at all, due to ItemStack#isEmpty() being true.
    If the byte count was > 0, then it was just a wrong number.
    
    This Commit allows for up to Short.MAX_VALUE (32 767) aspects to be still representable,
    by manually overriding the NBT compound to use item count as short type.
    I think that this number should be high enough for any (modded) item,
    but it could be bumped up to use integer count instead, just to be sure.
    
    This change will only work for newly generated aspect json files.
    Old, pre-existing ones will still behave the way they did previously.
    
    Fixes #14
    kantenkugel committed Oct 14, 2018
    Copy the full SHA
    a6c462f View commit details

Commits on Nov 11, 2018

  1. Copy the full SHA
    19a040d View commit details
  2. Merge pull request #39 from kantenkugel/master

    Fix aspect count being capped at 127
    Buuz135 authored Nov 11, 2018
    Copy the full SHA
    731a77f View commit details
  3. Copy the full SHA
    e6b6fa0 View commit details
  4. Increased version

    Buuz135 committed Nov 11, 2018
    Copy the full SHA
    eb3f7b3 View commit details

Commits on Mar 29, 2019

  1. Copy the full SHA
    98c4e56 View commit details

Commits on Mar 31, 2019

  1. Merge pull request #47 from mgziminsky/patch-1

    Fix crash during register with EnderIO 5.0.43
    Buuz135 authored Mar 31, 2019
    Copy the full SHA
    b52ff76 View commit details
  2. Copy the full SHA
    9fbcda5 View commit details
  3. Copy the full SHA
    6359fcd View commit details
  4. Increased version

    Buuz135 committed Mar 31, 2019
    Copy the full SHA
    2bf9188 View commit details

Commits on Apr 4, 2019

  1. Copy the full SHA
    cca272c View commit details

Commits on Apr 7, 2019

  1. Merge pull request #48 from codewarrior0/patch-1

    Log and ignore JSON syntax errors in aspect cache file
    Buuz135 authored Apr 7, 2019
    Copy the full SHA
    ee977f5 View commit details
  2. Update gradle.properties

    Buuz135 authored Apr 7, 2019
    Copy the full SHA
    d1a9773 View commit details
  3. Updated to a newer JEI

    Buuz135 committed Apr 7, 2019
    Copy the full SHA
    759d711 View commit details
  4. Copy the full SHA
    e962319 View commit details
  5. Copy the full SHA
    cbf83a6 View commit details
  6. Copy the full SHA
    f43dc35 View commit details

Commits on Apr 29, 2019

  1. Copy the full SHA
    874126a View commit details
  2. Copy the full SHA
    d352c05 View commit details
  3. JEI recipes that have missing research will have an icon displaying i…

    …ts missing research, closes #54
    Buuz135 committed Apr 29, 2019
    Copy the full SHA
    e244dc9 View commit details

Commits on May 18, 2019

  1. Updated German language

    Legondas authored May 18, 2019
    Copy the full SHA
    2673674 View commit details
  2. Merge pull request #57 from Legondas/master

    Updated German language
    Buuz135 authored May 18, 2019
    Copy the full SHA
    a2872fd View commit details

Commits on May 19, 2019

  1. Update de_de.lang

    Vexatos authored May 19, 2019
    Copy the full SHA
    dcbf240 View commit details
  2. Merge pull request #58 from Vexatos/patch-1

    Update de_de.lang
    Buuz135 authored May 19, 2019
    Copy the full SHA
    eabc075 View commit details

Commits on Aug 19, 2024

  1. Copy the full SHA
    eaa85ba View commit details
  2. Copy the full SHA
    92d04e2 View commit details

Commits on Aug 20, 2024

  1. Improved gradle

    Buuz135 committed Aug 20, 2024
    Copy the full SHA
    a9214dd View commit details
  2. Copy the full SHA
    ce4488c View commit details
  3. Increased version

    Buuz135 committed Aug 20, 2024
    Copy the full SHA
    53a1201 View commit details
256 changes: 142 additions & 114 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,153 +1,181 @@
buildscript {
repositories {
jcenter()
maven {
name = "forge"
url = "https://files.minecraftforge.net/maven"
}
}
dependencies {
classpath "net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT"
classpath 'com.selesse:gradle-git-changelog:0.2.+'
classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.1.0"
}
}
plugins {
id "com.github.hierynomus.license" version "0.14.0"
id "com.matthewprenger.cursegradle" version "1.1.0"
id 'java'
id 'eclipse'
id 'idea'
id 'net.minecraftforge.gradle' version '6.0.+'
}
apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'com.selesse.git.changelog'
apply plugin: 'java'

repositories {
maven {
name "Su5ed LegacyDev Fork"
url "https://maven.su5ed.dev/releases"
}
}

String b = ""
if (project.hasProperty("teamcity")) {
b = System.getenv("BUILD_NUMBER")
// eclipse thinks test needs resources if this is not here
sourceSets {
test {
resources.setSrcDirs([])
}
}

if (b == null || b == "") {
version = "${project.minecraftVersion}-${modVersion}"
} else {
version = "${project.minecraftVersion}-${modVersion}-" + b
import net.minecraftforge.gradle.mcp.MCPRepo
import net.minecraftforge.gradle.common.tasks.SignJar
import net.minecraftforge.gradle.common.util.MavenArtifactDownloader

repositories {
maven {
url = 'https://www.cursemaven.com/'
content {
includeGroup "curse.maven"
}
}
}

group = modGroup
archivesBaseName = modBaseName
version = "${mcversion}-${version}"
group = 'com.buuz135.thaumicjei'
archivesBaseName = 'ThaumicJEI'

java.toolchain.languageVersion = JavaLanguageVersion.of(8)

sourceCompatibility = "1.8"
targetCompatibility = "1.8" // Need this here so eclipse task generates correctly.
compileJava {
sourceCompatibility = targetCompatibility = "1.8"

legacy {
fixClasspath = true
extractMappings = true
attachMappings = true
}

final arch = System.getProperty("os.arch")
final needCustomNatives = arch != "x86" && arch != "i386" && arch != "x86_64" && arch != "amd64"

minecraft {
version = project.forgeVersion
runDir = "run"

// the mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD snapshot are built nightly.
// stable_# stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not always work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = project.mcpVersion
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
mappings channel: 'stable', version: '39-1.12'

runs {
client {
workingDirectory file('run')

property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
property 'forge.logging.console.level', 'debug'


if (needCustomNatives) {
property 'java.library.path', ''
environment 'nativesDirectory', "${project.getProjectDir()}/natives"
}

environment 'MC_VERSION', '1.12.2'

mods {
thaumicaugmentation {
source sourceSets.main
}
}
}

server {
workingDirectory file('run')

property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
property 'forge.logging.console.level', 'debug'


if (needCustomNatives) {
property 'java.library.path', ''
environment 'nativesDirectory', "${project.getProjectDir()}/natives"
}

environment 'MC_VERSION', '1.12.2'

mods {
thaumicaugmentation {
source sourceSets.main
}
}
}
}
}

repositories {
mavenCentral()
maven {
// location of the maven that hosts JEI files
name = "Progwml6 maven"
url = "http://dvs1.progwml6.com/files/maven"
dependencies {
minecraft "net.minecraftforge:forge:${mcversion}-${forgeversion}"

implementation fg.deobf("curse.maven:jei-238222:5101347")
implementation fg.deobf('curse.maven:thaumcraft-223628:2629023')
implementation fg.deobf('curse.maven:baubles-227083:2518667')

constraints {
implementation('net.minecraftforge:legacydev:0.3.0.0-legacyExt') {
because 'needed to have all ATs work properly'
}

implementation('org.ow2.asm:asm-debug-all:5.2') {
because 'newer ASM versions include module info that causes errors in Java 8'
}
}
maven {
// location of a maven mirror for JEI files, as a fallback
name = "ModMaven"
url = "modmaven.k-4u.nl"

configurations.forEach {
// mergetool pollutes the classpath with conflicting classes
it.exclude(group: 'net.minecraftforge', module: 'mergetool')

// legacydev forge dep wants fatjar as the classifier, but 3.0 lacks it
it.resolutionStrategy.eachDependency {
if (it.requested.module.toString() == "net.minecraftforge:legacydev") {
it.artifactSelection {
it.selectArtifact(DependencyArtifact.DEFAULT_TYPE, null, null)
}
}
}
}
maven {
name 'Curseforge Maven' // Thaumcraft
url 'http://minecraft.curseforge.com/api/maven/'

if (needCustomNatives) {
implementation fileTree(dir: 'natives', include: '*.jar')
}
}

dependencies {
deobfCompile "mezz.jei:jei_1.12.2:${project.jei_version}:api"
// at runtime, use the full JEI jar
runtime "mezz.jei:jei_1.12.2:${project.jei_version}"
deobfCompile "thaumcraft:Thaumcraft:${project.minecraftVersion}:${project.thaumcraft}"
idea {
module {
inheritOutputDirs = true
downloadJavadoc = true
downloadSources = true
}
}


processResources {
// required to allow file expansion later
duplicatesStrategy = 'include'

// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
inputs.property 'version', version
inputs.property 'apiversion', apiversion
inputs.property 'mcversion', mcversion

// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include "mcmod.info"
include 'mcmod.info'

// replace version and mcversion
expand "version": project.version, "mcversion": project.minecraft.version
expand 'version': version, 'mcversion': mcversion, 'forgeversion': forgeversion, 'forgeminversion': forgeminversion
}

// copy everything else, thats not the mcmod.info
// copy everything else except the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude "mcmod.info"
}
}

license {
header rootProject.file('HEADER')
include "**/*.java"
ext.year = Calendar.getInstance().get(Calendar.YEAR)
ext.name = 'Buuz135'
ignoreFailures = true
mapping {
java='SLASHSTAR_STYLE'
exclude 'mcmod.info'
}
}

changelog {
title = "Thaumic JEI"
fileName = "CHANGELOG.md"
outputDirectory = file("$projectDir")
since = '1.4.0'
commitFormat = '%s (%an)'
markdown {
commitFormat = '* %s (%an)'
}
includeLines = {
!it.contains("Merge")
}
processLines = {
String input = it as String
if (input.contains('[ci skip] ')) {
input = input.minus('[ci skip] ')
}
input
}
}

tasks.curseforge.enabled = project.hasProperty('curse_api')

curseforge {
if (project.hasProperty('curse_api')) {
apiKey = project.curse_api
}
project {
id = '285492'
changelog = file('CHANGELOG.md')
changelogType = 'markdown'
releaseType = 'beta'

mainArtifact(jar){
relations {
requiredLibrary 'thaumcraft'
requiredLibrary 'jei'
}
}
jar {
manifest {
attributes([
"Specification-Title": "Thaumic JEI",
"Specification-Vendor": "thaumicjei",
"Specification-Version": "1", // We are version 1 of ourselves
"Implementation-Title": project.name,
"Implementation-Version": "${version}",
"Implementation-Vendor" :"thaumicjei",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
])
}
}
17 changes: 9 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
modGroup=com.buuz135.thaumicjei.ThaumicJEI
modVersion=1.5.4
minecraftVersion=1.12.2
modBaseName=ThaumicJEI
forgeVersion=1.12.2-14.23.4.2747
mcpVersion=snapshot_20171003
jei_version=4.12.0.215
thaumcraft=6.1.BETA20
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
version=1.7.0
apiversion=1.7.0
mcversion=1.12.2
forgeminversion=14.23.5.2816
forgeversion=14.23.5.2860
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sun Mar 11 01:44:04 CET 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
8 changes: 8 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
pluginManagement {
repositories {
maven {
name 'MinecraftForge'
url 'https://maven.minecraftforge.net/'
}
}
}
Loading