No files matched your search
@@ -1,4 +1,4 @@
|
||||
//version: 1675173326
|
||||
//version: 1682104756
|
||||
/*
|
||||
DO NOT CHANGE THIS FILE!
|
||||
Also, you may replace this file at any time if there is an update available.
|
||||
@@ -9,13 +9,18 @@
|
||||
import com.diffplug.blowdryer.Blowdryer
|
||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
|
||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||
import com.gtnewhorizons.retrofuturagradle.ObfuscationAttribute
|
||||
import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar
|
||||
import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask
|
||||
import com.matthewprenger.cursegradle.CurseArtifact
|
||||
import com.matthewprenger.cursegradle.CurseRelation
|
||||
import com.modrinth.minotaur.dependencies.ModDependency
|
||||
import com.modrinth.minotaur.dependencies.VersionDependency
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import org.gradle.api.tasks.options.Option;
|
||||
import org.gradle.internal.logging.text.StyledTextOutput.Style
|
||||
import org.gradle.internal.logging.text.StyledTextOutputFactory
|
||||
import org.gradle.internal.xml.XmlTransformer
|
||||
import org.jetbrains.gradle.ext.*
|
||||
|
||||
import java.nio.file.Files
|
||||
@@ -23,10 +28,10 @@ import java.nio.file.Paths
|
||||
import java.util.concurrent.TimeUnit
|
||||
import java.util.zip.ZipEntry
|
||||
import java.util.zip.ZipOutputStream
|
||||
import javax.inject.Inject
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
mavenCentral()
|
||||
|
||||
maven {
|
||||
@@ -47,6 +52,8 @@ buildscript {
|
||||
name 'Scala CI dependencies'
|
||||
url 'https://repo1.maven.org/maven2/'
|
||||
}
|
||||
|
||||
mavenLocal()
|
||||
}
|
||||
}
|
||||
plugins {
|
||||
@@ -58,22 +65,23 @@ plugins {
|
||||
id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false
|
||||
id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false
|
||||
id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false
|
||||
id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version ,unused, available for addon.gradle
|
||||
id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle
|
||||
id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
|
||||
id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version
|
||||
id 'com.palantir.git-version' version '3.0.0' apply false
|
||||
id 'de.undercouch.download' version '5.3.0'
|
||||
id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle
|
||||
id 'com.diffplug.spotless' version '6.7.2' apply false
|
||||
id 'com.modrinth.minotaur' version '2.+' apply false
|
||||
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
|
||||
id 'com.gtnewhorizons.retrofuturagradle' version '1.1.3'
|
||||
id 'com.gtnewhorizons.retrofuturagradle' version '1.2.7'
|
||||
}
|
||||
boolean settingsupdated = verifySettingsGradle()
|
||||
settingsupdated = verifyGitAttributes() || settingsupdated
|
||||
if (settingsupdated)
|
||||
throw new GradleException("Settings has been updated, please re-run task.")
|
||||
|
||||
if (project.file('.git/HEAD').isFile()) {
|
||||
// In submodules, .git is a file pointing to the real git dir
|
||||
if (project.file('.git/HEAD').isFile() || project.file('.git').isFile()) {
|
||||
apply plugin: 'com.palantir.git-version'
|
||||
}
|
||||
|
||||
@@ -122,6 +130,9 @@ propertyDefaultIfUnset("gradleTokenGroupName", "")
|
||||
propertyDefaultIfUnset("enableModernJavaSyntax", false) // On by default for new projects only
|
||||
propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new projects only
|
||||
|
||||
// this is meant to be set using the user wide property file. by default we do nothing.
|
||||
propertyDefaultIfUnset("ideaOverrideBuildType", "") // Can be nothing, "gradle" or "idea"
|
||||
|
||||
project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts
|
||||
if (!disableSpotless) {
|
||||
apply plugin: 'com.diffplug.spotless'
|
||||
@@ -143,13 +154,21 @@ java {
|
||||
} else {
|
||||
languageVersion.set(projectJavaVersion)
|
||||
}
|
||||
vendor.set(JvmVendorSpec.ADOPTIUM)
|
||||
vendor.set(JvmVendorSpec.AZUL)
|
||||
}
|
||||
if (!noPublishedSources) {
|
||||
withSourcesJar()
|
||||
}
|
||||
}
|
||||
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
options.encoding = "UTF-8"
|
||||
}
|
||||
|
||||
tasks.withType(ScalaCompile).configureEach {
|
||||
options.encoding = "UTF-8"
|
||||
}
|
||||
|
||||
pluginManager.withPlugin('org.jetbrains.kotlin.jvm') {
|
||||
// If Kotlin is enabled in the project
|
||||
kotlin {
|
||||
@@ -183,14 +202,32 @@ configurations {
|
||||
canBeConsumed = false
|
||||
canBeResolved = false
|
||||
}
|
||||
|
||||
create("devOnlyNonPublishable") {
|
||||
description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)"
|
||||
canBeConsumed = false
|
||||
canBeResolved = false
|
||||
}
|
||||
compileOnly.extendsFrom(devOnlyNonPublishable)
|
||||
runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable)
|
||||
}
|
||||
|
||||
if (enableModernJavaSyntax.toBoolean()) {
|
||||
repositories {
|
||||
mavenCentral {
|
||||
mavenContent {
|
||||
includeGroup("me.eigenraven.java8unsupported")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0'
|
||||
compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') {
|
||||
transitive = false // We only care about the 1 annotation class
|
||||
}
|
||||
// Allow using jdk.unsupported classes like sun.misc.Unsafe in the compiled code, working around JDK-8206937.
|
||||
patchedMinecraft('me.eigenraven.java8unsupported:java-8-unsupported-shim:1.0.0')
|
||||
}
|
||||
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
@@ -202,7 +239,7 @@ if (enableModernJavaSyntax.toBoolean()) {
|
||||
|
||||
javaCompiler.set(javaToolchains.compilerFor {
|
||||
languageVersion.set(JavaLanguageVersion.of(17))
|
||||
vendor.set(JvmVendorSpec.ADOPTIUM)
|
||||
vendor.set(JvmVendorSpec.AZUL)
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -234,12 +271,14 @@ if (apiPackage) {
|
||||
}
|
||||
|
||||
if (accessTransformersFile) {
|
||||
String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
|
||||
if (!getFile(targetFile).exists()) {
|
||||
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
|
||||
for (atFile in accessTransformersFile.split(",")) {
|
||||
String targetFile = "src/main/resources/META-INF/" + atFile.trim()
|
||||
if (!getFile(targetFile).exists()) {
|
||||
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
|
||||
}
|
||||
tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile)
|
||||
tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile)
|
||||
}
|
||||
tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile)
|
||||
tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile)
|
||||
} else {
|
||||
boolean atsFound = false
|
||||
for (File at : sourceSets.getByName("main").resources.files) {
|
||||
@@ -367,12 +406,14 @@ minecraft {
|
||||
injectMissingGenerics.set(true)
|
||||
}
|
||||
|
||||
username = developmentEnvironmentUserName.toString()
|
||||
|
||||
lwjgl3Version = "3.3.2-SNAPSHOT"
|
||||
|
||||
// Enable assertions in the current mod
|
||||
extraRunJvmArguments.add("-ea:${modGroup}")
|
||||
|
||||
if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
|
||||
extraTweakClasses.add("org.spongepowered.asm.launch.MixinTweaker")
|
||||
|
||||
if (usesMixinDebug.toBoolean()) {
|
||||
extraRunJvmArguments.addAll([
|
||||
"-Dmixin.debug.countInjections=true",
|
||||
@@ -401,6 +442,16 @@ configurations.configureEach {
|
||||
}
|
||||
}
|
||||
}
|
||||
def obfuscationAttr = it.attributes.getAttribute(ObfuscationAttribute.OBFUSCATION_ATTRIBUTE)
|
||||
if (obfuscationAttr != null && obfuscationAttr.name == ObfuscationAttribute.SRG) {
|
||||
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
|
||||
// Remap CoFH core cursemaven dev jar to the obfuscated version for runObfClient/Server
|
||||
if (details.requested.group == 'curse.maven' && details.requested.name.endsWith('-69162') && details.requested.version == '2388751') {
|
||||
details.useVersion '2388750'
|
||||
details.because 'Pick obfuscated jar'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Ensure tests have access to minecraft classes
|
||||
@@ -430,8 +481,9 @@ repositories.configureEach { repo ->
|
||||
apply from: 'repositories.gradle'
|
||||
|
||||
configurations {
|
||||
runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
|
||||
testRuntimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
|
||||
for (config in [compileClasspath, runtimeClasspath, testCompileClasspath, testRuntimeClasspath]) {
|
||||
config.extendsFrom(runtimeOnlyNonPublishable)
|
||||
if (usesShadowedDependencies.toBoolean()) {
|
||||
config.extendsFrom(shadowImplementation)
|
||||
// TODO: remove Compile after all uses are refactored to Implementation
|
||||
@@ -476,12 +528,11 @@ repositories {
|
||||
url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
|
||||
allowInsecureProtocol = true
|
||||
}
|
||||
if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
|
||||
if (usesMixinDebug.toBoolean()) {
|
||||
maven {
|
||||
name = "Fabric Maven"
|
||||
url = "https://maven.fabricmc.net/"
|
||||
}
|
||||
maven {
|
||||
name 'sonatype'
|
||||
url 'https://oss.sonatype.org/content/repositories/snapshots/'
|
||||
content {
|
||||
includeGroup "org.lwjgl"
|
||||
}
|
||||
}
|
||||
if (includeWellKnownRepositories.toBoolean()) {
|
||||
@@ -515,29 +566,49 @@ repositories {
|
||||
}
|
||||
}
|
||||
|
||||
def mixinProviderGroup = "io.github.legacymoddingmc"
|
||||
def mixinProviderModule = "unimixins"
|
||||
def mixinProviderVersion = "0.1.6"
|
||||
def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
|
||||
def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
|
||||
|
||||
dependencies {
|
||||
if (usesMixins.toBoolean()) {
|
||||
annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
|
||||
annotationProcessor('com.google.guava:guava:24.1.1-jre')
|
||||
annotationProcessor('com.google.code.gson:gson:2.8.6')
|
||||
annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.10:processor')
|
||||
annotationProcessor(mixinProviderSpec)
|
||||
if (usesMixinDebug.toBoolean()) {
|
||||
runtimeOnlyNonPublishable('org.jetbrains:intellij-fernflower:1.2.1.16')
|
||||
}
|
||||
}
|
||||
if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
|
||||
implementation('com.gtnewhorizon:gtnhmixins:2.1.10')
|
||||
if (usesMixins.toBoolean()) {
|
||||
implementation(mixinProviderSpec)
|
||||
} else if (forceEnableMixins.toBoolean()) {
|
||||
runtimeOnlyNonPublishable(mixinProviderSpec)
|
||||
}
|
||||
}
|
||||
|
||||
pluginManager.withPlugin('org.jetbrains.kotlin.kapt') {
|
||||
if (usesMixins.toBoolean()) {
|
||||
dependencies {
|
||||
kapt('com.gtnewhorizon:gtnhmixins:2.1.10:processor')
|
||||
kapt(mixinProviderSpec)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Replace old mixin mods with unimixins
|
||||
// https://docs.gradle.org/8.0.2/userguide/resolution_rules.html#sec:substitution_with_classifier
|
||||
configurations.all {
|
||||
resolutionStrategy.dependencySubstitution {
|
||||
substitute module('com.gtnewhorizon:gtnhmixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
||||
substitute module('com.github.GTNewHorizons:Mixingasm') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
||||
substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
||||
substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
||||
substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier")
|
||||
}
|
||||
}
|
||||
|
||||
apply from: 'dependencies.gradle'
|
||||
|
||||
def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
|
||||
@@ -633,9 +704,146 @@ tasks.named("processResources", ProcessResources).configure {
|
||||
|
||||
if (usesMixins.toBoolean()) {
|
||||
from refMap
|
||||
dependsOn("compileJava", "compileScala")
|
||||
}
|
||||
}
|
||||
|
||||
ext.java17Toolchain = (JavaToolchainSpec spec) -> {
|
||||
spec.languageVersion.set(JavaLanguageVersion.of(17))
|
||||
spec.vendor.set(JvmVendorSpec.matching("jetbrains"))
|
||||
}
|
||||
|
||||
ext.java17DependenciesCfg = configurations.create("java17Dependencies") {
|
||||
extendsFrom(configurations.getByName("runtimeClasspath")) // Ensure consistent transitive dependency resolution
|
||||
canBeConsumed = false
|
||||
}
|
||||
ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies") {
|
||||
canBeConsumed = false
|
||||
}
|
||||
|
||||
dependencies {
|
||||
def lwjgl3ifyVersion = '1.3.3'
|
||||
def asmVersion = '9.4'
|
||||
if (modId != 'lwjgl3ify') {
|
||||
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
|
||||
}
|
||||
if (modId != 'hodgepodge') {
|
||||
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.4')
|
||||
}
|
||||
|
||||
java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
|
||||
java17PatchDependencies("org.ow2.asm:asm:${asmVersion}")
|
||||
java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}")
|
||||
java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}")
|
||||
java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}")
|
||||
java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}")
|
||||
java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1')
|
||||
java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0")
|
||||
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
|
||||
}
|
||||
|
||||
ext.java17JvmArgs = [
|
||||
// Java 9+ support
|
||||
"--illegal-access=warn",
|
||||
"-Djava.security.manager=allow",
|
||||
"-Dfile.encoding=UTF-8",
|
||||
"--add-opens", "java.base/jdk.internal.loader=ALL-UNNAMED",
|
||||
"--add-opens", "java.base/java.net=ALL-UNNAMED",
|
||||
"--add-opens", "java.base/java.nio=ALL-UNNAMED",
|
||||
"--add-opens", "java.base/java.io=ALL-UNNAMED",
|
||||
"--add-opens", "java.base/java.lang=ALL-UNNAMED",
|
||||
"--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED",
|
||||
"--add-opens", "java.base/java.text=ALL-UNNAMED",
|
||||
"--add-opens", "java.base/java.util=ALL-UNNAMED",
|
||||
"--add-opens", "java.base/jdk.internal.reflect=ALL-UNNAMED",
|
||||
"--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED",
|
||||
"--add-opens", "jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming",
|
||||
"--add-opens", "java.desktop/sun.awt.image=ALL-UNNAMED",
|
||||
"--add-modules", "jdk.dynalink",
|
||||
"--add-opens", "jdk.dynalink/jdk.dynalink.beans=ALL-UNNAMED",
|
||||
"--add-modules", "java.sql.rowset",
|
||||
"--add-opens", "java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED"
|
||||
]
|
||||
|
||||
ext.hotswapJvmArgs = [
|
||||
// DCEVM advanced hot reload
|
||||
"-XX:+AllowEnhancedClassRedefinition",
|
||||
"-XX:HotswapAgent=fatjar"
|
||||
]
|
||||
|
||||
ext.setupHotswapAgentTask = tasks.register("setupHotswapAgent") {
|
||||
group = "GTNH Buildscript"
|
||||
description = "Installs a recent version of HotSwapAgent into the Java 17 JetBrains runtime directory"
|
||||
def hsaUrl = 'https://github.com/HotswapProjects/HotswapAgent/releases/download/1.4.2-SNAPSHOT/hotswap-agent-1.4.2-SNAPSHOT.jar'
|
||||
def targetFolderProvider = javaToolchains.launcherFor(java17Toolchain).map {it.metadata.installationPath.dir("lib/hotswap")}
|
||||
def targetFilename = "hotswap-agent.jar"
|
||||
onlyIf {
|
||||
!targetFolderProvider.get().file(targetFilename).asFile.exists()
|
||||
}
|
||||
doLast {
|
||||
def targetFolder = targetFolderProvider.get()
|
||||
targetFolder.asFile.mkdirs()
|
||||
download.run {
|
||||
src hsaUrl
|
||||
dest targetFolder.file(targetFilename).asFile
|
||||
overwrite false
|
||||
tempAndMove true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
|
||||
// IntelliJ doesn't seem to allow commandline arguments so we also support an env variable
|
||||
private boolean enableHotswap = Boolean.valueOf(System.getenv("HOTSWAP"));
|
||||
|
||||
@Input
|
||||
public boolean getEnableHotswap() { return enableHotswap }
|
||||
@Option(option = "hotswap", description = "Enables HotSwapAgent for enhanced class reloading under a debugger")
|
||||
public boolean setEnableHotswap(boolean enable) { enableHotswap = enable }
|
||||
|
||||
@Inject
|
||||
public RunHotswappableMinecraftTask(Side side, String superTask, org.gradle.api.invocation.Gradle gradle) {
|
||||
super(side, gradle)
|
||||
|
||||
this.lwjglVersion = 3
|
||||
this.javaLauncher = project.javaToolchains.launcherFor(project.java17Toolchain)
|
||||
this.extraJvmArgs.addAll(project.java17JvmArgs)
|
||||
this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : []))
|
||||
|
||||
this.classpath(project.java17PatchDependenciesCfg)
|
||||
if (side == Side.CLIENT) {
|
||||
this.classpath(project.minecraftTasks.lwjgl3Configuration)
|
||||
}
|
||||
// Use a raw provider instead of map to not create a dependency on the task
|
||||
this.classpath(project.provider(() -> project.tasks.named(superTask, RunMinecraftTask).get().classpath))
|
||||
this.classpath.filter { file ->
|
||||
!file.path.contains("2.9.4-nightly-20150209") // Remove lwjgl2
|
||||
}
|
||||
this.classpath(project.java17DependenciesCfg)
|
||||
}
|
||||
}
|
||||
|
||||
def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Side.CLIENT, "runClient")
|
||||
runClient17Task.configure {
|
||||
setup(project)
|
||||
group = "Modded Minecraft"
|
||||
description = "Runs the modded client using Java 17, lwjgl3ify and Hodgepodge"
|
||||
dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar')
|
||||
mainClass = "GradleStart"
|
||||
username = minecraft.username
|
||||
userUUID = minecraft.userUUID
|
||||
}
|
||||
|
||||
def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Side.SERVER, "runServer")
|
||||
runServer17Task.configure {
|
||||
setup(project)
|
||||
group = "Modded Minecraft"
|
||||
description = "Runs the modded server using Java 17, lwjgl3ify and Hodgepodge"
|
||||
dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar')
|
||||
mainClass = "GradleStartServer"
|
||||
extraArgs.add("nogui")
|
||||
}
|
||||
|
||||
def getManifestAttributes() {
|
||||
def manifestAttributes = [:]
|
||||
if (!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
|
||||
@@ -670,7 +878,7 @@ if (usesShadowedDependencies.toBoolean()) {
|
||||
tasks.register('relocateShadowJar', ConfigureShadowRelocation) {
|
||||
target = tasks.shadowJar
|
||||
prefix = modGroup + ".shadow"
|
||||
enabled = minimizeShadowedDependencies.toBoolean()
|
||||
enabled = relocateShadowedDependencies.toBoolean()
|
||||
}
|
||||
tasks.named("shadowJar", ShadowJar).configure {
|
||||
manifest {
|
||||
@@ -686,7 +894,7 @@ if (usesShadowedDependencies.toBoolean()) {
|
||||
project.configurations.shadeCompile
|
||||
]
|
||||
archiveClassifier.set('dev')
|
||||
if (minimizeShadowedDependencies.toBoolean()) {
|
||||
if (relocateShadowedDependencies.toBoolean()) {
|
||||
dependsOn(relocateShadowJar)
|
||||
}
|
||||
}
|
||||
@@ -705,7 +913,7 @@ if (usesShadowedDependencies.toBoolean()) {
|
||||
javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) {
|
||||
skip()
|
||||
}
|
||||
for (runTask in ["runClient", "runServer"]) {
|
||||
for (runTask in ["runClient", "runServer", "runClient17", "runServer17"]) {
|
||||
tasks.named(runTask).configure {
|
||||
dependsOn("shadowJar")
|
||||
}
|
||||
@@ -747,6 +955,19 @@ idea {
|
||||
}
|
||||
project {
|
||||
settings {
|
||||
if (ideaOverrideBuildType != "") {
|
||||
delegateActions {
|
||||
if ("gradle".equalsIgnoreCase(ideaOverrideBuildType)) {
|
||||
delegateBuildRunToGradle = true
|
||||
testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.GRADLE
|
||||
} else if ("idea".equalsIgnoreCase(ideaOverrideBuildType)) {
|
||||
delegateBuildRunToGradle = false
|
||||
testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.PLATFORM
|
||||
} else {
|
||||
throw GradleScriptException('Accepted value for ideaOverrideBuildType is one of gradle or idea.')
|
||||
}
|
||||
}
|
||||
}
|
||||
runConfigurations {
|
||||
"1. Run Client"(Gradle) {
|
||||
taskNames = ["runClient"]
|
||||
@@ -754,6 +975,20 @@ idea {
|
||||
"2. Run Server"(Gradle) {
|
||||
taskNames = ["runServer"]
|
||||
}
|
||||
"1a. Run Client (Java 17)"(Gradle) {
|
||||
taskNames = ["runClient17"]
|
||||
}
|
||||
"2a. Run Server (Java 17)"(Gradle) {
|
||||
taskNames = ["runServer17"]
|
||||
}
|
||||
"1b. Run Client (Java 17, Hotswap)"(Gradle) {
|
||||
taskNames = ["runClient17"]
|
||||
envs = ["HOTSWAP": "true"]
|
||||
}
|
||||
"2b. Run Server (Java 17, Hotswap)"(Gradle) {
|
||||
taskNames = ["runServer17"]
|
||||
envs = ["HOTSWAP": "true"]
|
||||
}
|
||||
"3. Run Obfuscated Client"(Gradle) {
|
||||
taskNames = ["runObfClient"]
|
||||
}
|
||||
@@ -771,7 +1006,7 @@ idea {
|
||||
}
|
||||
"Run Client (IJ Native)"(Application) {
|
||||
mainClass = "GradleStart"
|
||||
moduleName = project.name + ".main"
|
||||
moduleName = project.name + ".ideVirtualMain"
|
||||
afterEvaluate {
|
||||
workingDirectory = tasks.runClient.workingDir.absolutePath
|
||||
programParameters = tasks.runClient.calculateArgs(project).collect { '"' + it + '"' }.join(' ')
|
||||
@@ -782,7 +1017,7 @@ idea {
|
||||
}
|
||||
"Run Server (IJ Native)"(Application) {
|
||||
mainClass = "GradleStartServer"
|
||||
moduleName = project.name + ".main"
|
||||
moduleName = project.name + ".ideVirtualMain"
|
||||
afterEvaluate {
|
||||
workingDirectory = tasks.runServer.workingDir.absolutePath
|
||||
programParameters = tasks.runServer.calculateArgs(project).collect { '"' + it + '"' }.join(' ')
|
||||
@@ -794,11 +1029,57 @@ idea {
|
||||
}
|
||||
compiler.javac {
|
||||
afterEvaluate {
|
||||
javacAdditionalOptions = "-encoding utf8"
|
||||
moduleJavacAdditionalOptions = [
|
||||
(project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ')
|
||||
]
|
||||
}
|
||||
}
|
||||
withIDEADir { File ideaDir ->
|
||||
if (!ideaDir.path.contains(".idea")) {
|
||||
// If an .ipr file exists, the project root directory is passed here instead of the .idea subdirectory
|
||||
ideaDir = new File(ideaDir, ".idea")
|
||||
}
|
||||
if (ideaDir.isDirectory()) {
|
||||
def miscFile = new File(ideaDir, "misc.xml")
|
||||
if (miscFile.isFile()) {
|
||||
boolean dirty = false
|
||||
def miscTransformer = new XmlTransformer()
|
||||
miscTransformer.addAction { root ->
|
||||
Node rootNode = root.asNode()
|
||||
def rootManager = rootNode
|
||||
.component.find { it.@name == 'ProjectRootManager' }
|
||||
if (!rootManager) {
|
||||
rootManager = rootNode.appendNode('component', ['name': 'ProjectRootManager', 'version': '2'])
|
||||
dirty = true
|
||||
}
|
||||
def output = rootManager.output
|
||||
if (!output) {
|
||||
output = rootManager.appendNode('output')
|
||||
dirty = true
|
||||
}
|
||||
if (!output.@url) {
|
||||
// Only modify the output url if it doesn't yet have one, or if the existing one is blank somehow.
|
||||
// This is a sensible default for most setups
|
||||
output.@url = 'file://$PROJECT_DIR$/build/ideaBuild'
|
||||
dirty = true
|
||||
}
|
||||
}
|
||||
def result = miscTransformer.transform(miscFile.text)
|
||||
if (dirty) {
|
||||
miscFile.write(result)
|
||||
}
|
||||
} else {
|
||||
miscFile.text = """<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2">
|
||||
<output url="file://\$PROJECT_DIR\$/out" />
|
||||
</component>
|
||||
</project>
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -868,7 +1149,7 @@ if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) {
|
||||
}
|
||||
}
|
||||
if (usesMixins.toBoolean()) {
|
||||
addModrinthDep("required", "project", "gtnhmixins")
|
||||
addModrinthDep("required", "project", "unimixins")
|
||||
}
|
||||
tasks.modrinth.dependsOn(build)
|
||||
tasks.publish.dependsOn(tasks.modrinth)
|
||||
@@ -912,7 +1193,7 @@ if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null
|
||||
}
|
||||
}
|
||||
if (usesMixins.toBoolean()) {
|
||||
addCurseForgeRelation("requiredDependency", "gtnhmixins")
|
||||
addCurseForgeRelation("requiredDependency", "unimixins")
|
||||
}
|
||||
tasks.curseforge.dependsOn(build)
|
||||
tasks.publish.dependsOn(tasks.curseforge)
|
||||
@@ -946,10 +1227,21 @@ def addCurseForgeRelation(String type, String name) {
|
||||
}
|
||||
|
||||
// Updating
|
||||
|
||||
def buildscriptGradleVersion = "8.0.2"
|
||||
|
||||
tasks.named('wrapper', Wrapper).configure {
|
||||
gradleVersion = buildscriptGradleVersion
|
||||
}
|
||||
|
||||
tasks.register('updateBuildScript') {
|
||||
group = 'GTNH Buildscript'
|
||||
description = 'Updates the build script to the latest version'
|
||||
|
||||
if (gradle.gradleVersion != buildscriptGradleVersion && !Boolean.getBoolean('DISABLE_BUILDSCRIPT_GRADLE_UPDATE')) {
|
||||
dependsOn('wrapper')
|
||||
}
|
||||
|
||||
doLast {
|
||||
if (performBuildScriptUpdate()) return
|
||||
|
||||
@@ -962,6 +1254,9 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA
|
||||
performBuildScriptUpdate()
|
||||
} else {
|
||||
out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
|
||||
if (gradle.gradleVersion != buildscriptGradleVersion) {
|
||||
out.style(Style.SuccessHeader).println("updateBuildScript can update gradle from ${gradle.gradleVersion} to ${buildscriptGradleVersion}\n")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1102,7 +1397,7 @@ static int replaceParams(File file, Map<String, String> params) {
|
||||
return 0
|
||||
}
|
||||
|
||||
// Dependency Deobfuscation
|
||||
// Dependency Deobfuscation (Deprecated, use the new RFG API documented in dependencies.gradle)
|
||||
|
||||
def deobf(String sourceURL) {
|
||||
try {
|
||||
@@ -1144,11 +1439,7 @@ def deobfMaven(String repoURL, String mavenDep) {
|
||||
}
|
||||
|
||||
def deobfCurse(String curseDep) {
|
||||
try {
|
||||
return deobfMaven("https://www.cursemaven.com/", "curse.maven:$curseDep")
|
||||
} catch (Exception ignored) {
|
||||
out.style(Style.Failure).println("Failed to get $curseDep from cursemaven.")
|
||||
}
|
||||
return dependencies.rfg.deobf("curse.maven:$curseDep")
|
||||
}
|
||||
|
||||
// The method above is to be preferred. Use this method if the filename is not at the end of the URL.
|
||||
@@ -1156,34 +1447,7 @@ def deobf(String sourceURL, String rawFileName) {
|
||||
String bon2Version = "2.5.1"
|
||||
String fileName = URLDecoder.decode(rawFileName, "UTF-8")
|
||||
String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
|
||||
String bon2Dir = "$cacheDir/forge_gradle/deobf"
|
||||
String bon2File = "$bon2Dir/BON2-${bon2Version}.jar"
|
||||
String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar"
|
||||
String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar"
|
||||
|
||||
if (file(deobfFile).exists()) {
|
||||
return files(deobfFile)
|
||||
}
|
||||
|
||||
String mappingsVer
|
||||
String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
|
||||
if (remoteMappings) {
|
||||
String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
|
||||
String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
|
||||
|
||||
zipMappings(mappingsZIP, remoteMappings, bon2Dir)
|
||||
|
||||
mappingsVer = "snapshot_$id"
|
||||
} else {
|
||||
mappingsVer = "${channel}_$mappingsVersion"
|
||||
}
|
||||
|
||||
download.run {
|
||||
src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
|
||||
dest bon2File
|
||||
quiet true
|
||||
overwrite false
|
||||
}
|
||||
|
||||
download.run {
|
||||
src sourceURL
|
||||
@@ -1191,50 +1455,8 @@ def deobf(String sourceURL, String rawFileName) {
|
||||
quiet true
|
||||
overwrite false
|
||||
}
|
||||
|
||||
exec {
|
||||
commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
|
||||
workingDir bon2Dir
|
||||
standardOutput = new FileOutputStream("${deobfFile}.log")
|
||||
}
|
||||
|
||||
return files(deobfFile)
|
||||
return dependencies.rfg.deobf(files(obfFile))
|
||||
}
|
||||
|
||||
def zipMappings(String zipPath, String url, String bon2Dir) {
|
||||
File zipFile = new File(zipPath)
|
||||
if (zipFile.exists()) {
|
||||
return
|
||||
}
|
||||
|
||||
String fieldsCache = "$bon2Dir/data/fields.csv"
|
||||
String methodsCache = "$bon2Dir/data/methods.csv"
|
||||
|
||||
download.run {
|
||||
src "${url}fields.csv"
|
||||
dest fieldsCache
|
||||
quiet true
|
||||
}
|
||||
download.run {
|
||||
src "${url}methods.csv"
|
||||
dest methodsCache
|
||||
quiet true
|
||||
}
|
||||
|
||||
zipFile.getParentFile().mkdirs()
|
||||
ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
|
||||
|
||||
zos.putNextEntry(new ZipEntry("fields.csv"))
|
||||
Files.copy(Paths.get(fieldsCache), zos)
|
||||
zos.closeEntry()
|
||||
|
||||
zos.putNextEntry(new ZipEntry("methods.csv"))
|
||||
Files.copy(Paths.get(methodsCache), zos)
|
||||
zos.closeEntry()
|
||||
|
||||
zos.close()
|
||||
}
|
||||
|
||||
// Helper methods
|
||||
|
||||
def checkPropertyExists(String propertyName) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
|
||||
networkTimeout=10000
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
# shellcheck disable=SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
# shellcheck disable=SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
|
||||
@@ -21,13 +21,8 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||
|
||||
import team.chisel.block.*;
|
||||
import team.chisel.carving.Carving;
|
||||
import team.chisel.client.render.SubmapManagerAntiblock;
|
||||
import team.chisel.client.render.SubmapManagerCarpetFloor;
|
||||
import team.chisel.client.render.SubmapManagerCombinedCTM;
|
||||
import team.chisel.client.render.SubmapManagerFakeController;
|
||||
import team.chisel.client.render.SubmapManagerLeaves;
|
||||
import team.chisel.client.render.SubmapManagerSlab;
|
||||
import team.chisel.client.render.SubmapManagerVoidstone;
|
||||
import team.chisel.client.render.*;
|
||||
import team.chisel.client.render.SubmapManagerSpecialMaterial;
|
||||
import team.chisel.compat.fmp.ItemBlockChiselTorchPart;
|
||||
import team.chisel.config.Configurations;
|
||||
import team.chisel.entity.EntityBallOMoss;
|
||||
@@ -837,6 +832,35 @@ public enum Features {
|
||||
}
|
||||
},
|
||||
|
||||
CUBITS {
|
||||
|
||||
@Override
|
||||
void addBlocks() {
|
||||
BlockCarvable cubit = (BlockCarvable) new BlockCarvable(Material.rock)
|
||||
.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.8F).setResistance(10.0F)
|
||||
.setStepSound(Block.soundTypeStone);
|
||||
|
||||
for (int i = 0; i < 16; i++) {
|
||||
cubit.carverHelper.addVariation("tile.cubit." + i + ".desc", i, "cubit/" + i);
|
||||
}
|
||||
|
||||
cubit.carverHelper.registerAll(cubit, "cubit");
|
||||
}
|
||||
|
||||
@Override
|
||||
void addRecipes() {
|
||||
GameRegistry.addRecipe(
|
||||
new ItemStack(cubit, 8, 0),
|
||||
"***",
|
||||
"*X*",
|
||||
"***",
|
||||
'*',
|
||||
new ItemStack(Blocks.stone, 1),
|
||||
'X',
|
||||
new ItemStack(Blocks.wool, 1, 15));
|
||||
}
|
||||
},
|
||||
|
||||
DIAMOND_BLOCK {
|
||||
|
||||
@Override
|
||||
@@ -1308,6 +1332,44 @@ public enum Features {
|
||||
}
|
||||
},
|
||||
|
||||
GLOTEK {
|
||||
|
||||
@Override
|
||||
void addBlocks() {
|
||||
BlockCarvable glotek = (BlockCarvable) new BlockCarvableGlowie(Material.rock)
|
||||
.setCreativeTab(ChiselTabs.tabOtherChiselBlocks);
|
||||
|
||||
if (!Configurations.allowChiselCrossColors) {
|
||||
glotek.carverHelper.forbidChiseling = true;
|
||||
}
|
||||
|
||||
for (int i = 0; i < 16; i++) {
|
||||
glotek.carverHelper.addVariation(
|
||||
"tile.glotek." + i + ".desc",
|
||||
i,
|
||||
new SubmapManagerSpecialMaterial(
|
||||
String.valueOf(i),
|
||||
SubmapManagerSpecialMaterial.MaterialType.GLOTEK));
|
||||
}
|
||||
|
||||
glotek.carverHelper.registerAll(glotek, "glotek");
|
||||
OreDictionary.registerOre("glotek", glotek);
|
||||
}
|
||||
|
||||
@Override
|
||||
void addRecipes() {
|
||||
GameRegistry.addRecipe(
|
||||
new ItemStack(ChiselBlocks.glotek, 8, 0),
|
||||
"***",
|
||||
"*X*",
|
||||
"***",
|
||||
'*',
|
||||
new ItemStack(neonite, 1),
|
||||
'X',
|
||||
new ItemStack(Items.glowstone_dust, 1));
|
||||
}
|
||||
},
|
||||
|
||||
GLOWSTONE {
|
||||
|
||||
@Override
|
||||
@@ -1530,6 +1592,72 @@ public enum Features {
|
||||
}
|
||||
},
|
||||
|
||||
Hempcrete {
|
||||
|
||||
@Override
|
||||
void addBlocks() {
|
||||
BlockCarvable hempcrete = (BlockCarvable) new BlockCarvable(Material.rock)
|
||||
.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.8F).setResistance(10.0F)
|
||||
.setStepSound(Block.soundTypeStone);
|
||||
|
||||
for (int i = 0; i < 16; i++) hempcrete.carverHelper.addVariation(
|
||||
"tile.hempcrete." + i + ".desc",
|
||||
i,
|
||||
"hempCrete/concrete/" + sGNames[i].replaceAll(" ", "").toLowerCase());
|
||||
hempcrete.carverHelper.registerAll(hempcrete, "hempcrete");
|
||||
}
|
||||
|
||||
@Override
|
||||
void addRecipes() {
|
||||
for (int i = 0; i < 16; i++) {
|
||||
|
||||
GameRegistry.addSmelting(
|
||||
new ItemStack(ChiselBlocks.hempcretesand, 1, i),
|
||||
new ItemStack(ChiselBlocks.hempcrete, 1, i),
|
||||
20F);
|
||||
|
||||
GameRegistry.addSmelting(
|
||||
new ItemStack(ChiselBlocks.hempcretesand, 1, i),
|
||||
new ItemStack(ChiselBlocks.hempcrete, 1, i),
|
||||
0.1F);
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
Hempcrete_Sand {
|
||||
|
||||
@Override
|
||||
void addBlocks() {
|
||||
BlockCarvableSand hempcretesand = (BlockCarvableSand) new BlockCarvableSand()
|
||||
.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.5F).setResistance(0.5F)
|
||||
.setStepSound(Block.soundTypeSand);
|
||||
|
||||
for (int i = 0; i < 16; i++) {
|
||||
hempcretesand.carverHelper.addVariation(
|
||||
"tile.hempcretesand." + i + ".desc",
|
||||
i,
|
||||
"hempCrete/sand/" + sGNames[i].replaceAll(" ", "").toLowerCase());
|
||||
}
|
||||
|
||||
hempcretesand.carverHelper.registerAll(hempcretesand, "hempcretesand");
|
||||
OreDictionary.registerOre("hempcretesand", hempcretesand);
|
||||
}
|
||||
|
||||
@Override
|
||||
void addRecipes() {
|
||||
GameRegistry.addRecipe(
|
||||
new ItemStack(ChiselBlocks.hempcretesand, 8, 0),
|
||||
"***",
|
||||
"*X*",
|
||||
"***",
|
||||
'*',
|
||||
new ItemStack(Blocks.sand, 1),
|
||||
'X',
|
||||
new ItemStack(Blocks.tallgrass, 1, 2));
|
||||
}
|
||||
},
|
||||
|
||||
ICE {
|
||||
|
||||
@Override
|
||||
@@ -2334,6 +2462,45 @@ public enum Features {
|
||||
}
|
||||
},
|
||||
|
||||
NEONITE {
|
||||
|
||||
@Override
|
||||
void addBlocks() {
|
||||
BlockCarvable neonite = (BlockCarvable) new BlockCarvableGlowie(Material.rock)
|
||||
.setCreativeTab(ChiselTabs.tabOtherChiselBlocks);
|
||||
|
||||
if (!Configurations.allowChiselCrossColors) {
|
||||
neonite.carverHelper.forbidChiseling = true;
|
||||
}
|
||||
|
||||
for (int i = 0; i < 16; i++) {
|
||||
neonite.carverHelper.addVariation(
|
||||
"tile.neonite." + i + ".desc",
|
||||
i,
|
||||
new SubmapManagerSpecialMaterial(
|
||||
String.valueOf(i),
|
||||
SubmapManagerSpecialMaterial.MaterialType.NEONITE));
|
||||
|
||||
}
|
||||
|
||||
neonite.carverHelper.registerAll(neonite, "neonite");
|
||||
OreDictionary.registerOre("neonite", neonite);
|
||||
}
|
||||
|
||||
@Override
|
||||
void addRecipes() {
|
||||
GameRegistry.addRecipe(
|
||||
new ItemStack(neonite, 8, 0),
|
||||
"***",
|
||||
"*X*",
|
||||
"***",
|
||||
'*',
|
||||
new ItemStack(Items.emerald, 1),
|
||||
'X',
|
||||
new ItemStack(Items.glowstone_dust, 1));
|
||||
}
|
||||
},
|
||||
|
||||
NETHER_BRICK {
|
||||
|
||||
@Override
|
||||
@@ -2408,6 +2575,50 @@ public enum Features {
|
||||
}
|
||||
},
|
||||
|
||||
NUCRETE {
|
||||
|
||||
@Override
|
||||
void addBlocks() {
|
||||
BlockCarvable nucrete = (BlockCarvable) new BlockCarvable(Material.rock)
|
||||
.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F)
|
||||
.setStepSound(Block.soundTypeStone);
|
||||
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.0.desc", 0, "nucrete/darkbreezeblock");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.1.desc", 1, "nucrete/darkpanel");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.2.desc", 2, "nucrete/darkpanel2");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.3.desc", 3, "nucrete/darksmooth");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.4.desc", 4, "nucrete/darkstamped");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.5.desc", 5, "nucrete/darkstrip");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.6.desc", 6, "nucrete/darkstripes");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.7.desc", 7, "nucrete/darktiles");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.8.desc", 8, "nucrete/lightbreezeblocks");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.9.desc", 9, "nucrete/lightpanel");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.10.desc", 10, "nucrete/lightpanel2");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.11.desc", 11, "nucrete/lightsmooth");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.12.desc", 12, "nucrete/lightstamped");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.13.desc", 13, "nucrete/lightstrip");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.14.desc", 14, "nucrete/lightstripe");
|
||||
nucrete.carverHelper.addVariation("tile.nucrete.15.desc", 15, "nucrete/lighttiles");
|
||||
nucrete.carverHelper.registerAll(nucrete, "nucrete");
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
void addRecipes() {
|
||||
GameRegistry.addRecipe(
|
||||
new ItemStack(nucrete, 8, 0),
|
||||
"XYX",
|
||||
"*X*",
|
||||
"XYX",
|
||||
'*',
|
||||
new ItemStack(Blocks.sand, 1),
|
||||
'X',
|
||||
new ItemStack(Blocks.gravel, 1),
|
||||
'Y',
|
||||
new ItemStack(Items.clay_ball, 1));
|
||||
}
|
||||
},
|
||||
|
||||
OBSIDIAN {
|
||||
|
||||
@Override
|
||||
@@ -2436,6 +2647,7 @@ public enum Features {
|
||||
obsidian.carverHelper.registerAll(obsidian, "obsidian");
|
||||
Carving.chisel.registerOre("obsidian", "obsidian");
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
PACKEDICE {
|
||||
@@ -2873,6 +3085,7 @@ public enum Features {
|
||||
road_line.carverHelper.addVariation("tile.roadLine.1.desc", 1, "line-marking/double-white-center");
|
||||
road_line.carverHelper.addVariation("tile.roadLine.2.desc", 2, "line-marking/yellow-center");
|
||||
road_line.carverHelper.addVariation("tile.roadLine.3.desc", 3, "line-marking/double-yellow-center");
|
||||
road_line.carverHelper.addVariation("tile.roadLine.4.desc", 4, "line-marking/warning-center");
|
||||
road_line.carverHelper.registerAll(road_line, "road_line");
|
||||
Carving.chisel.registerOre("road_line", "roadLine");
|
||||
}
|
||||
@@ -3148,6 +3361,34 @@ public enum Features {
|
||||
// 0, 0);
|
||||
}
|
||||
},
|
||||
SVELSTONE {
|
||||
|
||||
@Override
|
||||
void addBlocks() {
|
||||
BlockCarvable svelstone = (BlockCarvable) new BlockCarvable(Material.rock)
|
||||
.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F)
|
||||
.setStepSound(Block.soundTypeStone);
|
||||
|
||||
for (int i = 0; i < 16; i++) {
|
||||
svelstone.carverHelper.addVariation("tile.sveltstone." + i + ".desc", i, "sveltstone/" + i);
|
||||
}
|
||||
|
||||
svelstone.carverHelper.registerAll(svelstone, "sveltstone");
|
||||
}
|
||||
|
||||
@Override
|
||||
void addRecipes() {
|
||||
GameRegistry.addRecipe(
|
||||
new ItemStack(sveltstone, 8, 0),
|
||||
"***",
|
||||
"*X*",
|
||||
"***",
|
||||
'*',
|
||||
new ItemStack(Blocks.stone, 1),
|
||||
'X',
|
||||
new ItemStack(ChiselBlocks.andesite, 1));
|
||||
}
|
||||
},
|
||||
|
||||
TALLOW("Thaumcraft") {
|
||||
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
package team.chisel.block;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EnumCreatureType;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
public class BlockCarvableGlowie extends BlockCarvable {
|
||||
|
||||
public BlockCarvableGlowie(Material material) {
|
||||
super(material);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -16,9 +16,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockRoadLine extends BlockCarvable {
|
||||
|
||||
public IIcon aloneIcon[] = new IIcon[4];
|
||||
public IIcon halfLineIcon[] = new IIcon[4];
|
||||
public IIcon fullLineIcon[] = new IIcon[4];
|
||||
public IIcon aloneIcon[] = new IIcon[5];
|
||||
public IIcon halfLineIcon[] = new IIcon[5];
|
||||
public IIcon fullLineIcon[] = new IIcon[5];
|
||||
|
||||
public BlockRoadLine() {
|
||||
super(Material.circuits);
|
||||
@@ -71,8 +71,8 @@ public class BlockRoadLine extends BlockCarvable {
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockIcons(IIconRegister reg) {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
String[] texNames = { "white", "yellow", "double-white", "double-yellow" };
|
||||
for (int i = 0; i < 5; i++) {
|
||||
String[] texNames = { "white", "yellow", "double-white", "double-yellow", "warning" };
|
||||
aloneIcon[i] = reg.registerIcon("Chisel:line-marking/" + texNames[i] + "-center");
|
||||
halfLineIcon[i] = reg.registerIcon("Chisel:line-marking/" + texNames[i] + "-side");
|
||||
fullLineIcon[i] = reg.registerIcon("Chisel:line-marking/" + texNames[i] + "-long");
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
package team.chisel.client.render;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import team.chisel.ctmlib.RenderBlocksCTM;
|
||||
import team.chisel.ctmlib.TextureSubmap;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class SubmapManagerSpecialMaterial extends SubmapManagerBase {
|
||||
|
||||
public enum MaterialType {
|
||||
NEONITE,
|
||||
GLOTEK
|
||||
}
|
||||
|
||||
private static class RenderBlocksCTMFullbright extends RenderBlocksCTM {
|
||||
|
||||
@Override
|
||||
protected void fillLightmap(int bottomLeft, int bottomRight, int topRight, int topLeft) {
|
||||
enableAmbientOcclusionIfInWorld();
|
||||
int maxLight = 0xF000F0;
|
||||
super.fillLightmap(maxLight, maxLight, maxLight, maxLight);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void fillColormap(float bottomLeft, float bottomRight, float topRight, float topLeft, float[][] map) {
|
||||
enableAmbientOcclusionIfInWorld();
|
||||
int color = 0xFFFFFF;
|
||||
super.fillColormap(color, color, color, color, map);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean renderStandardBlock(Block block, int x, int y, int z) {
|
||||
boolean ret = super.renderStandardBlock(block, x, y, z);
|
||||
this.enableAO = false;
|
||||
return ret;
|
||||
}
|
||||
|
||||
private void enableAmbientOcclusionIfInWorld() {
|
||||
if (this.inWorld) {
|
||||
this.enableAO = true;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
private static RenderBlocksCTMFullbright renderBlocksFullbright;
|
||||
|
||||
private String color;
|
||||
private MaterialType materialType;
|
||||
private TextureSubmap submap, submapSmall;
|
||||
|
||||
public SubmapManagerSpecialMaterial(String color, MaterialType materialType) {
|
||||
this.color = color;
|
||||
this.materialType = materialType;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(int side, int meta) {
|
||||
return submapSmall.getBaseIcon();
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(String modName, Block block, IIconRegister register) {
|
||||
String materialName = materialType.name().toLowerCase();
|
||||
submap = new TextureSubmap(register.registerIcon(modName + ":" + materialName + "/" + color + "-ctm"), 4, 4);
|
||||
submapSmall = new TextureSubmap(register.registerIcon(modName + ":" + materialName + "/" + color), 2, 2);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
|
||||
if (renderBlocksFullbright == null) {
|
||||
renderBlocksFullbright = new RenderBlocksCTMFullbright();
|
||||
}
|
||||
renderBlocksFullbright.setRenderBoundsFromBlock(block);
|
||||
renderBlocksFullbright.submap = submap;
|
||||
renderBlocksFullbright.submapSmall = submapSmall;
|
||||
return renderBlocksFullbright;
|
||||
}
|
||||
}
|
||||
@@ -104,6 +104,15 @@ public final class ChiselBlocks {
|
||||
// Holidays
|
||||
public static final BlockCarvable valentines = null;
|
||||
public static final BlockPresent present = null;
|
||||
public static BlockCarvableSand hempcretesand = null;
|
||||
public static final BlockCarvable nucrete = null;
|
||||
public static final BlockCarvable neonite = null;
|
||||
public static final BlockCarvable glotek = null;
|
||||
|
||||
public static final BlockCarvable hempcrete = null;
|
||||
|
||||
public static final BlockCarvable sveltstone = null;
|
||||
public static final BlockCarvable cubit = null;
|
||||
|
||||
// Arrays can't be final because of how @ObjectHolder works
|
||||
public static BlockCarvableStairs[] marbleStairs = new BlockCarvableStairs[8];
|
||||
|
||||
@@ -780,6 +780,7 @@ tile.roadLine.0.desc=White
|
||||
tile.roadLine.1.desc=Yellow
|
||||
tile.roadLine.2.desc=Double White
|
||||
tile.roadLine.3.desc=Double Yellow
|
||||
tile.roadLine.4.desc=Hazard Tape
|
||||
|
||||
# Iron Blocks
|
||||
tile.chisel.iron_block.name=Iron Block
|
||||
|
||||
@@ -776,12 +776,13 @@ tile.concrete.8.desc=Partly Weathered Concrete
|
||||
tile.concrete.9.desc=Partly Weathered Concrete Block
|
||||
tile.concrete.10.desc=Asphalt
|
||||
|
||||
#Road Line
|
||||
# Road Line
|
||||
tile.chisel.road_line.name=Road Lines
|
||||
tile.roadLine.0.desc=White
|
||||
tile.roadLine.1.desc=Yellow
|
||||
tile.roadLine.2.desc=Double White
|
||||
tile.roadLine.3.desc=Double Yellow
|
||||
tile.roadLine.4.desc=Hazard Tape
|
||||
|
||||
#Iron Blocks
|
||||
tile.chisel.iron_block.name=Iron Block
|
||||
@@ -1744,3 +1745,136 @@ container.chisel.mode.single=Single
|
||||
container.chisel.mode.panel=Panel
|
||||
container.chisel.mode.column=Column
|
||||
container.chisel.mode.row=Row
|
||||
|
||||
#cubits
|
||||
tile.chisel.cubit.name=Cubits
|
||||
tile.cubit.0.desc=Cubit(0)
|
||||
tile.cubit.1.desc=Cubit(1)
|
||||
tile.cubit.2.desc=Cubit(2)
|
||||
tile.cubit.3.desc=Cubit(3)
|
||||
tile.cubit.4.desc=Cubit(4)
|
||||
tile.cubit.5.desc=Cubit(5)
|
||||
tile.cubit.6.desc=Cubit(6)
|
||||
tile.cubit.7.desc=Cubit(7)
|
||||
tile.cubit.8.desc=Cubit(8)
|
||||
tile.cubit.9.desc=Cubit(9)
|
||||
tile.cubit.10.desc=Cubit(10)
|
||||
tile.cubit.11.desc=Cubit(11)
|
||||
tile.cubit.12.desc=Cubit(12)
|
||||
tile.cubit.13.desc=Cubit(13)
|
||||
tile.cubit.14.desc=Cubit(14)
|
||||
tile.cubit.15.desc=Cubit(15)
|
||||
|
||||
#Hempcrete
|
||||
tile.chisel.hempcrete.name=Hempcrete
|
||||
tile.hempcrete.0.desc=White
|
||||
tile.hempcrete.1.desc=Orange
|
||||
tile.hempcrete.2.desc=Magenta
|
||||
tile.hempcrete.3.desc=Light Blue
|
||||
tile.hempcrete.4.desc=Yellow
|
||||
tile.hempcrete.5.desc=Light Green
|
||||
tile.hempcrete.6.desc=Pink
|
||||
tile.hempcrete.7.desc=Gray
|
||||
tile.hempcrete.8.desc=Light Gray
|
||||
tile.hempcrete.9.desc=Cyan
|
||||
tile.hempcrete.10.desc=Purple
|
||||
tile.hempcrete.11.desc=Blue
|
||||
tile.hempcrete.12.desc=Brown
|
||||
tile.hempcrete.13.desc=Green
|
||||
tile.hempcrete.14.desc=Red
|
||||
tile.hempcrete.15.desc=Black
|
||||
|
||||
#hempcreteSand
|
||||
tile.chisel.hempcretesand.name=Hempcrete powder
|
||||
tile.hempcretesand.0.desc=White
|
||||
tile.hempcretesand.1.desc=Orange
|
||||
tile.hempcretesand.2.desc=Magenta
|
||||
tile.hempcretesand.3.desc=Light Blue
|
||||
tile.hempcretesand.4.desc=Yellow
|
||||
tile.hempcretesand.5.desc=Light Green
|
||||
tile.hempcretesand.6.desc=Pink
|
||||
tile.hempcretesand.7.desc=Gray
|
||||
tile.hempcretesand.8.desc=Light Gray
|
||||
tile.hempcretesand.9.desc=Cyan
|
||||
tile.hempcretesand.10.desc=Purple
|
||||
tile.hempcretesand.11.desc=Blue
|
||||
tile.hempcretesand.12.desc=Brown
|
||||
tile.hempcretesand.13.desc=Green
|
||||
tile.hempcretesand.14.desc=Red
|
||||
tile.hempcretesand.15.desc=Black
|
||||
|
||||
#Sveltsone
|
||||
tile.chisel.sveltstone.name=Svelstone block
|
||||
tile.sveltstone.0.desc=Silver Sand
|
||||
tile.sveltstone.1.desc=Sand Dune
|
||||
tile.sveltstone.2.desc=Fuscous Grey
|
||||
tile.sveltstone.3.desc=Flint
|
||||
tile.sveltstone.4.desc=Taupe
|
||||
tile.sveltstone.5.desc=Tobacco Brown
|
||||
tile.sveltstone.6.desc=Boulder
|
||||
tile.sveltstone.7.desc=Olive Haze
|
||||
tile.sveltstone.8.desc=Pale Oister
|
||||
tile.sveltstone.9.desc=Hemlock
|
||||
tile.sveltstone.10.desc=Rifle Green
|
||||
tile.sveltstone.11.desc=Everglade
|
||||
tile.sveltstone.12.desc=Baltic Sea
|
||||
tile.sveltstone.13.desc=Outer Space
|
||||
tile.sveltstone.14.desc=Gunmetal
|
||||
tile.sveltstone.15.desc=Matterhorn
|
||||
|
||||
#NUCRETE
|
||||
tile.chisel.nucrete.name=Structural Concrete
|
||||
tile.nucrete.0.desc=Dark Concrete Breezeblocks
|
||||
tile.nucrete.1.desc=Dark Concrete Panel
|
||||
tile.nucrete.2.desc=Dark Concrete Panel 2
|
||||
tile.nucrete.3.desc=Dark Smooth Concrete
|
||||
tile.nucrete.4.desc=Dark Concrete Tiles
|
||||
tile.nucrete.5.desc=Dark Concrete Strip
|
||||
tile.nucrete.6.desc=Dark Concrete Caution Tape
|
||||
tile.nucrete.7.desc=Dark Concrete Tiles
|
||||
tile.nucrete.8.desc=Light Concrete Breezeblocks
|
||||
tile.nucrete.9.desc=Light Concrete Panel
|
||||
tile.nucrete.10.desc=Light Concrete Panel 2
|
||||
tile.nucrete.11.desc=Light Smooth Concrete
|
||||
tile.nucrete.12.desc=Light Concrete Tiles
|
||||
tile.nucrete.13.desc=Light Concrete Strip
|
||||
tile.nucrete.14.desc=Light Concrete Caution Tape
|
||||
tile.nucrete.15.desc=Light Concrete Tiles
|
||||
|
||||
#Neonite
|
||||
tile.chisel.neonite.name=Neonite
|
||||
tile.neonite.0.desc=Atomic Tangerine
|
||||
tile.neonite.1.desc=Saffron Mango
|
||||
tile.neonite.2.desc=Golden Glow
|
||||
tile.neonite.3.desc=Oasis
|
||||
tile.neonite.4.desc=Pixie Green
|
||||
tile.neonite.5.desc=Fresh Green
|
||||
tile.neonite.6.desc=Jungle Green
|
||||
tile.neonite.7.desc=Mariner
|
||||
tile.neonite.8.desc=Congress Blue
|
||||
tile.neonite.9.desc=Deep Saphire
|
||||
tile.neonite.10.desc=Deep Cove
|
||||
tile.neonite.11.desc=Meteorite
|
||||
tile.neonite.12.desc=Eminence
|
||||
tile.neonite.13.desc=Warm Purple
|
||||
tile.neonite.14.desc=Raspberry Pink
|
||||
tile.neonite.15.desc=Watermelon Pink
|
||||
|
||||
#Glotek
|
||||
tile.chisel.glotek.name=GloTek
|
||||
tile.glotek.0.desc=Ceramic
|
||||
tile.glotek.1.desc=Sandwisp
|
||||
tile.glotek.2.desc=Easter Green
|
||||
tile.glotek.3.desc=Dragon Green
|
||||
tile.glotek.4.desc=Tealish Green
|
||||
tile.glotek.5.desc=Green Haze
|
||||
tile.glotek.6.desc=Petrol
|
||||
tile.glotek.7.desc=Catalina Blue
|
||||
tile.glotek.8.desc=Blue Gem
|
||||
tile.glotek.9.desc=Royal Purple
|
||||
tile.glotek.10.desc=Dark Magenta
|
||||
tile.glotek.11.desc=Dogwood Rose
|
||||
tile.glotek.12.desc=Cranberry
|
||||
tile.glotek.13.desc=Brink Pink
|
||||
tile.glotek.14.desc=Dark Salmon
|
||||
tile.glotek.15.desc=Harvest Gold
|
||||
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 640 B |
|
After Width: | Height: | Size: 206 B |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 479 B |
|
After Width: | Height: | Size: 207 B |
|
After Width: | Height: | Size: 485 B |
|
After Width: | Height: | Size: 213 B |
|
After Width: | Height: | Size: 495 B |
|
After Width: | Height: | Size: 213 B |
|
After Width: | Height: | Size: 499 B |
|
After Width: | Height: | Size: 210 B |
|
After Width: | Height: | Size: 488 B |
|
After Width: | Height: | Size: 212 B |
|
After Width: | Height: | Size: 488 B |
|
After Width: | Height: | Size: 212 B |
|
After Width: | Height: | Size: 488 B |
|
After Width: | Height: | Size: 213 B |
|
After Width: | Height: | Size: 491 B |
|
After Width: | Height: | Size: 213 B |
|
After Width: | Height: | Size: 487 B |
|
After Width: | Height: | Size: 212 B |
|
After Width: | Height: | Size: 490 B |
|
After Width: | Height: | Size: 213 B |
|
After Width: | Height: | Size: 490 B |
|
After Width: | Height: | Size: 208 B |
|
After Width: | Height: | Size: 494 B |
|
After Width: | Height: | Size: 210 B |
|
After Width: | Height: | Size: 500 B |
|
After Width: | Height: | Size: 212 B |
|
After Width: | Height: | Size: 493 B |
|
After Width: | Height: | Size: 203 B |
|
After Width: | Height: | Size: 498 B |
|
After Width: | Height: | Size: 207 B |
|
After Width: | Height: | Size: 500 B |
|
After Width: | Height: | Size: 213 B |
|
After Width: | Height: | Size: 254 B |
|
After Width: | Height: | Size: 262 B |
|
After Width: | Height: | Size: 245 B |
|
After Width: | Height: | Size: 203 B |
|
After Width: | Height: | Size: 240 B |
|
After Width: | Height: | Size: 254 B |
|
After Width: | Height: | Size: 258 B |
|
After Width: | Height: | Size: 263 B |
|
After Width: | Height: | Size: 260 B |
|
After Width: | Height: | Size: 261 B |
|
After Width: | Height: | Size: 269 B |
|
After Width: | Height: | Size: 264 B |
|
After Width: | Height: | Size: 262 B |
|
After Width: | Height: | Size: 227 B |
|
After Width: | Height: | Size: 174 B |
|
After Width: | Height: | Size: 261 B |
|
After Width: | Height: | Size: 398 B |
|
After Width: | Height: | Size: 415 B |
|
After Width: | Height: | Size: 421 B |
|
After Width: | Height: | Size: 417 B |
|
After Width: | Height: | Size: 399 B |
|
After Width: | Height: | Size: 409 B |
|
After Width: | Height: | Size: 403 B |
|
After Width: | Height: | Size: 421 B |
|
After Width: | Height: | Size: 412 B |
|
After Width: | Height: | Size: 416 B |
|
After Width: | Height: | Size: 355 B |
|
After Width: | Height: | Size: 409 B |
|
After Width: | Height: | Size: 416 B |
|
After Width: | Height: | Size: 414 B |
|
After Width: | Height: | Size: 367 B |
|
After Width: | Height: | Size: 380 B |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.3 KiB |
|
After Width: | Height: | Size: 162 B |