1.16.2 Pre 2
All checks were successful
EnergonRelics/pipeline/head This commit looks good

ModMenu And REI Are Disabled
This commit is contained in:
TheBrokenRail 2020-08-05 20:58:51 -04:00
parent cdd97294a9
commit 79306df187
6 changed files with 41 additions and 12 deletions

View File

@ -1,5 +1,6 @@
plugins { plugins {
id 'fabric-loom' version '0.5-SNAPSHOT' id 'fabric-loom' version '0.5-SNAPSHOT'
id 'com.matthewprenger.cursegradle' version '1.4.0'
id 'maven-publish' id 'maven-publish'
} }
@ -9,7 +10,7 @@ compileJava {
} }
version = "${project.mod_version}+${project.minecraft_version}" version = "${project.mod_version}+${project.minecraft_version}"
group = project.maven_group group = project.maven_group as Object
loom { loom {
accessWidener "src/main/resources/energonrelics.accesswidener" accessWidener "src/main/resources/energonrelics.accesswidener"
@ -29,7 +30,7 @@ dependencies {
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
modImplementation "io.github.prospector:modmenu:${project.modmenu_version}" modCompileOnly "io.github.prospector:modmenu:${project.modmenu_version}"
modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${project.roughlyenoughitems_version}" modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${project.roughlyenoughitems_version}"
modRuntime "me.shedaniel:RoughlyEnoughItems:${project.roughlyenoughitems_version}" modRuntime "me.shedaniel:RoughlyEnoughItems:${project.roughlyenoughitems_version}"
@ -97,3 +98,29 @@ jar {
javadoc { javadoc {
title "EnergonRelics v${version}" title "EnergonRelics v${version}"
} }
if (project.hasProperty('curseforge.api_key')) {
curseforge {
apiKey = project.getProperty('curseforge.api_key')
//noinspection GroovyAssignabilityCheck
project {
id = project.curseforge_id
changelog = 'A changelog can be found at https://gitea.thebrokenrail.com/TheBrokenRail/EnergonRelics/src/branch/master/CHANGELOG.md'
releaseType = 'release'
addGameVersion project.simple_minecraft_version
addGameVersion 'Fabric'
mainArtifact(remapJar) {
displayName = "EnergonRelics v${mod_version} for ${project.minecraft_version}"
}
afterEvaluate {
uploadTask.dependsOn('remapJar')
}
relations {
requiredDependency 'fabric-api'
}
}
options {
forgeGradleIntegration = false
}
}
}

View File

@ -3,8 +3,10 @@ org.gradle.jvmargs = -Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
minecraft_version = 1.16.2-pre1 minecraft_version = 1.16.2-pre2
yarn_build = 17 curseforge_id = 398250
simple_minecraft_version = 1.16.2-Snapshot
yarn_build = 1
fabric_loader_version = 0.9.0+build.204 fabric_loader_version = 0.9.0+build.204
# Mod Properties # Mod Properties
@ -13,9 +15,9 @@ org.gradle.jvmargs = -Xmx1G
# Dependencies # Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_api_version = 0.16.3+build.390-1.16 fabric_api_version = 0.16.4+build.392-1.16
modmenu_version = 1.14.6+build.31 modmenu_version = 1.14.6+build.31
cloth_config_version = 4.7.0-unstable cloth_config_version = 4.7.0-unstable
autoconfig_version = 3.2.0-unstable autoconfig_version = 3.2.0-unstable
libstructure_version = 1.4.1 libstructure_version = 1.4.1
roughlyenoughitems_version = 5.0.1-unstable roughlyenoughitems_version = 5.1.0-unstable

View File

@ -45,7 +45,7 @@ public class IndustrialLaserBlock extends AbstractFieldBlock {
super.onEntityCollision(state, world, pos, entity); super.onEntityCollision(state, world, pos, entity);
if (entity instanceof CreeperEntity) { if (entity instanceof CreeperEntity) {
((CreeperEntity) entity).setIgnited(); ((CreeperEntity) entity).ignite();
} else if (entity instanceof LivingEntity) { } else if (entity instanceof LivingEntity) {
entity.damage(DAMAGE_SOURCE, HardcodedConfig.INDUSTRIAL_LASER_BEAM_DAMAGE); entity.damage(DAMAGE_SOURCE, HardcodedConfig.INDUSTRIAL_LASER_BEAM_DAMAGE);
} else if (entity instanceof ItemEntity) { } else if (entity instanceof ItemEntity) {

View File

@ -45,9 +45,9 @@ public class InfuserCategory implements RecipeCategory<InfuserDisplay> {
int outputY = startPoint.y + 26; int outputY = startPoint.y + 26;
if (display.outputsItem) { if (display.outputsItem) {
widgets.add(Widgets.createResultSlotBackground(new Point(startPoint.x + 61, startPoint.y + 26))); widgets.add(Widgets.createResultSlotBackground(new Point(startPoint.x + 61, startPoint.y + 26)));
widgets.add(Widgets.createSlot(new Point(outputX, outputY)).entries(display.getOutputEntries()).disableBackground().markOutput()); widgets.add(Widgets.createSlot(new Point(outputX, outputY)).entries(display.getResultingEntries().get(0)).disableBackground().markOutput());
} else { } else {
Identifier outputID = Registry.ITEM.getId(display.getOutputEntries().get(0).getItem()); Identifier outputID = Registry.ITEM.getId(display.getResultingEntries().get(0).get(0).getItem());
Text text = new TranslatableText("category.rei." + EnergonRelics.NAMESPACE + ".infuser.display_item." + outputID.getNamespace() + "." + outputID.getPath()); Text text = new TranslatableText("category.rei." + EnergonRelics.NAMESPACE + ".infuser.display_item." + outputID.getNamespace() + "." + outputID.getPath());
widgets.add(Widgets.createLabel(new Point(outputX - 7, outputY + 3), text).noShadow().leftAligned().color(0xFF404040, 0xFFBBBBBB)); widgets.add(Widgets.createLabel(new Point(outputX - 7, outputY + 3), text).noShadow().leftAligned().color(0xFF404040, 0xFFBBBBBB));
} }

View File

@ -34,8 +34,8 @@ public class InfuserDisplay implements RecipeDisplay {
} }
@Override @Override
public List<EntryStack> getOutputEntries() { public List<List<EntryStack>> getResultingEntries() {
return Collections.singletonList(output); return Collections.singletonList(Collections.singletonList(output));
} }
@Override @Override

View File

@ -27,7 +27,7 @@ public class ReactorFuelDisplay implements RecipeDisplay {
} }
@Override @Override
public List<EntryStack> getOutputEntries() { public List<List<EntryStack>> getResultingEntries() {
return Collections.emptyList(); return Collections.emptyList();
} }