Fix ConditionalCodec having an inverted test. Closes #9742

Remove clean project on CI.
Bump FG version to fix transitive issue on module path.
This commit is contained in:
LexManos committed 2023-10-08 13:13:17 -07:00
1 parent 9cd73c84a6
commit 2332ecf984
8 files changed
+215 -128

No files matched your search

+21 -83
View File
@@ -4,7 +4,6 @@ import net.minecraftforge.forge.tasks.checks.CheckExcs
import net.minecraftforge.forge.tasks.checks.CheckPatches
import net.minecraftforge.forge.tasks.checks.CheckSAS
import net.minecraftforge.forge.tasks.checks.CheckTask
import net.minecraftforge.forge.tasks.FixPatchImports
import java.nio.file.Files
import java.util.Date
@@ -28,8 +27,8 @@ plugins {
id 'net.minecraftforge.gradleutils' version '2.+'
id 'eclipse'
id 'de.undercouch.download' version '5.4.0'
id 'net.minecraftforge.gradle.patcher' version '[6.0.13,6.2)' apply false
id 'net.minecraftforge.gradle.mcp' version '[6.0.13,6.2)' apply false
id 'net.minecraftforge.gradle.patcher' version '[6.0.14,6.2)' apply false
id 'net.minecraftforge.gradle.mcp' version '[6.0.14,6.2)' apply false
}
Util.init() //Init all our extension methods!
@@ -115,6 +114,7 @@ tasks.register('downloadVersionManifest', Download) {
quiet true
}
tasks.register('downloadJson', Download) {
dependsOn downloadVersionManifest
inputs.file downloadVersionManifest.dest
src { downloadVersionManifest.dest.json.versions.find{ it.id == MC_VERSION }.url }
dest file("build/versions/${MC_VERSION}/version.json")
@@ -123,6 +123,7 @@ tasks.register('downloadJson', Download) {
quiet true
}
tasks.register('downloadClientRaw', Download) {
dependsOn downloadJson
inputs.file downloadJson.dest
src { downloadJson.dest.json.downloads.client.url }
dest file("build/versions/${MC_VERSION}/client.jar")
@@ -131,6 +132,7 @@ tasks.register('downloadClientRaw', Download) {
quiet true
}
tasks.register('downloadServerRaw', Download) {
dependsOn downloadJson
inputs.file downloadJson.dest
src { downloadJson.dest.json.downloads.server.url }
dest file("build/versions/${MC_VERSION}/server.jar")
@@ -148,14 +150,6 @@ subprojects {
version = VERSION
//println(name + ' Version: ' + version)
ext {
isNonStable = { String version ->
def stableKeyword = ['RELEASE', 'FINAL', 'GA'].any { ver -> version.toUpperCase().contains(ver) }
def regex = /^[0-9,.v-]+(-r)?$/
return !stableKeyword && !(version ==~ regex)
}
}
repositories {
mavenLocal()
mavenCentral()
@@ -233,55 +227,6 @@ project(':mcp') {
}
}
project(':clean') {
evaluationDependsOn(':mcp')
apply plugin: 'net.minecraftforge.gradle.patcher'
tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything
dependencies {
implementation 'net.minecraftforge:forgespi:' + SPI_VERSION
}
patcher {
parent = project(':mcp')
mcVersion = MC_VERSION
patchedSrc = file('src/main/java')
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
runs {
clean_client {
client true
taskName 'clean_client'
ideaModule "${rootProject.name}.${project.name}.main"
main 'net.minecraft.client.main.Main'
workingDirectory project.file('run/client')
args '--gameDir', '.'
args '--version', MC_VERSION
args '--assetsDir', downloadAssets.output
args '--assetIndex', '{asset_index}'
args '--accessToken', '0'
}
clean_server {
client false
taskName 'clean_server'
ideaModule "${rootProject.name}.${project.name}.main"
main 'net.minecraft.server.Main'
workingDirectory project.file('run/server')
}
}
}
eclipse.classpath.file.whenMerged {
// Disable optional warnings on the minecraft decompiled source code. It just muddies the warning window and hides warnings in our own codebase
def src = entries.find { it.path == 'src/main/java' }
src.entryAttributes['ignore_optional_problems'] = 'true'
}
}
def sharedDeps = {
moduleonly("cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}")
moduleonly("org.ow2.asm:asm:${ASM_VERSION}")
@@ -291,9 +236,9 @@ def sharedDeps = {
moduleonly("org.ow2.asm:asm-analysis:${ASM_VERSION}")
moduleonly("cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}")
moduleonly("net.minecraftforge:JarJarFileSystems:${JARJAR_VERSION}")
moduleonly("com.google.jimfs:jimfs:${JIMFS_VERSION}") { transitive = false }
moduleonly("com.google.guava:guava:${GUAVA_VERSION}") { transitive = false } // Need by jimfs
moduleonly("com.google.guava:failureaccess:1.0.1"){ transitive = false} // Needed by guava
moduleonly("com.google.jimfs:jimfs:${JIMFS_VERSION}")
moduleonly("com.google.guava:guava:${GUAVA_VERSION}") // Need by jimfs
moduleonly("com.google.guava:failureaccess:1.0.1") // Needed by guava
installer "cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}"
installer "org.ow2.asm:asm:${ASM_VERSION}"
@@ -449,7 +394,7 @@ def sharedFmlonlyForge = { Project prj ->
}
}
def MODULE_PATH = Util.getArtifacts(prj, prj.configurations.moduleonly, false).values().collect{"libraries/${it.downloads.artifact.path}"}
def MODULE_PATH = Util.getArtifacts(prj, prj.configurations.moduleonly, false).values().collect{"libraries/${it.downloads.artifact.path}"}.sort()
def tokens = [
TASK: 'forge_server',
MAVEN_PATH: prj.ext.MAVEN_PATH.toString(),
@@ -457,7 +402,7 @@ def sharedFmlonlyForge = { Project prj ->
MC_VERSION: MC_VERSION,
MCP_VERSION: MCP_VERSION,
FORGE_GROUP: prj.group,
IGNORE_LIST: Util.getArtifacts(prj, prj.configurations.moduleonly, false).values().collect{it.downloads.artifact.path.rsplit('/', 1)[1]}.join(','),
IGNORE_LIST: Util.getArtifacts(prj, prj.configurations.moduleonly, false).values().collect{it.downloads.artifact.path.rsplit('/', 1)[1]}.sort().join(','),
MODULES: 'ALL-MODULE-PATH'
]
@@ -501,7 +446,7 @@ def sharedFmlonlyForge = { Project prj ->
}
project(':forge') {
evaluationDependsOn(':clean')
evaluationDependsOn(':mcp')
apply plugin: 'java-library'
apply plugin: 'net.minecraftforge.gradle.patcher'
apply plugin: 'org.cadixdev.licenser'
@@ -571,11 +516,9 @@ project(':forge') {
}
configurations {
installer {
// Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
transitive = false
}
moduleonly
// Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
installer { transitive = false }
moduleonly { transitive = false }
api.extendsFrom(installer)
}
@@ -596,7 +539,9 @@ project(':forge') {
patcher {
excs.from file("$rootDir/src/main/resources/forge.exc")
parent = project(':clean')
parent = project(':mcp')
mcVersion = MC_VERSION
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
patches = file("$rootDir/patches/minecraft")
patchedSrc = file('src/main/java')
srgPatches = false
@@ -904,11 +849,6 @@ project(':forge') {
]
}
tasks.register('fixPatchImports', FixPatchImports) {
clean.set(rootProject.file('projects/clean/src/main/java'))
patched.set(rootProject.file('projects/forge/src/main/java'))
}
genPatches {
finalizedBy checkAndFixPatches
autoHeader true
@@ -1420,19 +1360,17 @@ project(':forge') {
publish.dependsOn(':forge:checkJarCompatibility')
}
//evaluationDependsOnChildren()
task setup() { //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
dependsOn ':clean:extractMapped'
tasks.register('setup') {
dependsOn ':forge:extractMapped'
if (findProject(':clean'))
dependsOn ':clean:extractMapped'
}
task doChecks {
tasks.register('doChecks') {
dependsOn ':forge:checkJarCompatibility'
dependsOn ':forge:publish'
}
project.gradle.startParameter.excludedTaskNames.add(':clean:genPatches')
if (System.env.TEAMCITY_VERSION) {
//Only setup the CI environment if and only if the environment variables are set.
tasks.configureTeamCity {
@@ -1,40 +0,0 @@
package net.minecraftforge.forge.tasks
import org.gradle.api.DefaultTask
import org.gradle.api.file.DirectoryProperty
import org.gradle.api.tasks.InputDirectory
import org.gradle.api.tasks.TaskAction
import java.nio.file.Files
abstract class FixPatchImports extends DefaultTask {
@InputDirectory abstract DirectoryProperty getClean()
@InputDirectory abstract DirectoryProperty getPatched()
@TaskAction
void run() {
final patchedPath = getPatched().get().asFile.toPath()
final cleanPath = getClean().get().asFile.toPath()
try (final var stream = Files.find(patchedPath, Integer.MAX_VALUE, (path, attr) -> path.toString().endsWith('.java'))) {
final itr = stream.iterator()
while (itr.hasNext()) {
final next = itr.next()
final clean = cleanPath.resolve(patchedPath.relativize(next).toString())
final patchedLines = Files.readAllLines(next)
final cleanLines = Files.readAllLines(clean)
final patchedImport = patchedLines.findLastIndexOf(2) { it.startsWith('import ') }
final cleanImport = cleanLines.findLastIndexOf(2) { it.startsWith('import ') }
if (cleanImport !== patchedImport) {
patchedLines.removeIf { it.startsWith('import ') }
patchedLines.addAll(2, cleanLines.subList(2, cleanImport + 1))
Files.write(next, patchedLines)
}
}
}
}
}
+51
View File
@@ -0,0 +1,51 @@
plugins {
id 'org.cadixdev.licenser'
id 'java-library'
id 'eclipse'
id 'net.minecraftforge.gradle.patcher' version '[6.0.14,6.2)'
}
evaluationDependsOn(':mcp')
dependencies {
implementation 'net.minecraftforge:forgespi:' + SPI_VERSION
}
patcher {
parent = project(':mcp')
mcVersion = MC_VERSION
patchedSrc = file('src/main/java')
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
runs {
clean_client {
client true
taskName 'clean_client'
ideaModule "${rootProject.name}.${project.name}.main"
main 'net.minecraft.client.main.Main'
workingDirectory project.file('run/client')
args '--gameDir', '.'
args '--version', MC_VERSION
args '--assetsDir', downloadAssets.output
args '--assetIndex', '{asset_index}'
args '--accessToken', '0'
}
clean_server {
client false
taskName 'clean_server'
ideaModule "${rootProject.name}.${project.name}.main"
main 'net.minecraft.server.Main'
workingDirectory project.file('run/server')
}
}
}
eclipse.classpath.file.whenMerged {
// Disable optional warnings on the minecraft decompiled source code. It just muddies the warning window and hides warnings in our own codebase
def src = entries.find { it.path == 'src/main/java' }
src.entryAttributes['ignore_optional_problems'] = 'true'
}
+1 -1
View File
@@ -2,7 +2,7 @@ plugins {
id 'eclipse'
id 'idea'
id 'maven-publish'
id 'net.minecraftforge.gradle' version '[6.0,6.2)'
id 'net.minecraftforge.gradle' version '[6.0.14,6.2)'
}
version = mod_version
+6 -2
View File
@@ -30,9 +30,13 @@ include 'lowcodelanguage'
include 'fmlearlydisplay'
include ':mcp'
include ':clean'
include ':forge'
project(":mcp").projectDir = file("projects/mcp")
project(":clean").projectDir = file("projects/clean")
project(":forge").projectDir = file("projects/forge")
if (!System.env.TEAMCITY_VERSION) {
include ':clean'
project(':clean').projectDir = file('projects/clean')
project(':clean').buildFileName = '../../build_clean.gradle'
}
@@ -0,0 +1,34 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:diamond_block"
}
],
"forge:condition": {
"type": "forge:false",
"value": {}
},
"rolls": 1.0
},
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:golden_apple"
}
],
"forge:condition": {
"type": "forge:true",
"value": {}
},
"rolls": 1.0
}
],
"random_sequence": "conditional_loot_test:blocks/test"
}
@@ -62,8 +62,8 @@ public class ConditionCodec {
return DataResult.error(() -> conditionDecoded.error().get().message());
var condition = conditionDecoded.result().get();
if (condition.test(getContext(ops)))
return DataResult.success(Pair.of(Optional.empty(), null));
if (!condition.test(getContext(ops)))
return DataResult.success(Pair.of(Optional.empty(), ops.empty()));
return normal.decode(ops, input).map(p -> p.mapFirst(Optional::of));
}
@@ -0,0 +1,100 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.debug.gameplay.loot;
import net.minecraft.core.BlockPos;
import net.minecraft.data.PackOutput;
import net.minecraft.data.loot.BlockLootSubProvider;
import net.minecraft.data.loot.LootTableProvider;
import net.minecraft.gametest.framework.GameTest;
import net.minecraft.gametest.framework.GameTestHelper;
import net.minecraft.world.flag.FeatureFlags;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.storage.loot.LootPool;
import net.minecraft.world.level.storage.loot.LootTable;
import net.minecraft.world.level.storage.loot.entries.LootItem;
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.test.BaseTestMod;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.common.crafting.conditions.IConditionBuilder;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.gametest.GameTestHolder;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import java.util.List;
import java.util.Set;
@Mod(ConditionalLootPools.MODID)
@GameTestHolder("forge." + ConditionalLootPools.MODID)
public class ConditionalLootPools extends BaseTestMod {
public static final String MODID = "conditional_loot_test";
private static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
private static final RegistryObject<Block> TEST_BLOCK = BLOCKS.register("test", () -> new Block(BlockBehaviour.Properties.of()));
@SubscribeEvent
public void runData(GatherDataEvent event) {
event.getGenerator().addProvider(event.includeServer(), new LootProvider(event.getGenerator().getPackOutput()));
}
@GameTest(template = "forge:empty3x3x3")
public static void test_true_false(GameTestHelper helper) {
var center = new BlockPos(1, 1, 1);
helper.setBlock(center, TEST_BLOCK.get());
helper.assertBlock(center, block -> block == TEST_BLOCK.get(), "Failed to set block");
var player = helper.makeMockServerPlayer();
player.gameMode.destroyBlock(helper.absolutePos(center));
helper.assertItemEntityPresent(Items.GOLDEN_APPLE, center, 1.0);
helper.succeed();
}
private static class LootProvider extends LootTableProvider {
public LootProvider(PackOutput out) {
super(out, Set.of(), List.of(
new LootTableProvider.SubProviderEntry(BlockLoot::new, LootContextParamSets.BLOCK)
));
}
}
private static class BlockLoot extends BlockLootSubProvider implements IConditionBuilder {
public BlockLoot() {
super(Set.of(), FeatureFlags.REGISTRY.allFlags());
}
@Override
protected Iterable<Block> getKnownBlocks() {
return List.of(TEST_BLOCK.get());
}
@Override
protected void generate() {
this.add(TEST_BLOCK.get(), LootTable.lootTable()
.withPool(
LootPool.lootPool()
.when(FALSE())
.setRolls(ConstantValue.exactly(1.0F))
.add(LootItem.lootTableItem(Items.DIAMOND_BLOCK))
)
.withPool(
LootPool.lootPool()
.when(TRUE())
.setRolls(ConstantValue.exactly(1.0F))
.add(LootItem.lootTableItem(Items.GOLDEN_APPLE))
)
);
}
}
}