Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix NPE with an itemstack with a null item #23

Merged
merged 1 commit into from
Apr 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ src/main/resources/mixins.*.json
*.bat
*.DS_Store
!gradlew.bat
/src/main/generated
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//version: 1682280358
//version: 1682616243
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
Expand Down Expand Up @@ -69,7 +69,7 @@ plugins {
id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
id 'com.modrinth.minotaur' version '2.+' apply false
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.2'
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.7'
}
boolean settingsupdated = verifySettingsGradle()
settingsupdated = verifyGitAttributes() || settingsupdated
Expand Down
26 changes: 13 additions & 13 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ dependencies {
compileOnly('com.google.auto.value:auto-value-annotations:1.8.2')
annotationProcessor('com.google.auto.value:auto-value:1.8.2')

compile('com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev')
api('com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev')

compile('com.github.GTNewHorizons:DetravScannerMod:1.7.0:dev') {transitive=false}
compile('com.github.GTNewHorizons:EnderStorage:1.4.12:dev') {transitive=false}
compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.82:dev') {transitive=false}
compile('com.github.GTNewHorizons:GTplusplus:1.8.42:dev') {transitive=false}
compile('com.github.GTNewHorizons:NewHorizonsCoreMod:2.0.32:dev') {transitive=false}
compile('com.github.GTNewHorizons:bartworks:0.6.15:dev') {transitive=false}
api('com.github.GTNewHorizons:DetravScannerMod:1.7.0:dev') {transitive=false}
api('com.github.GTNewHorizons:EnderStorage:1.4.12:dev') {transitive=false}
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.82:dev') {transitive=false}
api('com.github.GTNewHorizons:GTplusplus:1.8.42:dev') {transitive=false}
api('com.github.GTNewHorizons:NewHorizonsCoreMod:2.0.32:dev') {transitive=false}
api('com.github.GTNewHorizons:bartworks:0.6.15:dev') {transitive=false}

// Compile-time dependencies of GT5
compile('com.github.GTNewHorizons:BuildCraft:7.1.33:api') {transitive=false}
compile('com.github.GTNewHorizons:EnderIO:2.4.11:api') {transitive=false}
compile('com.github.GTNewHorizons:ForestryMC:4.6.6:api') {transitive=false}
compile('com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev') {transitive=false}
compile('com.github.GTNewHorizons:Railcraft:9.14.1:api') {transitive=false}
implementation('com.github.GTNewHorizons:BuildCraft:7.1.33:api') {transitive=false}
implementation('com.github.GTNewHorizons:EnderIO:2.4.11:api') {transitive=false}
implementation('com.github.GTNewHorizons:ForestryMC:4.6.6:api') {transitive=false}
implementation('com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev') {transitive=false}
implementation('com.github.GTNewHorizons:Railcraft:9.14.1:api') {transitive=false}

compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
implementation('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
runtimeOnly("curse.maven:cofh-core-69162:2388751")
runtimeOnly('curse.maven:advsolar-362768:2885953')

Expand Down
5 changes: 3 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ developmentEnvironmentUserName = Developer
# 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 = NeiCustomDiagram.java
replaceGradleTokenInFile =
gradleTokenModId =
gradleTokenModName =
gradleTokenVersion = GRADLETOKEN_VERSION
gradleTokenVersion = VERSION
gradleTokenGroupName =
generateGradleTokenClass =com.github.dcysteine.neicustomdiagram.main.Tags

# 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.
Expand Down
19 changes: 0 additions & 19 deletions repositories.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,4 @@
// Add any additional repositories for your dependencies here

repositories {

maven {
name = "GTNH"
url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
}
maven {
name = "ic2"
url = "https://maven.ic2.player.to/"
metadataSources {
mavenPom()
artifact()
}
}
maven {
url "https://cursemaven.com"
}
maven{
url "https://maven.fabricmc.net/"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class RecipeHandler {
void initialize() {
craftingTableOutputs = new HashSet<>();
((List<IRecipe>) CraftingManager.getInstance().getRecipeList()).stream()
.filter(recipe -> recipe.getRecipeOutput() != null)
.filter(recipe -> recipe.getRecipeOutput() != null && recipe.getRecipeOutput().getItem() != null)
.forEach(recipe -> craftingTableOutputs.add(ItemComponent.create(recipe.getRecipeOutput())));

assemblingMachineOutputs = GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList.stream()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public final class NeiCustomDiagram {

public static final String MOD_ID = "neicustomdiagram";
public static final String MOD_NAME = "NEI Custom Diagram";
public static final String MOD_VERSION = "GRADLETOKEN_VERSION";
public static final String MOD_VERSION = Tags.VERSION;
public static final String MOD_DEPENDENCIES = "required-after:NotEnoughItems;" + "after:dreamcraft;"
+ "after:gregtech;"
+ "after:bartworks;"
Expand Down