Compare commits
51 Commits
1.19-hotfi
...
1.19.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2bec37ce0a | ||
|
|
5fce26a796 | ||
|
|
28d47a0cbb | ||
|
|
00cb48b929 | ||
|
|
0d6613c3ba | ||
|
|
1607aa35ce | ||
|
|
b75cfc45d8 | ||
|
|
4537dd409d | ||
|
|
268d6e7a6b | ||
|
|
ca44da71e7 | ||
|
|
8570bde282 | ||
|
|
5fb2edb97a | ||
|
|
0a9b764d3f | ||
|
|
82ee3eefaa | ||
|
|
f033c261d7 | ||
|
|
0dad523e13 | ||
|
|
9c9e4d04b7 | ||
|
|
8288e5db97 | ||
|
|
9e680fc2dc | ||
|
|
33033666b9 | ||
|
|
594b5e1c0d | ||
|
|
410d154276 | ||
|
|
6046b9f5fa | ||
|
|
a7dd0823e1 | ||
|
|
df1efef63b | ||
|
|
23b8c0c9fc | ||
|
|
bda0908731 | ||
|
|
589059fd44 | ||
|
|
07667efe98 | ||
|
|
d4cb0c6858 | ||
|
|
953a3fe923 | ||
|
|
420b06d414 | ||
|
|
c46ae91e99 | ||
|
|
2a84c7ca41 | ||
|
|
98ebc61bb8 | ||
|
|
ed2609f97e | ||
|
|
a760565b66 | ||
|
|
4ea34fc854 | ||
|
|
af4ef73375 | ||
|
|
ae75e48c01 | ||
|
|
ef687c0658 | ||
|
|
617fc82114 | ||
|
|
349c673553 | ||
|
|
91834f9b60 | ||
|
|
cce5e2e28d | ||
|
|
fe69a81622 | ||
|
|
5f27eedde2 | ||
|
|
cd3afbbb82 | ||
|
|
fa1aadcd86 | ||
|
|
c2d413fad0 | ||
|
|
064973b07b |
229
build.gradle
229
build.gradle
@@ -1,77 +1,69 @@
|
|||||||
plugins {
|
buildscript {
|
||||||
id 'eclipse'
|
repositories {
|
||||||
id 'maven-publish'
|
maven { url = 'https://maven.minecraftforge.net' }
|
||||||
id 'net.minecraftforge.gradle' version '5.1.+'
|
mavenCentral()
|
||||||
|
maven { url = 'https://repo.spongepowered.org/repository/maven-public' }
|
||||||
|
maven { url = 'https://maven.parchmentmc.org' }
|
||||||
|
}
|
||||||
|
dependencies {
|
||||||
|
classpath "net.minecraftforge.gradle:ForgeGradle:${forgegradle_version}"
|
||||||
|
classpath "org.spongepowered:mixingradle:${mixingradle_version}"
|
||||||
|
classpath "org.parchmentmc:librarian:${librarian_version}"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
version = '1.19-2.38'
|
plugins {
|
||||||
group = 'nl.requios.effortlessbuilding'
|
id 'com.matthewprenger.cursegradle' version "${cursegradle_version}"
|
||||||
archivesBaseName = 'effortlessbuilding'
|
}
|
||||||
|
apply plugin: 'net.minecraftforge.gradle'
|
||||||
|
apply plugin: 'org.parchmentmc.librarian.forgegradle'
|
||||||
|
apply plugin: 'eclipse'
|
||||||
|
apply plugin: 'maven-publish'
|
||||||
|
apply plugin: 'org.spongepowered.mixin'
|
||||||
|
|
||||||
|
jarJar.enable()
|
||||||
|
|
||||||
|
boolean flywheelInWorkspace = findProject(':Flywheel') != null
|
||||||
|
|
||||||
|
ext.buildNumber = System.getenv('BUILD_NUMBER')
|
||||||
|
|
||||||
|
version = mod_version
|
||||||
|
group = 'nl.requios.effortlessbuilding'
|
||||||
|
base {
|
||||||
|
archivesName = "effortlessbuilding-${artifact_minecraft_version}"
|
||||||
|
}
|
||||||
|
|
||||||
// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
|
|
||||||
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
|
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
|
||||||
|
|
||||||
println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
|
println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + ' (' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
|
||||||
minecraft {
|
|
||||||
// The mappings can be changed at any time, and must be in the following format.
|
minecraft {
|
||||||
// snapshot_YYYYMMDD Snapshot are built nightly.
|
mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}"
|
||||||
// stable_# Stables are built at the discretion of the MCP team.
|
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
|
||||||
// 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 channel: 'official', version: '1.19.2'
|
|
||||||
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
|
|
||||||
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
|
|
||||||
|
|
||||||
// Default run configurations.
|
|
||||||
// These can be tweaked, removed, or duplicated as needed.
|
|
||||||
runs {
|
runs {
|
||||||
client {
|
client {
|
||||||
workingDirectory project.file('run')
|
workingDirectory project.file('run')
|
||||||
|
arg '-mixin.config=flywheel.mixins.json'
|
||||||
|
//jvmArgs '-XX:+UnlockCommercialFeatures' // uncomment for profiling
|
||||||
|
property 'forge.logging.console.level', 'info'
|
||||||
|
|
||||||
// Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP)
|
|
||||||
property 'forge.logging.markers', 'REGISTRIES'
|
|
||||||
|
|
||||||
// Recommended logging level for the console
|
|
||||||
property 'forge.logging.console.level', 'debug'
|
|
||||||
|
|
||||||
// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
|
|
||||||
property 'forge.enabledGameTestNamespaces', 'effortlessbuilding'
|
|
||||||
|
|
||||||
mods {
|
mods {
|
||||||
effortlessbuilding {
|
effortlessbuilding {
|
||||||
source sourceSets.main
|
source sourceSets.main
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (flywheelInWorkspace) {
|
||||||
|
flywheel {
|
||||||
|
source project(":Flywheel").sourceSets.main
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
workingDirectory project.file('run')
|
workingDirectory project.file('run/server')
|
||||||
|
property 'forge.logging.console.level', 'info'
|
||||||
property 'forge.logging.markers', 'REGISTRIES'
|
|
||||||
|
|
||||||
property 'forge.logging.console.level', 'debug'
|
|
||||||
|
|
||||||
property 'forge.enabledGameTestNamespaces', 'effortlessbuilding'
|
|
||||||
|
|
||||||
mods {
|
|
||||||
effortlessbuilding {
|
|
||||||
source sourceSets.main
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// This run config launches GameTestServer and runs all registered gametests, then exits.
|
|
||||||
// By default, the server will crash when no gametests are provided.
|
|
||||||
// The gametest system is also enabled by default for other run configs under the /test command.
|
|
||||||
gameTestServer {
|
|
||||||
workingDirectory project.file('run')
|
|
||||||
|
|
||||||
property 'forge.logging.markers', 'REGISTRIES'
|
|
||||||
|
|
||||||
property 'forge.logging.console.level', 'debug'
|
|
||||||
|
|
||||||
property 'forge.enabledGameTestNamespaces', 'effortlessbuilding'
|
|
||||||
|
|
||||||
mods {
|
mods {
|
||||||
effortlessbuilding {
|
effortlessbuilding {
|
||||||
source sourceSets.main
|
source sourceSets.main
|
||||||
@@ -80,63 +72,90 @@ minecraft {
|
|||||||
}
|
}
|
||||||
|
|
||||||
data {
|
data {
|
||||||
workingDirectory project.file('run')
|
workingDirectory project.file('run')
|
||||||
|
property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
|
||||||
property 'forge.logging.markers', 'REGISTRIES'
|
|
||||||
|
|
||||||
property 'forge.logging.console.level', 'debug'
|
property 'forge.logging.console.level', 'debug'
|
||||||
|
args '--mod', 'effortlessbuilding', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources')
|
||||||
// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
|
|
||||||
args '--mod', 'effortlessbuilding', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
|
|
||||||
|
|
||||||
mods {
|
mods {
|
||||||
effortlessbuilding {
|
effortlessbuilding {
|
||||||
source sourceSets.main
|
source sourceSets.main
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (flywheelInWorkspace) {
|
||||||
|
flywheel {
|
||||||
|
source project(":Flywheel").sourceSets.main
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Include resources generated by data generators.
|
|
||||||
sourceSets.main.resources { srcDir 'src/generated/resources' }
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
// Put repositories for dependencies here
|
maven {
|
||||||
// ForgeGradle automatically adds the Forge maven and Maven Central for you
|
// location of the maven for Registrate and Flywheel
|
||||||
|
name = 'tterrag maven'
|
||||||
|
url = 'https://maven.tterrag.com'
|
||||||
|
}
|
||||||
|
|
||||||
// If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
|
maven {
|
||||||
// flatDir {
|
url = 'https://www.cursemaven.com'
|
||||||
// dir 'libs'
|
content {
|
||||||
// }
|
includeGroup "curse.maven"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
name = "Modrinth"
|
||||||
|
url = "https://api.modrinth.com/maven"
|
||||||
|
content {
|
||||||
|
includeGroup "maven.modrinth"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mavenLocal()
|
||||||
|
flatDir {
|
||||||
|
dirs 'libs'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
|
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
|
||||||
// that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
|
|
||||||
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
|
|
||||||
minecraft 'net.minecraftforge:forge:1.19.2-43.1.47'
|
|
||||||
|
|
||||||
// Real mod deobf dependency examples - these get remapped to your current mappings
|
jarJar("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}") {
|
||||||
// compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
|
jarJar.ranged(it, '[0.6.9,0.7)')
|
||||||
// runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
|
}
|
||||||
// implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
|
|
||||||
|
|
||||||
// Examples using mod jars from ./libs
|
if (flywheelInWorkspace) {
|
||||||
// implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
|
implementation project(':Flywheel')
|
||||||
|
} else {
|
||||||
|
implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}")
|
||||||
|
}
|
||||||
|
|
||||||
// For more info...
|
// Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings
|
||||||
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
|
// This allows 'Settings > Build, Execution, and Deployment > Build Tools > Gradle > Build and run using' set to IntelliJ to work correctly
|
||||||
// http://www.gradle.org/docs/current/userguide/dependency_management.html
|
if (!Boolean.getBoolean('idea.sync.active')) {
|
||||||
|
annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sourceSets.main.resources {
|
||||||
|
srcDir 'src/generated/resources'
|
||||||
|
exclude '.cache/'
|
||||||
|
}
|
||||||
|
tasks.withType(JavaCompile).configureEach {
|
||||||
|
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
||||||
|
}
|
||||||
|
|
||||||
|
compileJava {
|
||||||
|
options.compilerArgs = ['-Xdiags:verbose']
|
||||||
}
|
}
|
||||||
|
|
||||||
// Example for how to get properties into the manifest for reading by the runtime..
|
|
||||||
jar {
|
jar {
|
||||||
manifest {
|
manifest {
|
||||||
attributes([
|
attributes([
|
||||||
"Specification-Title": "effortlessbuilding",
|
"Specification-Title": "effortlessbuilding",
|
||||||
"Specification-Vendor": "requios",
|
"Specification-Vendor": "requios",
|
||||||
"Specification-Version": "1", // We are version 1 of ourselves
|
"Specification-Version": "1",
|
||||||
"Implementation-Title": project.name,
|
"Implementation-Title": project.name,
|
||||||
"Implementation-Version": project.jar.archiveVersion,
|
"Implementation-Version": project.jar.archiveVersion,
|
||||||
"Implementation-Vendor" :"requios",
|
"Implementation-Vendor" :"requios",
|
||||||
@@ -145,25 +164,39 @@ jar {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Example configuration to allow publishing using the maven-publish plugin
|
task jarJarRelease {
|
||||||
// This is the preferred method to reobfuscate your jar file
|
group = 'jarjar'
|
||||||
|
doLast {
|
||||||
|
tasks.jarJar {
|
||||||
|
classifier = ''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finalizedBy tasks.jarJar
|
||||||
|
}
|
||||||
|
|
||||||
|
java {
|
||||||
|
withSourcesJar()
|
||||||
|
withJavadocJar()
|
||||||
|
}
|
||||||
|
|
||||||
jar.finalizedBy('reobfJar')
|
jar.finalizedBy('reobfJar')
|
||||||
// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
|
tasks.jarJar.finalizedBy('reobfJarJar')
|
||||||
// publish.dependsOn('reobfJar')
|
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
publications {
|
publications {
|
||||||
mavenJava(MavenPublication) {
|
mavenJava(MavenPublication) {
|
||||||
artifact jar
|
artifactId = base.archivesName.get()
|
||||||
|
|
||||||
|
from components.java
|
||||||
|
fg.component(it)
|
||||||
|
jarJar.component(it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
if (project.hasProperty('mavendir')) {
|
||||||
url "file://${project.projectDir}/mcmodsrepo"
|
maven { url mavendir }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,4 +1,20 @@
|
|||||||
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
|
# 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.
|
# This is required to provide enough memory for the Minecraft decompilation process.
|
||||||
org.gradle.jvmargs=-Xmx3G
|
org.gradle.jvmargs=-Xmx3G
|
||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
|
|
||||||
|
mod_version = 3.7
|
||||||
|
artifact_minecraft_version = 1.19.4
|
||||||
|
|
||||||
|
minecraft_version = 1.19.4
|
||||||
|
forge_version = 45.2.6
|
||||||
|
|
||||||
|
forgegradle_version = 6.0.7
|
||||||
|
mixingradle_version = 0.7-SNAPSHOT
|
||||||
|
mixin_version = 0.8.5
|
||||||
|
librarian_version = 1.+
|
||||||
|
cursegradle_version = 1.4.0
|
||||||
|
parchment_version = 2023.06.26
|
||||||
|
|
||||||
|
flywheel_minecraft_version = 1.19.3
|
||||||
|
flywheel_version = 0.6.9-2
|
||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
28
gradlew
vendored
28
gradlew
vendored
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright <EFBFBD> 2015-2021 the original authors.
|
# Copyright © 2015-2021 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -32,10 +32,10 @@
|
|||||||
# Busybox and similar reduced shells will NOT work, because this script
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
# requires all of these POSIX shell features:
|
# requires all of these POSIX shell features:
|
||||||
# * functions;
|
# * functions;
|
||||||
# * expansions <EFBFBD>$var<EFBFBD>, <EFBFBD>${var}<EFBFBD>, <EFBFBD>${var:-default}<EFBFBD>, <EFBFBD>${var+SET}<EFBFBD>,
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
# <EFBFBD>${var#prefix}<EFBFBD>, <EFBFBD>${var%suffix}<EFBFBD>, and <EFBFBD>$( cmd )<EFBFBD>;
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
# * compound commands having a testable exit status, especially <EFBFBD>case<EFBFBD>;
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
# * various built-in commands including <EFBFBD>command<EFBFBD>, <EFBFBD>set<EFBFBD>, and <EFBFBD>ulimit<EFBFBD>.
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
#
|
#
|
||||||
# Important for patching:
|
# Important for patching:
|
||||||
#
|
#
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -80,10 +80,10 @@ do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# This is normally unused
|
||||||
|
# shellcheck disable=SC2034
|
||||||
APP_NAME="Gradle"
|
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
@@ -143,12 +143,16 @@ fi
|
|||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC3045
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC3045
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
@@ -205,6 +209,12 @@ set -- \
|
|||||||
org.gradle.wrapper.GradleWrapperMain \
|
org.gradle.wrapper.GradleWrapperMain \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
|
# Stop when "xargs" is not available.
|
||||||
|
if ! command -v xargs >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "xargs is not available"
|
||||||
|
fi
|
||||||
|
|
||||||
# Use "xargs" to parse quoted args.
|
# Use "xargs" to parse quoted args.
|
||||||
#
|
#
|
||||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
|||||||
15
gradlew.bat
vendored
15
gradlew.bat
vendored
@@ -14,7 +14,7 @@
|
|||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%" == "" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@rem
|
@rem
|
||||||
@rem Gradle startup script for Windows
|
@rem Gradle startup script for Windows
|
||||||
@@ -25,7 +25,8 @@
|
|||||||
if "%OS%"=="Windows_NT" setlocal
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%" == "" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
|
@rem This is normally unused
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if "%ERRORLEVEL%" == "0" goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
|
|
||||||
:fail
|
:fail
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
rem the _cmd.exe /c_ return code!
|
rem the _cmd.exe /c_ return code!
|
||||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
exit /b 1
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
|
exit /b %EXIT_CODE%
|
||||||
|
|
||||||
:mainEnd
|
:mainEnd
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|||||||
@@ -3,4 +3,8 @@ pluginManagement {
|
|||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
maven { url = 'https://maven.minecraftforge.net/' }
|
maven { url = 'https://maven.minecraftforge.net/' }
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
plugins {
|
||||||
|
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
package nl.requios.effortlessbuilding;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraft.client.gui.GuiComponent;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Color;
|
||||||
|
|
||||||
|
public enum AllGuiTextures implements ScreenElement {
|
||||||
|
ARRAY_ENTRY("modifiers", 226, 64),
|
||||||
|
MIRROR_ENTRY("modifiers", 0, 64, 226, 64),
|
||||||
|
RADIAL_MIRROR_ENTRY("modifiers", 0, 128, 226, 64),
|
||||||
|
ENABLE_BUTTON_BACKGROUND("modifiers", 234, 0, 9, 9),
|
||||||
|
CHECKMARK("modifiers", 243, 0, 10, 9),
|
||||||
|
ARROW_UP("modifiers", 234, 9, 9, 9),
|
||||||
|
ARROW_DOWN("modifiers", 243, 9, 9, 9),
|
||||||
|
TRASH("modifiers", 234, 18, 9, 9),
|
||||||
|
;
|
||||||
|
public final ResourceLocation location;
|
||||||
|
public int width, height;
|
||||||
|
public int startX, startY;
|
||||||
|
private AllGuiTextures(String location, int width, int height) {
|
||||||
|
this(location, 0, 0, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
private AllGuiTextures(int startX, int startY) {
|
||||||
|
this("icons", startX * 16, startY * 16, 16, 16);
|
||||||
|
}
|
||||||
|
|
||||||
|
private AllGuiTextures(String location, int startX, int startY, int width, int height) {
|
||||||
|
this(EffortlessBuilding.MODID, location, startX, startY, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
private AllGuiTextures(String namespace, String location, int startX, int startY, int width, int height) {
|
||||||
|
this.location = new ResourceLocation(namespace, "textures/gui/" + location + ".png");
|
||||||
|
this.width = width;
|
||||||
|
this.height = height;
|
||||||
|
this.startX = startX;
|
||||||
|
this.startY = startY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public void bind() {
|
||||||
|
RenderSystem.setShaderTexture(0, location);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
@Override
|
||||||
|
public void render(PoseStack poseStack, int x, int y) {
|
||||||
|
bind();
|
||||||
|
GuiComponent.blit(poseStack, x, y, 0, startX, startY, width, height, 256, 256);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public void render(PoseStack poseStack, int x, int y, GuiComponent component) {
|
||||||
|
bind();
|
||||||
|
component.blit(poseStack, x, y, 0, startX, startY, width, height, 256, 256);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public void render(PoseStack poseStack, int x, int y, Color c, GuiComponent component) {
|
||||||
|
bind();
|
||||||
|
UIRenderHelper.drawColoredTexture(poseStack, c, x, y, startX, startY, width, height);
|
||||||
|
}
|
||||||
|
}
|
||||||
151
src/main/java/nl/requios/effortlessbuilding/AllIcons.java
Normal file
151
src/main/java/nl/requios/effortlessbuilding/AllIcons.java
Normal file
@@ -0,0 +1,151 @@
|
|||||||
|
package nl.requios.effortlessbuilding;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||||
|
import net.minecraft.client.gui.GuiComponent;
|
||||||
|
import net.minecraft.client.renderer.LightTexture;
|
||||||
|
import net.minecraft.client.renderer.MultiBufferSource;
|
||||||
|
import net.minecraft.client.renderer.RenderType;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
import nl.requios.effortlessbuilding.create.Create;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Color;
|
||||||
|
import org.joml.Matrix4f;
|
||||||
|
|
||||||
|
public class AllIcons implements ScreenElement {
|
||||||
|
|
||||||
|
public static final ResourceLocation ICON_ATLAS = Create.asResource("textures/gui/icons.png");
|
||||||
|
public static final int ICON_ATLAS_SIZE = 256;
|
||||||
|
private static int x = 0, y = -1;
|
||||||
|
private int iconX;
|
||||||
|
private int iconY;
|
||||||
|
|
||||||
|
public static final AllIcons
|
||||||
|
I_SETTINGS = newRow(),
|
||||||
|
I_UNDO = next(),
|
||||||
|
I_REDO = next(),
|
||||||
|
I_REPLACE = next(),
|
||||||
|
I_REPLACE_AIR = next(),
|
||||||
|
I_REPLACE_BLOCKS_AND_AIR = next(),
|
||||||
|
I_REPLACE_BLOCKS = next(),
|
||||||
|
I_REPLACE_OFFHAND_FILTERED = next(),
|
||||||
|
I_PROTECT_TILE_ENTITIES = next();
|
||||||
|
|
||||||
|
|
||||||
|
public static final AllIcons
|
||||||
|
I_DISABLE = newRow(),
|
||||||
|
I_SINGLE = next(),
|
||||||
|
I_LINE = next(),
|
||||||
|
I_WALL = next(),
|
||||||
|
I_FLOOR = next(),
|
||||||
|
I_CUBE = next(),
|
||||||
|
I_DIAGONAL_LINE = next(),
|
||||||
|
I_DIAGONAL_WALL = next(),
|
||||||
|
I_SLOPED_FLOOR = next(),
|
||||||
|
I_CIRCLE = next(),
|
||||||
|
I_CYLINDER = next(),
|
||||||
|
I_SPHERE = next(),
|
||||||
|
I_PYRAMID = next(),
|
||||||
|
I_CONE = next(),
|
||||||
|
I_DOME = next();
|
||||||
|
|
||||||
|
public static final AllIcons
|
||||||
|
I_NORMAL_SPEED = newRow(),
|
||||||
|
I_FAST_SPEED = next(),
|
||||||
|
I_FILLED = next(),
|
||||||
|
I_HOLLOW = next(),
|
||||||
|
I_CUBE_FILLED = next(),
|
||||||
|
I_CUBE_HOLLOW = next(),
|
||||||
|
I_CUBE_SKELETON = next(),
|
||||||
|
I_SHORT_EDGE = next(),
|
||||||
|
I_LONG_EDGE = next(),
|
||||||
|
I_CIRCLE_START_CORNER = next(),
|
||||||
|
I_CIRCLE_START_CENTER = next(),
|
||||||
|
I_THICKNESS_1 = next(),
|
||||||
|
I_THICKNESS_3 = next(),
|
||||||
|
I_THICKNESS_5 = next();
|
||||||
|
|
||||||
|
public static final AllIcons
|
||||||
|
I_PLAYER = newRow(),
|
||||||
|
I_BLOCK_CENTER = next(),
|
||||||
|
I_BLOCK_CORNER = next(),
|
||||||
|
I_HIDE_LINES = next(),
|
||||||
|
I_SHOW_LINES = next(),
|
||||||
|
I_HIDE_AREAS = next(),
|
||||||
|
I_SHOW_AREAS = next(),
|
||||||
|
I_X_OFF = next(),
|
||||||
|
I_X_ON = next(),
|
||||||
|
I_Y_OFF = next(),
|
||||||
|
I_Y_ON = next(),
|
||||||
|
I_Z_OFF = next(),
|
||||||
|
I_Z_ON = next(),
|
||||||
|
I_ALTERNATE_OFF = next(),
|
||||||
|
I_ALTERNATE_ON = next();
|
||||||
|
|
||||||
|
|
||||||
|
public AllIcons(int x, int y) {
|
||||||
|
iconX = x * 16;
|
||||||
|
iconY = y * 16;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static AllIcons next() {
|
||||||
|
return new AllIcons(++x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static AllIcons newRow() {
|
||||||
|
return new AllIcons(x = 0, ++y);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void bind() {
|
||||||
|
RenderSystem.setShaderTexture(0, ICON_ATLAS);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
@Override
|
||||||
|
public void render(PoseStack ms, int x, int y) {
|
||||||
|
bind();
|
||||||
|
GuiComponent.blit(ms, x, y, 0, iconX, iconY, 16, 16, 256, 256);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public void render(PoseStack ms, MultiBufferSource buffer, int color) {
|
||||||
|
VertexConsumer builder = buffer.getBuffer(RenderType.textSeeThrough(ICON_ATLAS));
|
||||||
|
Matrix4f matrix = ms.last().pose();
|
||||||
|
Color rgb = new Color(color);
|
||||||
|
int light = LightTexture.FULL_BRIGHT;
|
||||||
|
|
||||||
|
Vec3 vec1 = new Vec3(0, 0, 0);
|
||||||
|
Vec3 vec2 = new Vec3(0, 1, 0);
|
||||||
|
Vec3 vec3 = new Vec3(1, 1, 0);
|
||||||
|
Vec3 vec4 = new Vec3(1, 0, 0);
|
||||||
|
|
||||||
|
float u1 = iconX * 1f / ICON_ATLAS_SIZE;
|
||||||
|
float u2 = (iconX + 16) * 1f / ICON_ATLAS_SIZE;
|
||||||
|
float v1 = iconY * 1f / ICON_ATLAS_SIZE;
|
||||||
|
float v2 = (iconY + 16) * 1f / ICON_ATLAS_SIZE;
|
||||||
|
|
||||||
|
vertex(builder, matrix, vec1, rgb, u1, v1, light);
|
||||||
|
vertex(builder, matrix, vec2, rgb, u1, v2, light);
|
||||||
|
vertex(builder, matrix, vec3, rgb, u2, v2, light);
|
||||||
|
vertex(builder, matrix, vec4, rgb, u2, v1, light);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
private void vertex(VertexConsumer builder, Matrix4f matrix, Vec3 vec, Color rgb, float u, float v, int light) {
|
||||||
|
builder.vertex(matrix, (float) vec.x, (float) vec.y, (float) vec.z)
|
||||||
|
.color(rgb.getRed(), rgb.getGreen(), rgb.getBlue(), 255)
|
||||||
|
.uv(u, v)
|
||||||
|
.uv2(light)
|
||||||
|
.endVertex();
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public DelegatedStencilElement asStencil() {
|
||||||
|
return new DelegatedStencilElement().withStencilRenderer((ms, w, h, alpha) -> this.render(ms, 0, 0)).withBounds(16, 16);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding;
|
|
||||||
|
|
||||||
import net.minecraftforge.common.ForgeConfigSpec;
|
|
||||||
|
|
||||||
public class BuildConfig {
|
|
||||||
|
|
||||||
private static final ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder();
|
|
||||||
public static final Reach reach = new Reach(builder);
|
|
||||||
public static final SurvivalBalancers survivalBalancers = new SurvivalBalancers(builder);
|
|
||||||
public static final Visuals visuals = new Visuals(builder);
|
|
||||||
public static final ForgeConfigSpec spec = builder.build();
|
|
||||||
|
|
||||||
public static class Reach {
|
|
||||||
public final ForgeConfigSpec.ConfigValue<Boolean> enableReachUpgrades;
|
|
||||||
public final ForgeConfigSpec.ConfigValue<Integer> maxReachCreative;
|
|
||||||
public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel0;
|
|
||||||
public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel1;
|
|
||||||
public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel2;
|
|
||||||
public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel3;
|
|
||||||
|
|
||||||
public Reach(ForgeConfigSpec.Builder builder) {
|
|
||||||
builder.push("Reach");
|
|
||||||
enableReachUpgrades = builder
|
|
||||||
.comment("Reach: how far away the player can place blocks using mirror/array etc.",
|
|
||||||
"Enable the crafting of reach upgrades to increase reach.",
|
|
||||||
"If disabled, reach is set to level 3 for survival players.")
|
|
||||||
.define("enableReachUpgrades", true);
|
|
||||||
|
|
||||||
maxReachCreative = builder
|
|
||||||
.comment("Maximum reach in creative",
|
|
||||||
"Keep in mind that chunks need to be loaded to be able to place blocks inside.")
|
|
||||||
.define("maxReachCreative", 200);
|
|
||||||
|
|
||||||
maxReachLevel0 = builder
|
|
||||||
.comment("Maximum reach in survival without upgrades",
|
|
||||||
"Reach upgrades are craftable consumables that permanently increase reach.",
|
|
||||||
"Set to 0 to disable Effortless Building until the player has consumed a reach upgrade.")
|
|
||||||
.define("maxReachLevel0", 20);
|
|
||||||
|
|
||||||
maxReachLevel1 = builder
|
|
||||||
.comment("Maximum reach in survival with one upgrade")
|
|
||||||
.define("maxReachLevel1", 50);
|
|
||||||
|
|
||||||
maxReachLevel2 = builder
|
|
||||||
.comment("Maximum reach in survival with two upgrades")
|
|
||||||
.define("maxReachLevel2", 100);
|
|
||||||
|
|
||||||
maxReachLevel3 = builder
|
|
||||||
.comment("Maximum reach in survival with three upgrades")
|
|
||||||
.define("maxReachLevel3", 200);
|
|
||||||
|
|
||||||
builder.pop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class SurvivalBalancers {
|
|
||||||
public final ForgeConfigSpec.ConfigValue<Integer> quickReplaceMiningLevel;
|
|
||||||
public final ForgeConfigSpec.ConfigValue<Integer> undoStackSize;
|
|
||||||
|
|
||||||
public SurvivalBalancers(ForgeConfigSpec.Builder builder) {
|
|
||||||
builder.push("SurvivalBalancers");
|
|
||||||
|
|
||||||
quickReplaceMiningLevel = builder
|
|
||||||
.comment("Determines what blocks can be replaced in survival.",
|
|
||||||
"-1: only blocks that can be harvested by hand (default)",
|
|
||||||
"0: blocks that can be harvested with wooden or gold tools",
|
|
||||||
"1: blocks that can be harvested with stone tools",
|
|
||||||
"2: blocks that can be harvested with iron tools",
|
|
||||||
"3: blocks that can be harvested with diamond tools",
|
|
||||||
"4: blocks that can be harvested with netherite tools")
|
|
||||||
.defineInRange("quickReplaceMiningLevel", -1, -1, 3);
|
|
||||||
|
|
||||||
undoStackSize = builder
|
|
||||||
.comment("How many placements are remembered for the undo functionality.")
|
|
||||||
.worldRestart()
|
|
||||||
.define("undoStackSize", 10);
|
|
||||||
|
|
||||||
builder.pop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class Visuals {
|
|
||||||
public final ForgeConfigSpec.ConfigValue<Boolean> alwaysShowBlockPreview;
|
|
||||||
public final ForgeConfigSpec.ConfigValue<Double> dissolveTimeMultiplier;
|
|
||||||
public final ForgeConfigSpec.ConfigValue<Integer> shaderThreshold;
|
|
||||||
public final ForgeConfigSpec.ConfigValue<Boolean> useShaders;
|
|
||||||
|
|
||||||
public Visuals(ForgeConfigSpec.Builder builder) {
|
|
||||||
builder.push("Visuals");
|
|
||||||
|
|
||||||
alwaysShowBlockPreview = builder
|
|
||||||
.comment("Show a block preview if you have a block in hand even in the 'Normal' build mode")
|
|
||||||
.define("alwaysShowBlockPreview", false);
|
|
||||||
|
|
||||||
dissolveTimeMultiplier = builder
|
|
||||||
.comment("How long the dissolve effect takes when placing blocks.",
|
|
||||||
"Default between 30 and 60 ticks, you can multiply that here.",
|
|
||||||
"Recommended values:",
|
|
||||||
"Snappy: 0.7",
|
|
||||||
"Relaxing: 1.5")
|
|
||||||
.define("dissolveTimeMultiplier", 1.0);
|
|
||||||
|
|
||||||
shaderThreshold = builder
|
|
||||||
.comment("Switch to using the simple performance shader when placing more than this many blocks.")
|
|
||||||
.define("shaderTreshold", 1500);
|
|
||||||
|
|
||||||
useShaders = builder
|
|
||||||
.comment("Use fancy shaders while placing blocks")
|
|
||||||
.define("useShaders", true);
|
|
||||||
|
|
||||||
builder.pop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package nl.requios.effortlessbuilding;
|
||||||
|
|
||||||
|
import net.minecraftforge.common.ForgeConfigSpec;
|
||||||
|
|
||||||
|
import static net.minecraftforge.common.ForgeConfigSpec.*;
|
||||||
|
|
||||||
|
public class ClientConfig {
|
||||||
|
|
||||||
|
private static final Builder builder = new Builder();
|
||||||
|
public static final Visuals visuals = new Visuals(builder);
|
||||||
|
public static final ForgeConfigSpec spec = builder.build();
|
||||||
|
|
||||||
|
public static class Visuals {
|
||||||
|
public final BooleanValue showBlockPreviews;
|
||||||
|
public final BooleanValue onlyShowBlockPreviewsWhenBuilding;
|
||||||
|
public final IntValue maxBlockPreviews;
|
||||||
|
public final IntValue appearAnimationLength;
|
||||||
|
public final IntValue breakAnimationLength;
|
||||||
|
|
||||||
|
public Visuals(Builder builder) {
|
||||||
|
builder.push("Visuals");
|
||||||
|
|
||||||
|
showBlockPreviews = builder
|
||||||
|
.comment("Show previews of the blocks while placing them")
|
||||||
|
.define("showBlockPreviews", true);
|
||||||
|
|
||||||
|
onlyShowBlockPreviewsWhenBuilding = builder
|
||||||
|
.comment("Show block previews only when actively using a build mode")
|
||||||
|
.define("onlyShowBlockPreviewsWhenBuilding", true);
|
||||||
|
|
||||||
|
maxBlockPreviews = builder
|
||||||
|
.comment("Don't show block previews when placing more than this many blocks. " +
|
||||||
|
"The outline will always be rendered.")
|
||||||
|
.defineInRange("maxBlockPreviews", 400, 0, 5000);
|
||||||
|
|
||||||
|
appearAnimationLength = builder
|
||||||
|
.comment("How long it takes for a block to appear when placed in ticks.",
|
||||||
|
"Set to 0 to disable animation.")
|
||||||
|
.defineInRange("appearAnimationLength", 5, 0, 100);
|
||||||
|
|
||||||
|
breakAnimationLength = builder
|
||||||
|
.comment("How long the break animation is in ticks.",
|
||||||
|
"Set to 0 to disable animation.")
|
||||||
|
.defineInRange("breakAnimationLength", 10, 0, 100);
|
||||||
|
|
||||||
|
builder.pop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
207
src/main/java/nl/requios/effortlessbuilding/ClientEvents.java
Normal file
207
src/main/java/nl/requios/effortlessbuilding/ClientEvents.java
Normal file
@@ -0,0 +1,207 @@
|
|||||||
|
package nl.requios.effortlessbuilding;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.InputConstants;
|
||||||
|
import net.minecraft.client.KeyMapping;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.gui.screens.Screen;
|
||||||
|
import net.minecraft.client.player.LocalPlayer;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.client.event.InputEvent;
|
||||||
|
import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
|
||||||
|
import net.minecraftforge.client.event.ScreenEvent;
|
||||||
|
import net.minecraftforge.client.settings.KeyConflictContext;
|
||||||
|
import net.minecraftforge.client.settings.KeyModifier;
|
||||||
|
import net.minecraftforge.event.TickEvent;
|
||||||
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
|
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
|
||||||
|
import nl.requios.effortlessbuilding.buildmode.BuildModeEnum;
|
||||||
|
import nl.requios.effortlessbuilding.buildmode.ModeOptions;
|
||||||
|
import nl.requios.effortlessbuilding.gui.buildmode.PlayerSettingsGui;
|
||||||
|
import nl.requios.effortlessbuilding.gui.buildmode.RadialMenu;
|
||||||
|
import nl.requios.effortlessbuilding.gui.buildmodifier.ModifiersScreen;
|
||||||
|
import org.lwjgl.glfw.GLFW;
|
||||||
|
|
||||||
|
@EventBusSubscriber(Dist.CLIENT)
|
||||||
|
public class ClientEvents {
|
||||||
|
|
||||||
|
public static KeyMapping[] keyBindings;
|
||||||
|
public static int ticksInGame = 0;
|
||||||
|
private static int placeCooldown = 0;
|
||||||
|
private static int breakCooldown = 0;
|
||||||
|
|
||||||
|
//Mod Bus Events
|
||||||
|
@EventBusSubscriber(value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD)
|
||||||
|
public static class ModBusEvents {
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void registerKeyMappings(RegisterKeyMappingsEvent event) {
|
||||||
|
|
||||||
|
keyBindings = new KeyMapping[6];
|
||||||
|
|
||||||
|
keyBindings[0] = new KeyMapping("key.effortlessbuilding.mode.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_ALT, 0), "key.effortlessbuilding.category");
|
||||||
|
keyBindings[1] = new KeyMapping("key.effortlessbuilding.hud.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_KP_ADD, 0), "key.effortlessbuilding.category");
|
||||||
|
keyBindings[2] = new KeyMapping("key.effortlessbuilding.undo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Z, 0), "key.effortlessbuilding.category");
|
||||||
|
keyBindings[3] = new KeyMapping("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Y, 0), "key.effortlessbuilding.category");
|
||||||
|
keyBindings[4] = new KeyMapping("key.effortlessbuilding.previous_build_mode.desc", KeyConflictContext.IN_GAME, InputConstants.UNKNOWN, "key.effortlessbuilding.category");
|
||||||
|
keyBindings[5] = new KeyMapping("key.effortlessbuilding.disable_build_mode_toggle.desc", KeyConflictContext.IN_GAME, InputConstants.UNKNOWN, "key.effortlessbuilding.category");
|
||||||
|
|
||||||
|
for (KeyMapping keyBinding : keyBindings) {
|
||||||
|
event.register(keyBinding);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// @SubscribeEvent
|
||||||
|
// public static void registerShaders(RegisterShadersEvent event) throws IOException {
|
||||||
|
// event.registerShader(new ShaderInstance(event.getResourceManager(),
|
||||||
|
// new ResourceLocation(EffortlessBuilding.MODID, "dissolve"),
|
||||||
|
// DefaultVertexFormat.BLOCK),
|
||||||
|
// shaderInstance -> BuildRenderTypes.dissolveShaderInstance = shaderInstance);
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onClientTick(TickEvent.ClientTickEvent event) {
|
||||||
|
if (!isGameActive()) return;
|
||||||
|
|
||||||
|
if (event.phase == TickEvent.Phase.START) {
|
||||||
|
|
||||||
|
EffortlessBuildingClient.BUILDER_CHAIN.onTick();
|
||||||
|
|
||||||
|
onMouseInput();
|
||||||
|
|
||||||
|
EffortlessBuildingClient.BLOCK_PREVIEWS.onTick();
|
||||||
|
|
||||||
|
} else if (event.phase == TickEvent.Phase.END) {
|
||||||
|
Screen gui = Minecraft.getInstance().screen;
|
||||||
|
if (gui == null || !gui.isPauseScreen()) {
|
||||||
|
ticksInGame++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void onMouseInput() {
|
||||||
|
Minecraft mc = Minecraft.getInstance();
|
||||||
|
LocalPlayer player = mc.player;
|
||||||
|
if (player == null) return;
|
||||||
|
BuildModeEnum buildMode = EffortlessBuildingClient.BUILD_MODES.getBuildMode();
|
||||||
|
|
||||||
|
if (mc.screen != null ||
|
||||||
|
RadialMenu.instance.isVisible()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mc.options.keyUse.isDown()) {
|
||||||
|
|
||||||
|
if (placeCooldown <= 0) {
|
||||||
|
placeCooldown = 4;
|
||||||
|
|
||||||
|
EffortlessBuildingClient.BUILDER_CHAIN.onRightClick();
|
||||||
|
|
||||||
|
} else if (buildMode == BuildModeEnum.SINGLE) {
|
||||||
|
placeCooldown--;
|
||||||
|
if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) placeCooldown = 0;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
placeCooldown = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mc.options.keyAttack.isDown()) {
|
||||||
|
|
||||||
|
//Break block in distance in creative (or survival if enabled in config)
|
||||||
|
if (breakCooldown <= 0) {
|
||||||
|
breakCooldown = 4;
|
||||||
|
|
||||||
|
EffortlessBuildingClient.BUILDER_CHAIN.onLeftClick();
|
||||||
|
|
||||||
|
} else if (buildMode == BuildModeEnum.SINGLE) {
|
||||||
|
breakCooldown--;
|
||||||
|
if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) breakCooldown = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
breakCooldown = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent(receiveCanceled = true)
|
||||||
|
public static void onKeyPress(InputEvent.Key event) {
|
||||||
|
LocalPlayer player = Minecraft.getInstance().player;
|
||||||
|
if (player == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
//Radial menu
|
||||||
|
if (keyBindings[0].isDown()) {
|
||||||
|
if (!EffortlessBuildingClient.POWER_LEVEL.isDisabled(player)) {
|
||||||
|
if (!RadialMenu.instance.isVisible()) {
|
||||||
|
Minecraft.getInstance().setScreen(RadialMenu.instance);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
EffortlessBuilding.log(player, "Build modes are disabled until your reach has increased. Increase your reach with craftable reach upgrades.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Show Modifier Settings GUI
|
||||||
|
if (keyBindings[1].consumeClick()) {
|
||||||
|
openModifierSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
//Undo (Ctrl+Z)
|
||||||
|
if (keyBindings[2].consumeClick()) {
|
||||||
|
ModeOptions.performAction(player, ModeOptions.ActionEnum.UNDO);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Redo (Ctrl+Y)
|
||||||
|
if (keyBindings[3].consumeClick()) {
|
||||||
|
ModeOptions.performAction(player, ModeOptions.ActionEnum.REDO);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Previous build mode
|
||||||
|
if (keyBindings[4].consumeClick()) {
|
||||||
|
ModeOptions.performAction(player, ModeOptions.ActionEnum.PREVIOUS_BUILD_MODE);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Disable build mode toggle
|
||||||
|
if (keyBindings[5].consumeClick()) {
|
||||||
|
ModeOptions.performAction(player, ModeOptions.ActionEnum.DISABLE_BUILD_MODE_TOGGLE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void openModifierSettings() {
|
||||||
|
Minecraft mc = Minecraft.getInstance();
|
||||||
|
LocalPlayer player = mc.player;
|
||||||
|
if (player == null) return;
|
||||||
|
|
||||||
|
//Disabled if max reach is 0, might be set in the config that way.
|
||||||
|
if (EffortlessBuildingClient.POWER_LEVEL.isDisabled(player)) {
|
||||||
|
EffortlessBuilding.log(player, "Build modifiers are disabled until your power level has increased. Increase your power level by consuming certain items.");
|
||||||
|
} else {
|
||||||
|
mc.setScreen(new ModifiersScreen());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void openPlayerSettings() {
|
||||||
|
Minecraft mc = Minecraft.getInstance();
|
||||||
|
mc.setScreen(new PlayerSettingsGui());
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onGuiOpen(ScreenEvent event) {
|
||||||
|
Player player = Minecraft.getInstance().player;
|
||||||
|
if (player != null) {
|
||||||
|
EffortlessBuildingClient.BUILDER_CHAIN.cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isKeybindDown(int keybindIndex) {
|
||||||
|
return InputConstants.isKeyDown(
|
||||||
|
Minecraft.getInstance().getWindow().getWindow(),
|
||||||
|
keyBindings[keybindIndex].getKey().getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isGameActive() {
|
||||||
|
return !(Minecraft.getInstance().level == null || Minecraft.getInstance().player == null);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
145
src/main/java/nl/requios/effortlessbuilding/CommonConfig.java
Normal file
145
src/main/java/nl/requios/effortlessbuilding/CommonConfig.java
Normal file
@@ -0,0 +1,145 @@
|
|||||||
|
package nl.requios.effortlessbuilding;
|
||||||
|
|
||||||
|
import net.minecraftforge.common.ForgeConfigSpec;
|
||||||
|
|
||||||
|
import static net.minecraftforge.common.ForgeConfigSpec.*;
|
||||||
|
|
||||||
|
public class CommonConfig {
|
||||||
|
|
||||||
|
private static final Builder builder = new Builder();
|
||||||
|
public static final Reach reach = new Reach(builder);
|
||||||
|
public static final MaxBlocksPlacedAtOnce maxBlocksPlacedAtOnce = new MaxBlocksPlacedAtOnce(builder);
|
||||||
|
public static final MaxBlocksPerAxis maxBlocksPerAxis = new MaxBlocksPerAxis(builder);
|
||||||
|
public static final MaxMirrorRadius maxMirrorRadius = new MaxMirrorRadius(builder);
|
||||||
|
public static final ForgeConfigSpec spec = builder.build();
|
||||||
|
|
||||||
|
public static class Reach {
|
||||||
|
public final IntValue creative;
|
||||||
|
public final IntValue level0;
|
||||||
|
public final IntValue level1;
|
||||||
|
public final IntValue level2;
|
||||||
|
public final IntValue level3;
|
||||||
|
|
||||||
|
public Reach(Builder builder) {
|
||||||
|
builder.push("Reach");
|
||||||
|
|
||||||
|
creative = builder
|
||||||
|
.comment("How far away the player can place and break blocks.")
|
||||||
|
.defineInRange("reachCreative", 200, 0, 1000);
|
||||||
|
|
||||||
|
level0 = builder
|
||||||
|
.comment("Maximum reach in survival without upgrades",
|
||||||
|
"Consume Power Level upgrades to permanently increase this.")
|
||||||
|
.defineInRange("reachLevel0", 0, 0, 1000);
|
||||||
|
|
||||||
|
level1 = builder
|
||||||
|
.defineInRange("reachLevel1", 8, 0, 1000);
|
||||||
|
|
||||||
|
level2 = builder
|
||||||
|
.defineInRange("reachLevel2", 16, 0, 1000);
|
||||||
|
|
||||||
|
level3 = builder
|
||||||
|
.defineInRange("reachLevel3", 32, 0, 1000);
|
||||||
|
|
||||||
|
builder.pop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class MaxBlocksPlacedAtOnce {
|
||||||
|
public final IntValue creative;
|
||||||
|
public final IntValue level0;
|
||||||
|
public final IntValue level1;
|
||||||
|
public final IntValue level2;
|
||||||
|
public final IntValue level3;
|
||||||
|
|
||||||
|
public MaxBlocksPlacedAtOnce(Builder builder) {
|
||||||
|
builder.push("MaxBlocksPlacedAtOnce");
|
||||||
|
|
||||||
|
creative = builder
|
||||||
|
.comment("How many blocks can be placed in one click.")
|
||||||
|
.defineInRange("maxBlocksPlacedAtOnceCreative", 10000, 0, 100000);
|
||||||
|
|
||||||
|
level0 = builder
|
||||||
|
.comment("In survival without upgrades",
|
||||||
|
"Consume Power Level upgrades to permanently increase this.",
|
||||||
|
"Set to 0 to disable Effortless Building until the player has increased their Building Power Level.")
|
||||||
|
.defineInRange("maxBlocksPlacedAtOnceLevel0", 128, 0, 100000);
|
||||||
|
|
||||||
|
level1 = builder
|
||||||
|
.defineInRange("maxBlocksPlacedAtOnceLevel1", 192, 0, 100000);
|
||||||
|
|
||||||
|
level2 = builder
|
||||||
|
.defineInRange("maxBlocksPlacedAtOnceLevel2", 320, 0, 100000);
|
||||||
|
|
||||||
|
level3 = builder
|
||||||
|
.defineInRange("maxBlocksPlacedAtOnceLevel3", 640, 0, 100000);
|
||||||
|
|
||||||
|
builder.pop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class MaxBlocksPerAxis {
|
||||||
|
public final IntValue creative;
|
||||||
|
public final IntValue level0;
|
||||||
|
public final IntValue level1;
|
||||||
|
public final IntValue level2;
|
||||||
|
public final IntValue level3;
|
||||||
|
|
||||||
|
public MaxBlocksPerAxis(Builder builder) {
|
||||||
|
builder.push("MaxBlocksPerAxis");
|
||||||
|
|
||||||
|
creative = builder
|
||||||
|
.comment("How many blocks can be placed at once per axis when using build modes (e.g. walls).",
|
||||||
|
"Also affects the array modifier.")
|
||||||
|
.defineInRange("maxBlocksPerAxisCreative", 1000, 0, 1000);
|
||||||
|
|
||||||
|
level0 = builder
|
||||||
|
.comment("In survival without upgrades",
|
||||||
|
"Consume Power Level upgrades to permanently increase this.")
|
||||||
|
.defineInRange("maxBlocksPerAxisLevel0", 8, 0, 1000);
|
||||||
|
|
||||||
|
level1 = builder
|
||||||
|
.defineInRange("maxBlocksPerAxisLevel1", 12, 0, 1000);
|
||||||
|
|
||||||
|
level2 = builder
|
||||||
|
.defineInRange("maxBlocksPerAxisLevel2", 16, 0, 1000);
|
||||||
|
|
||||||
|
level3 = builder
|
||||||
|
.defineInRange("maxBlocksPerAxisLevel3", 20, 0, 1000);
|
||||||
|
|
||||||
|
builder.pop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class MaxMirrorRadius {
|
||||||
|
public final IntValue creative;
|
||||||
|
public final IntValue level0;
|
||||||
|
public final IntValue level1;
|
||||||
|
public final IntValue level2;
|
||||||
|
public final IntValue level3;
|
||||||
|
|
||||||
|
public MaxMirrorRadius(Builder builder) {
|
||||||
|
builder.push("MaxMirrorRadius");
|
||||||
|
|
||||||
|
creative = builder
|
||||||
|
.comment("The maximum (radial) mirror radius.")
|
||||||
|
.defineInRange("maxMirrorRadiusCreative", 200, 0, 1000);
|
||||||
|
|
||||||
|
level0 = builder
|
||||||
|
.comment("Maximum reach in survival without upgrades",
|
||||||
|
"Consume Power Level upgrades upgrades to permanently increase this.")
|
||||||
|
.defineInRange("maxMirrorRadiusLevel0", 16, 0, 1000);
|
||||||
|
|
||||||
|
level1 = builder
|
||||||
|
.defineInRange("maxMirrorRadiusLevel1", 32, 0, 1000);
|
||||||
|
|
||||||
|
level2 = builder
|
||||||
|
.defineInRange("maxMirrorRadiusLevel2", 48, 0, 1000);
|
||||||
|
|
||||||
|
level3 = builder
|
||||||
|
.defineInRange("maxMirrorRadiusLevel3", 64, 0, 1000);
|
||||||
|
|
||||||
|
builder.pop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
139
src/main/java/nl/requios/effortlessbuilding/CommonEvents.java
Normal file
139
src/main/java/nl/requios/effortlessbuilding/CommonEvents.java
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
package nl.requios.effortlessbuilding;
|
||||||
|
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraft.world.InteractionHand;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraft.world.item.BlockItem;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraftforge.common.util.FakePlayer;
|
||||||
|
import net.minecraftforge.event.RegisterCommandsEvent;
|
||||||
|
import net.minecraftforge.event.TickEvent;
|
||||||
|
import net.minecraftforge.event.entity.player.PlayerEvent;
|
||||||
|
import net.minecraftforge.event.level.BlockEvent;
|
||||||
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
|
import net.minecraftforge.fml.LogicalSide;
|
||||||
|
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
|
||||||
|
import net.minecraftforge.network.PacketDistributor;
|
||||||
|
import nl.requios.effortlessbuilding.compatibility.CompatHelper;
|
||||||
|
import nl.requios.effortlessbuilding.network.ModifierSettingsPacket;
|
||||||
|
import nl.requios.effortlessbuilding.network.PacketHandler;
|
||||||
|
import nl.requios.effortlessbuilding.systems.ServerBuildState;
|
||||||
|
import nl.requios.effortlessbuilding.utilities.PowerLevelCommand;
|
||||||
|
|
||||||
|
@EventBusSubscriber
|
||||||
|
public class CommonEvents {
|
||||||
|
|
||||||
|
//Mod Bus Events
|
||||||
|
@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD)
|
||||||
|
public static class ModBusEvents {
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void registerCommands(RegisterCommandsEvent event) {
|
||||||
|
PowerLevelCommand.register(event.getDispatcher());
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onTick(TickEvent.LevelTickEvent event) {
|
||||||
|
if (event.phase != TickEvent.Phase.START) return;
|
||||||
|
if (event.side == LogicalSide.CLIENT) return;
|
||||||
|
|
||||||
|
EffortlessBuilding.SERVER_BLOCK_PLACER.tick();
|
||||||
|
}
|
||||||
|
|
||||||
|
//Cancel event if necessary. Nothing more, rest is handled on mouseclick
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) {
|
||||||
|
if (event.getLevel().isClientSide()) return; //Never called clientside anyway, but just to be sure
|
||||||
|
if (!(event.getEntity() instanceof Player player)) return;
|
||||||
|
if (event.getEntity() instanceof FakePlayer) return;
|
||||||
|
|
||||||
|
//Don't cancel event if our custom logic is breaking blocks
|
||||||
|
if (EffortlessBuilding.SERVER_BLOCK_PLACER.isPlacingOrBreakingBlocks()) return;
|
||||||
|
|
||||||
|
if (!ServerBuildState.isLikeVanilla(player)) {
|
||||||
|
|
||||||
|
//Only cancel if itemblock in hand
|
||||||
|
//Fixed issue with e.g. Create Wrench shift-rightclick disassembling being cancelled.
|
||||||
|
if (isPlayerHoldingBlock(player)) {
|
||||||
|
event.setCanceled(true);
|
||||||
|
//TODO Notify client to not decrease itemstack
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Cancel event if necessary. Nothing more, rest is handled on mouseclick
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onBlockBroken(BlockEvent.BreakEvent event) {
|
||||||
|
if (event.getLevel().isClientSide()) return;
|
||||||
|
Player player = event.getPlayer();
|
||||||
|
if (player instanceof FakePlayer) return;
|
||||||
|
|
||||||
|
//Don't cancel event if our custom logic is breaking blocks
|
||||||
|
if (EffortlessBuilding.SERVER_BLOCK_PLACER.isPlacingOrBreakingBlocks()) return;
|
||||||
|
|
||||||
|
if (!ServerBuildState.isLikeVanilla(player) && EffortlessBuilding.SERVER_POWER_LEVEL.canBreakFar(player)) {
|
||||||
|
event.setCanceled(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isPlayerHoldingBlock(Player player) {
|
||||||
|
ItemStack currentItemStack = player.getItemInHand(InteractionHand.MAIN_HAND);
|
||||||
|
return currentItemStack.getItem() instanceof BlockItem ||
|
||||||
|
(CompatHelper.isItemBlockProxy(currentItemStack) && !player.isShiftKeyDown());
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
|
||||||
|
if (event.getEntity() instanceof FakePlayer) return;
|
||||||
|
Player player = event.getEntity();
|
||||||
|
if (player.getCommandSenderWorld().isClientSide) return;
|
||||||
|
|
||||||
|
ServerBuildState.handleNewPlayer(player);
|
||||||
|
|
||||||
|
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new ModifierSettingsPacket(player));
|
||||||
|
EffortlessBuilding.SERVER_POWER_LEVEL.sendToClient(player);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
|
||||||
|
if (event.getEntity() instanceof FakePlayer) return;
|
||||||
|
Player player = event.getEntity();
|
||||||
|
if (player.getCommandSenderWorld().isClientSide) {
|
||||||
|
EffortlessBuilding.log("PlayerLoggedOutEvent triggers on client side");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
EffortlessBuilding.UNDO_REDO.clear(player);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
|
||||||
|
if (event.getEntity() instanceof FakePlayer) return;
|
||||||
|
Player player = event.getEntity();
|
||||||
|
if (player.getCommandSenderWorld().isClientSide) {
|
||||||
|
EffortlessBuilding.log("PlayerRespawnEvent triggers on client side");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//TODO check if this is needed
|
||||||
|
ServerBuildState.handleNewPlayer(player);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
|
||||||
|
if (event.getEntity() instanceof FakePlayer) return;
|
||||||
|
Player player = event.getEntity();
|
||||||
|
if (player.getCommandSenderWorld().isClientSide) {
|
||||||
|
EffortlessBuilding.log("PlayerChangedDimensionEvent triggers on client side");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Undo redo has no dimension data, so clear it
|
||||||
|
EffortlessBuilding.UNDO_REDO.clear(player);
|
||||||
|
|
||||||
|
//TODO disable build mode and modifiers?
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,25 +1,29 @@
|
|||||||
package nl.requios.effortlessbuilding;
|
package nl.requios.effortlessbuilding;
|
||||||
|
|
||||||
|
import com.mojang.serialization.Codec;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraft.world.flag.FeatureFlags;
|
||||||
import net.minecraft.world.inventory.AbstractContainerMenu;
|
import net.minecraft.world.inventory.AbstractContainerMenu;
|
||||||
import net.minecraft.world.inventory.MenuType;
|
import net.minecraft.world.inventory.MenuType;
|
||||||
|
import net.minecraft.world.item.CreativeModeTabs;
|
||||||
import net.minecraft.world.item.Item;
|
import net.minecraft.world.item.Item;
|
||||||
import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
|
import net.minecraftforge.common.loot.IGlobalLootModifier;
|
||||||
|
import net.minecraftforge.event.CreativeModeTabEvent;
|
||||||
|
import net.minecraftforge.eventbus.api.IEventBus;
|
||||||
import net.minecraftforge.fml.DistExecutor;
|
import net.minecraftforge.fml.DistExecutor;
|
||||||
import net.minecraftforge.fml.ModLoadingContext;
|
import net.minecraftforge.fml.ModLoadingContext;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
import net.minecraftforge.fml.config.ModConfig;
|
import net.minecraftforge.fml.config.ModConfig;
|
||||||
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
|
|
||||||
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
||||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||||
import net.minecraftforge.network.IContainerFactory;
|
import net.minecraftforge.network.IContainerFactory;
|
||||||
import net.minecraftforge.registries.RegistryObject;
|
|
||||||
import net.minecraftforge.registries.DeferredRegister;
|
import net.minecraftforge.registries.DeferredRegister;
|
||||||
import net.minecraftforge.registries.ForgeRegistries;
|
import net.minecraftforge.registries.ForgeRegistries;
|
||||||
import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
|
import net.minecraftforge.registries.RegistryObject;
|
||||||
import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
|
|
||||||
import nl.requios.effortlessbuilding.compatibility.CompatHelper;
|
import nl.requios.effortlessbuilding.compatibility.CompatHelper;
|
||||||
import nl.requios.effortlessbuilding.gui.DiamondRandomizerBagContainer;
|
import nl.requios.effortlessbuilding.gui.DiamondRandomizerBagContainer;
|
||||||
import nl.requios.effortlessbuilding.gui.GoldenRandomizerBagContainer;
|
import nl.requios.effortlessbuilding.gui.GoldenRandomizerBagContainer;
|
||||||
@@ -29,9 +33,15 @@ import nl.requios.effortlessbuilding.network.PacketHandler;
|
|||||||
import nl.requios.effortlessbuilding.proxy.ClientProxy;
|
import nl.requios.effortlessbuilding.proxy.ClientProxy;
|
||||||
import nl.requios.effortlessbuilding.proxy.IProxy;
|
import nl.requios.effortlessbuilding.proxy.IProxy;
|
||||||
import nl.requios.effortlessbuilding.proxy.ServerProxy;
|
import nl.requios.effortlessbuilding.proxy.ServerProxy;
|
||||||
|
import nl.requios.effortlessbuilding.systems.ItemUsageTracker;
|
||||||
|
import nl.requios.effortlessbuilding.systems.ServerBlockPlacer;
|
||||||
|
import nl.requios.effortlessbuilding.systems.ServerPowerLevel;
|
||||||
|
import nl.requios.effortlessbuilding.systems.UndoRedo;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Mod(EffortlessBuilding.MODID)
|
@Mod(EffortlessBuilding.MODID)
|
||||||
public class EffortlessBuilding {
|
public class EffortlessBuilding {
|
||||||
|
|
||||||
@@ -39,11 +49,17 @@ public class EffortlessBuilding {
|
|||||||
public static final Logger logger = LogManager.getLogger();
|
public static final Logger logger = LogManager.getLogger();
|
||||||
|
|
||||||
public static EffortlessBuilding instance;
|
public static EffortlessBuilding instance;
|
||||||
public static IProxy proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new);
|
public static IProxy proxy = DistExecutor.unsafeRunForDist(() -> ClientProxy::new, () -> ServerProxy::new);
|
||||||
|
|
||||||
|
public static final ServerBlockPlacer SERVER_BLOCK_PLACER = new ServerBlockPlacer();
|
||||||
|
public static final UndoRedo UNDO_REDO = new UndoRedo();
|
||||||
|
public static final ItemUsageTracker ITEM_USAGE_TRACKER = new ItemUsageTracker();
|
||||||
|
public static final ServerPowerLevel SERVER_POWER_LEVEL = new ServerPowerLevel();
|
||||||
|
|
||||||
//Registration
|
//Registration
|
||||||
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
|
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
|
||||||
private static final DeferredRegister<MenuType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, EffortlessBuilding.MODID);
|
private static final DeferredRegister<MenuType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, EffortlessBuilding.MODID);
|
||||||
|
public static final DeferredRegister<Codec<? extends IGlobalLootModifier>> LOOT_MODIFIERS = DeferredRegister.create(ForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, EffortlessBuilding.MODID);
|
||||||
|
|
||||||
public static final RegistryObject<Item> RANDOMIZER_BAG_ITEM = ITEMS.register("randomizer_bag", RandomizerBagItem::new);
|
public static final RegistryObject<Item> RANDOMIZER_BAG_ITEM = ITEMS.register("randomizer_bag", RandomizerBagItem::new);
|
||||||
public static final RegistryObject<Item> GOLDEN_RANDOMIZER_BAG_ITEM = ITEMS.register("golden_randomizer_bag", GoldenRandomizerBagItem::new);
|
public static final RegistryObject<Item> GOLDEN_RANDOMIZER_BAG_ITEM = ITEMS.register("golden_randomizer_bag", GoldenRandomizerBagItem::new);
|
||||||
@@ -51,47 +67,55 @@ public class EffortlessBuilding {
|
|||||||
public static final RegistryObject<Item> REACH_UPGRADE_1_ITEM = ITEMS.register("reach_upgrade1", ReachUpgrade1Item::new);
|
public static final RegistryObject<Item> REACH_UPGRADE_1_ITEM = ITEMS.register("reach_upgrade1", ReachUpgrade1Item::new);
|
||||||
public static final RegistryObject<Item> REACH_UPGRADE_2_ITEM = ITEMS.register("reach_upgrade2", ReachUpgrade2Item::new);
|
public static final RegistryObject<Item> REACH_UPGRADE_2_ITEM = ITEMS.register("reach_upgrade2", ReachUpgrade2Item::new);
|
||||||
public static final RegistryObject<Item> REACH_UPGRADE_3_ITEM = ITEMS.register("reach_upgrade3", ReachUpgrade3Item::new);
|
public static final RegistryObject<Item> REACH_UPGRADE_3_ITEM = ITEMS.register("reach_upgrade3", ReachUpgrade3Item::new);
|
||||||
|
public static final RegistryObject<Item> MUSCLES_ITEM = ITEMS.register("muscles", PowerLevelItem::new);
|
||||||
|
public static final RegistryObject<Item> ELASTIC_HAND_ITEM = ITEMS.register("elastic_hand", PowerLevelItem::new);
|
||||||
|
public static final RegistryObject<Item> BUILDING_TECHNIQUES_BOOK_ITEM = ITEMS.register("building_techniques_book", PowerLevelItem::new);
|
||||||
|
|
||||||
public static final RegistryObject<MenuType<RandomizerBagContainer>> RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("randomizer_bag", () -> registerContainer(RandomizerBagContainer::new));
|
public static final RegistryObject<MenuType<RandomizerBagContainer>> RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("randomizer_bag", () -> registerContainer(RandomizerBagContainer::new));
|
||||||
public static final RegistryObject<MenuType<GoldenRandomizerBagContainer>> GOLDEN_RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("golden_randomizer_bag", () -> registerContainer(GoldenRandomizerBagContainer::new));
|
public static final RegistryObject<MenuType<GoldenRandomizerBagContainer>> GOLDEN_RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("golden_randomizer_bag", () -> registerContainer(GoldenRandomizerBagContainer::new));
|
||||||
public static final RegistryObject<MenuType<DiamondRandomizerBagContainer>> DIAMOND_RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("diamond_randomizer_bag", () -> registerContainer(DiamondRandomizerBagContainer::new));
|
public static final RegistryObject<MenuType<DiamondRandomizerBagContainer>> DIAMOND_RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("diamond_randomizer_bag", () -> registerContainer(DiamondRandomizerBagContainer::new));
|
||||||
|
|
||||||
|
|
||||||
public EffortlessBuilding() {
|
public EffortlessBuilding() {
|
||||||
instance = this;
|
instance = this;
|
||||||
|
|
||||||
// Register ourselves for server and other game events we are interested in
|
ModLoadingContext modLoadingContext = ModLoadingContext.get();
|
||||||
FMLJavaModLoadingContext.get().getModEventBus().register(this);
|
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
|
||||||
|
IEventBus forgeEventBus = MinecraftForge.EVENT_BUS;
|
||||||
|
|
||||||
|
modEventBus.addListener(EffortlessBuilding::setup);
|
||||||
|
modEventBus.addListener(EffortlessBuilding::addTabContents);
|
||||||
|
|
||||||
|
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> EffortlessBuildingClient.onConstructorClient(modEventBus, forgeEventBus));
|
||||||
|
|
||||||
ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
|
ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
|
||||||
CONTAINERS.register(FMLJavaModLoadingContext.get().getModEventBus());
|
CONTAINERS.register(FMLJavaModLoadingContext.get().getModEventBus());
|
||||||
|
|
||||||
|
var singleItemLootModifier = SingleItemLootModifier.CODEC; //load this class to register the loot modifier
|
||||||
|
LOOT_MODIFIERS.register(FMLJavaModLoadingContext.get().getModEventBus());
|
||||||
|
|
||||||
//Register config
|
//Register config
|
||||||
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, BuildConfig.spec);
|
modLoadingContext.registerConfig(ModConfig.Type.COMMON, CommonConfig.spec);
|
||||||
|
modLoadingContext.registerConfig(ModConfig.Type.CLIENT, ClientConfig.spec);
|
||||||
|
modLoadingContext.registerConfig(ModConfig.Type.SERVER, ServerConfig.spec);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T extends AbstractContainerMenu> MenuType<T> registerContainer(IContainerFactory<T> fact){
|
public static void setup(final FMLCommonSetupEvent event) {
|
||||||
MenuType<T> type = new MenuType<T>(fact);
|
|
||||||
return type;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public void setup(final FMLCommonSetupEvent event) {
|
|
||||||
PacketHandler.register();
|
PacketHandler.register();
|
||||||
|
|
||||||
proxy.setup(event);
|
|
||||||
|
|
||||||
CompatHelper.setup();
|
CompatHelper.setup();
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
public static void addTabContents(final CreativeModeTabEvent.BuildContents event) {
|
||||||
public void clientSetup(final FMLClientSetupEvent event) {
|
if (event.getTab() == CreativeModeTabs.TOOLS_AND_UTILITIES) {
|
||||||
proxy.clientSetup(event);
|
List<ItemStack> stacks = ITEMS.getEntries().stream().map(reg -> new ItemStack(reg.get())).toList();
|
||||||
|
event.acceptAll(stacks);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
public static <T extends AbstractContainerMenu> MenuType<T> registerContainer(IContainerFactory<T> fact){
|
||||||
public void registerCapabilities(RegisterCapabilitiesEvent event){
|
MenuType<T> type = new MenuType<T>(fact, FeatureFlags.REGISTRY.allFlags());
|
||||||
event.register(ModifierCapabilityManager.IModifierCapability.class);
|
return type;
|
||||||
event.register(ModeCapabilityManager.IModeCapability.class);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void log(String msg) {
|
public static void log(String msg) {
|
||||||
@@ -110,4 +134,9 @@ public class EffortlessBuilding {
|
|||||||
public static void logTranslate(Player player, String prefix, String translationKey, String suffix, boolean actionBar) {
|
public static void logTranslate(Player player, String prefix, String translationKey, String suffix, boolean actionBar) {
|
||||||
proxy.logTranslate(player, prefix, translationKey, suffix, actionBar);
|
proxy.logTranslate(player, prefix, translationKey, suffix, actionBar);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void logError(String msg) {
|
||||||
|
logger.error(msg);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package nl.requios.effortlessbuilding;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.screens.MenuScreens;
|
||||||
|
import net.minecraftforge.eventbus.api.IEventBus;
|
||||||
|
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
|
||||||
|
import nl.requios.effortlessbuilding.buildmode.BuildModes;
|
||||||
|
import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
|
||||||
|
import nl.requios.effortlessbuilding.gui.DiamondRandomizerBagScreen;
|
||||||
|
import nl.requios.effortlessbuilding.gui.GoldenRandomizerBagScreen;
|
||||||
|
import nl.requios.effortlessbuilding.gui.RandomizerBagScreen;
|
||||||
|
import nl.requios.effortlessbuilding.render.BlockPreviews;
|
||||||
|
import nl.requios.effortlessbuilding.systems.*;
|
||||||
|
|
||||||
|
public class EffortlessBuildingClient {
|
||||||
|
|
||||||
|
public static final BuilderChain BUILDER_CHAIN = new BuilderChain();
|
||||||
|
public static final BuildModes BUILD_MODES = new BuildModes();
|
||||||
|
public static final BuildModifiers BUILD_MODIFIERS = new BuildModifiers();
|
||||||
|
public static final BuildSettings BUILD_SETTINGS = new BuildSettings();
|
||||||
|
public static final BlockPreviews BLOCK_PREVIEWS = new BlockPreviews();
|
||||||
|
public static final BuilderFilter BUILDER_FILTER = new BuilderFilter();
|
||||||
|
public static final ItemUsageTracker ITEM_USAGE_TRACKER = new ItemUsageTracker();
|
||||||
|
public static final PowerLevel POWER_LEVEL = new PowerLevel();
|
||||||
|
|
||||||
|
public static void onConstructorClient(IEventBus modEventBus, IEventBus forgeEventBus) {
|
||||||
|
modEventBus.addListener(EffortlessBuildingClient::clientSetup);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void clientSetup(final FMLClientSetupEvent event) {
|
||||||
|
MenuScreens.register(EffortlessBuilding.RANDOMIZER_BAG_CONTAINER.get(), RandomizerBagScreen::new);
|
||||||
|
MenuScreens.register(EffortlessBuilding.GOLDEN_RANDOMIZER_BAG_CONTAINER.get(), GoldenRandomizerBagScreen::new);
|
||||||
|
MenuScreens.register(EffortlessBuilding.DIAMOND_RANDOMIZER_BAG_CONTAINER.get(), DiamondRandomizerBagScreen::new);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,175 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding;
|
|
||||||
|
|
||||||
import net.minecraft.world.InteractionHand;
|
|
||||||
import net.minecraft.world.item.BlockItem;
|
|
||||||
import net.minecraft.world.item.ItemStack;
|
|
||||||
import net.minecraft.world.level.block.Blocks;
|
|
||||||
import net.minecraft.world.entity.Entity;
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
|
||||||
import net.minecraft.server.level.ServerPlayer;
|
|
||||||
import net.minecraft.resources.ResourceLocation;
|
|
||||||
import net.minecraftforge.common.util.FakePlayer;
|
|
||||||
import net.minecraftforge.event.AttachCapabilitiesEvent;
|
|
||||||
import net.minecraftforge.event.RegisterCommandsEvent;
|
|
||||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
|
||||||
import net.minecraftforge.event.level.BlockEvent;
|
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
|
||||||
import net.minecraftforge.fml.common.Mod;
|
|
||||||
import net.minecraftforge.network.PacketDistributor;
|
|
||||||
import nl.requios.effortlessbuilding.buildmode.BuildModes;
|
|
||||||
import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
|
|
||||||
import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
|
|
||||||
import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
|
|
||||||
import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
|
|
||||||
import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
|
|
||||||
import nl.requios.effortlessbuilding.compatibility.CompatHelper;
|
|
||||||
import nl.requios.effortlessbuilding.helper.ReachHelper;
|
|
||||||
import nl.requios.effortlessbuilding.network.AddUndoMessage;
|
|
||||||
import nl.requios.effortlessbuilding.network.ClearUndoMessage;
|
|
||||||
import nl.requios.effortlessbuilding.network.PacketHandler;
|
|
||||||
import nl.requios.effortlessbuilding.network.RequestLookAtMessage;
|
|
||||||
|
|
||||||
@Mod.EventBusSubscriber(modid = EffortlessBuilding.MODID, bus = Mod.EventBusSubscriber.Bus.FORGE)
|
|
||||||
public class EventHandler {
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public static void attachCapabilities(AttachCapabilitiesEvent<Entity> event) {
|
|
||||||
if (event.getObject() instanceof FakePlayer) return;
|
|
||||||
if (event.getObject() instanceof Player) {
|
|
||||||
event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_modifier"), new ModifierCapabilityManager.Provider());
|
|
||||||
event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_mode"), new ModeCapabilityManager.Provider());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) {
|
|
||||||
if (event.getLevel().isClientSide()) return;
|
|
||||||
|
|
||||||
if (!(event.getEntity() instanceof Player)) return;
|
|
||||||
|
|
||||||
if (event.getEntity() instanceof FakePlayer) return;
|
|
||||||
|
|
||||||
//Cancel event if necessary
|
|
||||||
ServerPlayer player = ((ServerPlayer) event.getEntity());
|
|
||||||
BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
|
|
||||||
ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
|
|
||||||
|
|
||||||
if (buildMode != BuildModes.BuildModeEnum.NORMAL) {
|
|
||||||
|
|
||||||
//Only cancel if itemblock in hand
|
|
||||||
//Fixed issue with e.g. Create Wrench shift-rightclick disassembling being cancelled.
|
|
||||||
ItemStack currentItemStack = player.getItemInHand(InteractionHand.MAIN_HAND);
|
|
||||||
if (currentItemStack.getItem() instanceof BlockItem ||
|
|
||||||
(CompatHelper.isItemBlockProxy(currentItemStack) && !player.isShiftKeyDown())) {
|
|
||||||
event.setCanceled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (modifierSettings.doQuickReplace()) {
|
|
||||||
//Cancel event and send message if QuickReplace
|
|
||||||
event.setCanceled(true);
|
|
||||||
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new RequestLookAtMessage(true));
|
|
||||||
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()));
|
|
||||||
} else {
|
|
||||||
//NORMAL mode, let vanilla handle block placing
|
|
||||||
//But modifiers should still work
|
|
||||||
|
|
||||||
//Send message to client, which sends message back with raytrace info
|
|
||||||
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new RequestLookAtMessage(false));
|
|
||||||
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stat<ResourceLocation> blocksPlacedStat = StatList.CUSTOM.get(new ResourceLocation(EffortlessBuilding.MODID, "blocks_placed"));
|
|
||||||
// player.getStats().increment(player, blocksPlacedStat, 1);
|
|
||||||
//
|
|
||||||
// System.out.println(player.getStats().getValue(blocksPlacedStat));
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public static void onBlockBroken(BlockEvent.BreakEvent event) {
|
|
||||||
if (event.getLevel().isClientSide()) return;
|
|
||||||
|
|
||||||
if (event.getPlayer() instanceof FakePlayer) return;
|
|
||||||
|
|
||||||
//Cancel event if necessary
|
|
||||||
//If cant break far then dont cancel event ever
|
|
||||||
BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(event.getPlayer()).getBuildMode();
|
|
||||||
if (buildMode != BuildModes.BuildModeEnum.NORMAL && ReachHelper.canBreakFar(event.getPlayer())) {
|
|
||||||
event.setCanceled(true);
|
|
||||||
} else {
|
|
||||||
//NORMAL mode, let vanilla handle block breaking
|
|
||||||
//But modifiers and QuickReplace should still work
|
|
||||||
//Dont break the original block yourself, otherwise Tinkers Hammer and Veinminer won't work
|
|
||||||
BuildModes.onBlockBroken(event.getPlayer(), event.getPos(), false);
|
|
||||||
|
|
||||||
//Add to undo stack in client
|
|
||||||
if (event.getPlayer() instanceof ServerPlayer && event.getState() != null && event.getPos() != null) {
|
|
||||||
PacketDistributor.PacketTarget packetTarget = PacketDistributor.PLAYER.with(() -> (ServerPlayer) event.getPlayer());
|
|
||||||
if (packetTarget != null)
|
|
||||||
PacketHandler.INSTANCE.send(packetTarget, new AddUndoMessage(event.getPos(), event.getState(), Blocks.AIR.defaultBlockState()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
|
|
||||||
if (event.getEntity() instanceof FakePlayer) return;
|
|
||||||
Player player = event.getEntity();
|
|
||||||
ModifierSettingsManager.handleNewPlayer(player);
|
|
||||||
ModeSettingsManager.handleNewPlayer(player);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
|
|
||||||
if (event.getEntity() instanceof FakePlayer) return;
|
|
||||||
Player player = event.getEntity();
|
|
||||||
if (player.getCommandSenderWorld().isClientSide) return;
|
|
||||||
|
|
||||||
UndoRedo.clear(player);
|
|
||||||
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new ClearUndoMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
|
|
||||||
if (event.getEntity() instanceof FakePlayer) return;
|
|
||||||
Player player = event.getEntity();
|
|
||||||
ModifierSettingsManager.handleNewPlayer(player);
|
|
||||||
ModeSettingsManager.handleNewPlayer(player);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
|
|
||||||
if (event.getEntity() instanceof FakePlayer) return;
|
|
||||||
Player player = event.getEntity();
|
|
||||||
if (player.getCommandSenderWorld().isClientSide) return;
|
|
||||||
|
|
||||||
//Set build mode to normal
|
|
||||||
ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
|
|
||||||
modeSettings.setBuildMode(BuildModes.BuildModeEnum.NORMAL);
|
|
||||||
ModeSettingsManager.setModeSettings(player, modeSettings);
|
|
||||||
|
|
||||||
//Disable modifiers
|
|
||||||
ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
|
|
||||||
modifierSettings.getMirrorSettings().enabled = false;
|
|
||||||
modifierSettings.getRadialMirrorSettings().enabled = false;
|
|
||||||
modifierSettings.getArraySettings().enabled = false;
|
|
||||||
ModifierSettingsManager.setModifierSettings(player, modifierSettings);
|
|
||||||
|
|
||||||
ModifierSettingsManager.handleNewPlayer(player);
|
|
||||||
ModeSettingsManager.handleNewPlayer(player);
|
|
||||||
|
|
||||||
UndoRedo.clear(player);
|
|
||||||
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new ClearUndoMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public static void onPlayerClone(PlayerEvent.Clone event) {
|
|
||||||
if (event.getEntity() instanceof FakePlayer) return;
|
|
||||||
//Attach capabilities on death, otherwise crash
|
|
||||||
Player oldPlayer = event.getOriginal();
|
|
||||||
oldPlayer.revive();
|
|
||||||
|
|
||||||
Player newPlayer = event.getEntity();
|
|
||||||
ModifierSettingsManager.setModifierSettings(newPlayer, ModifierSettingsManager.getModifierSettings(oldPlayer));
|
|
||||||
ModeSettingsManager.setModeSettings(newPlayer, ModeSettingsManager.getModeSettings(oldPlayer));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.platform.InputConstants;
|
|
||||||
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
|
|
||||||
import net.minecraft.client.KeyMapping;
|
|
||||||
import net.minecraft.client.renderer.ShaderInstance;
|
|
||||||
import net.minecraft.resources.ResourceLocation;
|
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
|
||||||
import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
|
|
||||||
import net.minecraftforge.client.event.RegisterShadersEvent;
|
|
||||||
import net.minecraftforge.client.settings.KeyConflictContext;
|
|
||||||
import net.minecraftforge.client.settings.KeyModifier;
|
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
|
||||||
import net.minecraftforge.fml.common.Mod;
|
|
||||||
import nl.requios.effortlessbuilding.proxy.ClientProxy;
|
|
||||||
import nl.requios.effortlessbuilding.render.BuildRenderTypes;
|
|
||||||
import org.lwjgl.glfw.GLFW;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = {Dist.CLIENT})
|
|
||||||
public class ModClientEventHandler {
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public static void registerKeyMappings(RegisterKeyMappingsEvent event) {
|
|
||||||
EffortlessBuilding.log("Registering KeyMappings!");
|
|
||||||
|
|
||||||
// register key bindings
|
|
||||||
ClientProxy.keyBindings = new KeyMapping[6];
|
|
||||||
|
|
||||||
// instantiate the key bindings
|
|
||||||
ClientProxy.keyBindings[0] = new KeyMapping("key.effortlessbuilding.hud.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_KP_ADD, 0), "key.effortlessbuilding.category");
|
|
||||||
ClientProxy.keyBindings[1] = new KeyMapping("key.effortlessbuilding.replace.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_KP_SUBTRACT, 0), "key.effortlessbuilding.category");
|
|
||||||
ClientProxy.keyBindings[2] = new KeyMapping("key.effortlessbuilding.mode.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_ALT, 0), "key.effortlessbuilding.category");
|
|
||||||
ClientProxy.keyBindings[3] = new KeyMapping("key.effortlessbuilding.undo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Z, 0), "key.effortlessbuilding.category");
|
|
||||||
ClientProxy.keyBindings[4] = new KeyMapping("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Y, 0), "key.effortlessbuilding.category");
|
|
||||||
ClientProxy.keyBindings[5] = new KeyMapping("key.effortlessbuilding.altplacement.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_CONTROL, 0), "key.effortlessbuilding.category");
|
|
||||||
|
|
||||||
for (KeyMapping keyBinding : ClientProxy.keyBindings) {
|
|
||||||
event.register(keyBinding);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public static void registerShaders(RegisterShadersEvent event) throws IOException {
|
|
||||||
event.registerShader(new ShaderInstance(event.getResourceManager(),
|
|
||||||
new ResourceLocation(EffortlessBuilding.MODID, "dissolve"),
|
|
||||||
DefaultVertexFormat.BLOCK),
|
|
||||||
shaderInstance -> BuildRenderTypes.dissolveShaderInstance = shaderInstance);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package nl.requios.effortlessbuilding;
|
||||||
|
|
||||||
|
import net.minecraftforge.common.ForgeConfigSpec;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static net.minecraftforge.common.ForgeConfigSpec.*;
|
||||||
|
|
||||||
|
public class ServerConfig {
|
||||||
|
private static final Builder builder = new Builder();
|
||||||
|
public static final ServerConfig.Validation validation = new ServerConfig.Validation(builder);
|
||||||
|
public static final ServerConfig.Memory memory = new ServerConfig.Memory(builder);
|
||||||
|
public static final ForgeConfigSpec spec = builder.build();
|
||||||
|
|
||||||
|
public static class Validation {
|
||||||
|
public final BooleanValue allowInSurvival;
|
||||||
|
public final BooleanValue useWhitelist;
|
||||||
|
public final ConfigValue<List<? extends String>> whitelist;
|
||||||
|
public final IntValue maxBlocksPlacedAtOnce;
|
||||||
|
|
||||||
|
public Validation(Builder builder) {
|
||||||
|
builder.push("Validation");
|
||||||
|
|
||||||
|
allowInSurvival = builder
|
||||||
|
.comment("Allow use of the mod for players that are in survival mode. Otherwise, only creative mode players can use the mod.")
|
||||||
|
.define("allowInSurvival", true);
|
||||||
|
|
||||||
|
useWhitelist = builder
|
||||||
|
.comment("Use a whitelist to determine which players can use the mod. If false, all players can use the mod.")
|
||||||
|
.define("useWhitelist", false);
|
||||||
|
|
||||||
|
whitelist = builder
|
||||||
|
.comment("List of player names that can use the mod.")
|
||||||
|
.defineList("whitelist", Arrays.asList("Player1", "Player2"), o -> true);
|
||||||
|
|
||||||
|
maxBlocksPlacedAtOnce = builder
|
||||||
|
.comment("Maximum number of blocks that can be placed at once. This is a last check. If you want the player to receive visual feedback instead of an error message, change values in the common config.")
|
||||||
|
.defineInRange("maxBlocksPlacedAtOnce", 10000, 1, 100000);
|
||||||
|
|
||||||
|
builder.pop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Memory {
|
||||||
|
public final IntValue undoStackSize;
|
||||||
|
|
||||||
|
public Memory(Builder builder) {
|
||||||
|
builder.push("Memory");
|
||||||
|
|
||||||
|
undoStackSize = builder
|
||||||
|
.comment("How many sets of blocks are remembered for the undo functionality, per player.")
|
||||||
|
.worldRestart()
|
||||||
|
.defineInRange("undoStackSize", 50, 10, 200);
|
||||||
|
|
||||||
|
builder.pop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,39 +1,19 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmode;
|
package nl.requios.effortlessbuilding.buildmode;
|
||||||
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
import nl.requios.effortlessbuilding.utilities.BlockSet;
|
||||||
import net.minecraft.core.Direction;
|
|
||||||
import net.minecraft.core.BlockPos;
|
|
||||||
import net.minecraft.world.phys.Vec3;
|
|
||||||
|
|
||||||
import java.util.Dictionary;
|
|
||||||
import java.util.Hashtable;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
public abstract class BaseBuildMode implements IBuildMode {
|
public abstract class BaseBuildMode implements IBuildMode {
|
||||||
//In singleplayer client and server variables are shared
|
|
||||||
//Split everything that needs separate values and may not be called twice in one click
|
protected int clicks;
|
||||||
protected Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
|
|
||||||
protected Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
|
|
||||||
protected Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
|
|
||||||
protected Dictionary<UUID, Direction> sideHitTable = new Hashtable<>();
|
|
||||||
protected Dictionary<UUID, Vec3> hitVecTable = new Hashtable<>();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initialize(Player player) {
|
public void initialize() {
|
||||||
rightClickClientTable.put(player.getUUID(), 0);
|
clicks = 0;
|
||||||
rightClickServerTable.put(player.getUUID(), 0);
|
|
||||||
firstPosTable.put(player.getUUID(), BlockPos.ZERO);
|
|
||||||
sideHitTable.put(player.getUUID(), Direction.UP);
|
|
||||||
hitVecTable.put(player.getUUID(), Vec3.ZERO);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Direction getSideHit(Player player) {
|
public boolean onClick(BlockSet blocks) {
|
||||||
return sideHitTable.get(player.getUUID());
|
clicks++;
|
||||||
}
|
return false;
|
||||||
|
|
||||||
@Override
|
|
||||||
public Vec3 getHitVec(Player player) {
|
|
||||||
return hitVecTable.get(player.getUUID());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package nl.requios.effortlessbuilding.buildmode;
|
||||||
|
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Color;
|
||||||
|
|
||||||
|
public enum BuildModeCategoryEnum {
|
||||||
|
BASIC(new Color(0f, .5f, 1f, .8f)),
|
||||||
|
DIAGONAL(new Color(0.56f, 0.28f, 0.87f, .8f)),
|
||||||
|
CIRCULAR(new Color(0.29f, 0.76f, 0.3f, 1f)),
|
||||||
|
ROOF(new Color(0.83f, 0.87f, 0.23f, .8f));
|
||||||
|
|
||||||
|
public final Color color;
|
||||||
|
|
||||||
|
BuildModeCategoryEnum(Color color) {
|
||||||
|
this.color = color;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
package nl.requios.effortlessbuilding.buildmode;
|
||||||
|
|
||||||
|
import nl.requios.effortlessbuilding.AllIcons;
|
||||||
|
import nl.requios.effortlessbuilding.buildmode.buildmodes.*;
|
||||||
|
|
||||||
|
public enum BuildModeEnum {
|
||||||
|
DISABLED("normal", new Disabled(), BuildModeCategoryEnum.BASIC, AllIcons.I_DISABLE),
|
||||||
|
SINGLE("normal_plus", new Single(), BuildModeCategoryEnum.BASIC, AllIcons.I_SINGLE, ModeOptions.OptionEnum.BUILD_SPEED),
|
||||||
|
LINE("line", new Line(), BuildModeCategoryEnum.BASIC, AllIcons.I_LINE /*, OptionEnum.THICKNESS*/),
|
||||||
|
WALL("wall", new Wall(), BuildModeCategoryEnum.BASIC, AllIcons.I_WALL, ModeOptions.OptionEnum.FILL),
|
||||||
|
FLOOR("floor", new Floor(), BuildModeCategoryEnum.BASIC, AllIcons.I_FLOOR, ModeOptions.OptionEnum.FILL),
|
||||||
|
CUBE("cube", new Cube(), BuildModeCategoryEnum.BASIC, AllIcons.I_CUBE, ModeOptions.OptionEnum.CUBE_FILL),
|
||||||
|
DIAGONAL_LINE("diagonal_line", new DiagonalLine(), BuildModeCategoryEnum.DIAGONAL, AllIcons.I_DIAGONAL_LINE /*, OptionEnum.THICKNESS*/),
|
||||||
|
DIAGONAL_WALL("diagonal_wall", new DiagonalWall(), BuildModeCategoryEnum.DIAGONAL, AllIcons.I_DIAGONAL_WALL /*, OptionEnum.FILL*/),
|
||||||
|
SLOPE_FLOOR("slope_floor", new SlopeFloor(), BuildModeCategoryEnum.DIAGONAL, AllIcons.I_SLOPED_FLOOR, ModeOptions.OptionEnum.RAISED_EDGE),
|
||||||
|
CIRCLE("circle", new Circle(), BuildModeCategoryEnum.CIRCULAR, AllIcons.I_CIRCLE, ModeOptions.OptionEnum.CIRCLE_START, ModeOptions.OptionEnum.FILL),
|
||||||
|
CYLINDER("cylinder", new Cylinder(), BuildModeCategoryEnum.CIRCULAR, AllIcons.I_CYLINDER, ModeOptions.OptionEnum.CIRCLE_START, ModeOptions.OptionEnum.FILL),
|
||||||
|
SPHERE("sphere", new Sphere(), BuildModeCategoryEnum.CIRCULAR, AllIcons.I_SPHERE, ModeOptions.OptionEnum.CIRCLE_START, ModeOptions.OptionEnum.FILL);
|
||||||
|
// PYRAMID("pyramid", new Pyramid(), BuildModeCategoryEnum.ROOF),
|
||||||
|
// CONE("cone", new Cone(), BuildModeCategoryEnum.ROOF),
|
||||||
|
// DOME("dome", new Dome(), BuildModeCategoryEnum.ROOF);
|
||||||
|
|
||||||
|
private final String name;
|
||||||
|
public final IBuildMode instance;
|
||||||
|
public final BuildModeCategoryEnum category;
|
||||||
|
public final AllIcons icon;
|
||||||
|
public final ModeOptions.OptionEnum[] options;
|
||||||
|
|
||||||
|
BuildModeEnum(String name, IBuildMode instance, BuildModeCategoryEnum category, AllIcons icon, ModeOptions.OptionEnum... options) {
|
||||||
|
this.name = name;
|
||||||
|
this.instance = instance;
|
||||||
|
this.category = category;
|
||||||
|
this.icon = icon;
|
||||||
|
this.options = options;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getNameKey() {
|
||||||
|
return "effortlessbuilding.mode." + name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDescriptionKey() {
|
||||||
|
return "effortlessbuilding.modedescription." + name;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,180 +1,57 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmode;
|
package nl.requios.effortlessbuilding.buildmode;
|
||||||
|
|
||||||
import com.mojang.math.Vector4f;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.resources.language.I18n;
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.core.Direction;
|
|
||||||
import net.minecraft.core.BlockPos;
|
|
||||||
import net.minecraft.world.level.ClipContext;
|
import net.minecraft.world.level.ClipContext;
|
||||||
import net.minecraft.world.phys.HitResult;
|
import net.minecraft.world.phys.HitResult;
|
||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
||||||
import nl.requios.effortlessbuilding.buildmode.buildmodes.*;
|
import nl.requios.effortlessbuilding.network.IsUsingBuildModePacket;
|
||||||
import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
|
import nl.requios.effortlessbuilding.network.PacketHandler;
|
||||||
import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
|
import nl.requios.effortlessbuilding.utilities.BlockSet;
|
||||||
import nl.requios.effortlessbuilding.helper.ReachHelper;
|
|
||||||
import nl.requios.effortlessbuilding.helper.SurvivalHelper;
|
|
||||||
import nl.requios.effortlessbuilding.network.BlockBrokenMessage;
|
|
||||||
import nl.requios.effortlessbuilding.network.BlockPlacedMessage;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Dictionary;
|
|
||||||
import java.util.Hashtable;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import static nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum;
|
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
public class BuildModes {
|
public class BuildModes {
|
||||||
|
private BuildModeEnum buildMode = BuildModeEnum.DISABLED;
|
||||||
|
private BuildModeEnum previousBuildMode = BuildModeEnum.DISABLED;
|
||||||
|
private BuildModeEnum beforeDisabledBuildMode = BuildModeEnum.SINGLE;
|
||||||
|
|
||||||
//Static variables are shared between client and server in singleplayer
|
public void findCoordinates(BlockSet blocks, Player player) {
|
||||||
//We need them separate
|
buildMode.instance.findCoordinates(blocks);
|
||||||
public static Dictionary<Player, Boolean> currentlyBreakingClient = new Hashtable<>();
|
|
||||||
public static Dictionary<Player, Boolean> currentlyBreakingServer = new Hashtable<>();
|
|
||||||
|
|
||||||
//Uses a network message to get the previous raytraceresult from the player
|
|
||||||
//The server could keep track of all raytraceresults but this might lag with many players
|
|
||||||
//Raytraceresult is needed for sideHit and hitVec
|
|
||||||
public static void onBlockPlacedMessage(Player player, BlockPlacedMessage message) {
|
|
||||||
|
|
||||||
//Check if not in the middle of breaking
|
|
||||||
Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
|
|
||||||
if (currentlyBreaking.get(player) != null && currentlyBreaking.get(player)) {
|
|
||||||
//Cancel breaking
|
|
||||||
initializeMode(player);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
|
|
||||||
ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
|
|
||||||
BuildModeEnum buildMode = modeSettings.getBuildMode();
|
|
||||||
|
|
||||||
BlockPos startPos = null;
|
|
||||||
|
|
||||||
if (message.isBlockHit() && message.getBlockPos() != null) {
|
|
||||||
startPos = message.getBlockPos();
|
|
||||||
|
|
||||||
//Offset in direction of sidehit if not quickreplace and not replaceable
|
|
||||||
boolean replaceable = player.level.getBlockState(startPos).getMaterial().isReplaceable();
|
|
||||||
boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos, message.getSideHit());
|
|
||||||
if (!modifierSettings.doQuickReplace() && !replaceable && !becomesDoubleSlab) {
|
|
||||||
startPos = startPos.relative(message.getSideHit());
|
|
||||||
}
|
|
||||||
|
|
||||||
//Get under tall grass and other replaceable blocks
|
|
||||||
if (modifierSettings.doQuickReplace() && replaceable) {
|
|
||||||
startPos = startPos.below();
|
|
||||||
}
|
|
||||||
|
|
||||||
//Check if player reach does not exceed startpos
|
|
||||||
int maxReach = ReachHelper.getMaxReach(player);
|
|
||||||
if (buildMode != BuildModeEnum.NORMAL && player.blockPosition().distSqr(startPos) > maxReach * maxReach) {
|
|
||||||
EffortlessBuilding.log(player, "Placement exceeds your reach.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Even when no starting block is found, call buildmode instance
|
|
||||||
//We might want to place things in the air
|
|
||||||
List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, message.getSideHit(), message.getHitVec(), modifierSettings.doQuickReplace());
|
|
||||||
|
|
||||||
if (coordinates.isEmpty()) {
|
|
||||||
currentlyBreaking.put(player, false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Limit number of blocks you can place
|
|
||||||
int limit = ReachHelper.getMaxBlocksPlacedAtOnce(player);
|
|
||||||
if (coordinates.size() > limit) {
|
|
||||||
coordinates = coordinates.subList(0, limit);
|
|
||||||
}
|
|
||||||
|
|
||||||
Direction sideHit = buildMode.instance.getSideHit(player);
|
|
||||||
if (sideHit == null) sideHit = message.getSideHit();
|
|
||||||
|
|
||||||
Vec3 hitVec = buildMode.instance.getHitVec(player);
|
|
||||||
if (hitVec == null) hitVec = message.getHitVec();
|
|
||||||
|
|
||||||
BuildModifiers.onBlockPlaced(player, coordinates, sideHit, hitVec, message.getPlaceStartPos());
|
|
||||||
|
|
||||||
//Only works when finishing a buildmode is equal to placing some blocks
|
|
||||||
//No intermediate blocks allowed
|
|
||||||
currentlyBreaking.remove(player);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//Use a network message to break blocks in the distance using clientside mouse input
|
public BuildModeEnum getBuildMode() {
|
||||||
public static void onBlockBrokenMessage(Player player, BlockBrokenMessage message) {
|
return buildMode;
|
||||||
BlockPos startPos = message.isBlockHit() ? message.getBlockPos() : null;
|
|
||||||
onBlockBroken(player, startPos, true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void onBlockBroken(Player player, BlockPos startPos, boolean breakStartPos) {
|
public void setBuildMode(BuildModeEnum buildMode) {
|
||||||
|
this.buildMode = buildMode;
|
||||||
|
|
||||||
//Check if not in the middle of placing
|
PacketHandler.INSTANCE.sendToServer(new IsUsingBuildModePacket(this.buildMode != BuildModeEnum.DISABLED));
|
||||||
Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
|
|
||||||
if (currentlyBreaking.get(player) != null && !currentlyBreaking.get(player)) {
|
EffortlessBuilding.log(Minecraft.getInstance().player, I18n.get(buildMode.getNameKey()), true);
|
||||||
//Cancel placing
|
}
|
||||||
initializeMode(player);
|
|
||||||
return;
|
public void activatePreviousBuildMode() {
|
||||||
|
var temp = buildMode;
|
||||||
|
setBuildMode(previousBuildMode);
|
||||||
|
previousBuildMode = temp;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void activateDisableBuildModeToggle(){
|
||||||
|
if (buildMode == BuildModeEnum.DISABLED) {
|
||||||
|
setBuildMode(beforeDisabledBuildMode);
|
||||||
|
} else {
|
||||||
|
beforeDisabledBuildMode = buildMode;
|
||||||
|
setBuildMode(BuildModeEnum.DISABLED);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ReachHelper.canBreakFar(player)) return;
|
|
||||||
|
|
||||||
//If first click
|
|
||||||
if (currentlyBreaking.get(player) == null) {
|
|
||||||
//If startpos is null, dont do anything
|
|
||||||
if (startPos == null) return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
|
|
||||||
ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
|
|
||||||
|
|
||||||
//Get coordinates
|
|
||||||
BuildModeEnum buildMode = modeSettings.getBuildMode();
|
|
||||||
List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, Direction.UP, Vec3.ZERO, true);
|
|
||||||
|
|
||||||
if (coordinates.isEmpty()) {
|
|
||||||
currentlyBreaking.put(player, true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Let buildmodifiers break blocks
|
|
||||||
BuildModifiers.onBlockBroken(player, coordinates, breakStartPos);
|
|
||||||
|
|
||||||
//Only works when finishing a buildmode is equal to breaking some blocks
|
|
||||||
//No intermediate blocks allowed
|
|
||||||
currentlyBreaking.remove(player);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<BlockPos> findCoordinates(Player player, BlockPos startPos, boolean skipRaytrace) {
|
public void onCancel() {
|
||||||
List<BlockPos> coordinates = new ArrayList<>();
|
getBuildMode().instance.initialize();
|
||||||
|
|
||||||
ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
|
|
||||||
coordinates.addAll(modeSettings.getBuildMode().instance.findCoordinates(player, startPos, skipRaytrace));
|
|
||||||
|
|
||||||
return coordinates;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void initializeMode(Player player) {
|
|
||||||
//Resetting mode, so not placing or breaking
|
|
||||||
Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
|
|
||||||
currentlyBreaking.remove(player);
|
|
||||||
|
|
||||||
ModeSettingsManager.getModeSettings(player).getBuildMode().instance.initialize(player);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isCurrentlyPlacing(Player player) {
|
|
||||||
Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
|
|
||||||
return currentlyBreaking.get(player) != null && !currentlyBreaking.get(player);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isCurrentlyBreaking(Player player) {
|
|
||||||
Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
|
|
||||||
return currentlyBreaking.get(player) != null && currentlyBreaking.get(player);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Either placing or breaking
|
|
||||||
public static boolean isActive(Player player) {
|
|
||||||
Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
|
|
||||||
return currentlyBreaking.get(player) != null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//Find coordinates on a line bound by a plane
|
//Find coordinates on a line bound by a plane
|
||||||
@@ -186,9 +63,6 @@ public class BuildModes {
|
|||||||
return new Vec3(x, y, z);
|
return new Vec3(x, y, z);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//-- Common build mode functionality --//
|
|
||||||
|
|
||||||
public static Vec3 findYBound(double y, Vec3 start, Vec3 look) {
|
public static Vec3 findYBound(double y, Vec3 start, Vec3 look) {
|
||||||
//then x and z are
|
//then x and z are
|
||||||
double x = (y - start.y) / look.y * look.x + start.x;
|
double x = (y - start.y) / look.y * look.x + start.x;
|
||||||
@@ -245,54 +119,4 @@ public class BuildModes {
|
|||||||
!intersects;
|
!intersects;
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum BuildModeEnum {
|
|
||||||
NORMAL("normal", new Normal(), BuildModeCategoryEnum.BASIC),
|
|
||||||
NORMAL_PLUS("normal_plus", new NormalPlus(), BuildModeCategoryEnum.BASIC, OptionEnum.BUILD_SPEED),
|
|
||||||
LINE("line", new Line(), BuildModeCategoryEnum.BASIC /*, OptionEnum.THICKNESS*/),
|
|
||||||
WALL("wall", new Wall(), BuildModeCategoryEnum.BASIC, OptionEnum.FILL),
|
|
||||||
FLOOR("floor", new Floor(), BuildModeCategoryEnum.BASIC, OptionEnum.FILL),
|
|
||||||
CUBE("cube", new Cube(), BuildModeCategoryEnum.BASIC, OptionEnum.CUBE_FILL),
|
|
||||||
DIAGONAL_LINE("diagonal_line", new DiagonalLine(), BuildModeCategoryEnum.DIAGONAL /*, OptionEnum.THICKNESS*/),
|
|
||||||
DIAGONAL_WALL("diagonal_wall", new DiagonalWall(), BuildModeCategoryEnum.DIAGONAL /*, OptionEnum.FILL*/),
|
|
||||||
SLOPE_FLOOR("slope_floor", new SlopeFloor(), BuildModeCategoryEnum.DIAGONAL, OptionEnum.RAISED_EDGE),
|
|
||||||
CIRCLE("circle", new Circle(), BuildModeCategoryEnum.CIRCULAR, OptionEnum.CIRCLE_START, OptionEnum.FILL),
|
|
||||||
CYLINDER("cylinder", new Cylinder(), BuildModeCategoryEnum.CIRCULAR, OptionEnum.CIRCLE_START, OptionEnum.FILL),
|
|
||||||
SPHERE("sphere", new Sphere(), BuildModeCategoryEnum.CIRCULAR, OptionEnum.CIRCLE_START, OptionEnum.FILL);
|
|
||||||
// PYRAMID("pyramid", new Pyramid(), BuildModeCategoryEnum.ROOF),
|
|
||||||
// CONE("cone", new Cone(), BuildModeCategoryEnum.ROOF),
|
|
||||||
// DOME("dome", new Dome(), BuildModeCategoryEnum.ROOF);
|
|
||||||
|
|
||||||
private final String name;
|
|
||||||
public final IBuildMode instance;
|
|
||||||
public final BuildModeCategoryEnum category;
|
|
||||||
public final OptionEnum[] options;
|
|
||||||
|
|
||||||
BuildModeEnum(String name, IBuildMode instance, BuildModeCategoryEnum category, OptionEnum... options) {
|
|
||||||
this.name = name;
|
|
||||||
this.instance = instance;
|
|
||||||
this.category = category;
|
|
||||||
this.options = options;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getNameKey() {
|
|
||||||
return "effortlessbuilding.mode." + name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDescriptionKey() {
|
|
||||||
return "effortlessbuilding.modedescription." + name;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum BuildModeCategoryEnum {
|
|
||||||
BASIC(new Vector4f(0f, .5f, 1f, .8f)),
|
|
||||||
DIAGONAL(new Vector4f(0.56f, 0.28f, 0.87f, .8f)),
|
|
||||||
CIRCULAR(new Vector4f(0.29f, 0.76f, 0.3f, 1f)),
|
|
||||||
ROOF(new Vector4f(0.83f, 0.87f, 0.23f, .8f));
|
|
||||||
|
|
||||||
public final Vector4f color;
|
|
||||||
|
|
||||||
BuildModeCategoryEnum(Vector4f color) {
|
|
||||||
this.color = color;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,25 +1,14 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmode;
|
package nl.requios.effortlessbuilding.buildmode;
|
||||||
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
import nl.requios.effortlessbuilding.utilities.BlockSet;
|
||||||
import net.minecraft.core.Direction;
|
|
||||||
import net.minecraft.core.BlockPos;
|
|
||||||
import net.minecraft.world.phys.Vec3;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public interface IBuildMode {
|
public interface IBuildMode {
|
||||||
|
|
||||||
//Fired when a player selects a buildmode and when it needs to initializeMode
|
//Reset values here, start over
|
||||||
void initialize(Player player);
|
void initialize();
|
||||||
|
|
||||||
//Fired when a block would be placed
|
//Returns if we should place blocks now
|
||||||
//Return a list of coordinates where you want to place blocks
|
boolean onClick(BlockSet blocks);
|
||||||
List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace);
|
|
||||||
|
|
||||||
//Fired continuously for visualization purposes
|
void findCoordinates(BlockSet blocks);
|
||||||
List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace);
|
|
||||||
|
|
||||||
Direction getSideHit(Player player);
|
|
||||||
|
|
||||||
Vec3 getHitVec(Player player);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,18 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmode;
|
package nl.requios.effortlessbuilding.buildmode;
|
||||||
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.ChatFormatting;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
import nl.requios.effortlessbuilding.AllIcons;
|
||||||
|
import nl.requios.effortlessbuilding.ClientEvents;
|
||||||
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
||||||
import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
|
import nl.requios.effortlessbuilding.EffortlessBuildingClient;
|
||||||
import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
|
import nl.requios.effortlessbuilding.network.PacketHandler;
|
||||||
import nl.requios.effortlessbuilding.proxy.ClientProxy;
|
import nl.requios.effortlessbuilding.network.PerformRedoPacket;
|
||||||
|
import nl.requios.effortlessbuilding.network.PerformUndoPacket;
|
||||||
|
import nl.requios.effortlessbuilding.systems.BuildSettings;
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
public class ModeOptions {
|
public class ModeOptions {
|
||||||
|
|
||||||
private static ActionEnum buildSpeed = ActionEnum.NORMAL_SPEED;
|
private static ActionEnum buildSpeed = ActionEnum.NORMAL_SPEED;
|
||||||
@@ -59,116 +65,106 @@ public class ModeOptions {
|
|||||||
return circleStart;
|
return circleStart;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Called on both client and server
|
|
||||||
public static void performAction(Player player, ActionEnum action) {
|
public static void performAction(Player player, ActionEnum action) {
|
||||||
if (action == null) return;
|
if (action == null) return;
|
||||||
|
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case UNDO:
|
case UNDO -> PacketHandler.INSTANCE.sendToServer(new PerformUndoPacket());
|
||||||
UndoRedo.undo(player);
|
case REDO -> PacketHandler.INSTANCE.sendToServer(new PerformRedoPacket());
|
||||||
break;
|
case OPEN_MODIFIER_SETTINGS -> ClientEvents.openModifierSettings();
|
||||||
case REDO:
|
case OPEN_PLAYER_SETTINGS -> ClientEvents.openPlayerSettings();
|
||||||
UndoRedo.redo(player);
|
case PREVIOUS_BUILD_MODE -> EffortlessBuildingClient.BUILD_MODES.activatePreviousBuildMode();
|
||||||
break;
|
case DISABLE_BUILD_MODE_TOGGLE -> EffortlessBuildingClient.BUILD_MODES.activateDisableBuildModeToggle();
|
||||||
case REPLACE:
|
|
||||||
ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
|
|
||||||
modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
|
|
||||||
EffortlessBuilding.log(player, "Set " + ChatFormatting.GOLD + "Quick Replace " + ChatFormatting.RESET + (
|
|
||||||
modifierSettings.doQuickReplace() ? "on" : "off"), true);
|
|
||||||
break;
|
|
||||||
case OPEN_MODIFIER_SETTINGS:
|
|
||||||
if (player.level.isClientSide)
|
|
||||||
ClientProxy.openModifierSettings();
|
|
||||||
break;
|
|
||||||
case OPEN_PLAYER_SETTINGS:
|
|
||||||
if (player.level.isClientSide)
|
|
||||||
ClientProxy.openPlayerSettings();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NORMAL_SPEED:
|
case REPLACE_ONLY_AIR -> EffortlessBuildingClient.BUILD_SETTINGS.setReplaceMode(BuildSettings.ReplaceMode.ONLY_AIR);
|
||||||
buildSpeed = ActionEnum.NORMAL_SPEED;
|
case REPLACE_BLOCKS_AND_AIR -> EffortlessBuildingClient.BUILD_SETTINGS.setReplaceMode(BuildSettings.ReplaceMode.BLOCKS_AND_AIR);
|
||||||
break;
|
case REPLACE_ONLY_BLOCKS -> EffortlessBuildingClient.BUILD_SETTINGS.setReplaceMode(BuildSettings.ReplaceMode.ONLY_BLOCKS);
|
||||||
case FAST_SPEED:
|
case REPLACE_FILTERED_BY_OFFHAND -> EffortlessBuildingClient.BUILD_SETTINGS.setReplaceMode(BuildSettings.ReplaceMode.FILTERED_BY_OFFHAND);
|
||||||
buildSpeed = ActionEnum.FAST_SPEED;
|
case TOGGLE_PROTECT_TILE_ENTITIES -> EffortlessBuildingClient.BUILD_SETTINGS.toggleProtectTileEntities();
|
||||||
break;
|
|
||||||
case FULL:
|
case NORMAL_SPEED -> buildSpeed = ActionEnum.NORMAL_SPEED;
|
||||||
fill = ActionEnum.FULL;
|
case FAST_SPEED -> buildSpeed = ActionEnum.FAST_SPEED;
|
||||||
break;
|
|
||||||
case HOLLOW:
|
case FULL -> fill = ActionEnum.FULL;
|
||||||
fill = ActionEnum.HOLLOW;
|
case HOLLOW -> fill = ActionEnum.HOLLOW;
|
||||||
break;
|
|
||||||
case CUBE_FULL:
|
case CUBE_FULL -> cubeFill = ActionEnum.CUBE_FULL;
|
||||||
cubeFill = ActionEnum.CUBE_FULL;
|
case CUBE_HOLLOW -> cubeFill = ActionEnum.CUBE_HOLLOW;
|
||||||
break;
|
case CUBE_SKELETON -> cubeFill = ActionEnum.CUBE_SKELETON;
|
||||||
case CUBE_HOLLOW:
|
|
||||||
cubeFill = ActionEnum.CUBE_HOLLOW;
|
case SHORT_EDGE -> raisedEdge = ActionEnum.SHORT_EDGE;
|
||||||
break;
|
case LONG_EDGE -> raisedEdge = ActionEnum.LONG_EDGE;
|
||||||
case CUBE_SKELETON:
|
|
||||||
cubeFill = ActionEnum.CUBE_SKELETON;
|
case THICKNESS_1 -> lineThickness = ActionEnum.THICKNESS_1;
|
||||||
break;
|
case THICKNESS_3 -> lineThickness = ActionEnum.THICKNESS_3;
|
||||||
case SHORT_EDGE:
|
case THICKNESS_5 -> lineThickness = ActionEnum.THICKNESS_5;
|
||||||
raisedEdge = ActionEnum.SHORT_EDGE;
|
|
||||||
break;
|
case CIRCLE_START_CENTER -> circleStart = ActionEnum.CIRCLE_START_CENTER;
|
||||||
case LONG_EDGE:
|
case CIRCLE_START_CORNER -> circleStart = ActionEnum.CIRCLE_START_CORNER;
|
||||||
raisedEdge = ActionEnum.LONG_EDGE;
|
|
||||||
break;
|
|
||||||
case THICKNESS_1:
|
|
||||||
lineThickness = ActionEnum.THICKNESS_1;
|
|
||||||
break;
|
|
||||||
case THICKNESS_3:
|
|
||||||
lineThickness = ActionEnum.THICKNESS_3;
|
|
||||||
break;
|
|
||||||
case THICKNESS_5:
|
|
||||||
lineThickness = ActionEnum.THICKNESS_5;
|
|
||||||
break;
|
|
||||||
case CIRCLE_START_CENTER:
|
|
||||||
circleStart = ActionEnum.CIRCLE_START_CENTER;
|
|
||||||
break;
|
|
||||||
case CIRCLE_START_CORNER:
|
|
||||||
circleStart = ActionEnum.CIRCLE_START_CORNER;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player.level.isClientSide &&
|
if (player.level.isClientSide &&
|
||||||
action != ActionEnum.REPLACE &&
|
|
||||||
action != ActionEnum.OPEN_MODIFIER_SETTINGS &&
|
action != ActionEnum.OPEN_MODIFIER_SETTINGS &&
|
||||||
action != ActionEnum.OPEN_PLAYER_SETTINGS) {
|
action != ActionEnum.OPEN_PLAYER_SETTINGS &&
|
||||||
|
action != ActionEnum.PREVIOUS_BUILD_MODE &&
|
||||||
|
action != ActionEnum.DISABLE_BUILD_MODE_TOGGLE) {
|
||||||
|
|
||||||
EffortlessBuilding.logTranslate(player, "", action.name, "", true);
|
EffortlessBuilding.logTranslate(player, "", action.getNameKey(), "", true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum ActionEnum {
|
public enum ActionEnum {
|
||||||
UNDO("effortlessbuilding.action.undo"),
|
UNDO("undo", AllIcons.I_UNDO),
|
||||||
REDO("effortlessbuilding.action.redo"),
|
REDO("redo", AllIcons.I_REDO),
|
||||||
REPLACE("effortlessbuilding.action.replace"),
|
OPEN_MODIFIER_SETTINGS("open_modifier_settings", AllIcons.I_SETTINGS),
|
||||||
OPEN_MODIFIER_SETTINGS("effortlessbuilding.action.open_modifier_settings"),
|
OPEN_PLAYER_SETTINGS("open_player_settings", AllIcons.I_SETTINGS),
|
||||||
OPEN_PLAYER_SETTINGS("effortlessbuilding.action.open_player_settings"),
|
PREVIOUS_BUILD_MODE("previous_build_mode", AllIcons.I_SINGLE),
|
||||||
|
DISABLE_BUILD_MODE_TOGGLE("disable_build_mode_toggle", AllIcons.I_DISABLE),
|
||||||
|
|
||||||
NORMAL_SPEED("effortlessbuilding.action.normal_speed"),
|
REPLACE_ONLY_AIR("replace_only_air", AllIcons.I_REPLACE_AIR),
|
||||||
FAST_SPEED("effortlessbuilding.action.fast_speed"),
|
REPLACE_BLOCKS_AND_AIR("replace_blocks_and_air", AllIcons.I_REPLACE_BLOCKS_AND_AIR),
|
||||||
|
REPLACE_ONLY_BLOCKS("replace_only_blocks", AllIcons.I_REPLACE_BLOCKS),
|
||||||
|
REPLACE_FILTERED_BY_OFFHAND("replace_filtered_by_offhand", AllIcons.I_REPLACE_OFFHAND_FILTERED),
|
||||||
|
TOGGLE_PROTECT_TILE_ENTITIES("toggle_protect_tile_entities", AllIcons.I_PROTECT_TILE_ENTITIES),
|
||||||
|
|
||||||
FULL("effortlessbuilding.action.full"),
|
NORMAL_SPEED("normal_speed", AllIcons.I_NORMAL_SPEED),
|
||||||
HOLLOW("effortlessbuilding.action.hollow"),
|
FAST_SPEED("fast_speed", AllIcons.I_FAST_SPEED),
|
||||||
|
|
||||||
CUBE_FULL("effortlessbuilding.action.full"),
|
FULL("full", AllIcons.I_FILLED),
|
||||||
CUBE_HOLLOW("effortlessbuilding.action.hollow"),
|
HOLLOW("hollow", AllIcons.I_HOLLOW),
|
||||||
CUBE_SKELETON("effortlessbuilding.action.skeleton"),
|
|
||||||
|
|
||||||
SHORT_EDGE("effortlessbuilding.action.short_edge"),
|
CUBE_FULL("full", AllIcons.I_CUBE_FILLED),
|
||||||
LONG_EDGE("effortlessbuilding.action.long_edge"),
|
CUBE_HOLLOW("hollow", AllIcons.I_CUBE_HOLLOW),
|
||||||
|
CUBE_SKELETON("skeleton", AllIcons.I_CUBE_SKELETON),
|
||||||
|
|
||||||
THICKNESS_1("effortlessbuilding.action.thickness_1"),
|
SHORT_EDGE("short_edge", AllIcons.I_SHORT_EDGE),
|
||||||
THICKNESS_3("effortlessbuilding.action.thickness_3"),
|
LONG_EDGE("long_edge", AllIcons.I_LONG_EDGE),
|
||||||
THICKNESS_5("effortlessbuilding.action.thickness_5"),
|
|
||||||
|
|
||||||
CIRCLE_START_CORNER("effortlessbuilding.action.start_corner"),
|
THICKNESS_1("thickness_1", AllIcons.I_THICKNESS_1),
|
||||||
CIRCLE_START_CENTER("effortlessbuilding.action.start_center");
|
THICKNESS_3("thickness_3", AllIcons.I_THICKNESS_3),
|
||||||
|
THICKNESS_5("thickness_5", AllIcons.I_THICKNESS_5),
|
||||||
|
|
||||||
|
CIRCLE_START_CORNER("start_corner", AllIcons.I_CIRCLE_START_CORNER),
|
||||||
|
CIRCLE_START_CENTER("start_center", AllIcons.I_CIRCLE_START_CENTER);
|
||||||
|
|
||||||
public String name;
|
public String name;
|
||||||
|
public AllIcons icon;
|
||||||
|
|
||||||
ActionEnum(String name) {
|
ActionEnum(String name, AllIcons icon) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
|
this.icon = icon;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getNameKey() {
|
||||||
|
return "effortlessbuilding.action." + name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDescriptionKey() {
|
||||||
|
return "effortlessbuilding.action." + name + ".description";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,97 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmode;
|
|
||||||
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
|
||||||
import net.minecraft.server.level.ServerPlayer;
|
|
||||||
import net.minecraftforge.common.util.LazyOptional;
|
|
||||||
import net.minecraftforge.fml.common.Mod;
|
|
||||||
import net.minecraftforge.network.PacketDistributor;
|
|
||||||
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
|
||||||
import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
|
|
||||||
import nl.requios.effortlessbuilding.helper.ReachHelper;
|
|
||||||
import nl.requios.effortlessbuilding.network.ModeSettingsMessage;
|
|
||||||
import nl.requios.effortlessbuilding.network.PacketHandler;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
@Mod.EventBusSubscriber
|
|
||||||
public class ModeSettingsManager {
|
|
||||||
|
|
||||||
//Retrieves the buildsettings of a player through the modeCapability capability
|
|
||||||
//Never returns null
|
|
||||||
@Nonnull
|
|
||||||
public static ModeSettings getModeSettings(Player player) {
|
|
||||||
LazyOptional<ModeCapabilityManager.IModeCapability> modeCapability =
|
|
||||||
player.getCapability(ModeCapabilityManager.MODE_CAPABILITY, null);
|
|
||||||
|
|
||||||
if (modeCapability.isPresent()) {
|
|
||||||
ModeCapabilityManager.IModeCapability capability = modeCapability.orElse(null);
|
|
||||||
if (capability.getModeData() == null){
|
|
||||||
capability.setModeData(new ModeSettings());
|
|
||||||
}
|
|
||||||
return capability.getModeData();
|
|
||||||
}
|
|
||||||
|
|
||||||
EffortlessBuilding.logger.warn("Player does not have modeCapability: " + player);
|
|
||||||
//Return dummy settings
|
|
||||||
return new ModeSettings();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setModeSettings(Player player, ModeSettings modeSettings) {
|
|
||||||
if (player == null) {
|
|
||||||
EffortlessBuilding.log("Cannot set buildmode settings, player is null");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
LazyOptional<ModeCapabilityManager.IModeCapability> modeCapability =
|
|
||||||
player.getCapability(ModeCapabilityManager.MODE_CAPABILITY, null);
|
|
||||||
|
|
||||||
modeCapability.ifPresent((capability) -> {
|
|
||||||
capability.setModeData(modeSettings);
|
|
||||||
|
|
||||||
BuildModes.initializeMode(player);
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!modeCapability.isPresent()) {
|
|
||||||
EffortlessBuilding.log(player, "Saving buildmode settings failed.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String sanitize(ModeSettings modeSettings, Player player) {
|
|
||||||
int maxReach = ReachHelper.getMaxReach(player);
|
|
||||||
String error = "";
|
|
||||||
|
|
||||||
//TODO sanitize
|
|
||||||
|
|
||||||
return error;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void handleNewPlayer(Player player) {
|
|
||||||
//Makes sure player has mode settings (if it doesnt it will create it)
|
|
||||||
getModeSettings(player);
|
|
||||||
|
|
||||||
//Only on server
|
|
||||||
if (!player.level.isClientSide) {
|
|
||||||
//Send to client
|
|
||||||
ModeSettingsMessage msg = new ModeSettingsMessage(getModeSettings(player));
|
|
||||||
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), msg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class ModeSettings {
|
|
||||||
private BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.NORMAL;
|
|
||||||
|
|
||||||
public ModeSettings() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public ModeSettings(BuildModes.BuildModeEnum buildMode) {
|
|
||||||
this.buildMode = buildMode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public BuildModes.BuildModeEnum getBuildMode() {
|
|
||||||
return this.buildMode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setBuildMode(BuildModes.BuildModeEnum buildMode) {
|
|
||||||
this.buildMode = buildMode;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,17 +1,129 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmode;
|
package nl.requios.effortlessbuilding.buildmode;
|
||||||
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.core.Direction;
|
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.phys.Vec3;
|
||||||
import nl.requios.effortlessbuilding.helper.ReachHelper;
|
import nl.requios.effortlessbuilding.EffortlessBuildingClient;
|
||||||
|
import nl.requios.effortlessbuilding.utilities.BlockEntry;
|
||||||
|
import nl.requios.effortlessbuilding.utilities.BlockSet;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public abstract class ThreeClicksBuildMode extends BaseBuildMode {
|
public abstract class ThreeClicksBuildMode extends BaseBuildMode {
|
||||||
protected Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
|
protected BlockEntry firstBlockEntry;
|
||||||
|
protected BlockEntry secondBlockEntry;
|
||||||
|
|
||||||
//Finds height after floor has been chosen in buildmodes with 3 clicks
|
//Finds height after floor has been chosen in buildmodes with 3 clicks
|
||||||
|
@Override
|
||||||
|
public void initialize() {
|
||||||
|
super.initialize();
|
||||||
|
firstBlockEntry = null;
|
||||||
|
secondBlockEntry = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onClick(BlockSet blocks) {
|
||||||
|
super.onClick(blocks);
|
||||||
|
|
||||||
|
if (clicks == 1) {
|
||||||
|
//First click, remember starting position
|
||||||
|
firstBlockEntry = EffortlessBuildingClient.BUILDER_CHAIN.getStartPos();
|
||||||
|
|
||||||
|
//If clicking in air, reset and try again
|
||||||
|
if (firstBlockEntry == null) clicks = 0;
|
||||||
|
|
||||||
|
} else if (clicks == 2) {
|
||||||
|
//Second click, find second position
|
||||||
|
|
||||||
|
if (blocks.size() == 0) {
|
||||||
|
clicks = 0;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var player = Minecraft.getInstance().player;
|
||||||
|
var secondPos = findSecondPos(player, firstBlockEntry.blockPos, true);
|
||||||
|
secondBlockEntry = new BlockEntry(secondPos);
|
||||||
|
} else {
|
||||||
|
//Third click, place blocks
|
||||||
|
clicks = 0;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void findCoordinates(BlockSet blocks) {
|
||||||
|
if (clicks == 0) return;
|
||||||
|
|
||||||
|
if (clicks == 1) {
|
||||||
|
var player = Minecraft.getInstance().player;
|
||||||
|
var firstPos = firstBlockEntry.blockPos;
|
||||||
|
var secondPos = findSecondPos(player, firstBlockEntry.blockPos, true);
|
||||||
|
if (secondPos == null) return;
|
||||||
|
|
||||||
|
//Limit amount of blocks we can place per row
|
||||||
|
int axisLimit = EffortlessBuildingClient.POWER_LEVEL.getMaxBlocksPerAxis(player);
|
||||||
|
|
||||||
|
int x1 = firstPos.getX(), x2 = secondPos.getX();
|
||||||
|
int y1 = firstPos.getY(), y2 = secondPos.getY();
|
||||||
|
int z1 = firstPos.getZ(), z2 = secondPos.getZ();
|
||||||
|
|
||||||
|
//limit axis
|
||||||
|
if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
|
||||||
|
if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
|
||||||
|
if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
|
||||||
|
if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
|
||||||
|
if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
|
||||||
|
if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
|
||||||
|
|
||||||
|
blocks.clear();
|
||||||
|
for (BlockPos pos : getIntermediateBlocks(player, x1, y1, z1, x2, y2, z2)) {
|
||||||
|
if (blocks.containsKey(pos)) continue;
|
||||||
|
blocks.add(new BlockEntry(pos));
|
||||||
|
}
|
||||||
|
blocks.firstPos = firstPos;
|
||||||
|
blocks.lastPos = secondPos;
|
||||||
|
} else {
|
||||||
|
var player = Minecraft.getInstance().player;
|
||||||
|
BlockPos firstPos = firstBlockEntry.blockPos;
|
||||||
|
BlockPos secondPos = secondBlockEntry.blockPos;
|
||||||
|
BlockPos thirdPos = findThirdPos(player, firstPos, secondPos, true);
|
||||||
|
if (thirdPos == null) return;
|
||||||
|
|
||||||
|
//Limit amount of blocks you can place per row
|
||||||
|
int axisLimit = EffortlessBuildingClient.POWER_LEVEL.getMaxBlocksPerAxis(player);
|
||||||
|
|
||||||
|
int x1 = firstPos.getX(), x2 = secondPos.getX(), x3 = thirdPos.getX();
|
||||||
|
int y1 = firstPos.getY(), y2 = secondPos.getY(), y3 = thirdPos.getY();
|
||||||
|
int z1 = firstPos.getZ(), z2 = secondPos.getZ(), z3 = thirdPos.getZ();
|
||||||
|
|
||||||
|
//limit axis
|
||||||
|
if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
|
||||||
|
if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
|
||||||
|
if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
|
||||||
|
if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
|
||||||
|
if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
|
||||||
|
if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
|
||||||
|
|
||||||
|
if (x3 - x1 >= axisLimit) x3 = x1 + axisLimit - 1;
|
||||||
|
if (x1 - x3 >= axisLimit) x3 = x1 - axisLimit + 1;
|
||||||
|
if (y3 - y1 >= axisLimit) y3 = y1 + axisLimit - 1;
|
||||||
|
if (y1 - y3 >= axisLimit) y3 = y1 - axisLimit + 1;
|
||||||
|
if (z3 - z1 >= axisLimit) z3 = z1 + axisLimit - 1;
|
||||||
|
if (z1 - z3 >= axisLimit) z3 = z1 - axisLimit + 1;
|
||||||
|
|
||||||
|
blocks.clear();
|
||||||
|
for (BlockPos pos : getFinalBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3)) {
|
||||||
|
if (blocks.containsKey(pos)) continue;
|
||||||
|
blocks.add(new BlockEntry(pos));
|
||||||
|
}
|
||||||
|
blocks.firstPos = firstPos;
|
||||||
|
blocks.lastPos = thirdPos;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static BlockPos findHeight(Player player, BlockPos secondPos, boolean skipRaytrace) {
|
public static BlockPos findHeight(Player player, BlockPos secondPos, boolean skipRaytrace) {
|
||||||
Vec3 look = BuildModes.getPlayerLookVec(player);
|
Vec3 look = BuildModes.getPlayerLookVec(player);
|
||||||
Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
|
Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
|
||||||
@@ -27,7 +139,7 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
|
|||||||
criteriaList.add(new HeightCriteria(zBound, secondPos, start));
|
criteriaList.add(new HeightCriteria(zBound, secondPos, start));
|
||||||
|
|
||||||
//Remove invalid criteria
|
//Remove invalid criteria
|
||||||
int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
|
int reach = EffortlessBuildingClient.POWER_LEVEL.getBuildModeReach(player);
|
||||||
criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
|
criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
|
||||||
|
|
||||||
//If none are valid, return empty list of blocks
|
//If none are valid, return empty list of blocks
|
||||||
@@ -52,127 +164,13 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return new BlockPos(selected.lineBound);
|
return BlockPos.containing(selected.lineBound);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
// protected abstract BlockEntry findSecondPos(List<BlockEntry> blocks);
|
||||||
public void initialize(Player player) {
|
|
||||||
super.initialize(player);
|
|
||||||
secondPosTable.put(player.getUUID(), BlockPos.ZERO);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) {
|
|
||||||
List<BlockPos> list = new ArrayList<>();
|
|
||||||
|
|
||||||
Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
|
|
||||||
int rightClickNr = rightClickTable.get(player.getUUID());
|
|
||||||
rightClickNr++;
|
|
||||||
rightClickTable.put(player.getUUID(), rightClickNr);
|
|
||||||
|
|
||||||
if (rightClickNr == 1) {
|
|
||||||
//If clicking in air, reset and try again
|
|
||||||
if (blockPos == null) {
|
|
||||||
rightClickTable.put(player.getUUID(), 0);
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
//First click, remember starting position
|
|
||||||
firstPosTable.put(player.getUUID(), blockPos);
|
|
||||||
sideHitTable.put(player.getUUID(), sideHit);
|
|
||||||
hitVecTable.put(player.getUUID(), hitVec);
|
|
||||||
//Keep list empty, dont place any blocks yet
|
|
||||||
} else if (rightClickNr == 2) {
|
|
||||||
//Second click, find other floor point
|
|
||||||
BlockPos firstPos = firstPosTable.get(player.getUUID());
|
|
||||||
BlockPos secondPos = findSecondPos(player, firstPos, true);
|
|
||||||
|
|
||||||
if (secondPos == null) {
|
|
||||||
rightClickTable.put(player.getUUID(), 1);
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
secondPosTable.put(player.getUUID(), secondPos);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
//Third click, place diagonal wall with height
|
|
||||||
list = findCoordinates(player, blockPos, skipRaytrace);
|
|
||||||
rightClickTable.put(player.getUUID(), 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) {
|
|
||||||
List<BlockPos> list = new ArrayList<>();
|
|
||||||
Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
|
|
||||||
int rightClickNr = rightClickTable.get(player.getUUID());
|
|
||||||
|
|
||||||
if (rightClickNr == 0) {
|
|
||||||
if (blockPos != null)
|
|
||||||
list.add(blockPos);
|
|
||||||
} else if (rightClickNr == 1) {
|
|
||||||
BlockPos firstPos = firstPosTable.get(player.getUUID());
|
|
||||||
|
|
||||||
BlockPos secondPos = findSecondPos(player, firstPos, true);
|
|
||||||
if (secondPos == null) return list;
|
|
||||||
|
|
||||||
//Limit amount of blocks you can place per row
|
|
||||||
int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
|
|
||||||
|
|
||||||
int x1 = firstPos.getX(), x2 = secondPos.getX();
|
|
||||||
int y1 = firstPos.getY(), y2 = secondPos.getY();
|
|
||||||
int z1 = firstPos.getZ(), z2 = secondPos.getZ();
|
|
||||||
|
|
||||||
//limit axis
|
|
||||||
if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
|
|
||||||
if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
|
|
||||||
if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
|
|
||||||
if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
|
|
||||||
if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
|
|
||||||
if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
|
|
||||||
|
|
||||||
//Add diagonal line from first to second
|
|
||||||
list.addAll(getIntermediateBlocks(player, x1, y1, z1, x2, y2, z2));
|
|
||||||
|
|
||||||
} else {
|
|
||||||
BlockPos firstPos = firstPosTable.get(player.getUUID());
|
|
||||||
BlockPos secondPos = secondPosTable.get(player.getUUID());
|
|
||||||
|
|
||||||
BlockPos thirdPos = findThirdPos(player, firstPos, secondPos, skipRaytrace);
|
|
||||||
if (thirdPos == null) return list;
|
|
||||||
|
|
||||||
//Limit amount of blocks you can place per row
|
|
||||||
int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
|
|
||||||
|
|
||||||
int x1 = firstPos.getX(), x2 = secondPos.getX(), x3 = thirdPos.getX();
|
|
||||||
int y1 = firstPos.getY(), y2 = secondPos.getY(), y3 = thirdPos.getY();
|
|
||||||
int z1 = firstPos.getZ(), z2 = secondPos.getZ(), z3 = thirdPos.getZ();
|
|
||||||
|
|
||||||
//limit axis
|
|
||||||
if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
|
|
||||||
if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
|
|
||||||
if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
|
|
||||||
if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
|
|
||||||
if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
|
|
||||||
if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
|
|
||||||
|
|
||||||
if (x3 - x1 >= axisLimit) x3 = x1 + axisLimit - 1;
|
|
||||||
if (x1 - x3 >= axisLimit) x3 = x1 - axisLimit + 1;
|
|
||||||
if (y3 - y1 >= axisLimit) y3 = y1 + axisLimit - 1;
|
|
||||||
if (y1 - y3 >= axisLimit) y3 = y1 - axisLimit + 1;
|
|
||||||
if (z3 - z1 >= axisLimit) z3 = z1 + axisLimit - 1;
|
|
||||||
if (z1 - z3 >= axisLimit) z3 = z1 - axisLimit + 1;
|
|
||||||
|
|
||||||
//Add diagonal line from first to third
|
|
||||||
list.addAll(getFinalBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3));
|
|
||||||
}
|
|
||||||
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Finds the place of the second block pos
|
//Finds the place of the second block pos
|
||||||
|
// @Deprecated
|
||||||
protected abstract BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace);
|
protected abstract BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace);
|
||||||
|
|
||||||
//Finds the place of the third block pos
|
//Finds the place of the third block pos
|
||||||
@@ -199,7 +197,7 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
|
|||||||
|
|
||||||
//Make it from a plane into a line, on y axis only
|
//Make it from a plane into a line, on y axis only
|
||||||
private Vec3 toLongestLine(Vec3 boundVec, BlockPos secondPos) {
|
private Vec3 toLongestLine(Vec3 boundVec, BlockPos secondPos) {
|
||||||
BlockPos bound = new BlockPos(boundVec);
|
BlockPos bound = BlockPos.containing(boundVec);
|
||||||
return new Vec3(secondPos.getX(), bound.getY(), secondPos.getZ());
|
return new Vec3(secondPos.getX(), bound.getY(), secondPos.getZ());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,81 +1,74 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmode;
|
package nl.requios.effortlessbuilding.buildmode;
|
||||||
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.core.Direction;
|
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import nl.requios.effortlessbuilding.helper.ReachHelper;
|
import nl.requios.effortlessbuilding.EffortlessBuildingClient;
|
||||||
|
import nl.requios.effortlessbuilding.utilities.BlockEntry;
|
||||||
|
import nl.requios.effortlessbuilding.utilities.BlockSet;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Dictionary;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
public abstract class TwoClicksBuildMode extends BaseBuildMode {
|
public abstract class TwoClicksBuildMode extends BaseBuildMode {
|
||||||
|
|
||||||
|
protected BlockEntry firstBlockEntry;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) {
|
public void initialize() {
|
||||||
List<BlockPos> list = new ArrayList<>();
|
super.initialize();
|
||||||
|
firstBlockEntry = null;
|
||||||
Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
|
|
||||||
int rightClickNr = rightClickTable.get(player.getUUID());
|
|
||||||
rightClickNr++;
|
|
||||||
rightClickTable.put(player.getUUID(), rightClickNr);
|
|
||||||
|
|
||||||
if (rightClickNr == 1) {
|
|
||||||
//If clicking in air, reset and try again
|
|
||||||
if (blockPos == null) {
|
|
||||||
rightClickTable.put(player.getUUID(), 0);
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
//First click, remember starting position
|
|
||||||
firstPosTable.put(player.getUUID(), blockPos);
|
|
||||||
sideHitTable.put(player.getUUID(), sideHit);
|
|
||||||
hitVecTable.put(player.getUUID(), hitVec);
|
|
||||||
//Keep list empty, dont place any blocks yet
|
|
||||||
} else {
|
|
||||||
//Second click, place blocks
|
|
||||||
list = findCoordinates(player, blockPos, skipRaytrace);
|
|
||||||
rightClickTable.put(player.getUUID(), 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return list;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) {
|
public boolean onClick(BlockSet blocks) {
|
||||||
List<BlockPos> list = new ArrayList<>();
|
super.onClick(blocks);
|
||||||
Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
|
|
||||||
int rightClickNr = rightClickTable.get(player.getUUID());
|
if (clicks == 1) {
|
||||||
BlockPos firstPos = firstPosTable.get(player.getUUID());
|
//First click, remember starting position
|
||||||
|
firstBlockEntry = EffortlessBuildingClient.BUILDER_CHAIN.getStartPos();
|
||||||
|
|
||||||
|
//If clicking in air, reset and try again
|
||||||
|
if (firstBlockEntry == null) clicks = 0;
|
||||||
|
|
||||||
if (rightClickNr == 0) {
|
|
||||||
if (blockPos != null)
|
|
||||||
list.add(blockPos);
|
|
||||||
} else {
|
} else {
|
||||||
BlockPos secondPos = findSecondPos(player, firstPos, skipRaytrace);
|
//Second click, place blocks
|
||||||
if (secondPos == null) return list;
|
clicks = 0;
|
||||||
|
return true;
|
||||||
//Limit amount of blocks we can place per row
|
|
||||||
int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
|
|
||||||
|
|
||||||
int x1 = firstPos.getX(), x2 = secondPos.getX();
|
|
||||||
int y1 = firstPos.getY(), y2 = secondPos.getY();
|
|
||||||
int z1 = firstPos.getZ(), z2 = secondPos.getZ();
|
|
||||||
|
|
||||||
//limit axis
|
|
||||||
if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
|
|
||||||
if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
|
|
||||||
if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
|
|
||||||
if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
|
|
||||||
if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
|
|
||||||
if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
|
|
||||||
|
|
||||||
list.addAll(getAllBlocks(player, x1, y1, z1, x2, y2, z2));
|
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return list;
|
@Override
|
||||||
|
public void findCoordinates(BlockSet blocks) {
|
||||||
|
if (clicks == 0) return;
|
||||||
|
|
||||||
|
var player = Minecraft.getInstance().player;
|
||||||
|
var firstPos = firstBlockEntry.blockPos;
|
||||||
|
var secondPos = findSecondPos(player, firstBlockEntry.blockPos, true);
|
||||||
|
if (secondPos == null) return;
|
||||||
|
|
||||||
|
//Limit amount of blocks we can place per row
|
||||||
|
int axisLimit = EffortlessBuildingClient.POWER_LEVEL.getMaxBlocksPerAxis(player);
|
||||||
|
|
||||||
|
int x1 = firstPos.getX(), x2 = secondPos.getX();
|
||||||
|
int y1 = firstPos.getY(), y2 = secondPos.getY();
|
||||||
|
int z1 = firstPos.getZ(), z2 = secondPos.getZ();
|
||||||
|
|
||||||
|
//limit axis
|
||||||
|
if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
|
||||||
|
if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
|
||||||
|
if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
|
||||||
|
if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
|
||||||
|
if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
|
||||||
|
if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
|
||||||
|
|
||||||
|
blocks.clear();
|
||||||
|
for (BlockPos pos : getAllBlocks(player, x1, y1, z1, x2, y2, z2)) {
|
||||||
|
if (blocks.containsKey(pos)) continue;
|
||||||
|
blocks.add(new BlockEntry(pos));
|
||||||
|
}
|
||||||
|
blocks.firstPos = firstPos;
|
||||||
|
blocks.lastPos = secondPos;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Finds the place of the second block pos based on criteria (floor must be on same height as first click, wall on same plane etc)
|
//Finds the place of the second block pos based on criteria (floor must be on same height as first click, wall on same plane etc)
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ public class DiagonalLine extends ThreeClicksBuildMode {
|
|||||||
int iterations = (int) Math.ceil(first.distanceTo(second) * sampleMultiplier);
|
int iterations = (int) Math.ceil(first.distanceTo(second) * sampleMultiplier);
|
||||||
for (double t = 0; t <= 1.0; t += 1.0 / iterations) {
|
for (double t = 0; t <= 1.0; t += 1.0 / iterations) {
|
||||||
Vec3 lerp = first.add(second.subtract(first).scale(t));
|
Vec3 lerp = first.add(second.subtract(first).scale(t));
|
||||||
BlockPos candidate = new BlockPos(lerp);
|
BlockPos candidate = BlockPos.containing(lerp);
|
||||||
//Only add if not equal to the last in the list
|
//Only add if not equal to the last in the list
|
||||||
if (list.isEmpty() || !list.get(list.size() - 1).equals(candidate))
|
if (list.isEmpty() || !list.get(list.size() - 1).equals(candidate))
|
||||||
list.add(candidate);
|
list.add(candidate);
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package nl.requios.effortlessbuilding.buildmode.buildmodes;
|
||||||
|
|
||||||
|
import nl.requios.effortlessbuilding.buildmode.IBuildMode;
|
||||||
|
import nl.requios.effortlessbuilding.utilities.BlockSet;
|
||||||
|
|
||||||
|
public class Disabled implements IBuildMode {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void initialize() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onClick(BlockSet blocks) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void findCoordinates(BlockSet blocks) {
|
||||||
|
//Do nothing
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,10 +3,10 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes;
|
|||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
import nl.requios.effortlessbuilding.EffortlessBuildingClient;
|
||||||
import nl.requios.effortlessbuilding.buildmode.BuildModes;
|
import nl.requios.effortlessbuilding.buildmode.BuildModes;
|
||||||
import nl.requios.effortlessbuilding.buildmode.ModeOptions;
|
import nl.requios.effortlessbuilding.buildmode.ModeOptions;
|
||||||
import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
|
import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
|
||||||
import nl.requios.effortlessbuilding.helper.ReachHelper;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -24,7 +24,7 @@ public class Floor extends TwoClicksBuildMode {
|
|||||||
criteriaList.add(new Criteria(yBound, start));
|
criteriaList.add(new Criteria(yBound, start));
|
||||||
|
|
||||||
//Remove invalid criteria
|
//Remove invalid criteria
|
||||||
int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
|
int reach = EffortlessBuildingClient.POWER_LEVEL.getBuildModeReach(player);
|
||||||
criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
|
criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
|
||||||
|
|
||||||
//If none are valid, return empty list of blocks
|
//If none are valid, return empty list of blocks
|
||||||
@@ -33,7 +33,7 @@ public class Floor extends TwoClicksBuildMode {
|
|||||||
//Then only 1 can be valid, return that one
|
//Then only 1 can be valid, return that one
|
||||||
Criteria selected = criteriaList.get(0);
|
Criteria selected = criteriaList.get(0);
|
||||||
|
|
||||||
return new BlockPos(selected.planeBound);
|
return BlockPos.containing(selected.planeBound);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<BlockPos> getFloorBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
|
public static List<BlockPos> getFloorBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmode.buildmodes;
|
package nl.requios.effortlessbuilding.buildmode.buildmodes;
|
||||||
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
import nl.requios.effortlessbuilding.EffortlessBuildingClient;
|
||||||
import nl.requios.effortlessbuilding.buildmode.BuildModes;
|
import nl.requios.effortlessbuilding.buildmode.BuildModes;
|
||||||
import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
|
import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
|
||||||
import nl.requios.effortlessbuilding.helper.ReachHelper;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -31,7 +31,7 @@ public class Line extends TwoClicksBuildMode {
|
|||||||
criteriaList.add(new Criteria(zBound, firstPos, start));
|
criteriaList.add(new Criteria(zBound, firstPos, start));
|
||||||
|
|
||||||
//Remove invalid criteria
|
//Remove invalid criteria
|
||||||
int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
|
int reach = EffortlessBuildingClient.POWER_LEVEL.getBuildModeReach(player);
|
||||||
criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
|
criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
|
||||||
|
|
||||||
//If none are valid, return empty list of blocks
|
//If none are valid, return empty list of blocks
|
||||||
@@ -58,7 +58,7 @@ public class Line extends TwoClicksBuildMode {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return new BlockPos(selected.lineBound);
|
return BlockPos.containing(selected.lineBound);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<BlockPos> getLineBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
|
public static List<BlockPos> getLineBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
|
||||||
@@ -89,7 +89,7 @@ public class Line extends TwoClicksBuildMode {
|
|||||||
|
|
||||||
public static void addZLineBlocks(List<BlockPos> list, int z1, int z2, int x, int y) {
|
public static void addZLineBlocks(List<BlockPos> list, int z1, int z2, int x, int y) {
|
||||||
for (int z = z1; z1 < z2 ? z <= z2 : z >= z2; z += z1 < z2 ? 1 : -1) {
|
for (int z = z1; z1 < z2 ? z <= z2 : z >= z2; z += z1 < z2 ? 1 : -1) {
|
||||||
list.add(new BlockPos(x, y, z));
|
list.add(BlockPos.containing(x, y, z));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -119,7 +119,7 @@ public class Line extends TwoClicksBuildMode {
|
|||||||
//Make it from a plane into a line
|
//Make it from a plane into a line
|
||||||
//Select the axis that is longest
|
//Select the axis that is longest
|
||||||
private Vec3 toLongestLine(Vec3 boundVec, BlockPos firstPos) {
|
private Vec3 toLongestLine(Vec3 boundVec, BlockPos firstPos) {
|
||||||
BlockPos bound = new BlockPos(boundVec);
|
BlockPos bound = BlockPos.containing(boundVec);
|
||||||
|
|
||||||
BlockPos firstToSecond = bound.subtract(firstPos);
|
BlockPos firstToSecond = bound.subtract(firstPos);
|
||||||
firstToSecond = new BlockPos(Math.abs(firstToSecond.getX()), Math.abs(firstToSecond.getY()), Math.abs(firstToSecond.getZ()));
|
firstToSecond = new BlockPos(Math.abs(firstToSecond.getX()), Math.abs(firstToSecond.getY()), Math.abs(firstToSecond.getZ()));
|
||||||
|
|||||||
@@ -1,41 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmode.buildmodes;
|
|
||||||
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
|
||||||
import net.minecraft.core.Direction;
|
|
||||||
import net.minecraft.core.BlockPos;
|
|
||||||
import net.minecraft.world.phys.Vec3;
|
|
||||||
import nl.requios.effortlessbuilding.buildmode.IBuildMode;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class Normal implements IBuildMode {
|
|
||||||
@Override
|
|
||||||
public void initialize(Player player) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) {
|
|
||||||
List<BlockPos> list = new ArrayList<>();
|
|
||||||
if (blockPos != null) list.add(blockPos);
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) {
|
|
||||||
List<BlockPos> list = new ArrayList<>();
|
|
||||||
if (blockPos != null) list.add(blockPos);
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Direction getSideHit(Player player) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Vec3 getHitVec(Player player) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmode.buildmodes;
|
|
||||||
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
|
||||||
import net.minecraft.core.Direction;
|
|
||||||
import net.minecraft.core.BlockPos;
|
|
||||||
import net.minecraft.world.phys.Vec3;
|
|
||||||
import nl.requios.effortlessbuilding.buildmode.IBuildMode;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class NormalPlus implements IBuildMode {
|
|
||||||
@Override
|
|
||||||
public void initialize(Player player) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) {
|
|
||||||
List<BlockPos> list = new ArrayList<>();
|
|
||||||
if (blockPos != null) list.add(blockPos);
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) {
|
|
||||||
List<BlockPos> list = new ArrayList<>();
|
|
||||||
if (blockPos != null) list.add(blockPos);
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Direction getSideHit(Player player) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Vec3 getHitVec(Player player) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,11 +2,8 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes;
|
|||||||
|
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import nl.requios.effortlessbuilding.buildmode.ModeOptions;
|
|
||||||
import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
|
import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
|
||||||
import nl.requios.effortlessbuilding.helper.ReachHelper;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class Pyramid extends ThreeClicksBuildMode {
|
public class Pyramid extends ThreeClicksBuildMode {
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package nl.requios.effortlessbuilding.buildmode.buildmodes;
|
||||||
|
|
||||||
|
import nl.requios.effortlessbuilding.buildmode.IBuildMode;
|
||||||
|
import nl.requios.effortlessbuilding.utilities.BlockSet;
|
||||||
|
|
||||||
|
public class Single implements IBuildMode {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void initialize() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onClick(BlockSet blocks) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void findCoordinates(BlockSet blocks) {
|
||||||
|
//Do nothing
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,9 +2,9 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes;
|
|||||||
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
|
import nl.requios.effortlessbuilding.EffortlessBuildingClient;
|
||||||
import nl.requios.effortlessbuilding.buildmode.ModeOptions;
|
import nl.requios.effortlessbuilding.buildmode.ModeOptions;
|
||||||
import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
|
import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
|
||||||
import nl.requios.effortlessbuilding.helper.ReachHelper;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -15,7 +15,7 @@ public class SlopeFloor extends ThreeClicksBuildMode {
|
|||||||
public static List<BlockPos> getSlopeFloorBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
|
public static List<BlockPos> getSlopeFloorBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
|
||||||
List<BlockPos> list = new ArrayList<>();
|
List<BlockPos> list = new ArrayList<>();
|
||||||
|
|
||||||
int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
|
int axisLimit = EffortlessBuildingClient.POWER_LEVEL.getMaxBlocksPerAxis(player);
|
||||||
|
|
||||||
//Determine whether to use x or z axis to slope up
|
//Determine whether to use x or z axis to slope up
|
||||||
boolean onXAxis = true;
|
boolean onXAxis = true;
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes;
|
|||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
import nl.requios.effortlessbuilding.EffortlessBuildingClient;
|
||||||
import nl.requios.effortlessbuilding.buildmode.BuildModes;
|
import nl.requios.effortlessbuilding.buildmode.BuildModes;
|
||||||
import nl.requios.effortlessbuilding.buildmode.ModeOptions;
|
import nl.requios.effortlessbuilding.buildmode.ModeOptions;
|
||||||
import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
|
import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
|
||||||
import nl.requios.effortlessbuilding.helper.ReachHelper;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -28,7 +28,7 @@ public class Wall extends TwoClicksBuildMode {
|
|||||||
criteriaList.add(new Criteria(zBound, firstPos, start, look));
|
criteriaList.add(new Criteria(zBound, firstPos, start, look));
|
||||||
|
|
||||||
//Remove invalid criteria
|
//Remove invalid criteria
|
||||||
int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
|
int reach = EffortlessBuildingClient.POWER_LEVEL.getBuildModeReach(player);
|
||||||
criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
|
criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
|
||||||
|
|
||||||
//If none are valid, return empty list of blocks
|
//If none are valid, return empty list of blocks
|
||||||
@@ -48,7 +48,7 @@ public class Wall extends TwoClicksBuildMode {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return new BlockPos(selected.planeBound);
|
return BlockPos.containing(selected.planeBound);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<BlockPos> getWallBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
|
public static List<BlockPos> getWallBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
|
||||||
|
|||||||
@@ -1,104 +1,63 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmodifier;
|
package nl.requios.effortlessbuilding.buildmodifier;
|
||||||
|
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
import net.minecraft.nbt.CompoundTag;
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.item.ItemStack;
|
|
||||||
import net.minecraft.core.Direction;
|
|
||||||
import net.minecraft.world.InteractionHand;
|
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.world.phys.Vec3;
|
|
||||||
import net.minecraft.core.Vec3i;
|
import net.minecraft.core.Vec3i;
|
||||||
import net.minecraftforge.items.IItemHandler;
|
import nl.requios.effortlessbuilding.utilities.BlockEntry;
|
||||||
import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
|
import nl.requios.effortlessbuilding.utilities.BlockSet;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
public class Array extends BaseModifier {
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class Array {
|
public Vec3i offset = BlockPos.ZERO;
|
||||||
|
public int count = 5;
|
||||||
|
|
||||||
public static List<BlockPos> findCoordinates(Player player, BlockPos startPos) {
|
@Override
|
||||||
List<BlockPos> coordinates = new ArrayList<>();
|
public void findCoordinates(BlockSet blocks, Player player) {
|
||||||
|
if (!enabled || offset.getX() == 0 && offset.getY() == 0 && offset.getZ() == 0) return;
|
||||||
|
|
||||||
//find arraysettings for the player
|
var originalBlocks = new BlockSet(blocks);
|
||||||
ArraySettings a = ModifierSettingsManager.getModifierSettings(player).getArraySettings();
|
for (BlockEntry blockEntry : originalBlocks) {
|
||||||
if (!isEnabled(a)) return coordinates;
|
var pos = blockEntry.blockPos;
|
||||||
|
for (int i = 0; i < count; i++) {
|
||||||
|
pos = pos.offset(offset);
|
||||||
|
if (blocks.containsKey(pos)) continue;
|
||||||
|
|
||||||
BlockPos pos = startPos;
|
var newBlockEntry = new BlockEntry(pos);
|
||||||
Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
|
newBlockEntry.copyRotationSettingsFrom(blockEntry);
|
||||||
|
blocks.add(newBlockEntry);
|
||||||
for (int i = 0; i < a.count; i++) {
|
|
||||||
pos = pos.offset(offset);
|
|
||||||
coordinates.add(pos);
|
|
||||||
}
|
|
||||||
|
|
||||||
return coordinates;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static List<BlockState> findBlockStates(Player player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
|
|
||||||
List<BlockState> blockStates = new ArrayList<>();
|
|
||||||
|
|
||||||
//find arraysettings for the player that placed the block
|
|
||||||
ArraySettings a = ModifierSettingsManager.getModifierSettings(player).getArraySettings();
|
|
||||||
if (!isEnabled(a)) return blockStates;
|
|
||||||
|
|
||||||
BlockPos pos = startPos;
|
|
||||||
Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
|
|
||||||
|
|
||||||
//Randomizer bag synergy
|
|
||||||
AbstractRandomizerBagItem randomizerBagItem = null;
|
|
||||||
IItemHandler bagInventory = null;
|
|
||||||
if (!itemStack.isEmpty() && itemStack.getItem() instanceof AbstractRandomizerBagItem) {
|
|
||||||
randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem() ;
|
|
||||||
bagInventory = randomizerBagItem.getBagInventory(itemStack);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 0; i < a.count; i++) {
|
|
||||||
pos = pos.offset(offset);
|
|
||||||
|
|
||||||
//Randomizer bag synergy
|
|
||||||
if (randomizerBagItem != null) {
|
|
||||||
itemStack = randomizerBagItem.pickRandomStack(bagInventory);
|
|
||||||
blockState = BuildModifiers
|
|
||||||
.getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vec3(0, 0, 0), InteractionHand.MAIN_HAND);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//blockState = blockState.getBlock().getStateForPlacement(player.world, pos, )
|
|
||||||
blockStates.add(blockState);
|
|
||||||
itemStacks.add(itemStack);
|
|
||||||
}
|
|
||||||
|
|
||||||
return blockStates;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isEnabled(ArraySettings a) {
|
|
||||||
if (a == null || !a.enabled) return false;
|
|
||||||
|
|
||||||
return a.offset.getX() != 0 || a.offset.getY() != 0 || a.offset.getZ() != 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class ArraySettings {
|
|
||||||
public boolean enabled = false;
|
|
||||||
public BlockPos offset = BlockPos.ZERO;
|
|
||||||
public int count = 5;
|
|
||||||
|
|
||||||
public ArraySettings() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public ArraySettings(boolean enabled, BlockPos offset, int count) {
|
|
||||||
this.enabled = enabled;
|
|
||||||
this.offset = offset;
|
|
||||||
this.count = count;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getReach() {
|
|
||||||
//find largest offset
|
|
||||||
int x = Math.abs(offset.getX());
|
|
||||||
int y = Math.abs(offset.getY());
|
|
||||||
int z = Math.abs(offset.getZ());
|
|
||||||
int largestOffset = Math.max(Math.max(x, y), z);
|
|
||||||
|
|
||||||
return largestOffset * count;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPowerLevelChanged(int powerLevel) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getReach() {
|
||||||
|
//find largest offset
|
||||||
|
int x = Math.abs(offset.getX());
|
||||||
|
int y = Math.abs(offset.getY());
|
||||||
|
int z = Math.abs(offset.getZ());
|
||||||
|
int largestOffset = Math.max(Math.max(x, y), z);
|
||||||
|
|
||||||
|
return largestOffset * count;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompoundTag serializeNBT() {
|
||||||
|
var compound = super.serializeNBT();
|
||||||
|
compound.putIntArray("offset", new int[]{offset.getX(), offset.getY(), offset.getZ()});
|
||||||
|
compound.putInt("count", count);
|
||||||
|
return compound;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deserializeNBT(CompoundTag compound) {
|
||||||
|
super.deserializeNBT(compound);
|
||||||
|
int[] offsetArray = compound.getIntArray("offset");
|
||||||
|
offset = new Vec3i(offsetArray[0], offsetArray[1], offsetArray[2]);
|
||||||
|
count = compound.getInt("count");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package nl.requios.effortlessbuilding.buildmodifier;
|
||||||
|
|
||||||
|
import net.minecraft.nbt.CompoundTag;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import nl.requios.effortlessbuilding.utilities.BlockSet;
|
||||||
|
|
||||||
|
public abstract class BaseModifier {
|
||||||
|
public boolean enabled = true;
|
||||||
|
|
||||||
|
public abstract void findCoordinates(BlockSet blocks, Player player);
|
||||||
|
|
||||||
|
public abstract void onPowerLevelChanged(int powerLevel);
|
||||||
|
|
||||||
|
public CompoundTag serializeNBT() {
|
||||||
|
CompoundTag compound = new CompoundTag();
|
||||||
|
compound.putString("type", this.getClass().getSimpleName());
|
||||||
|
compound.putBoolean("enabled", enabled);
|
||||||
|
return compound;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deserializeNBT(CompoundTag compound) {
|
||||||
|
enabled = compound.getBoolean("enabled");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,267 +1,160 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmodifier;
|
package nl.requios.effortlessbuilding.buildmodifier;
|
||||||
|
|
||||||
import net.minecraft.world.level.block.Block;
|
import net.minecraft.nbt.CompoundTag;
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
import net.minecraft.nbt.Tag;
|
||||||
import net.minecraft.world.level.block.Blocks;
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.item.BlockItem;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraft.world.item.context.BlockPlaceContext;
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import nl.requios.effortlessbuilding.create.foundation.utility.NBTHelper;
|
||||||
import net.minecraft.world.item.context.UseOnContext;
|
import nl.requios.effortlessbuilding.network.ModifierSettingsPacket;
|
||||||
import net.minecraft.core.Direction;
|
import nl.requios.effortlessbuilding.network.PacketHandler;
|
||||||
import net.minecraft.world.InteractionHand;
|
import nl.requios.effortlessbuilding.utilities.BlockSet;
|
||||||
import net.minecraft.core.BlockPos;
|
|
||||||
import net.minecraft.world.phys.BlockHitResult;
|
|
||||||
import net.minecraft.world.phys.Vec3;
|
|
||||||
import net.minecraft.world.level.Level;
|
|
||||||
import nl.requios.effortlessbuilding.compatibility.CompatHelper;
|
|
||||||
import nl.requios.effortlessbuilding.helper.InventoryHelper;
|
|
||||||
import nl.requios.effortlessbuilding.helper.SurvivalHelper;
|
|
||||||
import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
|
|
||||||
import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
public class BuildModifiers {
|
public class BuildModifiers {
|
||||||
|
private List<BaseModifier> modifierSettingsList = new ArrayList<>();
|
||||||
|
|
||||||
//Called from BuildModes
|
public List<BaseModifier> getModifierSettingsList() {
|
||||||
public static void onBlockPlaced(Player player, List<BlockPos> startCoordinates, Direction sideHit, Vec3 hitVec, boolean placeStartPos) {
|
return Collections.unmodifiableList(modifierSettingsList);
|
||||||
Level world = player.level;
|
}
|
||||||
AbstractRandomizerBagItem.renewRandomness();
|
|
||||||
|
|
||||||
//Format hitvec to 0.x
|
public void addModifierSettings(BaseModifier modifierSettings) {
|
||||||
hitVec = new Vec3(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)), Math.abs(hitVec.z - ((int) hitVec.z)));
|
modifierSettingsList.add(modifierSettings);
|
||||||
|
}
|
||||||
|
|
||||||
//find coordinates and blockstates
|
public void removeModifierSettings(BaseModifier modifierSettings) {
|
||||||
List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
|
modifierSettingsList.remove(modifierSettings);
|
||||||
List<ItemStack> itemStacks = new ArrayList<>();
|
}
|
||||||
List<BlockState> blockStates = findBlockStates(player, startCoordinates, hitVec, sideHit, itemStacks);
|
|
||||||
|
|
||||||
//check if valid blockstates
|
public void removeModifierSettings(int index) {
|
||||||
if (blockStates.size() == 0 || coordinates.size() != blockStates.size()) return;
|
modifierSettingsList.remove(index);
|
||||||
|
}
|
||||||
|
|
||||||
//remember previous blockstates for undo
|
public void moveUp(BaseModifier modifierSettings) {
|
||||||
List<BlockState> previousBlockStates = new ArrayList<>(coordinates.size());
|
int index = modifierSettingsList.indexOf(modifierSettings);
|
||||||
List<BlockState> newBlockStates = new ArrayList<>(coordinates.size());
|
if (index == 0) return;
|
||||||
for (BlockPos coordinate : coordinates) {
|
|
||||||
previousBlockStates.add(world.getBlockState(coordinate));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (world.isClientSide) {
|
Collections.swap(modifierSettingsList, index, index - 1);
|
||||||
|
}
|
||||||
|
|
||||||
BlockPreviewRenderer.onBlocksPlaced();
|
public void moveDown(BaseModifier modifierSettings) {
|
||||||
|
int index = modifierSettingsList.indexOf(modifierSettings);
|
||||||
|
if (index == modifierSettingsList.size() - 1) return;
|
||||||
|
|
||||||
newBlockStates = blockStates;
|
Collections.swap(modifierSettingsList, index, index + 1);
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
public void setFirst(BaseModifier modifierSettings) {
|
||||||
|
int index = modifierSettingsList.indexOf(modifierSettings);
|
||||||
|
if (index == 0) return;
|
||||||
|
|
||||||
//place blocks
|
modifierSettingsList.remove(index);
|
||||||
for (int i = placeStartPos ? 0 : 1; i < coordinates.size(); i++) {
|
modifierSettingsList.add(0, modifierSettings);
|
||||||
BlockPos blockPos = coordinates.get(i);
|
}
|
||||||
BlockState blockState = blockStates.get(i);
|
|
||||||
ItemStack itemStack = itemStacks.get(i);
|
|
||||||
|
|
||||||
if (world.isLoaded(blockPos)) {
|
public void setLast(BaseModifier modifierSettings) {
|
||||||
//check itemstack empty
|
int index = modifierSettingsList.indexOf(modifierSettings);
|
||||||
if (itemStack.isEmpty()) {
|
if (index == modifierSettingsList.size() - 1) return;
|
||||||
//try to find new stack, otherwise continue
|
|
||||||
itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
|
|
||||||
if (itemStack.isEmpty()) continue;
|
|
||||||
}
|
|
||||||
SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, Direction.UP, hitVec, false, false, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//find actual new blockstates for undo
|
modifierSettingsList.remove(index);
|
||||||
for (BlockPos coordinate : coordinates) {
|
modifierSettingsList.add(modifierSettings);
|
||||||
newBlockStates.add(world.getBlockState(coordinate));
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Set first previousBlockState to empty if in NORMAL mode, to make undo/redo work
|
public void clearAllModifierSettings() {
|
||||||
//(Block is placed by the time it gets here, and unplaced after this)
|
modifierSettingsList.clear();
|
||||||
if (!placeStartPos) previousBlockStates.set(0, Blocks.AIR.defaultBlockState());
|
}
|
||||||
|
|
||||||
//If all new blockstates are air then no use in adding it, no block was actually placed
|
public void findCoordinates(BlockSet blocks, Player player) {
|
||||||
//Can happen when e.g. placing one block in yourself
|
for (BaseModifier modifierSettings : modifierSettingsList) {
|
||||||
if (Collections.frequency(newBlockStates, Blocks.AIR.defaultBlockState()) != newBlockStates.size()) {
|
modifierSettings.findCoordinates(blocks, player);
|
||||||
//add to undo stack
|
|
||||||
BlockPos firstPos = startCoordinates.get(0);
|
|
||||||
BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
|
|
||||||
UndoRedo.addUndo(player, new BlockSet(coordinates, previousBlockStates, newBlockStates, hitVec, firstPos, secondPos));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void onBlockBroken(Player player, List<BlockPos> startCoordinates, boolean breakStartPos) {
|
public void onPowerLevelChanged(int powerLevel) {
|
||||||
Level world = player.level;
|
for (BaseModifier modifierSettings : modifierSettingsList) {
|
||||||
|
modifierSettings.onPowerLevelChanged(powerLevel);
|
||||||
List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
|
|
||||||
|
|
||||||
if (coordinates.isEmpty()) return;
|
|
||||||
|
|
||||||
//remember previous blockstates for undo
|
|
||||||
List<BlockState> previousBlockStates = new ArrayList<>(coordinates.size());
|
|
||||||
List<BlockState> newBlockStates = new ArrayList<>(coordinates.size());
|
|
||||||
for (BlockPos coordinate : coordinates) {
|
|
||||||
previousBlockStates.add(world.getBlockState(coordinate));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (world.isClientSide) {
|
|
||||||
BlockPreviewRenderer.onBlocksBroken();
|
|
||||||
|
|
||||||
//list of air blockstates
|
|
||||||
for (int i = 0; i < coordinates.size(); i++) {
|
|
||||||
newBlockStates.add(Blocks.AIR.defaultBlockState());
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
//If the player is going to instabreak grass or a plant, only break other instabreaking things
|
|
||||||
boolean onlyInstaBreaking = !player.isCreative() &&
|
|
||||||
world.getBlockState(startCoordinates.get(0)).getDestroySpeed(world, startCoordinates.get(0)) == 0f;
|
|
||||||
|
|
||||||
//break all those blocks
|
|
||||||
for (int i = breakStartPos ? 0 : 1; i < coordinates.size(); i++) {
|
|
||||||
BlockPos coordinate = coordinates.get(i);
|
|
||||||
if (world.isLoaded(coordinate) && !world.isEmptyBlock(coordinate)) {
|
|
||||||
if (!onlyInstaBreaking || world.getBlockState(coordinate).getDestroySpeed(world, coordinate) == 0f) {
|
|
||||||
SurvivalHelper.breakBlock(world, player, coordinate, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//find actual new blockstates for undo
|
|
||||||
for (BlockPos coordinate : coordinates) {
|
|
||||||
newBlockStates.add(world.getBlockState(coordinate));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Set first newBlockState to empty if in NORMAL mode, to make undo/redo work
|
|
||||||
//(Block isn't broken yet by the time it gets here, and broken after this)
|
|
||||||
if (!breakStartPos) newBlockStates.set(0, Blocks.AIR.defaultBlockState());
|
|
||||||
|
|
||||||
//add to undo stack
|
|
||||||
BlockPos firstPos = startCoordinates.get(0);
|
|
||||||
BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
|
|
||||||
Vec3 hitVec = new Vec3(0.5, 0.5, 0.5);
|
|
||||||
UndoRedo.addUndo(player, new BlockSet(coordinates, previousBlockStates, newBlockStates, hitVec, firstPos, secondPos));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<BlockPos> findCoordinates(Player player, List<BlockPos> posList) {
|
public CompoundTag serializeNBT() {
|
||||||
List<BlockPos> coordinates = new ArrayList<>();
|
var compoundTag = new CompoundTag();
|
||||||
//Add current blocks being placed too
|
compoundTag.put("modifierSettingsList", NBTHelper.writeCompoundList(modifierSettingsList, BaseModifier::serializeNBT));
|
||||||
coordinates.addAll(posList);
|
return compoundTag;
|
||||||
|
|
||||||
//Find mirror/array/radial mirror coordinates for each blockpos
|
|
||||||
for (BlockPos blockPos : posList) {
|
|
||||||
List<BlockPos> arrayCoordinates = Array.findCoordinates(player, blockPos);
|
|
||||||
coordinates.addAll(arrayCoordinates);
|
|
||||||
coordinates.addAll(Mirror.findCoordinates(player, blockPos));
|
|
||||||
coordinates.addAll(RadialMirror.findCoordinates(player, blockPos));
|
|
||||||
//get mirror for each array coordinate
|
|
||||||
for (BlockPos coordinate : arrayCoordinates) {
|
|
||||||
coordinates.addAll(Mirror.findCoordinates(player, coordinate));
|
|
||||||
coordinates.addAll(RadialMirror.findCoordinates(player, coordinate));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return coordinates;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<BlockPos> findCoordinates(Player player, BlockPos blockPos) {
|
public void deserializeNBT(CompoundTag compoundTag) {
|
||||||
return findCoordinates(player, new ArrayList<>(Collections.singletonList(blockPos)));
|
var listTag = compoundTag.getList("modifierSettingsList", Tag.TAG_COMPOUND);
|
||||||
|
modifierSettingsList = NBTHelper.readCompoundList(listTag, tag -> {
|
||||||
|
var modifier = createModifier(tag.getString("type"));
|
||||||
|
modifier.deserializeNBT(tag);
|
||||||
|
return modifier;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<BlockState> findBlockStates(Player player, List<BlockPos> posList, Vec3 hitVec, Direction facing, List<ItemStack> itemStacks) {
|
public void save() {
|
||||||
List<BlockState> blockStates = new ArrayList<>();
|
PacketHandler.INSTANCE.sendToServer(new ModifierSettingsPacket(serializeNBT()));
|
||||||
itemStacks.clear();
|
|
||||||
|
|
||||||
//Get itemstack
|
//Save locally as well?
|
||||||
ItemStack itemStack = player.getItemInHand(InteractionHand.MAIN_HAND);
|
// var listTag = NBTHelper.writeCompoundList(modifierSettingsList, BaseModifier::serializeNBT);
|
||||||
if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
|
// player.getPersistentData().put(DATA_KEY, listTag);
|
||||||
itemStack = player.getItemInHand(InteractionHand.OFF_HAND);
|
|
||||||
}
|
|
||||||
if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
|
|
||||||
return blockStates;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Get ItemBlock stack
|
|
||||||
ItemStack itemBlock = ItemStack.EMPTY;
|
|
||||||
if (itemStack.getItem() instanceof BlockItem) itemBlock = itemStack;
|
|
||||||
else itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
|
|
||||||
AbstractRandomizerBagItem.resetRandomness();
|
|
||||||
|
|
||||||
//Add blocks in posList first
|
|
||||||
for (BlockPos blockPos : posList) {
|
|
||||||
if (!(itemStack.getItem() instanceof BlockItem)) itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
|
|
||||||
BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, InteractionHand.MAIN_HAND);
|
|
||||||
if (blockState == null) continue;
|
|
||||||
|
|
||||||
blockStates.add(blockState);
|
|
||||||
itemStacks.add(itemBlock);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (BlockPos blockPos : posList) {
|
|
||||||
BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, InteractionHand.MAIN_HAND);
|
|
||||||
if (blockState == null) continue;
|
|
||||||
|
|
||||||
List<BlockState> arrayBlockStates = Array.findBlockStates(player, blockPos, blockState, itemStack, itemStacks);
|
|
||||||
blockStates.addAll(arrayBlockStates);
|
|
||||||
blockStates.addAll(Mirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
|
|
||||||
blockStates.addAll(RadialMirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
|
|
||||||
//add mirror for each array coordinate
|
|
||||||
List<BlockPos> arrayCoordinates = Array.findCoordinates(player, blockPos);
|
|
||||||
for (int i = 0; i < arrayCoordinates.size(); i++) {
|
|
||||||
BlockPos coordinate = arrayCoordinates.get(i);
|
|
||||||
BlockState blockState1 = arrayBlockStates.get(i);
|
|
||||||
if (blockState1 == null) continue;
|
|
||||||
|
|
||||||
blockStates.addAll(Mirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
|
|
||||||
blockStates.addAll(RadialMirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
|
|
||||||
}
|
|
||||||
|
|
||||||
//Adjust blockstates for torches and ladders etc to place on a valid side
|
|
||||||
//TODO optimize findCoordinates (done twice now)
|
|
||||||
//TODO fix mirror
|
|
||||||
// List<BlockPos> coordinates = findCoordinates(player, startPos);
|
|
||||||
// for (int i = 0; i < blockStates.size(); i++) {
|
|
||||||
// blockStates.set(i, blockStates.get(i).getBlock().getStateForPlacement(player.world, coordinates.get(i), facing,
|
|
||||||
// (float) hitVec.x, (float) hitVec.y, (float) hitVec.z, itemStacks.get(i).getMetadata(), player, EnumHand.MAIN_HAND));
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
return blockStates;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isEnabled(ModifierSettingsManager.ModifierSettings modifierSettings, BlockPos startPos) {
|
private BaseModifier createModifier(String type) {
|
||||||
return Mirror.isEnabled(modifierSettings.getMirrorSettings(), startPos) ||
|
switch (type) {
|
||||||
Array.isEnabled(modifierSettings.getArraySettings()) ||
|
case "Mirror": return new Mirror();
|
||||||
RadialMirror.isEnabled(modifierSettings.getRadialMirrorSettings(), startPos) ||
|
case "Array": return new Array();
|
||||||
modifierSettings.doQuickReplace();
|
case "RadialMirror": return new RadialMirror();
|
||||||
}
|
default: throw new IllegalArgumentException("Unknown modifier type: " + type);
|
||||||
|
|
||||||
public static BlockState getBlockStateFromItem(ItemStack itemStack, Player player, BlockPos blockPos, Direction facing, Vec3 hitVec, InteractionHand hand) {
|
|
||||||
return Block.byItem(itemStack.getItem()).getStateForPlacement(new BlockPlaceContext(new UseOnContext(player, hand, new BlockHitResult(hitVec, facing, blockPos, false))));
|
|
||||||
}
|
|
||||||
|
|
||||||
//Returns true if equal (or both null)
|
|
||||||
public static boolean compareCoordinates(List<BlockPos> coordinates1, List<BlockPos> coordinates2) {
|
|
||||||
if (coordinates1 == null && coordinates2 == null) return true;
|
|
||||||
if (coordinates1 == null || coordinates2 == null) return false;
|
|
||||||
|
|
||||||
//Check count, not actual values
|
|
||||||
if (coordinates1.size() == coordinates2.size()) {
|
|
||||||
if (coordinates1.size() == 1) {
|
|
||||||
return coordinates1.get(0).equals(coordinates2.get(0));
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// return coordinates1.equals(coordinates2);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// public static String sanitize(ModifierSettingsManager.ModifierSettings modifierSettings, Player player) {
|
||||||
|
// int maxReach = ReachHelper.getMaxReach(player);
|
||||||
|
// String error = "";
|
||||||
|
//
|
||||||
|
// //Mirror settings
|
||||||
|
// Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
|
||||||
|
// if (m.radius < 1) {
|
||||||
|
// m.radius = 1;
|
||||||
|
// error += "Mirror size has to be at least 1. This has been corrected. ";
|
||||||
|
// }
|
||||||
|
// if (m.getReach() > maxReach) {
|
||||||
|
// m.radius = maxReach / 2;
|
||||||
|
// error += "Mirror exceeds your maximum reach of " + (maxReach / 2) + ". Radius has been set to " + (maxReach / 2) + ". ";
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// //Array settings
|
||||||
|
// Array.ArraySettings a = modifierSettings.getArraySettings();
|
||||||
|
// if (a.count < 0) {
|
||||||
|
// a.count = 0;
|
||||||
|
// error += "Array count may not be negative. It has been reset to 0.";
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// if (a.getReach() > maxReach) {
|
||||||
|
// a.count = 0;
|
||||||
|
// error += "Array exceeds your maximum reach of " + maxReach + ". Array count has been reset to 0. ";
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// //Radial mirror settings
|
||||||
|
// RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
|
||||||
|
// if (r.slices < 2) {
|
||||||
|
// r.slices = 2;
|
||||||
|
// error += "Radial mirror needs to have at least 2 slices. Slices has been set to 2.";
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// if (r.radius < 1) {
|
||||||
|
// r.radius = 1;
|
||||||
|
// error += "Radial mirror radius has to be at least 1. This has been corrected. ";
|
||||||
|
// }
|
||||||
|
// if (r.getReach() > maxReach) {
|
||||||
|
// r.radius = maxReach / 2;
|
||||||
|
// error += "Radial mirror exceeds your maximum reach of " + (maxReach / 2) + ". Radius has been set to " + (maxReach / 2) + ". ";
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// return error;
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,234 +1,151 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmodifier;
|
package nl.requios.effortlessbuilding.buildmodifier;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.nbt.CompoundTag;
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.item.ItemStack;
|
|
||||||
import net.minecraft.world.level.block.state.properties.Half;
|
|
||||||
import net.minecraft.world.level.block.state.properties.SlabType;
|
|
||||||
import net.minecraft.core.Direction;
|
|
||||||
import net.minecraft.world.InteractionHand;
|
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.phys.Vec3;
|
||||||
import net.minecraftforge.items.IItemHandler;
|
|
||||||
import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import nl.requios.effortlessbuilding.EffortlessBuildingClient;
|
||||||
import java.util.List;
|
import nl.requios.effortlessbuilding.utilities.BlockEntry;
|
||||||
|
import nl.requios.effortlessbuilding.utilities.BlockSet;
|
||||||
|
|
||||||
import net.minecraft.world.level.block.DirectionalBlock;
|
public class Mirror extends BaseModifier {
|
||||||
import net.minecraft.world.level.block.DispenserBlock;
|
public Vec3 position = new Vec3(0.5, 64.5, 0.5);
|
||||||
import net.minecraft.world.level.block.SlabBlock;
|
public boolean mirrorX = true;
|
||||||
import net.minecraft.world.level.block.StairBlock;
|
public boolean mirrorY = false;
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
public boolean mirrorZ = false;
|
||||||
|
public int radius = 10;
|
||||||
public class Mirror {
|
public boolean drawLines = true;
|
||||||
|
public boolean drawPlanes = true;
|
||||||
public static List<BlockPos> findCoordinates(Player player, BlockPos startPos) {
|
|
||||||
List<BlockPos> coordinates = new ArrayList<>();
|
public Mirror() {
|
||||||
|
super();
|
||||||
//find mirrorsettings for the player
|
var player = Minecraft.getInstance().player;
|
||||||
MirrorSettings m = ModifierSettingsManager.getModifierSettings(player).getMirrorSettings();
|
if (player != null)
|
||||||
if (!isEnabled(m, startPos)) return coordinates;
|
position = Vec3.atLowerCornerOf(Minecraft.getInstance().player.blockPosition());
|
||||||
|
|
||||||
if (m.mirrorX) coordinateMirrorX(m, startPos, coordinates);
|
|
||||||
if (m.mirrorY) coordinateMirrorY(m, startPos, coordinates);
|
|
||||||
if (m.mirrorZ) coordinateMirrorZ(m, startPos, coordinates);
|
|
||||||
|
|
||||||
return coordinates;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void findCoordinates(BlockSet blocks, Player player) {
|
||||||
|
if (!(enabled && (mirrorX || mirrorY || mirrorZ))) return;
|
||||||
|
|
||||||
private static void coordinateMirrorX(MirrorSettings m, BlockPos oldBlockPos, List<BlockPos> coordinates) {
|
var originalBlocks = new BlockSet(blocks);
|
||||||
//find mirror position
|
for (BlockEntry blockEntry : originalBlocks) {
|
||||||
double x = m.position.x + (m.position.x - oldBlockPos.getX() - 0.5);
|
if (!isWithinRange(blockEntry.blockPos)) continue;
|
||||||
BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
|
|
||||||
coordinates.add(newBlockPos);
|
|
||||||
|
|
||||||
if (m.mirrorY) coordinateMirrorY(m, newBlockPos, coordinates);
|
if (mirrorX) performMirrorX(blocks, blockEntry);
|
||||||
if (m.mirrorZ) coordinateMirrorZ(m, newBlockPos, coordinates);
|
if (mirrorY) performMirrorY(blocks, blockEntry);
|
||||||
}
|
if (mirrorZ) performMirrorZ(blocks, blockEntry);
|
||||||
|
|
||||||
private static void coordinateMirrorY(MirrorSettings m, BlockPos oldBlockPos, List<BlockPos> coordinates) {
|
|
||||||
//find mirror position
|
|
||||||
double y = m.position.y + (m.position.y - oldBlockPos.getY() - 0.5);
|
|
||||||
BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ());
|
|
||||||
coordinates.add(newBlockPos);
|
|
||||||
|
|
||||||
if (m.mirrorZ) coordinateMirrorZ(m, newBlockPos, coordinates);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void coordinateMirrorZ(MirrorSettings m, BlockPos oldBlockPos, List<BlockPos> coordinates) {
|
|
||||||
//find mirror position
|
|
||||||
double z = m.position.z + (m.position.z - oldBlockPos.getZ() - 0.5);
|
|
||||||
BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z);
|
|
||||||
coordinates.add(newBlockPos);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static List<BlockState> findBlockStates(Player player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
|
|
||||||
List<BlockState> blockStates = new ArrayList<>();
|
|
||||||
|
|
||||||
//find mirrorsettings for the player
|
|
||||||
MirrorSettings m = ModifierSettingsManager.getModifierSettings(player).getMirrorSettings();
|
|
||||||
if (!isEnabled(m, startPos)) return blockStates;
|
|
||||||
|
|
||||||
//Randomizer bag synergy
|
|
||||||
AbstractRandomizerBagItem randomizerBagItem = null;
|
|
||||||
IItemHandler bagInventory = null;
|
|
||||||
if (!itemStack.isEmpty() && itemStack.getItem() instanceof AbstractRandomizerBagItem) {
|
|
||||||
randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem() ;
|
|
||||||
bagInventory = randomizerBagItem.getBagInventory(itemStack);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m.mirrorX)
|
|
||||||
blockStateMirrorX(player, m, startPos, blockState, bagInventory, itemStack, InteractionHand.MAIN_HAND, blockStates, itemStacks);
|
|
||||||
if (m.mirrorY)
|
|
||||||
blockStateMirrorY(player, m, startPos, blockState, bagInventory, itemStack, InteractionHand.MAIN_HAND, blockStates, itemStacks);
|
|
||||||
if (m.mirrorZ)
|
|
||||||
blockStateMirrorZ(player, m, startPos, blockState, bagInventory, itemStack, InteractionHand.MAIN_HAND, blockStates, itemStacks);
|
|
||||||
|
|
||||||
return blockStates;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void blockStateMirrorX(Player player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
|
@Override
|
||||||
IItemHandler bagInventory, ItemStack itemStack, InteractionHand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
|
public void onPowerLevelChanged(int powerLevel) {
|
||||||
|
radius = EffortlessBuildingClient.POWER_LEVEL.getMaxMirrorRadius(Minecraft.getInstance().player);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void performMirrorX(BlockSet blocks, BlockEntry blockEntry) {
|
||||||
//find mirror position
|
//find mirror position
|
||||||
double x = m.position.x + (m.position.x - oldBlockPos.getX() - 0.5);
|
double x = position.x + (position.x - blockEntry.blockPos.getX() - 0.5);
|
||||||
BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
|
BlockPos newBlockPos = BlockPos.containing(x, blockEntry.blockPos.getY(), blockEntry.blockPos.getZ());
|
||||||
|
|
||||||
//Randomizer bag synergy
|
if (blocks.containsKey(newBlockPos)) return;
|
||||||
if (bagInventory != null) {
|
|
||||||
itemStack = ((AbstractRandomizerBagItem)itemStack.getItem()).pickRandomStack(bagInventory);
|
|
||||||
oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3(0, 0, 0), hand);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Find blockstate
|
var newBlockEntry = new BlockEntry(newBlockPos);
|
||||||
BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.world.level.block.Mirror.FRONT_BACK);
|
newBlockEntry.copyRotationSettingsFrom(blockEntry);
|
||||||
|
newBlockEntry.mirrorX = !newBlockEntry.mirrorX;
|
||||||
|
blocks.add(newBlockEntry);
|
||||||
|
|
||||||
//Store blockstate and itemstack
|
if (mirrorY) performMirrorY(blocks, newBlockEntry);
|
||||||
blockStates.add(newBlockState);
|
if (mirrorZ) performMirrorZ(blocks, newBlockEntry);
|
||||||
itemStacks.add(itemStack);
|
|
||||||
|
|
||||||
if (m.mirrorY)
|
|
||||||
blockStateMirrorY(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
|
|
||||||
if (m.mirrorZ)
|
|
||||||
blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void blockStateMirrorY(Player player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
|
private void performMirrorY(BlockSet blocks, BlockEntry blockEntry) {
|
||||||
IItemHandler bagInventory, ItemStack itemStack, InteractionHand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
|
|
||||||
//find mirror position
|
//find mirror position
|
||||||
double y = m.position.y + (m.position.y - oldBlockPos.getY() - 0.5);
|
double y = position.y + (position.y - blockEntry.blockPos.getY() - 0.5);
|
||||||
BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ());
|
BlockPos newBlockPos = BlockPos.containing(blockEntry.blockPos.getX(), y, blockEntry.blockPos.getZ());
|
||||||
|
|
||||||
//Randomizer bag synergy
|
if (blocks.containsKey(newBlockPos)) return;
|
||||||
if (bagInventory != null) {
|
|
||||||
itemStack = ((AbstractRandomizerBagItem)itemStack.getItem()).pickRandomStack(bagInventory);
|
|
||||||
oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3(0, 0, 0), hand);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Find blockstate
|
var newBlockEntry = new BlockEntry(newBlockPos);
|
||||||
BlockState newBlockState = oldBlockState == null ? null : getVerticalMirror(oldBlockState);
|
newBlockEntry.copyRotationSettingsFrom(blockEntry);
|
||||||
|
newBlockEntry.mirrorY = !newBlockEntry.mirrorY;
|
||||||
|
blocks.add(newBlockEntry);
|
||||||
|
|
||||||
//Store blockstate and itemstack
|
if (mirrorZ) performMirrorZ(blocks, newBlockEntry);
|
||||||
blockStates.add(newBlockState);
|
|
||||||
itemStacks.add(itemStack);
|
|
||||||
|
|
||||||
if (m.mirrorZ)
|
|
||||||
blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void blockStateMirrorZ(Player player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
|
private void performMirrorZ(BlockSet blocks, BlockEntry blockEntry) {
|
||||||
IItemHandler bagInventory, ItemStack itemStack, InteractionHand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
|
|
||||||
//find mirror position
|
//find mirror position
|
||||||
double z = m.position.z + (m.position.z - oldBlockPos.getZ() - 0.5);
|
double z = position.z + (position.z - blockEntry.blockPos.getZ() - 0.5);
|
||||||
BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z);
|
BlockPos newBlockPos = BlockPos.containing(blockEntry.blockPos.getX(), blockEntry.blockPos.getY(), z);
|
||||||
|
|
||||||
//Randomizer bag synergy
|
if (blocks.containsKey(newBlockPos)) return;
|
||||||
if (bagInventory != null) {
|
|
||||||
itemStack = ((AbstractRandomizerBagItem)itemStack.getItem()).pickRandomStack(bagInventory);
|
var newBlockEntry = new BlockEntry(newBlockPos);
|
||||||
oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3(0, 0, 0), hand);
|
newBlockEntry.copyRotationSettingsFrom(blockEntry);
|
||||||
|
newBlockEntry.mirrorZ = !newBlockEntry.mirrorZ;
|
||||||
|
blocks.add(newBlockEntry);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isWithinRange(BlockPos blockPos) {
|
||||||
|
return !(blockPos.getX() + 0.5 < position.x - radius) && !(blockPos.getX() + 0.5 > position.x + radius) &&
|
||||||
|
!(blockPos.getY() + 0.5 < position.y - radius) && !(blockPos.getY() + 0.5 > position.y + radius) &&
|
||||||
|
!(blockPos.getZ() + 0.5 < position.z - radius) && !(blockPos.getZ() + 0.5 > position.z + radius);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getReach() {
|
||||||
|
return radius * 2; //Change ModifierSettings#setReachUpgrade too
|
||||||
|
}
|
||||||
|
|
||||||
|
public void toggleMirrorAxis(int index) {
|
||||||
|
switch (index) {
|
||||||
|
case 0 -> mirrorX = !mirrorX;
|
||||||
|
case 1 -> mirrorY = !mirrorY;
|
||||||
|
case 2 -> mirrorZ = !mirrorZ;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Find blockstate
|
|
||||||
BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.world.level.block.Mirror.LEFT_RIGHT);
|
|
||||||
|
|
||||||
//Store blockstate and itemstack
|
|
||||||
blockStates.add(newBlockState);
|
|
||||||
itemStacks.add(itemStack);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isEnabled(MirrorSettings m, BlockPos startPos) {
|
public boolean getMirrorAxis(int index) {
|
||||||
if (m == null || !m.enabled || (!m.mirrorX && !m.mirrorY && !m.mirrorZ)) return false;
|
switch (index) {
|
||||||
|
case 0 -> {
|
||||||
//within mirror distance
|
return mirrorX;
|
||||||
return !(startPos.getX() + 0.5 < m.position.x - m.radius) && !(startPos.getX() + 0.5 > m.position.x + m.radius) &&
|
}
|
||||||
!(startPos.getY() + 0.5 < m.position.y - m.radius) && !(startPos.getY() + 0.5 > m.position.y + m.radius) &&
|
case 1 -> {
|
||||||
!(startPos.getZ() + 0.5 < m.position.z - m.radius) && !(startPos.getZ() + 0.5 > m.position.z + m.radius);
|
return mirrorY;
|
||||||
}
|
}
|
||||||
|
case 2 -> {
|
||||||
private static BlockState getVerticalMirror(BlockState blockState) {
|
return mirrorZ;
|
||||||
//Stairs
|
|
||||||
if (blockState.getBlock() instanceof StairBlock) {
|
|
||||||
if (blockState.getValue(StairBlock.HALF) == Half.BOTTOM) {
|
|
||||||
return blockState.setValue(StairBlock.HALF, Half.TOP);
|
|
||||||
} else {
|
|
||||||
return blockState.setValue(StairBlock.HALF, Half.BOTTOM);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
//Slabs
|
|
||||||
if (blockState.getBlock() instanceof SlabBlock) {
|
|
||||||
if (blockState.getValue(SlabBlock.TYPE) == SlabType.DOUBLE) {
|
|
||||||
return blockState;
|
|
||||||
} else if (blockState.getValue(SlabBlock.TYPE) == SlabType.BOTTOM) {
|
|
||||||
return blockState.setValue(SlabBlock.TYPE, SlabType.TOP);
|
|
||||||
} else {
|
|
||||||
return blockState.setValue(SlabBlock.TYPE, SlabType.BOTTOM);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Buttons, endrod, observer, piston
|
|
||||||
if (blockState.getBlock() instanceof DirectionalBlock) {
|
|
||||||
if (blockState.getValue(DirectionalBlock.FACING) == Direction.DOWN) {
|
|
||||||
return blockState.setValue(DirectionalBlock.FACING, Direction.UP);
|
|
||||||
} else if (blockState.getValue(DirectionalBlock.FACING) == Direction.UP) {
|
|
||||||
return blockState.setValue(DirectionalBlock.FACING, Direction.DOWN);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Dispenser, dropper
|
|
||||||
if (blockState.getBlock() instanceof DispenserBlock) {
|
|
||||||
if (blockState.getValue(DispenserBlock.FACING) == Direction.DOWN) {
|
|
||||||
return blockState.setValue(DispenserBlock.FACING, Direction.UP);
|
|
||||||
} else if (blockState.getValue(DispenserBlock.FACING) == Direction.UP) {
|
|
||||||
return blockState.setValue(DispenserBlock.FACING, Direction.DOWN);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return blockState;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class MirrorSettings {
|
@Override
|
||||||
public boolean enabled = false;
|
public CompoundTag serializeNBT() {
|
||||||
public Vec3 position = new Vec3(0.5, 64.5, 0.5);
|
var compound = super.serializeNBT();
|
||||||
public boolean mirrorX = true, mirrorY = false, mirrorZ = false;
|
compound.putDouble("positionX", position.x);
|
||||||
public int radius = 10;
|
compound.putDouble("positionY", position.y);
|
||||||
public boolean drawLines = true, drawPlanes = true;
|
compound.putDouble("positionZ", position.z);
|
||||||
|
compound.putBoolean("mirrorX", mirrorX);
|
||||||
|
compound.putBoolean("mirrorY", mirrorY);
|
||||||
|
compound.putBoolean("mirrorZ", mirrorZ);
|
||||||
|
compound.putInt("radius", radius);
|
||||||
|
compound.putBoolean("drawLines", drawLines);
|
||||||
|
compound.putBoolean("drawPlanes", drawPlanes);
|
||||||
|
return compound;
|
||||||
|
}
|
||||||
|
|
||||||
public MirrorSettings() {
|
@Override
|
||||||
}
|
public void deserializeNBT(CompoundTag compound) {
|
||||||
|
super.deserializeNBT(compound);
|
||||||
public MirrorSettings(boolean mirrorEnabled, Vec3 position, boolean mirrorX, boolean mirrorY, boolean mirrorZ, int radius, boolean drawLines, boolean drawPlanes) {
|
position = new Vec3(compound.getDouble("positionX"), compound.getDouble("positionY"), compound.getDouble("positionZ"));
|
||||||
this.enabled = mirrorEnabled;
|
mirrorX = compound.getBoolean("mirrorX");
|
||||||
this.position = position;
|
mirrorY = compound.getBoolean("mirrorY");
|
||||||
this.mirrorX = mirrorX;
|
mirrorZ = compound.getBoolean("mirrorZ");
|
||||||
this.mirrorY = mirrorY;
|
radius = compound.getInt("radius");
|
||||||
this.mirrorZ = mirrorZ;
|
drawLines = compound.getBoolean("drawLines");
|
||||||
this.radius = radius;
|
drawPlanes = compound.getBoolean("drawPlanes");
|
||||||
this.drawLines = drawLines;
|
|
||||||
this.drawPlanes = drawPlanes;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getReach() {
|
|
||||||
return radius * 2; //Change ModifierSettings#setReachUpgrade too
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,215 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmodifier;
|
|
||||||
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
|
||||||
import net.minecraft.server.level.ServerPlayer;
|
|
||||||
import net.minecraftforge.common.util.LazyOptional;
|
|
||||||
import net.minecraftforge.fml.common.Mod;
|
|
||||||
import net.minecraftforge.network.PacketDistributor;
|
|
||||||
import nl.requios.effortlessbuilding.BuildConfig;
|
|
||||||
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
|
||||||
import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
|
|
||||||
import nl.requios.effortlessbuilding.helper.ReachHelper;
|
|
||||||
import nl.requios.effortlessbuilding.network.ModifierSettingsMessage;
|
|
||||||
import nl.requios.effortlessbuilding.network.PacketHandler;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
@Mod.EventBusSubscriber
|
|
||||||
public class ModifierSettingsManager {
|
|
||||||
|
|
||||||
//Retrieves the buildsettings of a player through the modifierCapability capability
|
|
||||||
//Never returns null
|
|
||||||
@Nonnull
|
|
||||||
public static ModifierSettings getModifierSettings(Player player) {
|
|
||||||
|
|
||||||
LazyOptional<ModifierCapabilityManager.IModifierCapability> modifierCapability =
|
|
||||||
player.getCapability(ModifierCapabilityManager.MODIFIER_CAPABILITY, null);
|
|
||||||
|
|
||||||
if (modifierCapability.isPresent()) {
|
|
||||||
ModifierCapabilityManager.IModifierCapability capability = modifierCapability.orElse(null);
|
|
||||||
if (capability.getModifierData() == null){
|
|
||||||
capability.setModifierData(new ModifierSettings());
|
|
||||||
}
|
|
||||||
return capability.getModifierData();
|
|
||||||
}
|
|
||||||
|
|
||||||
EffortlessBuilding.logger.warn("Player does not have modifierCapability: " + player);
|
|
||||||
//Return dummy settings
|
|
||||||
return new ModifierSettings();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setModifierSettings(Player player, ModifierSettings modifierSettings) {
|
|
||||||
if (player == null) {
|
|
||||||
EffortlessBuilding.log("Cannot set buildsettings, player is null");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
LazyOptional<ModifierCapabilityManager.IModifierCapability> modifierCapability =
|
|
||||||
player.getCapability(ModifierCapabilityManager.MODIFIER_CAPABILITY, null);
|
|
||||||
|
|
||||||
modifierCapability.ifPresent((capability) -> {
|
|
||||||
capability.setModifierData(modifierSettings);
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!modifierCapability.isPresent()) {
|
|
||||||
EffortlessBuilding.log(player, "Saving buildsettings failed.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String sanitize(ModifierSettings modifierSettings, Player player) {
|
|
||||||
int maxReach = ReachHelper.getMaxReach(player);
|
|
||||||
String error = "";
|
|
||||||
|
|
||||||
//Mirror settings
|
|
||||||
Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
|
|
||||||
if (m.radius < 1) {
|
|
||||||
m.radius = 1;
|
|
||||||
error += "Mirror size has to be at least 1. This has been corrected. ";
|
|
||||||
}
|
|
||||||
if (m.getReach() > maxReach) {
|
|
||||||
m.radius = maxReach / 2;
|
|
||||||
error += "Mirror exceeds your maximum reach of " + (maxReach / 2) + ". Radius has been set to " + (maxReach / 2) + ". ";
|
|
||||||
}
|
|
||||||
|
|
||||||
//Array settings
|
|
||||||
Array.ArraySettings a = modifierSettings.getArraySettings();
|
|
||||||
if (a.count < 0) {
|
|
||||||
a.count = 0;
|
|
||||||
error += "Array count may not be negative. It has been reset to 0.";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (a.getReach() > maxReach) {
|
|
||||||
a.count = 0;
|
|
||||||
error += "Array exceeds your maximum reach of " + maxReach + ". Array count has been reset to 0. ";
|
|
||||||
}
|
|
||||||
|
|
||||||
//Radial mirror settings
|
|
||||||
RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
|
|
||||||
if (r.slices < 2) {
|
|
||||||
r.slices = 2;
|
|
||||||
error += "Radial mirror needs to have at least 2 slices. Slices has been set to 2.";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (r.radius < 1) {
|
|
||||||
r.radius = 1;
|
|
||||||
error += "Radial mirror radius has to be at least 1. This has been corrected. ";
|
|
||||||
}
|
|
||||||
if (r.getReach() > maxReach) {
|
|
||||||
r.radius = maxReach / 2;
|
|
||||||
error += "Radial mirror exceeds your maximum reach of " + (maxReach / 2) + ". Radius has been set to " + (maxReach / 2) + ". ";
|
|
||||||
}
|
|
||||||
|
|
||||||
//Other
|
|
||||||
if (modifierSettings.reachUpgrade < 0) {
|
|
||||||
modifierSettings.reachUpgrade = 0;
|
|
||||||
}
|
|
||||||
if (modifierSettings.reachUpgrade > 3) {
|
|
||||||
modifierSettings.reachUpgrade = 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
return error;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void handleNewPlayer(Player player) {
|
|
||||||
//Makes sure player has modifier settings (if it doesnt it will create it)
|
|
||||||
getModifierSettings(player);
|
|
||||||
|
|
||||||
//Only on server
|
|
||||||
if (!player.level.isClientSide) {
|
|
||||||
//Send to client
|
|
||||||
ModifierSettingsMessage msg = new ModifierSettingsMessage(getModifierSettings(player));
|
|
||||||
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), msg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class ModifierSettings {
|
|
||||||
private Mirror.MirrorSettings mirrorSettings;
|
|
||||||
private Array.ArraySettings arraySettings;
|
|
||||||
private RadialMirror.RadialMirrorSettings radialMirrorSettings;
|
|
||||||
private boolean quickReplace = false;
|
|
||||||
private int reachUpgrade = 0;
|
|
||||||
|
|
||||||
public ModifierSettings() {
|
|
||||||
mirrorSettings = new Mirror.MirrorSettings();
|
|
||||||
arraySettings = new Array.ArraySettings();
|
|
||||||
radialMirrorSettings = new RadialMirror.RadialMirrorSettings();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ModifierSettings(Mirror.MirrorSettings mirrorSettings, Array.ArraySettings arraySettings,
|
|
||||||
RadialMirror.RadialMirrorSettings radialMirrorSettings, boolean quickReplace, int reachUpgrade) {
|
|
||||||
this.mirrorSettings = mirrorSettings;
|
|
||||||
this.arraySettings = arraySettings;
|
|
||||||
this.radialMirrorSettings = radialMirrorSettings;
|
|
||||||
this.quickReplace = quickReplace;
|
|
||||||
this.reachUpgrade = reachUpgrade;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Mirror.MirrorSettings getMirrorSettings() {
|
|
||||||
if (this.mirrorSettings == null) this.mirrorSettings = new Mirror.MirrorSettings();
|
|
||||||
return this.mirrorSettings;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setMirrorSettings(Mirror.MirrorSettings mirrorSettings) {
|
|
||||||
if (mirrorSettings == null) return;
|
|
||||||
this.mirrorSettings = mirrorSettings;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Array.ArraySettings getArraySettings() {
|
|
||||||
if (this.arraySettings == null) this.arraySettings = new Array.ArraySettings();
|
|
||||||
return this.arraySettings;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setArraySettings(Array.ArraySettings arraySettings) {
|
|
||||||
if (arraySettings == null) return;
|
|
||||||
this.arraySettings = arraySettings;
|
|
||||||
}
|
|
||||||
|
|
||||||
public RadialMirror.RadialMirrorSettings getRadialMirrorSettings() {
|
|
||||||
if (this.radialMirrorSettings == null) this.radialMirrorSettings = new RadialMirror.RadialMirrorSettings();
|
|
||||||
return this.radialMirrorSettings;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setRadialMirrorSettings(RadialMirror.RadialMirrorSettings radialMirrorSettings) {
|
|
||||||
if (radialMirrorSettings == null) return;
|
|
||||||
this.radialMirrorSettings = radialMirrorSettings;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean doQuickReplace() {
|
|
||||||
return quickReplace;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setQuickReplace(boolean quickReplace) {
|
|
||||||
this.quickReplace = quickReplace;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getReachUpgrade() {
|
|
||||||
return reachUpgrade;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setReachUpgrade(int reachUpgrade) {
|
|
||||||
this.reachUpgrade = reachUpgrade;
|
|
||||||
//Set mirror radius to max
|
|
||||||
int reach = 10;
|
|
||||||
switch (reachUpgrade) {
|
|
||||||
case 0:
|
|
||||||
reach = BuildConfig.reach.maxReachLevel0.get();
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
reach = BuildConfig.reach.maxReachLevel1.get();
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
reach = BuildConfig.reach.maxReachLevel2.get();
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
reach = BuildConfig.reach.maxReachLevel3.get();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.mirrorSettings != null)
|
|
||||||
this.mirrorSettings.radius = reach / 2;
|
|
||||||
if (this.radialMirrorSettings != null)
|
|
||||||
this.radialMirrorSettings.radius = reach / 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,118 +1,111 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmodifier;
|
package nl.requios.effortlessbuilding.buildmodifier;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.nbt.CompoundTag;
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.item.ItemStack;
|
|
||||||
import net.minecraft.core.Direction;
|
|
||||||
import net.minecraft.world.InteractionHand;
|
|
||||||
import net.minecraft.world.level.block.Mirror;
|
import net.minecraft.world.level.block.Mirror;
|
||||||
import net.minecraft.world.level.block.Rotation;
|
import net.minecraft.world.level.block.Rotation;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.util.Mth;
|
import net.minecraft.util.Mth;
|
||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.phys.Vec3;
|
||||||
import net.minecraftforge.items.IItemHandler;
|
import nl.requios.effortlessbuilding.EffortlessBuildingClient;
|
||||||
import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
|
import nl.requios.effortlessbuilding.utilities.BlockEntry;
|
||||||
|
import nl.requios.effortlessbuilding.utilities.BlockSet;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
public class RadialMirror extends BaseModifier {
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class RadialMirror {
|
public Vec3 position = new Vec3(0.5, 64.5, 0.5);
|
||||||
|
public int slices = 4;
|
||||||
|
public boolean alternate = false;
|
||||||
|
public int radius = 20;
|
||||||
|
public boolean drawLines = true;
|
||||||
|
public boolean drawPlanes = false;
|
||||||
|
|
||||||
public static List<BlockPos> findCoordinates(Player player, BlockPos startPos) {
|
public RadialMirror() {
|
||||||
List<BlockPos> coordinates = new ArrayList<>();
|
super();
|
||||||
|
var player = Minecraft.getInstance().player;
|
||||||
|
if (player != null)
|
||||||
|
position = Vec3.atLowerCornerOf(Minecraft.getInstance().player.blockPosition());
|
||||||
|
}
|
||||||
|
|
||||||
//find radial mirror settings for the player
|
@Override
|
||||||
RadialMirrorSettings r = ModifierSettingsManager.getModifierSettings(player).getRadialMirrorSettings();
|
public void findCoordinates(BlockSet blocks, Player player) {
|
||||||
if (!isEnabled(r, startPos)) return coordinates;
|
if (!enabled) return;
|
||||||
|
|
||||||
|
var originalBlocks = new BlockSet(blocks);
|
||||||
|
for (BlockEntry blockEntry : originalBlocks) {
|
||||||
|
if (!isWithinRange(blockEntry.blockPos)) continue;
|
||||||
|
|
||||||
|
performRadialMirror(blocks, blockEntry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPowerLevelChanged(int powerLevel) {
|
||||||
|
radius = EffortlessBuildingClient.POWER_LEVEL.getMaxMirrorRadius(Minecraft.getInstance().player);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void performRadialMirror(BlockSet blocks, BlockEntry blockEntry) {
|
||||||
|
|
||||||
//get angle between slices
|
//get angle between slices
|
||||||
double sliceAngle = 2 * Math.PI / r.slices;
|
double sliceAngle = 2 * Math.PI / slices;
|
||||||
|
|
||||||
Vec3 startVec = new Vec3(startPos.getX() + 0.5f, startPos.getY() + 0.5f, startPos.getZ() + 0.5f);
|
//Get start vector relative to mirror center
|
||||||
Vec3 relStartVec = startVec.subtract(r.position);
|
Vec3 relStartVec = Vec3.atCenterOf(blockEntry.blockPos).subtract(position);
|
||||||
|
|
||||||
double startAngleToCenter = Mth.atan2(relStartVec.x, relStartVec.z);
|
double startAngleToCenter = Mth.atan2(relStartVec.x, relStartVec.z); //between -PI and PI
|
||||||
|
//TODO change to Abs if alternative?
|
||||||
if (startAngleToCenter < 0) startAngleToCenter += Math.PI;
|
if (startAngleToCenter < 0) startAngleToCenter += Math.PI;
|
||||||
double startAngleInSlice = startAngleToCenter % sliceAngle;
|
double startAngleInSlice = startAngleToCenter % sliceAngle;
|
||||||
|
|
||||||
for (int i = 1; i < r.slices; i++) {
|
for (int i = 1; i < slices; i++) {
|
||||||
double curAngle = sliceAngle * i;
|
double curAngle = sliceAngle * i;
|
||||||
|
|
||||||
//alternate mirroring of slices
|
//alternate mirroring of slices
|
||||||
if (r.alternate && i % 2 == 1) {
|
boolean doAlternate = alternate && i % 2 == 1;
|
||||||
|
if (doAlternate) {
|
||||||
curAngle = curAngle - startAngleInSlice + (sliceAngle - startAngleInSlice);
|
curAngle = curAngle - startAngleInSlice + (sliceAngle - startAngleInSlice);
|
||||||
}
|
}
|
||||||
|
|
||||||
Vec3 relNewVec = relStartVec.yRot((float) curAngle);
|
Vec3 relNewVec = relStartVec.yRot((float) curAngle);
|
||||||
BlockPos newBlockPos = new BlockPos(r.position.add(relNewVec));
|
BlockPos newBlockPos = BlockPos.containing(position.add(relNewVec));
|
||||||
if (!coordinates.contains(newBlockPos) && !newBlockPos.equals(startPos)) coordinates.add(newBlockPos);
|
|
||||||
}
|
|
||||||
|
|
||||||
return coordinates;
|
if (blocks.containsKey(newBlockPos)) continue;
|
||||||
|
|
||||||
|
BlockEntry newBlockEntry = new BlockEntry(newBlockPos);
|
||||||
|
newBlockEntry.copyRotationSettingsFrom(blockEntry);
|
||||||
|
|
||||||
|
//rotate block
|
||||||
|
double angleToCenter = Mth.atan2(relNewVec.x, relNewVec.z); //between -PI and PI
|
||||||
|
rotateBlockEntry(newBlockEntry, angleToCenter, doAlternate);
|
||||||
|
|
||||||
|
blocks.add(newBlockEntry);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<BlockState> findBlockStates(Player player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
|
private void rotateBlockEntry(BlockEntry blockEntry, double angleToCenter, boolean alternate) {
|
||||||
List<BlockState> blockStates = new ArrayList<>();
|
|
||||||
List<BlockPos> coordinates = new ArrayList<>(); //to keep track of duplicates
|
|
||||||
|
|
||||||
//find radial mirror settings for the player that placed the block
|
if (angleToCenter < -0.751 * Math.PI || angleToCenter > 0.749 * Math.PI) {
|
||||||
RadialMirrorSettings r = ModifierSettingsManager.getModifierSettings(player).getRadialMirrorSettings();
|
blockEntry.rotation = blockEntry.rotation.getRotated(Rotation.CLOCKWISE_180);
|
||||||
if (!isEnabled(r, startPos)) return blockStates;
|
if (alternate) {
|
||||||
|
// blockEntry.mirrorX = !blockEntry.mirrorX;
|
||||||
|
|
||||||
//get angle between slices
|
|
||||||
double sliceAngle = 2 * Math.PI / r.slices;
|
|
||||||
|
|
||||||
Vec3 startVec = new Vec3(startPos.getX() + 0.5f, startPos.getY() + 0.5f, startPos.getZ() + 0.5f);
|
|
||||||
Vec3 relStartVec = startVec.subtract(r.position);
|
|
||||||
|
|
||||||
double startAngleToCenter = Mth.atan2(relStartVec.x, relStartVec.z);
|
|
||||||
double startAngleToCenterMod = startAngleToCenter < 0 ? startAngleToCenter + Math.PI : startAngleToCenter;
|
|
||||||
double startAngleInSlice = startAngleToCenterMod % sliceAngle;
|
|
||||||
|
|
||||||
//Rotate the original blockstate
|
|
||||||
blockState = rotateOriginalBlockState(player, startPos, startAngleToCenter, blockState);
|
|
||||||
|
|
||||||
//Randomizer bag synergy
|
|
||||||
AbstractRandomizerBagItem randomizerBagItem = null;
|
|
||||||
IItemHandler bagInventory = null;
|
|
||||||
if (!itemStack.isEmpty() && itemStack.getItem() instanceof AbstractRandomizerBagItem) {
|
|
||||||
randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem() ;
|
|
||||||
bagInventory = randomizerBagItem.getBagInventory(itemStack);
|
|
||||||
}
|
|
||||||
|
|
||||||
BlockState newBlockState;
|
|
||||||
for (int i = 1; i < r.slices; i++) {
|
|
||||||
newBlockState = blockState;
|
|
||||||
double curAngle = sliceAngle * i;
|
|
||||||
|
|
||||||
//alternate mirroring of slices
|
|
||||||
if (r.alternate && i % 2 == 1) {
|
|
||||||
curAngle = curAngle - startAngleInSlice + (sliceAngle - startAngleInSlice);
|
|
||||||
}
|
}
|
||||||
|
} else if (angleToCenter < -0.251 * Math.PI) {
|
||||||
Vec3 relNewVec = relStartVec.yRot((float) curAngle);
|
blockEntry.rotation = blockEntry.rotation.getRotated(Rotation.CLOCKWISE_90);
|
||||||
BlockPos newBlockPos = new BlockPos(r.position.add(relNewVec));
|
if (alternate) {
|
||||||
if (coordinates.contains(newBlockPos) || newBlockPos.equals(startPos)) continue; //filter out duplicates
|
// blockEntry.mirrorZ = !blockEntry.mirrorZ;
|
||||||
coordinates.add(newBlockPos);
|
}
|
||||||
|
} else if (angleToCenter > 0.249 * Math.PI) {
|
||||||
//Randomizer bag synergy
|
blockEntry.rotation = blockEntry.rotation.getRotated(Rotation.COUNTERCLOCKWISE_90);
|
||||||
if (randomizerBagItem != null) {
|
if (alternate) {
|
||||||
itemStack = randomizerBagItem.pickRandomStack(bagInventory);
|
// blockEntry.mirrorZ = !blockEntry.mirrorZ;
|
||||||
newBlockState = BuildModifiers
|
}
|
||||||
.getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vec3(0, 0, 0), InteractionHand.MAIN_HAND);
|
} else {
|
||||||
|
if (alternate) {
|
||||||
newBlockState = rotateOriginalBlockState(player, startPos, startAngleToCenter, newBlockState);
|
// blockEntry.mirrorX = !blockEntry.mirrorX;
|
||||||
}
|
}
|
||||||
|
|
||||||
//rotate
|
|
||||||
newBlockState = rotateBlockState(player, startPos, relNewVec, newBlockState, r.alternate && i % 2 == 1);
|
|
||||||
|
|
||||||
blockStates.add(newBlockState);
|
|
||||||
itemStacks.add(itemStack);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return blockStates;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static BlockState rotateOriginalBlockState(Player player, BlockPos startPos, double startAngleToCenter, BlockState blockState) {
|
private static BlockState rotateOriginalBlockState(Player player, BlockPos startPos, double startAngleToCenter, BlockState blockState) {
|
||||||
@@ -158,37 +151,36 @@ public class RadialMirror {
|
|||||||
return newBlockState;
|
return newBlockState;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isEnabled(RadialMirrorSettings r, BlockPos startPos) {
|
public boolean isWithinRange(BlockPos startPos) {
|
||||||
if (r == null || !r.enabled) return false;
|
return (new Vec3(startPos.getX() + 0.5, startPos.getY() + 0.5, startPos.getZ() + 0.5).subtract(position).lengthSqr() < radius * radius);
|
||||||
|
|
||||||
return !(new Vec3(startPos.getX() + 0.5, startPos.getY() + 0.5, startPos.getZ() + 0.5).subtract(r.position).lengthSqr() >
|
|
||||||
r.radius * r.radius);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class RadialMirrorSettings {
|
public int getReach() {
|
||||||
public boolean enabled = false;
|
return radius * 2;
|
||||||
public Vec3 position = new Vec3(0.5, 64.5, 0.5);
|
|
||||||
public int slices = 4;
|
|
||||||
public boolean alternate = false;
|
|
||||||
public int radius = 20;
|
|
||||||
public boolean drawLines = true, drawPlanes = false;
|
|
||||||
|
|
||||||
public RadialMirrorSettings() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public RadialMirrorSettings(boolean enabled, Vec3 position, int slices, boolean alternate, int radius, boolean drawLines, boolean drawPlanes) {
|
|
||||||
this.enabled = enabled;
|
|
||||||
this.position = position;
|
|
||||||
this.slices = slices;
|
|
||||||
this.alternate = alternate;
|
|
||||||
this.radius = radius;
|
|
||||||
this.drawLines = drawLines;
|
|
||||||
this.drawPlanes = drawPlanes;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getReach() {
|
|
||||||
return radius * 2;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompoundTag serializeNBT() {
|
||||||
|
var compound = super.serializeNBT();
|
||||||
|
compound.putDouble("positionX", position.x);
|
||||||
|
compound.putDouble("positionY", position.y);
|
||||||
|
compound.putDouble("positionZ", position.z);
|
||||||
|
compound.putInt("slices", slices);
|
||||||
|
compound.putBoolean("alternate", alternate);
|
||||||
|
compound.putInt("radius", radius);
|
||||||
|
compound.putBoolean("drawLines", drawLines);
|
||||||
|
compound.putBoolean("drawPlanes", drawPlanes);
|
||||||
|
return compound;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deserializeNBT(CompoundTag nbt) {
|
||||||
|
super.deserializeNBT(nbt);
|
||||||
|
position = new Vec3(nbt.getDouble("positionX"), nbt.getDouble("positionY"), nbt.getDouble("positionZ"));
|
||||||
|
slices = nbt.getInt("slices");
|
||||||
|
alternate = nbt.getBoolean("alternate");
|
||||||
|
radius = nbt.getInt("radius");
|
||||||
|
drawLines = nbt.getBoolean("drawLines");
|
||||||
|
drawPlanes = nbt.getBoolean("drawPlanes");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,239 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding.buildmodifier;
|
|
||||||
|
|
||||||
import net.minecraft.world.level.block.Block;
|
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
|
||||||
import net.minecraft.world.level.block.Blocks;
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
|
||||||
import net.minecraft.world.item.BlockItem;
|
|
||||||
import net.minecraft.world.item.ItemStack;
|
|
||||||
import net.minecraft.core.Direction;
|
|
||||||
import net.minecraft.core.BlockPos;
|
|
||||||
import net.minecraft.world.phys.Vec3;
|
|
||||||
import net.minecraft.server.level.ServerLevel;
|
|
||||||
import nl.requios.effortlessbuilding.BuildConfig;
|
|
||||||
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
|
||||||
import nl.requios.effortlessbuilding.helper.FixedStack;
|
|
||||||
import nl.requios.effortlessbuilding.helper.InventoryHelper;
|
|
||||||
import nl.requios.effortlessbuilding.helper.SurvivalHelper;
|
|
||||||
import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
public class UndoRedo {
|
|
||||||
|
|
||||||
//Undo and redo stacks per player
|
|
||||||
//Gets added to twice in singleplayer (server and client) if not careful. So separate stacks.
|
|
||||||
private static final Map<UUID, FixedStack<BlockSet>> undoStacksClient = new HashMap<>();
|
|
||||||
private static final Map<UUID, FixedStack<BlockSet>> undoStacksServer = new HashMap<>();
|
|
||||||
private static final Map<UUID, FixedStack<BlockSet>> redoStacksClient = new HashMap<>();
|
|
||||||
private static final Map<UUID, FixedStack<BlockSet>> redoStacksServer = new HashMap<>();
|
|
||||||
|
|
||||||
//add to undo stack
|
|
||||||
public static void addUndo(Player player, BlockSet blockSet) {
|
|
||||||
Map<UUID, FixedStack<BlockSet>> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer;
|
|
||||||
|
|
||||||
//Assert coordinates is as long as previous and new blockstate lists
|
|
||||||
if (blockSet.getCoordinates().size() != blockSet.getPreviousBlockStates().size() ||
|
|
||||||
blockSet.getCoordinates().size() != blockSet.getNewBlockStates().size()) {
|
|
||||||
EffortlessBuilding.logger.error("Coordinates and blockstate lists are not equal length. Coordinates: {}. Previous blockstates: {}. New blockstates: {}.",
|
|
||||||
blockSet.getCoordinates().size(), blockSet.getPreviousBlockStates().size(), blockSet.getNewBlockStates().size());
|
|
||||||
}
|
|
||||||
|
|
||||||
//Warn if previous and new blockstate are equal
|
|
||||||
//Can happen in a lot of valid cases
|
|
||||||
// for (int i = 0; i < blockSet.getCoordinates().size(); i++) {
|
|
||||||
// if (blockSet.getPreviousBlockStates().get(i).equals(blockSet.getNewBlockStates().get(i))) {
|
|
||||||
// EffortlessBuilding.logger.warn("Previous and new blockstates are equal at index {}. Blockstate: {}.",
|
|
||||||
// i, blockSet.getPreviousBlockStates().get(i));
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
//If no stack exists, make one
|
|
||||||
if (!undoStacks.containsKey(player.getUUID())) {
|
|
||||||
undoStacks.put(player.getUUID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize.get()]));
|
|
||||||
}
|
|
||||||
|
|
||||||
undoStacks.get(player.getUUID()).push(blockSet);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void addRedo(Player player, BlockSet blockSet) {
|
|
||||||
Map<UUID, FixedStack<BlockSet>> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer;
|
|
||||||
|
|
||||||
//(No asserts necessary, it's private)
|
|
||||||
|
|
||||||
//If no stack exists, make one
|
|
||||||
if (!redoStacks.containsKey(player.getUUID())) {
|
|
||||||
redoStacks.put(player.getUUID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize.get()]));
|
|
||||||
}
|
|
||||||
|
|
||||||
redoStacks.get(player.getUUID()).push(blockSet);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean undo(Player player) {
|
|
||||||
Map<UUID, FixedStack<BlockSet>> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer;
|
|
||||||
|
|
||||||
if (!undoStacks.containsKey(player.getUUID())) return false;
|
|
||||||
|
|
||||||
FixedStack<BlockSet> undoStack = undoStacks.get(player.getUUID());
|
|
||||||
|
|
||||||
if (undoStack.isEmpty()) return false;
|
|
||||||
|
|
||||||
BlockSet blockSet = undoStack.pop();
|
|
||||||
List<BlockPos> coordinates = blockSet.getCoordinates();
|
|
||||||
List<BlockState> previousBlockStates = blockSet.getPreviousBlockStates();
|
|
||||||
List<BlockState> newBlockStates = blockSet.getNewBlockStates();
|
|
||||||
Vec3 hitVec = blockSet.getHitVec();
|
|
||||||
|
|
||||||
//Find up to date itemstacks in player inventory
|
|
||||||
List<ItemStack> itemStacks = findItemStacksInInventory(player, previousBlockStates);
|
|
||||||
|
|
||||||
if (player.level.isClientSide) {
|
|
||||||
BlockPreviewRenderer.onBlocksBroken(coordinates, itemStacks, newBlockStates, blockSet.getSecondPos(), blockSet.getFirstPos());
|
|
||||||
} else {
|
|
||||||
//break all those blocks, reset to what they were
|
|
||||||
for (int i = 0; i < coordinates.size(); i++) {
|
|
||||||
BlockPos coordinate = coordinates.get(i);
|
|
||||||
ItemStack itemStack = itemStacks.get(i);
|
|
||||||
|
|
||||||
if (previousBlockStates.get(i).equals(newBlockStates.get(i))) continue;
|
|
||||||
|
|
||||||
//get blockstate from itemstack
|
|
||||||
BlockState previousBlockState = Blocks.AIR.defaultBlockState();
|
|
||||||
if (itemStack.getItem() instanceof BlockItem) {
|
|
||||||
previousBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (player.level.isLoaded(coordinate)) {
|
|
||||||
//check itemstack empty
|
|
||||||
if (itemStack.isEmpty()) {
|
|
||||||
itemStack = findItemStackInInventory(player, previousBlockStates.get(i));
|
|
||||||
//get blockstate from new itemstack
|
|
||||||
if (!itemStack.isEmpty() && itemStack.getItem() instanceof BlockItem) {
|
|
||||||
previousBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
|
|
||||||
} else {
|
|
||||||
if (previousBlockStates.get(i).getBlock() != Blocks.AIR)
|
|
||||||
EffortlessBuilding.logTranslate(player, "", previousBlockStates.get(i).getBlock().getDescriptionId(), " not found in inventory", true);
|
|
||||||
previousBlockState = Blocks.AIR.defaultBlockState();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.level, player, coordinate, true);
|
|
||||||
//if previousBlockState is air, placeBlock will set it to air
|
|
||||||
SurvivalHelper.placeBlock(player.level, player, coordinate, previousBlockState, itemStack, Direction.UP, hitVec, true, false, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//add to redo
|
|
||||||
addRedo(player, blockSet);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean redo(Player player) {
|
|
||||||
Map<UUID, FixedStack<BlockSet>> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer;
|
|
||||||
|
|
||||||
if (!redoStacks.containsKey(player.getUUID())) return false;
|
|
||||||
|
|
||||||
FixedStack<BlockSet> redoStack = redoStacks.get(player.getUUID());
|
|
||||||
|
|
||||||
if (redoStack.isEmpty()) return false;
|
|
||||||
|
|
||||||
BlockSet blockSet = redoStack.pop();
|
|
||||||
List<BlockPos> coordinates = blockSet.getCoordinates();
|
|
||||||
List<BlockState> previousBlockStates = blockSet.getPreviousBlockStates();
|
|
||||||
List<BlockState> newBlockStates = blockSet.getNewBlockStates();
|
|
||||||
Vec3 hitVec = blockSet.getHitVec();
|
|
||||||
|
|
||||||
//Find up to date itemstacks in player inventory
|
|
||||||
List<ItemStack> itemStacks = findItemStacksInInventory(player, newBlockStates);
|
|
||||||
|
|
||||||
if (player.level.isClientSide) {
|
|
||||||
BlockPreviewRenderer.onBlocksPlaced(coordinates, itemStacks, newBlockStates, blockSet.getFirstPos(), blockSet.getSecondPos());
|
|
||||||
} else {
|
|
||||||
//place blocks
|
|
||||||
for (int i = 0; i < coordinates.size(); i++) {
|
|
||||||
BlockPos coordinate = coordinates.get(i);
|
|
||||||
ItemStack itemStack = itemStacks.get(i);
|
|
||||||
|
|
||||||
if (previousBlockStates.get(i).equals(newBlockStates.get(i))) continue;
|
|
||||||
|
|
||||||
//get blockstate from itemstack
|
|
||||||
BlockState newBlockState = Blocks.AIR.defaultBlockState();
|
|
||||||
if (itemStack.getItem() instanceof BlockItem) {
|
|
||||||
newBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (player.level.isLoaded(coordinate)) {
|
|
||||||
//check itemstack empty
|
|
||||||
if (itemStack.isEmpty()) {
|
|
||||||
itemStack = findItemStackInInventory(player, newBlockStates.get(i));
|
|
||||||
//get blockstate from new itemstack
|
|
||||||
if (!itemStack.isEmpty() && itemStack.getItem() instanceof BlockItem) {
|
|
||||||
newBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
|
|
||||||
} else {
|
|
||||||
if (newBlockStates.get(i).getBlock() != Blocks.AIR)
|
|
||||||
EffortlessBuilding.logTranslate(player, "", newBlockStates.get(i).getBlock().getDescriptionId(), " not found in inventory", true);
|
|
||||||
newBlockState = Blocks.AIR.defaultBlockState();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.level, player, coordinate, true);
|
|
||||||
SurvivalHelper.placeBlock(player.level, player, coordinate, newBlockState, itemStack, Direction.UP, hitVec, true, false, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//add to undo
|
|
||||||
addUndo(player, blockSet);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void clear(Player player) {
|
|
||||||
Map<UUID, FixedStack<BlockSet>> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer;
|
|
||||||
Map<UUID, FixedStack<BlockSet>> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer;
|
|
||||||
if (undoStacks.containsKey(player.getUUID())) {
|
|
||||||
undoStacks.get(player.getUUID()).clear();
|
|
||||||
}
|
|
||||||
if (redoStacks.containsKey(player.getUUID())) {
|
|
||||||
redoStacks.get(player.getUUID()).clear();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static List<ItemStack> findItemStacksInInventory(Player player, List<BlockState> blockStates) {
|
|
||||||
List<ItemStack> itemStacks = new ArrayList<>(blockStates.size());
|
|
||||||
for (BlockState blockState : blockStates) {
|
|
||||||
itemStacks.add(findItemStackInInventory(player, blockState));
|
|
||||||
}
|
|
||||||
return itemStacks;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ItemStack findItemStackInInventory(Player player, BlockState blockState) {
|
|
||||||
ItemStack itemStack = ItemStack.EMPTY;
|
|
||||||
if (blockState == null) return itemStack;
|
|
||||||
|
|
||||||
//First try previousBlockStates
|
|
||||||
//TODO try to find itemstack with right blockstate first
|
|
||||||
// then change line 103 back (get state from item)
|
|
||||||
itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
|
|
||||||
|
|
||||||
|
|
||||||
//then anything it drops
|
|
||||||
if (itemStack.isEmpty()) {
|
|
||||||
//Cannot check drops on clientside because loot tables are server only
|
|
||||||
if (!player.level.isClientSide) {
|
|
||||||
List<ItemStack> itemsDropped = Block.getDrops(blockState, (ServerLevel) player.level, BlockPos.ZERO, null);
|
|
||||||
for (ItemStack itemStackDropped : itemsDropped) {
|
|
||||||
if (itemStackDropped.getItem() instanceof BlockItem) {
|
|
||||||
Block block = ((BlockItem) itemStackDropped.getItem()).getBlock();
|
|
||||||
itemStack = InventoryHelper.findItemStackInInventory(player, block);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//then air
|
|
||||||
//(already empty)
|
|
||||||
|
|
||||||
return itemStack;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding.capability;
|
|
||||||
|
|
||||||
import net.minecraft.nbt.CompoundTag;
|
|
||||||
import net.minecraft.nbt.Tag;
|
|
||||||
import net.minecraft.core.Direction;
|
|
||||||
import net.minecraftforge.common.capabilities.*;
|
|
||||||
import net.minecraftforge.common.util.LazyOptional;
|
|
||||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
|
||||||
import net.minecraftforge.fml.common.Mod;
|
|
||||||
import nl.requios.effortlessbuilding.buildmode.BuildModes;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.ModeSettings;
|
|
||||||
|
|
||||||
@Mod.EventBusSubscriber
|
|
||||||
public class ModeCapabilityManager {
|
|
||||||
|
|
||||||
public static Capability<IModeCapability> MODE_CAPABILITY = CapabilityManager.get(new CapabilityToken<>(){});
|
|
||||||
|
|
||||||
// Allows for the capability to persist after death.
|
|
||||||
@SubscribeEvent
|
|
||||||
public static void clonePlayer(PlayerEvent.Clone event) {
|
|
||||||
LazyOptional<IModeCapability> original = event.getOriginal().getCapability(MODE_CAPABILITY, null);
|
|
||||||
LazyOptional<IModeCapability> clone = event.getEntity().getCapability(MODE_CAPABILITY, null);
|
|
||||||
clone.ifPresent(cloneModeCapability ->
|
|
||||||
original.ifPresent(originalModeCapability ->
|
|
||||||
cloneModeCapability.setModeData(originalModeCapability.getModeData())));
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface IModeCapability {
|
|
||||||
ModeSettings getModeData();
|
|
||||||
|
|
||||||
void setModeData(ModeSettings modeSettings);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class ModeCapability implements IModeCapability {
|
|
||||||
private ModeSettings modeSettings;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ModeSettings getModeData() {
|
|
||||||
return modeSettings;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setModeData(ModeSettings modeSettings) {
|
|
||||||
this.modeSettings = modeSettings;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class Provider extends CapabilityProvider<Provider> implements ICapabilitySerializable<Tag> {
|
|
||||||
|
|
||||||
private IModeCapability instance = new ModeCapability();
|
|
||||||
private LazyOptional<IModeCapability> modeCapabilityOptional = LazyOptional.of(() -> instance);
|
|
||||||
|
|
||||||
public Provider() {
|
|
||||||
super(Provider.class);
|
|
||||||
gatherCapabilities();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
|
|
||||||
if (cap == MODE_CAPABILITY) return modeCapabilityOptional.cast();
|
|
||||||
return LazyOptional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void invalidateCaps() {
|
|
||||||
super.invalidateCaps();
|
|
||||||
modeCapabilityOptional.invalidate();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void reviveCaps() {
|
|
||||||
super.reviveCaps();
|
|
||||||
modeCapabilityOptional = LazyOptional.of(() -> instance);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Tag serializeNBT() {
|
|
||||||
CompoundTag compound = new CompoundTag();
|
|
||||||
ModeSettings modeSettings = instance.getModeData();
|
|
||||||
if (modeSettings == null) modeSettings = new ModeSettings();
|
|
||||||
|
|
||||||
//compound.putInteger("buildMode", modeSettings.getBuildMode().ordinal());
|
|
||||||
|
|
||||||
//TODO add mode settings
|
|
||||||
|
|
||||||
return compound;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void deserializeNBT(Tag nbt) {
|
|
||||||
CompoundTag compound = (CompoundTag) nbt;
|
|
||||||
|
|
||||||
//BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[compound.getInteger("buildMode")];
|
|
||||||
|
|
||||||
//TODO add mode settings
|
|
||||||
|
|
||||||
ModeSettings modeSettings = new ModeSettings(BuildModes.BuildModeEnum.NORMAL);
|
|
||||||
instance.setModeData(modeSettings);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,186 +0,0 @@
|
|||||||
package nl.requios.effortlessbuilding.capability;
|
|
||||||
|
|
||||||
import net.minecraft.nbt.CompoundTag;
|
|
||||||
import net.minecraft.nbt.Tag;
|
|
||||||
import net.minecraft.core.Direction;
|
|
||||||
import net.minecraft.core.BlockPos;
|
|
||||||
import net.minecraft.world.phys.Vec3;
|
|
||||||
import net.minecraftforge.common.capabilities.*;
|
|
||||||
import net.minecraftforge.common.util.INBTSerializable;
|
|
||||||
import net.minecraftforge.common.util.LazyOptional;
|
|
||||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
|
||||||
import net.minecraftforge.fml.common.Mod;
|
|
||||||
import nl.requios.effortlessbuilding.buildmodifier.Array;
|
|
||||||
import nl.requios.effortlessbuilding.buildmodifier.Mirror;
|
|
||||||
import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.ModifierSettings;
|
|
||||||
|
|
||||||
@Mod.EventBusSubscriber
|
|
||||||
public class ModifierCapabilityManager {
|
|
||||||
|
|
||||||
public final static Capability<IModifierCapability> MODIFIER_CAPABILITY = CapabilityManager.get(new CapabilityToken<>(){});
|
|
||||||
|
|
||||||
// Allows for the capability to persist after death.
|
|
||||||
@SubscribeEvent
|
|
||||||
public static void clonePlayer(PlayerEvent.Clone event) {
|
|
||||||
LazyOptional<IModifierCapability> original = event.getOriginal().getCapability(MODIFIER_CAPABILITY, null);
|
|
||||||
LazyOptional<IModifierCapability> clone = event.getEntity().getCapability(MODIFIER_CAPABILITY, null);
|
|
||||||
clone.ifPresent(cloneModifierCapability ->
|
|
||||||
original.ifPresent(originalModifierCapability ->
|
|
||||||
cloneModifierCapability.setModifierData(originalModifierCapability.getModifierData())));
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface IModifierCapability {
|
|
||||||
ModifierSettings getModifierData();
|
|
||||||
|
|
||||||
void setModifierData(ModifierSettings modifierSettings);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class ModifierCapability implements IModifierCapability {
|
|
||||||
private ModifierSettings modifierSettings;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ModifierSettings getModifierData() {
|
|
||||||
return modifierSettings;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setModifierData(ModifierSettings modifierSettings) {
|
|
||||||
this.modifierSettings = modifierSettings;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class Provider extends CapabilityProvider<Provider> implements INBTSerializable<Tag> {
|
|
||||||
|
|
||||||
private final IModifierCapability instance = new ModifierCapability();
|
|
||||||
private LazyOptional<IModifierCapability> modifierCapabilityOptional = LazyOptional.of(() -> instance);
|
|
||||||
|
|
||||||
public Provider() {
|
|
||||||
super(Provider.class);
|
|
||||||
gatherCapabilities();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
|
|
||||||
if (cap == MODIFIER_CAPABILITY) return modifierCapabilityOptional.cast();
|
|
||||||
return LazyOptional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void invalidateCaps() {
|
|
||||||
super.invalidateCaps();
|
|
||||||
modifierCapabilityOptional.invalidate();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void reviveCaps() {
|
|
||||||
super.reviveCaps();
|
|
||||||
modifierCapabilityOptional = LazyOptional.of(() -> instance);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Tag serializeNBT() {
|
|
||||||
CompoundTag compound = new CompoundTag();
|
|
||||||
ModifierSettings modifierSettings = instance.getModifierData();
|
|
||||||
if (modifierSettings == null) modifierSettings = new ModifierSettings();
|
|
||||||
|
|
||||||
//MIRROR
|
|
||||||
Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
|
|
||||||
if (m == null) m = new Mirror.MirrorSettings();
|
|
||||||
compound.putBoolean("mirrorEnabled", m.enabled);
|
|
||||||
compound.putDouble("mirrorPosX", m.position.x);
|
|
||||||
compound.putDouble("mirrorPosY", m.position.y);
|
|
||||||
compound.putDouble("mirrorPosZ", m.position.z);
|
|
||||||
compound.putBoolean("mirrorX", m.mirrorX);
|
|
||||||
compound.putBoolean("mirrorY", m.mirrorY);
|
|
||||||
compound.putBoolean("mirrorZ", m.mirrorZ);
|
|
||||||
compound.putInt("mirrorRadius", m.radius);
|
|
||||||
compound.putBoolean("mirrorDrawLines", m.drawLines);
|
|
||||||
compound.putBoolean("mirrorDrawPlanes", m.drawPlanes);
|
|
||||||
|
|
||||||
//ARRAY
|
|
||||||
Array.ArraySettings a = modifierSettings.getArraySettings();
|
|
||||||
if (a == null) a = new Array.ArraySettings();
|
|
||||||
compound.putBoolean("arrayEnabled", a.enabled);
|
|
||||||
compound.putInt("arrayOffsetX", a.offset.getX());
|
|
||||||
compound.putInt("arrayOffsetY", a.offset.getY());
|
|
||||||
compound.putInt("arrayOffsetZ", a.offset.getZ());
|
|
||||||
compound.putInt("arrayCount", a.count);
|
|
||||||
|
|
||||||
compound.putInt("reachUpgrade", modifierSettings.getReachUpgrade());
|
|
||||||
|
|
||||||
//compound.putBoolean("quickReplace", buildSettings.doQuickReplace()); dont save quickreplace
|
|
||||||
|
|
||||||
//RADIAL MIRROR
|
|
||||||
RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
|
|
||||||
if (r == null) r = new RadialMirror.RadialMirrorSettings();
|
|
||||||
compound.putBoolean("radialMirrorEnabled", r.enabled);
|
|
||||||
compound.putDouble("radialMirrorPosX", r.position.x);
|
|
||||||
compound.putDouble("radialMirrorPosY", r.position.y);
|
|
||||||
compound.putDouble("radialMirrorPosZ", r.position.z);
|
|
||||||
compound.putInt("radialMirrorSlices", r.slices);
|
|
||||||
compound.putBoolean("radialMirrorAlternate", r.alternate);
|
|
||||||
compound.putInt("radialMirrorRadius", r.radius);
|
|
||||||
compound.putBoolean("radialMirrorDrawLines", r.drawLines);
|
|
||||||
compound.putBoolean("radialMirrorDrawPlanes", r.drawPlanes);
|
|
||||||
|
|
||||||
return compound;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void deserializeNBT(Tag nbt) {
|
|
||||||
CompoundTag compound = (CompoundTag) nbt;
|
|
||||||
|
|
||||||
//MIRROR
|
|
||||||
boolean mirrorEnabled = compound.getBoolean("mirrorEnabled");
|
|
||||||
Vec3 mirrorPosition = new Vec3(
|
|
||||||
compound.getDouble("mirrorPosX"),
|
|
||||||
compound.getDouble("mirrorPosY"),
|
|
||||||
compound.getDouble("mirrorPosZ"));
|
|
||||||
boolean mirrorX = compound.getBoolean("mirrorX");
|
|
||||||
boolean mirrorY = compound.getBoolean("mirrorY");
|
|
||||||
boolean mirrorZ = compound.getBoolean("mirrorZ");
|
|
||||||
int mirrorRadius = compound.getInt("mirrorRadius");
|
|
||||||
boolean mirrorDrawLines = compound.getBoolean("mirrorDrawLines");
|
|
||||||
boolean mirrorDrawPlanes = compound.getBoolean("mirrorDrawPlanes");
|
|
||||||
Mirror.MirrorSettings mirrorSettings = new Mirror.MirrorSettings(mirrorEnabled, mirrorPosition, mirrorX, mirrorY, mirrorZ, mirrorRadius, mirrorDrawLines, mirrorDrawPlanes);
|
|
||||||
|
|
||||||
//ARRAY
|
|
||||||
boolean arrayEnabled = compound.getBoolean("arrayEnabled");
|
|
||||||
BlockPos arrayOffset = new BlockPos(
|
|
||||||
compound.getInt("arrayOffsetX"),
|
|
||||||
compound.getInt("arrayOffsetY"),
|
|
||||||
compound.getInt("arrayOffsetZ"));
|
|
||||||
int arrayCount = compound.getInt("arrayCount");
|
|
||||||
Array.ArraySettings arraySettings = new Array.ArraySettings(arrayEnabled, arrayOffset, arrayCount);
|
|
||||||
|
|
||||||
int reachUpgrade = compound.getInt("reachUpgrade");
|
|
||||||
|
|
||||||
//boolean quickReplace = compound.getBoolean("quickReplace"); //dont load quickreplace
|
|
||||||
|
|
||||||
//RADIAL MIRROR
|
|
||||||
boolean radialMirrorEnabled = compound.getBoolean("radialMirrorEnabled");
|
|
||||||
Vec3 radialMirrorPosition = new Vec3(
|
|
||||||
compound.getDouble("radialMirrorPosX"),
|
|
||||||
compound.getDouble("radialMirrorPosY"),
|
|
||||||
compound.getDouble("radialMirrorPosZ"));
|
|
||||||
int radialMirrorSlices = compound.getInt("radialMirrorSlices");
|
|
||||||
boolean radialMirrorAlternate = compound.getBoolean("radialMirrorAlternate");
|
|
||||||
int radialMirrorRadius = compound.getInt("radialMirrorRadius");
|
|
||||||
boolean radialMirrorDrawLines = compound.getBoolean("radialMirrorDrawLines");
|
|
||||||
boolean radialMirrorDrawPlanes = compound.getBoolean("radialMirrorDrawPlanes");
|
|
||||||
RadialMirror.RadialMirrorSettings radialMirrorSettings = new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPosition,
|
|
||||||
radialMirrorSlices, radialMirrorAlternate, radialMirrorRadius, radialMirrorDrawLines, radialMirrorDrawPlanes);
|
|
||||||
|
|
||||||
ModifierSettings modifierSettings = new ModifierSettings(mirrorSettings, arraySettings, radialMirrorSettings, false, reachUpgrade);
|
|
||||||
instance.setModifierData(modifierSettings);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,10 +1,13 @@
|
|||||||
package nl.requios.effortlessbuilding.compatibility;
|
package nl.requios.effortlessbuilding.compatibility;
|
||||||
|
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
import net.minecraft.world.item.BlockItem;
|
import net.minecraft.world.item.BlockItem;
|
||||||
import net.minecraft.world.item.Item;
|
import net.minecraft.world.item.Item;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraftforge.items.IItemHandler;
|
import net.minecraftforge.items.IItemHandler;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.item.ItemHelper;
|
||||||
import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
|
import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
|
||||||
|
|
||||||
public class CompatHelper {
|
public class CompatHelper {
|
||||||
@@ -13,12 +16,16 @@ public class CompatHelper {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean isItemBlockProxy(ItemStack stack) {
|
||||||
|
return isItemBlockProxy(stack, true);
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the item given is a proxy for blocks. For now, we check for the randomizer bag,
|
// Check if the item given is a proxy for blocks. For now, we check for the randomizer bag,
|
||||||
// /dank/null, or plain old blocks.
|
// /dank/null, or plain old blocks.
|
||||||
public static boolean isItemBlockProxy(ItemStack stack) {
|
public static boolean isItemBlockProxy(ItemStack stack, boolean seeBlockItemsAsProxies) {
|
||||||
Item item = stack.getItem();
|
Item item = stack.getItem();
|
||||||
if (item instanceof BlockItem)
|
if (item instanceof BlockItem)
|
||||||
return true;
|
return seeBlockItemsAsProxies;
|
||||||
return item instanceof AbstractRandomizerBagItem;
|
return item instanceof AbstractRandomizerBagItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,4 +67,21 @@ public class CompatHelper {
|
|||||||
return ItemStack.EMPTY;
|
return ItemStack.EMPTY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean containsBlock(ItemStack stack, Block block) {
|
||||||
|
if (stack == null || stack.isEmpty() || !isItemBlockProxy(stack)) {
|
||||||
|
return block == null || block == Blocks.AIR;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stack.getItem() instanceof BlockItem) {
|
||||||
|
return ((BlockItem) stack.getItem()).getBlock() == block;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stack.getItem() instanceof AbstractRandomizerBagItem randomizerBagItem) {
|
||||||
|
IItemHandler bagInventory = randomizerBagItem.getBagInventory(stack);
|
||||||
|
ItemStack firstMatch = ItemHelper.findFirstMatch(bagInventory, s -> s.getItem() instanceof BlockItem);
|
||||||
|
return firstMatch != null && !firstMatch.isEmpty();
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.InputConstants;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.gui.screens.Screen;
|
||||||
|
import org.lwjgl.glfw.GLFW;
|
||||||
|
|
||||||
|
public class AllKeys {
|
||||||
|
|
||||||
|
public static boolean isKeyDown(int key) {
|
||||||
|
return InputConstants.isKeyDown(Minecraft.getInstance()
|
||||||
|
.getWindow()
|
||||||
|
.getWindow(), key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isMouseButtonDown(int button) {
|
||||||
|
return GLFW.glfwGetMouseButton(Minecraft.getInstance()
|
||||||
|
.getWindow()
|
||||||
|
.getWindow(), button) == 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean ctrlDown() {
|
||||||
|
return Screen.hasControlDown();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean shiftDown() {
|
||||||
|
return Screen.hasShiftDown();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean altDown() {
|
||||||
|
return Screen.hasAltDown();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
|
||||||
|
public enum AllSpecialTextures {
|
||||||
|
|
||||||
|
BLANK("blank.png"),
|
||||||
|
CHECKERED("checkerboard.png"),
|
||||||
|
THIN_CHECKERED("thin_checkerboard.png"),
|
||||||
|
CUTOUT_CHECKERED("cutout_checkerboard.png"),
|
||||||
|
HIGHLIGHT_CHECKERED("highlighted_checkerboard.png"),
|
||||||
|
SELECTION("selection.png"),
|
||||||
|
GLUE("glue.png"),
|
||||||
|
|
||||||
|
;
|
||||||
|
|
||||||
|
public static final String ASSET_PATH = "textures/special/";
|
||||||
|
private ResourceLocation location;
|
||||||
|
|
||||||
|
private AllSpecialTextures(String filename) {
|
||||||
|
location = Create.asResource(ASSET_PATH + filename);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void bind() {
|
||||||
|
RenderSystem.setShaderTexture(0, location);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ResourceLocation getLocation() {
|
||||||
|
return location;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create;
|
||||||
|
|
||||||
|
import com.mojang.logging.LogUtils;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import nl.requios.effortlessbuilding.EffortlessBuilding;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
|
public class Create {
|
||||||
|
public static final String ID = EffortlessBuilding.MODID;
|
||||||
|
|
||||||
|
public static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
|
||||||
|
public static ResourceLocation asResource(String path) {
|
||||||
|
return new ResourceLocation(EffortlessBuilding.MODID, path);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create;
|
||||||
|
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.render.SuperByteBufferCache;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.ghost.GhostBlocks;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.outliner.Outliner;
|
||||||
|
|
||||||
|
public class CreateClient {
|
||||||
|
public static final SuperByteBufferCache BUFFER_CACHE = new SuperByteBufferCache();
|
||||||
|
public static final Outliner OUTLINER = new Outliner();
|
||||||
|
public static final GhostBlocks GHOST_BLOCKS = new GhostBlocks();
|
||||||
|
|
||||||
|
public static void invalidateRenderers() {
|
||||||
|
CreateClient.BUFFER_CACHE.invalidate();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create;
|
||||||
|
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.fml.common.Mod;
|
||||||
|
|
||||||
|
@Mod.EventBusSubscriber(Dist.CLIENT)
|
||||||
|
public class CreateClientTest {
|
||||||
|
|
||||||
|
// @SubscribeEvent
|
||||||
|
// public static void onTick(TickEvent.ClientTickEvent event) {
|
||||||
|
// CreateClient.GHOST_BLOCKS.showGhostState(1, Blocks.SPRUCE_LOG.defaultBlockState())
|
||||||
|
// .at(0, 120, 0)
|
||||||
|
// .breathingAlpha();
|
||||||
|
// CreateClient.GHOST_BLOCKS.showGhostState(2, Blocks.SPRUCE_LOG.defaultBlockState())
|
||||||
|
// .at(1, 120, 0)
|
||||||
|
// .breathingAlpha();
|
||||||
|
//
|
||||||
|
// CreateClient.OUTLINER.showAABB(1, new AABB(0, 0, 0, 10, 2, 6)
|
||||||
|
// .move(10, 120, 0))
|
||||||
|
// .withFaceTexture(AllSpecialTextures.CHECKERED)
|
||||||
|
// .colored(new Color(0.11f, 0.49f, 0.7f, 1f))
|
||||||
|
//// .colored(0xbfbfbf)
|
||||||
|
// .disableNormals()
|
||||||
|
// .lineWidth(1 / 32f);
|
||||||
|
// }
|
||||||
|
}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.events;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.multiplayer.ClientLevel;
|
||||||
|
import net.minecraft.world.level.LevelAccessor;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.client.event.RenderLevelStageEvent;
|
||||||
|
import net.minecraftforge.client.event.ViewportEvent;
|
||||||
|
import net.minecraftforge.event.TickEvent;
|
||||||
|
import net.minecraftforge.event.TickEvent.ClientTickEvent;
|
||||||
|
import net.minecraftforge.event.level.LevelEvent;
|
||||||
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
|
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
|
||||||
|
import nl.requios.effortlessbuilding.create.Create;
|
||||||
|
import nl.requios.effortlessbuilding.create.CreateClient;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.render.SuperRenderTypeBuffer;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.AnimationTickHolder;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.CameraAngleAnimationService;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.worldWrappers.WrappedClientWorld;
|
||||||
|
|
||||||
|
@EventBusSubscriber(Dist.CLIENT)
|
||||||
|
public class ClientEvents {
|
||||||
|
|
||||||
|
private static final String ITEM_PREFIX = "item." + Create.ID;
|
||||||
|
private static final String BLOCK_PREFIX = "block." + Create.ID;
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onTick(ClientTickEvent event) {
|
||||||
|
if (!isGameActive() || event.phase != TickEvent.Phase.END) return;
|
||||||
|
|
||||||
|
AnimationTickHolder.tick();
|
||||||
|
|
||||||
|
CreateClient.GHOST_BLOCKS.tickGhosts();
|
||||||
|
CreateClient.OUTLINER.tickOutlines();
|
||||||
|
CameraAngleAnimationService.tick();
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onLoadWorld(LevelEvent.Load event) {
|
||||||
|
LevelAccessor world = event.getLevel();
|
||||||
|
if (world.isClientSide() && world instanceof ClientLevel && !(world instanceof WrappedClientWorld)) {
|
||||||
|
CreateClient.invalidateRenderers();
|
||||||
|
AnimationTickHolder.reset();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onUnloadWorld(LevelEvent.Unload event) {
|
||||||
|
if (!event.getLevel()
|
||||||
|
.isClientSide())
|
||||||
|
return;
|
||||||
|
CreateClient.invalidateRenderers();
|
||||||
|
AnimationTickHolder.reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onRenderWorld(RenderLevelStageEvent event) {
|
||||||
|
if(event.getStage() != RenderLevelStageEvent.Stage.AFTER_CUTOUT_BLOCKS) return;
|
||||||
|
|
||||||
|
Vec3 cameraPos = Minecraft.getInstance().gameRenderer.getMainCamera()
|
||||||
|
.getPosition();
|
||||||
|
float pt = AnimationTickHolder.getPartialTicks();
|
||||||
|
|
||||||
|
PoseStack ms = event.getPoseStack();
|
||||||
|
ms.pushPose();
|
||||||
|
ms.translate(-cameraPos.x(), -cameraPos.y(), -cameraPos.z());
|
||||||
|
SuperRenderTypeBuffer buffer = SuperRenderTypeBuffer.getInstance();
|
||||||
|
|
||||||
|
CreateClient.GHOST_BLOCKS.renderAll(ms, buffer);
|
||||||
|
|
||||||
|
CreateClient.OUTLINER.renderOutlines(ms, buffer, pt);
|
||||||
|
buffer.draw();
|
||||||
|
RenderSystem.enableCull();
|
||||||
|
|
||||||
|
ms.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onCameraSetup(ViewportEvent.ComputeCameraAngles event) {
|
||||||
|
float partialTicks = AnimationTickHolder.getPartialTicks();
|
||||||
|
|
||||||
|
if (CameraAngleAnimationService.isYawAnimating())
|
||||||
|
event.setYaw(CameraAngleAnimationService.getYaw(partialTicks));
|
||||||
|
|
||||||
|
if (CameraAngleAnimationService.isPitchAnimating())
|
||||||
|
event.setPitch(CameraAngleAnimationService.getPitch(partialTicks));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isGameActive() {
|
||||||
|
return !(Minecraft.getInstance().level == null || Minecraft.getInstance().player == null);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.events;
|
||||||
|
|
||||||
|
import net.minecraft.world.level.LevelAccessor;
|
||||||
|
import net.minecraftforge.event.level.LevelEvent;
|
||||||
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
|
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.WorldAttached;
|
||||||
|
|
||||||
|
@EventBusSubscriber
|
||||||
|
public class CommonEvents {
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onUnloadWorld(LevelEvent.Unload event) {
|
||||||
|
LevelAccessor world = event.getLevel();
|
||||||
|
WorldAttached.invalidateWorld(world);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD)
|
||||||
|
public static class ModBusEvents {
|
||||||
|
|
||||||
|
// @SubscribeEvent
|
||||||
|
// public static void addPackFinders(AddPackFindersEvent event) {
|
||||||
|
// if (event.getPackType() == PackType.CLIENT_RESOURCES) {
|
||||||
|
// IModFileInfo modFileInfo = ModList.get().getModFileById(Create.ID);
|
||||||
|
// if (modFileInfo == null) {
|
||||||
|
// Create.LOGGER.error("Could not find Create mod file info; built-in resource packs will be missing!");
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
// IModFile modFile = modFileInfo.getFile();
|
||||||
|
// event.addRepositorySource((consumer, constructor) -> {
|
||||||
|
// consumer.accept(Pack.create(Create.asResource("legacy_copper").toString(), false, () -> new ModFilePackResources("Create Legacy Copper", modFile, "resourcepacks/legacy_copper"), constructor, Pack.Position.TOP, PackSource.DEFAULT));
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation;
|
||||||
|
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.LangNumberFormat;
|
||||||
|
import net.minecraft.server.packs.resources.ResourceManager;
|
||||||
|
import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
|
||||||
|
|
||||||
|
public class ClientResourceReloadListener implements ResourceManagerReloadListener {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResourceManagerReload(ResourceManager resourceManager) {
|
||||||
|
// CreateClient.invalidateRenderers();
|
||||||
|
// SoundScapes.invalidateAll();
|
||||||
|
LangNumberFormat.numberFormat.update();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation;
|
||||||
|
|
||||||
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
|
import net.minecraftforge.resource.PathPackResources;
|
||||||
|
|
||||||
|
import java.nio.file.Path;
|
||||||
|
|
||||||
|
public class ModFilePackResources extends PathPackResources {
|
||||||
|
protected final IModFile modFile;
|
||||||
|
protected final String sourcePath;
|
||||||
|
|
||||||
|
public ModFilePackResources(String name, IModFile modFile, String sourcePath) {
|
||||||
|
super(name, true, modFile.findResource(sourcePath));
|
||||||
|
this.modFile = modFile;
|
||||||
|
this.sourcePath = sourcePath;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Path resolve(String... paths) {
|
||||||
|
String[] allPaths = new String[paths.length + 1];
|
||||||
|
allPaths[0] = sourcePath;
|
||||||
|
System.arraycopy(paths, 0, allPaths, 1, paths.length);
|
||||||
|
return modFile.findResource(allPaths);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.block.render;
|
||||||
|
|
||||||
|
import com.jozufozu.flywheel.core.StitchedSprite;
|
||||||
|
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
|
||||||
|
public class SpriteShiftEntry {
|
||||||
|
protected StitchedSprite original;
|
||||||
|
protected StitchedSprite target;
|
||||||
|
|
||||||
|
public void set(ResourceLocation originalTextureLocation, ResourceLocation targetTextureLocation) {
|
||||||
|
original = new StitchedSprite(originalTextureLocation);
|
||||||
|
target = new StitchedSprite(targetTextureLocation);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ResourceLocation getOriginalResourceLocation() {
|
||||||
|
return original.getLocation();
|
||||||
|
}
|
||||||
|
|
||||||
|
public ResourceLocation getTargetResourceLocation() {
|
||||||
|
return target.getLocation();
|
||||||
|
}
|
||||||
|
|
||||||
|
public TextureAtlasSprite getOriginal() {
|
||||||
|
return original.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public TextureAtlasSprite getTarget() {
|
||||||
|
return target.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getTargetU(float localU) {
|
||||||
|
return getTarget().getU(getUnInterpolatedU(getOriginal(), localU));
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getTargetV(float localV) {
|
||||||
|
return getTarget().getV(getUnInterpolatedV(getOriginal(), localV));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static float getUnInterpolatedU(TextureAtlasSprite sprite, float u) {
|
||||||
|
float f = sprite.getU1() - sprite.getU0();
|
||||||
|
return (u - sprite.getU0()) / f * 16.0F;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static float getUnInterpolatedV(TextureAtlasSprite sprite, float v) {
|
||||||
|
float f = sprite.getV1() - sprite.getV0();
|
||||||
|
return (v - sprite.getV0()) / f * 16.0F;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,181 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.InputConstants;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraft.client.gui.components.AbstractWidget;
|
||||||
|
import net.minecraft.client.gui.components.EditBox;
|
||||||
|
import net.minecraft.client.gui.components.Renderable;
|
||||||
|
import net.minecraft.client.gui.components.events.GuiEventListener;
|
||||||
|
import net.minecraft.client.gui.narration.NarratableEntry;
|
||||||
|
import net.minecraft.client.gui.screens.Screen;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Components;
|
||||||
|
import nl.requios.effortlessbuilding.gui.buildmodifier.ModifiersScreenList;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public abstract class AbstractSimiScreen extends Screen {
|
||||||
|
|
||||||
|
protected int windowWidth, windowHeight;
|
||||||
|
protected int windowXOffset, windowYOffset;
|
||||||
|
protected int guiLeft, guiTop;
|
||||||
|
|
||||||
|
protected AbstractSimiScreen(Component title) {
|
||||||
|
super(title);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected AbstractSimiScreen() {
|
||||||
|
this(Components.immutableEmpty());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method must be called before {@code super.init()}!
|
||||||
|
*/
|
||||||
|
protected void setWindowSize(int width, int height) {
|
||||||
|
windowWidth = width;
|
||||||
|
windowHeight = height;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method must be called before {@code super.init()}!
|
||||||
|
*/
|
||||||
|
protected void setWindowOffset(int xOffset, int yOffset) {
|
||||||
|
windowXOffset = xOffset;
|
||||||
|
windowYOffset = yOffset;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void init() {
|
||||||
|
guiLeft = (width - windowWidth) / 2;
|
||||||
|
guiTop = (height - windowHeight) / 2;
|
||||||
|
guiLeft += windowXOffset;
|
||||||
|
guiTop += windowYOffset;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick() {
|
||||||
|
for (GuiEventListener listener : children()) {
|
||||||
|
if (listener instanceof TickableGuiEventListener tickable) {
|
||||||
|
tickable.tick();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean mouseClicked(double pMouseX, double pMouseY, int pButton) {
|
||||||
|
if (getFocused() != null && !getFocused().isMouseOver(pMouseX, pMouseY))
|
||||||
|
setFocused(null);
|
||||||
|
return super.mouseClicked(pMouseX, pMouseY, pButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPauseScreen() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
protected <W extends GuiEventListener & Renderable & NarratableEntry> void addRenderableWidgets(W... widgets) {
|
||||||
|
for (W widget : widgets) {
|
||||||
|
addRenderableWidget(widget);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected <W extends GuiEventListener & Renderable & NarratableEntry> void addRenderableWidgets(Collection<W> widgets) {
|
||||||
|
for (W widget : widgets) {
|
||||||
|
addRenderableWidget(widget);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void removeWidgets(GuiEventListener... widgets) {
|
||||||
|
for (GuiEventListener widget : widgets) {
|
||||||
|
removeWidget(widget);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void removeWidgets(Collection<? extends GuiEventListener> widgets) {
|
||||||
|
for (GuiEventListener widget : widgets) {
|
||||||
|
removeWidget(widget);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
partialTicks = minecraft.getFrameTime();
|
||||||
|
ms.pushPose();
|
||||||
|
|
||||||
|
prepareFrame();
|
||||||
|
|
||||||
|
renderWindowBackground(ms, mouseX, mouseY, partialTicks);
|
||||||
|
renderWindow(ms, mouseX, mouseY, partialTicks);
|
||||||
|
super.render(ms, mouseX, mouseY, partialTicks);
|
||||||
|
renderWindowForeground(ms, mouseX, mouseY, partialTicks);
|
||||||
|
|
||||||
|
endFrame();
|
||||||
|
|
||||||
|
ms.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
|
||||||
|
boolean keyPressed = super.keyPressed(keyCode, scanCode, modifiers);
|
||||||
|
if (keyPressed || getFocused() instanceof EditBox)
|
||||||
|
return keyPressed;
|
||||||
|
|
||||||
|
InputConstants.Key mouseKey = InputConstants.getKey(keyCode, scanCode);
|
||||||
|
if (this.minecraft.options.keyInventory.isActiveAndMatches(mouseKey)) {
|
||||||
|
this.onClose();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void prepareFrame() {}
|
||||||
|
|
||||||
|
protected void renderWindowBackground(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
renderBackground(ms);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract void renderWindow(PoseStack ms, int mouseX, int mouseY, float partialTicks);
|
||||||
|
|
||||||
|
protected void renderWindowForeground(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
for (Renderable widget : renderables) {
|
||||||
|
if (widget instanceof AbstractSimiWidget simiWidget && simiWidget.isMouseOver(mouseX, mouseY)
|
||||||
|
&& simiWidget.visible) {
|
||||||
|
List<Component> tooltip = simiWidget.getToolTip();
|
||||||
|
if (tooltip.isEmpty())
|
||||||
|
continue;
|
||||||
|
int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.getX();
|
||||||
|
int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.getY();
|
||||||
|
renderComponentTooltip(ms, tooltip, ttx, tty);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Added
|
||||||
|
if (widget instanceof ModifiersScreenList list) {
|
||||||
|
list.renderWindowForeground(ms, mouseX, mouseY, partialTicks);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void endFrame() {}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
protected void debugWindowArea(PoseStack graphics) {
|
||||||
|
fill(graphics, guiLeft + windowWidth, guiTop + windowHeight, guiLeft, guiTop, 0xD3D3D3D3);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public GuiEventListener getFocused() {
|
||||||
|
GuiEventListener focused = super.getFocused();
|
||||||
|
if (focused instanceof AbstractWidget && !((AbstractWidget) focused).isFocused())
|
||||||
|
focused = null;
|
||||||
|
setFocused(focused);
|
||||||
|
return focused;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraft.client.gui.GuiComponent;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
import nl.requios.effortlessbuilding.create.Create;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Color;
|
||||||
|
|
||||||
|
public enum AllGuiTextures implements ScreenElement {
|
||||||
|
|
||||||
|
// Widgets
|
||||||
|
BUTTON("widgets", 18, 18),
|
||||||
|
BUTTON_HOVER("widgets", 18, 0, 18, 18),
|
||||||
|
BUTTON_DOWN("widgets", 36, 0, 18, 18),
|
||||||
|
INDICATOR("widgets", 0, 18, 18, 6),
|
||||||
|
INDICATOR_WHITE("widgets", 18, 18, 18, 6),
|
||||||
|
INDICATOR_GREEN("widgets", 36, 18, 18, 6),
|
||||||
|
INDICATOR_YELLOW("widgets", 54, 18, 18, 6),
|
||||||
|
INDICATOR_RED("widgets", 72, 18, 18, 6),
|
||||||
|
|
||||||
|
HOTSLOT_ARROW("widgets", 24, 51, 20, 12),
|
||||||
|
HOTSLOT("widgets", 0, 68, 22, 22),
|
||||||
|
HOTSLOT_ACTIVE("widgets", 0, 46, 22, 22),
|
||||||
|
HOTSLOT_SUPER_ACTIVE("widgets", 27, 67, 24, 24),
|
||||||
|
|
||||||
|
SPEECH_TOOLTIP_BACKGROUND("widgets", 0, 24, 8, 8),
|
||||||
|
SPEECH_TOOLTIP_COLOR("widgets", 8, 24, 8, 8),
|
||||||
|
|
||||||
|
TRAIN_HUD_SPEED_BG("widgets", 0, 190, 182, 5),
|
||||||
|
TRAIN_HUD_SPEED("widgets", 0, 185, 182, 5),
|
||||||
|
TRAIN_HUD_THROTTLE("widgets", 0, 195, 182, 5),
|
||||||
|
TRAIN_HUD_THROTTLE_POINTER("widgets", 0, 209, 6, 9),
|
||||||
|
TRAIN_HUD_FRAME("widgets", 0, 200, 186, 7),
|
||||||
|
TRAIN_HUD_DIRECTION("widgets", 77, 165, 28, 20),
|
||||||
|
TRAIN_PROMPT_L("widgets", 8, 209, 3, 16),
|
||||||
|
TRAIN_PROMPT_R("widgets", 11, 209, 3, 16),
|
||||||
|
TRAIN_PROMPT("widgets", 0, 230, 256, 16),
|
||||||
|
|
||||||
|
;
|
||||||
|
|
||||||
|
public static final int FONT_COLOR = 0x575F7A;
|
||||||
|
|
||||||
|
public final ResourceLocation location;
|
||||||
|
public int width, height;
|
||||||
|
public int startX, startY;
|
||||||
|
|
||||||
|
private AllGuiTextures(String location, int width, int height) {
|
||||||
|
this(location, 0, 0, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
private AllGuiTextures(int startX, int startY) {
|
||||||
|
this("icons", startX * 16, startY * 16, 16, 16);
|
||||||
|
}
|
||||||
|
|
||||||
|
private AllGuiTextures(String location, int startX, int startY, int width, int height) {
|
||||||
|
this(Create.ID, location, startX, startY, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
private AllGuiTextures(String namespace, String location, int startX, int startY, int width, int height) {
|
||||||
|
this.location = new ResourceLocation(namespace, "textures/gui/" + location + ".png");
|
||||||
|
this.width = width;
|
||||||
|
this.height = height;
|
||||||
|
this.startX = startX;
|
||||||
|
this.startY = startY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public void bind() {
|
||||||
|
RenderSystem.setShaderTexture(0, location);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void render(PoseStack ms, int x, int y) {
|
||||||
|
bind();
|
||||||
|
GuiComponent.blit(ms, x, y, startX, startY, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public void render(PoseStack ms, int x, int y, GuiComponent component) {
|
||||||
|
bind();
|
||||||
|
component.blit(ms, x, y, startX, startY, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public void render(PoseStack ms, int x, int y, Color c) {
|
||||||
|
bind();
|
||||||
|
UIRenderHelper.drawColoredTexture(ms, c, x, y, startX, startY, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,218 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||||
|
import net.minecraft.client.gui.GuiComponent;
|
||||||
|
import net.minecraft.client.renderer.LightTexture;
|
||||||
|
import net.minecraft.client.renderer.MultiBufferSource;
|
||||||
|
import net.minecraft.client.renderer.RenderType;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
import nl.requios.effortlessbuilding.create.Create;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Color;
|
||||||
|
import org.joml.Matrix4f;
|
||||||
|
|
||||||
|
public class AllIcons implements ScreenElement {
|
||||||
|
|
||||||
|
public static final ResourceLocation ICON_ATLAS = Create.asResource("textures/gui/create_icons.png");
|
||||||
|
public static final int ICON_ATLAS_SIZE = 256;
|
||||||
|
|
||||||
|
private static int x = 0, y = -1;
|
||||||
|
private int iconX;
|
||||||
|
private int iconY;
|
||||||
|
|
||||||
|
public static final AllIcons
|
||||||
|
I_ADD = newRow(),
|
||||||
|
I_TRASH = next(),
|
||||||
|
I_3x3 = next(),
|
||||||
|
I_TARGET = next(),
|
||||||
|
I_PRIORITY_VERY_LOW = next(),
|
||||||
|
I_PRIORITY_LOW = next(),
|
||||||
|
I_PRIORITY_HIGH = next(),
|
||||||
|
I_PRIORITY_VERY_HIGH = next(),
|
||||||
|
I_BLACKLIST = next(),
|
||||||
|
I_WHITELIST = next(),
|
||||||
|
I_WHITELIST_OR = next(),
|
||||||
|
I_WHITELIST_AND = next(),
|
||||||
|
I_WHITELIST_NOT = next(),
|
||||||
|
I_RESPECT_NBT = next(),
|
||||||
|
I_IGNORE_NBT = next();
|
||||||
|
|
||||||
|
public static final AllIcons
|
||||||
|
I_CONFIRM = newRow(),
|
||||||
|
I_NONE = next(),
|
||||||
|
I_OPEN_FOLDER = next(),
|
||||||
|
I_REFRESH = next(),
|
||||||
|
I_ACTIVE = next(),
|
||||||
|
I_PASSIVE = next(),
|
||||||
|
I_ROTATE_PLACE = next(),
|
||||||
|
I_ROTATE_PLACE_RETURNED = next(),
|
||||||
|
I_ROTATE_NEVER_PLACE = next(),
|
||||||
|
I_MOVE_PLACE = next(),
|
||||||
|
I_MOVE_PLACE_RETURNED = next(),
|
||||||
|
I_MOVE_NEVER_PLACE = next(),
|
||||||
|
I_CART_ROTATE = next(),
|
||||||
|
I_CART_ROTATE_PAUSED = next(),
|
||||||
|
I_CART_ROTATE_LOCKED = next();
|
||||||
|
|
||||||
|
public static final AllIcons
|
||||||
|
I_DONT_REPLACE = newRow(),
|
||||||
|
I_REPLACE_SOLID = next(),
|
||||||
|
I_REPLACE_ANY = next(),
|
||||||
|
I_REPLACE_EMPTY = next(),
|
||||||
|
I_CENTERED = next(),
|
||||||
|
I_ATTACHED = next(),
|
||||||
|
I_INSERTED = next(),
|
||||||
|
I_FILL = next(),
|
||||||
|
I_PLACE = next(),
|
||||||
|
I_REPLACE = next(),
|
||||||
|
I_CLEAR = next(),
|
||||||
|
I_OVERLAY = next(),
|
||||||
|
I_FLATTEN = next(),
|
||||||
|
I_LMB = next(),
|
||||||
|
I_SCROLL = next(),
|
||||||
|
I_RMB = next();
|
||||||
|
|
||||||
|
public static final AllIcons
|
||||||
|
I_TOOL_DEPLOY = newRow(),
|
||||||
|
I_SKIP_MISSING = next(),
|
||||||
|
I_SKIP_BLOCK_ENTITIES = next(),
|
||||||
|
I_DICE = next(),
|
||||||
|
I_TUNNEL_SPLIT = next(),
|
||||||
|
I_TUNNEL_FORCED_SPLIT = next(),
|
||||||
|
I_TUNNEL_ROUND_ROBIN = next(),
|
||||||
|
I_TUNNEL_FORCED_ROUND_ROBIN = next(),
|
||||||
|
I_TUNNEL_PREFER_NEAREST = next(),
|
||||||
|
I_TUNNEL_RANDOMIZE = next(),
|
||||||
|
I_TUNNEL_SYNCHRONIZE = next(),
|
||||||
|
I_TOOLBOX = next(),
|
||||||
|
I_VIEW_SCHEDULE = next(),
|
||||||
|
|
||||||
|
I_TOOL_MOVE_XZ = newRow(),
|
||||||
|
I_TOOL_MOVE_Y = next(),
|
||||||
|
I_TOOL_ROTATE = next(),
|
||||||
|
I_TOOL_MIRROR = next(),
|
||||||
|
I_ARM_ROUND_ROBIN = next(),
|
||||||
|
I_ARM_FORCED_ROUND_ROBIN = next(),
|
||||||
|
I_ARM_PREFER_FIRST = next(),
|
||||||
|
|
||||||
|
I_ADD_INVERTED_ATTRIBUTE = next(),
|
||||||
|
I_FLIP = next(),
|
||||||
|
|
||||||
|
I_PLAY = newRow(),
|
||||||
|
I_PAUSE = next(),
|
||||||
|
I_STOP = next(),
|
||||||
|
I_PLACEMENT_SETTINGS = next(),
|
||||||
|
I_ROTATE_CCW = next(),
|
||||||
|
I_HOUR_HAND_FIRST = next(),
|
||||||
|
I_MINUTE_HAND_FIRST = next(),
|
||||||
|
I_HOUR_HAND_FIRST_24 = next(),
|
||||||
|
|
||||||
|
I_PATTERN_SOLID = newRow(),
|
||||||
|
I_PATTERN_CHECKERED = next(),
|
||||||
|
I_PATTERN_CHECKERED_INVERSED = next(),
|
||||||
|
I_PATTERN_CHANCE_25 = next(),
|
||||||
|
|
||||||
|
I_PATTERN_CHANCE_50 = newRow(),
|
||||||
|
I_PATTERN_CHANCE_75 = next(),
|
||||||
|
I_FOLLOW_DIAGONAL = next(),
|
||||||
|
I_FOLLOW_MATERIAL = next(),
|
||||||
|
|
||||||
|
I_SCHEMATIC = newRow(),
|
||||||
|
I_SEQ_REPEAT = next(),
|
||||||
|
|
||||||
|
I_MTD_LEFT = newRow(),
|
||||||
|
I_MTD_CLOSE = next(),
|
||||||
|
I_MTD_RIGHT = next(),
|
||||||
|
I_MTD_SCAN = next(),
|
||||||
|
I_MTD_REPLAY = next(),
|
||||||
|
I_MTD_USER_MODE = next(),
|
||||||
|
I_MTD_SLOW_MODE = next(),
|
||||||
|
|
||||||
|
I_CONFIG_UNLOCKED = newRow(),
|
||||||
|
I_CONFIG_LOCKED = next(),
|
||||||
|
I_CONFIG_DISCARD = next(),
|
||||||
|
I_CONFIG_SAVE = next(),
|
||||||
|
I_CONFIG_RESET = next(),
|
||||||
|
I_CONFIG_BACK = next(),
|
||||||
|
I_CONFIG_PREV = next(),
|
||||||
|
I_CONFIG_NEXT = next(),
|
||||||
|
I_DISABLE = next(),
|
||||||
|
I_CONFIG_OPEN = next(),
|
||||||
|
|
||||||
|
I_FX_SURFACE_OFF = newRow(),
|
||||||
|
I_FX_SURFACE_ON = next(),
|
||||||
|
I_FX_FIELD_OFF = next(),
|
||||||
|
I_FX_FIELD_ON = next(),
|
||||||
|
I_FX_BLEND = next(),
|
||||||
|
I_FX_BLEND_OFF = next();
|
||||||
|
;
|
||||||
|
|
||||||
|
public AllIcons(int x, int y) {
|
||||||
|
iconX = x * 16;
|
||||||
|
iconY = y * 16;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static AllIcons next() {
|
||||||
|
return new AllIcons(++x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static AllIcons newRow() {
|
||||||
|
return new AllIcons(x = 0, ++y);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public void bind() {
|
||||||
|
RenderSystem.setShaderTexture(0, ICON_ATLAS);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
@Override
|
||||||
|
public void render(PoseStack ms, int x, int y) {
|
||||||
|
bind();
|
||||||
|
GuiComponent.blit(ms, x, y, 0, iconX, iconY, 16, 16, 256, 256);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public void render(PoseStack ms, MultiBufferSource buffer, int color) {
|
||||||
|
VertexConsumer builder = buffer.getBuffer(RenderType.text(ICON_ATLAS));
|
||||||
|
Matrix4f matrix = ms.last().pose();
|
||||||
|
Color rgb = new Color(color);
|
||||||
|
int light = LightTexture.FULL_BRIGHT;
|
||||||
|
|
||||||
|
Vec3 vec1 = new Vec3(0, 0, 0);
|
||||||
|
Vec3 vec2 = new Vec3(0, 1, 0);
|
||||||
|
Vec3 vec3 = new Vec3(1, 1, 0);
|
||||||
|
Vec3 vec4 = new Vec3(1, 0, 0);
|
||||||
|
|
||||||
|
float u1 = iconX * 1f / ICON_ATLAS_SIZE;
|
||||||
|
float u2 = (iconX + 16) * 1f / ICON_ATLAS_SIZE;
|
||||||
|
float v1 = iconY * 1f / ICON_ATLAS_SIZE;
|
||||||
|
float v2 = (iconY + 16) * 1f / ICON_ATLAS_SIZE;
|
||||||
|
|
||||||
|
vertex(builder, matrix, vec1, rgb, u1, v1, light);
|
||||||
|
vertex(builder, matrix, vec2, rgb, u1, v2, light);
|
||||||
|
vertex(builder, matrix, vec3, rgb, u2, v2, light);
|
||||||
|
vertex(builder, matrix, vec4, rgb, u2, v1, light);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
private void vertex(VertexConsumer builder, Matrix4f matrix, Vec3 vec, Color rgb, float u, float v, int light) {
|
||||||
|
builder.vertex(matrix, (float) vec.x, (float) vec.y, (float) vec.z)
|
||||||
|
.color(rgb.getRed(), rgb.getGreen(), rgb.getBlue(), 255)
|
||||||
|
.uv(u, v)
|
||||||
|
.uv2(light)
|
||||||
|
.endVertex();
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public DelegatedStencilElement asStencil() {
|
||||||
|
return new DelegatedStencilElement().withStencilRenderer((ms, w, h, alpha) -> this.render(ms, 0, 0)).withBounds(16, 16);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,227 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.gui.screens.Screen;
|
||||||
|
import net.minecraft.network.chat.FormattedText;
|
||||||
|
import net.minecraft.network.chat.Style;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.element.BoxElement;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.element.TextStencilElement;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.widget.BoxWidget;
|
||||||
|
import org.lwjgl.opengl.GL30;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
|
public class ConfirmationScreen extends AbstractSimiScreen {
|
||||||
|
|
||||||
|
private Screen source;
|
||||||
|
private Consumer<Response> action = _success -> {
|
||||||
|
};
|
||||||
|
private List<FormattedText> text = new ArrayList<>();
|
||||||
|
private boolean centered = false;
|
||||||
|
private int x;
|
||||||
|
private int y;
|
||||||
|
private int textWidth;
|
||||||
|
private int textHeight;
|
||||||
|
private boolean tristate;
|
||||||
|
|
||||||
|
private BoxWidget confirm;
|
||||||
|
private BoxWidget confirmDontSave;
|
||||||
|
private BoxWidget cancel;
|
||||||
|
private BoxElement textBackground;
|
||||||
|
|
||||||
|
public enum Response {
|
||||||
|
Confirm, ConfirmDontSave, Cancel
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Removes text lines from the back of the list
|
||||||
|
* */
|
||||||
|
public ConfirmationScreen removeTextLines(int amount) {
|
||||||
|
if (amount > text.size())
|
||||||
|
return clearText();
|
||||||
|
|
||||||
|
text.subList(text.size() - amount, text.size()).clear();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ConfirmationScreen clearText() {
|
||||||
|
this.text.clear();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ConfirmationScreen addText(FormattedText text) {
|
||||||
|
this.text.add(text);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ConfirmationScreen withText(FormattedText text) {
|
||||||
|
return clearText().addText(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ConfirmationScreen at(int x, int y) {
|
||||||
|
this.x = Math.max(x, 0);
|
||||||
|
this.y = Math.max(y, 0);
|
||||||
|
this.centered = false;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ConfirmationScreen centered() {
|
||||||
|
this.centered = true;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ConfirmationScreen withAction(Consumer<Boolean> action) {
|
||||||
|
this.action = r -> action.accept(r == Response.Confirm);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ConfirmationScreen withThreeActions(Consumer<Response> action) {
|
||||||
|
this.action = action;
|
||||||
|
this.tristate = true;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void open(@Nonnull Screen source) {
|
||||||
|
this.source = source;
|
||||||
|
Minecraft client = source.getMinecraft();
|
||||||
|
this.init(client, client.getWindow().getGuiScaledWidth(), client.getWindow().getGuiScaledHeight());
|
||||||
|
this.minecraft.screen = this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick() {
|
||||||
|
super.tick();
|
||||||
|
source.tick();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void init() {
|
||||||
|
super.init();
|
||||||
|
|
||||||
|
ArrayList<FormattedText> copy = new ArrayList<>(text);
|
||||||
|
text.clear();
|
||||||
|
copy.forEach(t -> text.addAll(font.getSplitter().splitLines(t, 300, Style.EMPTY)));
|
||||||
|
|
||||||
|
textHeight = text.size() * (font.lineHeight + 1) + 4;
|
||||||
|
textWidth = 300;
|
||||||
|
|
||||||
|
if (centered) {
|
||||||
|
x = width/2 - textWidth/2 - 2;
|
||||||
|
y = height/2 - textHeight/2 - 16;
|
||||||
|
} else {
|
||||||
|
x = Math.max(0, x - textWidth / 2);
|
||||||
|
y = Math.max(0, y -= textHeight);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (x + textWidth > width) {
|
||||||
|
x = width - textWidth;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (y + textHeight + 30 > height) {
|
||||||
|
y = height - textHeight - 30;
|
||||||
|
}
|
||||||
|
|
||||||
|
int buttonX = x + textWidth / 2 - 6 - (int) (70 * (tristate ? 1.5f : 1));
|
||||||
|
|
||||||
|
TextStencilElement confirmText =
|
||||||
|
new TextStencilElement(font, tristate ? "Save" : "Confirm").centered(true, true);
|
||||||
|
confirm = new BoxWidget(buttonX, y + textHeight + 6, 70, 16).withCallback(() -> accept(Response.Confirm));
|
||||||
|
confirm.showingElement(confirmText.withElementRenderer(BoxWidget.gradientFactory.apply(confirm)));
|
||||||
|
addRenderableWidget(confirm);
|
||||||
|
|
||||||
|
buttonX += 12 + 70;
|
||||||
|
|
||||||
|
if (tristate) {
|
||||||
|
TextStencilElement confirmDontSaveText =
|
||||||
|
new TextStencilElement(font, "Don't Save").centered(true, true);
|
||||||
|
confirmDontSave =
|
||||||
|
new BoxWidget(buttonX, y + textHeight + 6, 70, 16).withCallback(() -> accept(Response.ConfirmDontSave));
|
||||||
|
confirmDontSave.showingElement(
|
||||||
|
confirmDontSaveText.withElementRenderer(BoxWidget.gradientFactory.apply(confirmDontSave)));
|
||||||
|
addRenderableWidget(confirmDontSave);
|
||||||
|
buttonX += 12 + 70;
|
||||||
|
}
|
||||||
|
|
||||||
|
TextStencilElement cancelText = new TextStencilElement(font, "Cancel").centered(true, true);
|
||||||
|
cancel = new BoxWidget(buttonX, y + textHeight + 6, 70, 16)
|
||||||
|
.withCallback(() -> accept(Response.Cancel));
|
||||||
|
cancel.showingElement(cancelText.withElementRenderer(BoxWidget.gradientFactory.apply(cancel)));
|
||||||
|
addRenderableWidget(cancel);
|
||||||
|
|
||||||
|
textBackground = new BoxElement()
|
||||||
|
.gradientBorder(Theme.p(Theme.Key.BUTTON_DISABLE))
|
||||||
|
.withBounds(width + 10, textHeight + 35)
|
||||||
|
.at(-5, y - 5);
|
||||||
|
|
||||||
|
if (text.size() == 1)
|
||||||
|
x = (width - font.width(text.get(0))) / 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onClose() {
|
||||||
|
accept(Response.Cancel);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void accept(Response success) {
|
||||||
|
minecraft.screen = source;
|
||||||
|
action.accept(success);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void renderWindow(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
textBackground.render(ms);
|
||||||
|
int offset = font.lineHeight + 1;
|
||||||
|
int lineY = y - offset;
|
||||||
|
|
||||||
|
ms.pushPose();
|
||||||
|
ms.translate(0, 0, 200);
|
||||||
|
|
||||||
|
for (FormattedText line : text) {
|
||||||
|
lineY += offset;
|
||||||
|
if (line == null)
|
||||||
|
continue;
|
||||||
|
font.draw(ms, line.getString(), x, lineY, 0xeaeaea);
|
||||||
|
}
|
||||||
|
|
||||||
|
ms.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void renderWindowBackground(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
endFrame();
|
||||||
|
|
||||||
|
source.render(ms, 0, 0, 10); // zero mouse coords to prevent further tooltips
|
||||||
|
|
||||||
|
prepareFrame();
|
||||||
|
|
||||||
|
fillGradient(ms, 0, 0, this.width, this.height, 0x70101010, 0x80101010);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void prepareFrame() {
|
||||||
|
UIRenderHelper.swapAndBlitColor(minecraft.getMainRenderTarget(), UIRenderHelper.framebuffer);
|
||||||
|
RenderSystem.clear(GL30.GL_STENCIL_BUFFER_BIT | GL30.GL_DEPTH_BUFFER_BIT, Minecraft.ON_OSX);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void endFrame() {
|
||||||
|
UIRenderHelper.swapAndBlitColor(UIRenderHelper.framebuffer, minecraft.getMainRenderTarget());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void resize(@Nonnull Minecraft client, int width, int height) {
|
||||||
|
super.resize(client, width, height);
|
||||||
|
source.resize(client, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPauseScreen() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui;
|
||||||
|
|
||||||
|
import org.joml.Matrix4f;
|
||||||
|
import org.joml.Vector3f;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.mojang.math.Axis;
|
||||||
|
|
||||||
|
public class CustomLightingSettings implements ILightingSettings {
|
||||||
|
|
||||||
|
private Vector3f light1;
|
||||||
|
private Vector3f light2;
|
||||||
|
private Matrix4f lightMatrix;
|
||||||
|
|
||||||
|
protected CustomLightingSettings(float yRot, float xRot) {
|
||||||
|
init(yRot, xRot, 0, 0, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected CustomLightingSettings(float yRot1, float xRot1, float yRot2, float xRot2) {
|
||||||
|
init(yRot1, xRot1, yRot2, xRot2, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void init(float yRot1, float xRot1, float yRot2, float xRot2, boolean doubleLight) {
|
||||||
|
light1 = new Vector3f(0, 0, 1);
|
||||||
|
light1.rotate(Axis.YP.rotationDegrees(yRot1));
|
||||||
|
light1.rotate(Axis.XN.rotationDegrees(xRot1));
|
||||||
|
|
||||||
|
if (doubleLight) {
|
||||||
|
light2 = new Vector3f(0, 0, 1);
|
||||||
|
light2.rotate(Axis.YP.rotationDegrees(yRot2));
|
||||||
|
light2.rotate(Axis.XN.rotationDegrees(xRot2));
|
||||||
|
} else {
|
||||||
|
light2 = new Vector3f();
|
||||||
|
}
|
||||||
|
|
||||||
|
lightMatrix = new Matrix4f();
|
||||||
|
lightMatrix.identity();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void applyLighting() {
|
||||||
|
RenderSystem.setupLevelDiffuseLighting(light1, light2, lightMatrix);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Builder builder() {
|
||||||
|
return new Builder();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Builder {
|
||||||
|
|
||||||
|
private float yRot1, xRot1;
|
||||||
|
private float yRot2, xRot2;
|
||||||
|
private boolean doubleLight;
|
||||||
|
|
||||||
|
public Builder firstLightRotation(float yRot, float xRot) {
|
||||||
|
yRot1 = yRot;
|
||||||
|
xRot1 = xRot;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder secondLightRotation(float yRot, float xRot) {
|
||||||
|
yRot2 = yRot;
|
||||||
|
xRot2 = xRot;
|
||||||
|
doubleLight = true;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder doubleLight() {
|
||||||
|
doubleLight = true;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public CustomLightingSettings build() {
|
||||||
|
if (doubleLight) {
|
||||||
|
return new CustomLightingSettings(yRot1, xRot1, yRot2, xRot2);
|
||||||
|
} else {
|
||||||
|
return new CustomLightingSettings(yRot1, xRot1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.Lighting;
|
||||||
|
|
||||||
|
public interface ILightingSettings {
|
||||||
|
|
||||||
|
void applyLighting();
|
||||||
|
|
||||||
|
static final ILightingSettings DEFAULT_3D = () -> Lighting.setupFor3DItems();
|
||||||
|
static final ILightingSettings DEFAULT_FLAT = () -> Lighting.setupForFlatItems();
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,202 @@
|
|||||||
|
//package nl.requios.effortlessbuilding.create.foundation.gui;
|
||||||
|
//
|
||||||
|
//import java.util.ArrayList;
|
||||||
|
//import java.util.List;
|
||||||
|
//
|
||||||
|
//import javax.annotation.Nonnull;
|
||||||
|
//
|
||||||
|
//import net.minecraft.client.gui.GuiComponent;
|
||||||
|
//import org.joml.Matrix4f;
|
||||||
|
//
|
||||||
|
//import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
//import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
//import com.mojang.blaze3d.vertex.Tesselator;
|
||||||
|
//
|
||||||
|
//import net.minecraft.client.gui.Font;
|
||||||
|
//import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
//import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
|
||||||
|
//import net.minecraft.client.renderer.MultiBufferSource;
|
||||||
|
//import net.minecraft.network.chat.FormattedText;
|
||||||
|
//import net.minecraft.network.chat.Style;
|
||||||
|
//import net.minecraft.world.item.ItemStack;
|
||||||
|
//import net.minecraftforge.client.ForgeHooksClient;
|
||||||
|
//import net.minecraftforge.client.event.RenderTooltipEvent;
|
||||||
|
//import net.minecraftforge.client.extensions.IForgeGuiGraphics;
|
||||||
|
//import net.minecraftforge.common.MinecraftForge;
|
||||||
|
//
|
||||||
|
//public class RemovedGuiUtils {
|
||||||
|
// @Nonnull
|
||||||
|
// private static ItemStack cachedTooltipStack = ItemStack.EMPTY;
|
||||||
|
//
|
||||||
|
// public static void preItemToolTip(@Nonnull ItemStack stack) {
|
||||||
|
// cachedTooltipStack = stack;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// public static void postItemToolTip() {
|
||||||
|
// cachedTooltipStack = ItemStack.EMPTY;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// public static void drawHoveringText(PoseStack graphics, List<? extends FormattedText> textLines, int mouseX,
|
||||||
|
// int mouseY, int screenWidth, int screenHeight, int maxTextWidth, Font font) {
|
||||||
|
// drawHoveringText(graphics, textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth,
|
||||||
|
// IForgeGuiGraphics.DEFAULT_BACKGROUND_COLOR, IForgeGuiGraphics.DEFAULT_BORDER_COLOR_START, IForgeGuiGraphics.DEFAULT_BORDER_COLOR_END,
|
||||||
|
// font);
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// public static void drawHoveringText(PoseStack graphics, List<? extends FormattedText> textLines, int mouseX,
|
||||||
|
// int mouseY, int screenWidth, int screenHeight, int maxTextWidth, int backgroundColor, int borderColorStart,
|
||||||
|
// int borderColorEnd, Font font) {
|
||||||
|
// drawHoveringText(cachedTooltipStack, graphics, textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth,
|
||||||
|
// backgroundColor, borderColorStart, borderColorEnd, font);
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// public static void drawHoveringText(@Nonnull final ItemStack stack, PoseStack graphics,
|
||||||
|
// List<? extends FormattedText> textLines, int mouseX, int mouseY, int screenWidth, int screenHeight,
|
||||||
|
// int maxTextWidth, Font font) {
|
||||||
|
// drawHoveringText(stack, graphics, textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth,
|
||||||
|
// IForgeGuiGraphics.DEFAULT_BACKGROUND_COLOR, IForgeGuiGraphics.DEFAULT_BORDER_COLOR_START, IForgeGuiGraphics.DEFAULT_BORDER_COLOR_END,
|
||||||
|
// font);
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// public static void drawHoveringText(@Nonnull final ItemStack stack, PoseStack pStack,
|
||||||
|
// List<? extends FormattedText> textLines, int mouseX, int mouseY, int screenWidth, int screenHeight,
|
||||||
|
// int maxTextWidth, int backgroundColor, int borderColorStart, int borderColorEnd, Font font) {
|
||||||
|
// if (textLines.isEmpty())
|
||||||
|
// return;
|
||||||
|
//
|
||||||
|
// List<ClientTooltipComponent> list = ForgeHooksClient.gatherTooltipComponents(stack, textLines,
|
||||||
|
// stack.getTooltipImage(), mouseX, screenWidth, screenHeight, font);
|
||||||
|
// RenderTooltipEvent.Pre event =
|
||||||
|
// new RenderTooltipEvent.Pre(stack, pStack, mouseX, mouseY, screenWidth, screenHeight, font, list, null);
|
||||||
|
// if (MinecraftForge.EVENT_BUS.post(event))
|
||||||
|
// return;
|
||||||
|
//
|
||||||
|
// mouseX = event.getX();
|
||||||
|
// mouseY = event.getY();
|
||||||
|
// screenWidth = event.getScreenWidth();
|
||||||
|
// screenHeight = event.getScreenHeight();
|
||||||
|
// font = event.getFont();
|
||||||
|
//
|
||||||
|
// // RenderSystem.disableRescaleNormal();
|
||||||
|
// RenderSystem.disableDepthTest();
|
||||||
|
// int tooltipTextWidth = 0;
|
||||||
|
//
|
||||||
|
// for (FormattedText textLine : textLines) {
|
||||||
|
// int textLineWidth = font.width(textLine);
|
||||||
|
// if (textLineWidth > tooltipTextWidth)
|
||||||
|
// tooltipTextWidth = textLineWidth;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// boolean needsWrap = false;
|
||||||
|
//
|
||||||
|
// int titleLinesCount = 1;
|
||||||
|
// int tooltipX = mouseX + 12;
|
||||||
|
// if (tooltipX + tooltipTextWidth + 4 > screenWidth) {
|
||||||
|
// tooltipX = mouseX - 16 - tooltipTextWidth;
|
||||||
|
// if (tooltipX < 4) // if the tooltip doesn't fit on the screen
|
||||||
|
// {
|
||||||
|
// if (mouseX > screenWidth / 2)
|
||||||
|
// tooltipTextWidth = mouseX - 12 - 8;
|
||||||
|
// else
|
||||||
|
// tooltipTextWidth = screenWidth - 16 - mouseX;
|
||||||
|
// needsWrap = true;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// if (maxTextWidth > 0 && tooltipTextWidth > maxTextWidth) {
|
||||||
|
// tooltipTextWidth = maxTextWidth;
|
||||||
|
// needsWrap = true;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// if (needsWrap) {
|
||||||
|
// int wrappedTooltipWidth = 0;
|
||||||
|
// List<FormattedText> wrappedTextLines = new ArrayList<>();
|
||||||
|
// for (int i = 0; i < textLines.size(); i++) {
|
||||||
|
// FormattedText textLine = textLines.get(i);
|
||||||
|
// List<FormattedText> wrappedLine = font.getSplitter()
|
||||||
|
// .splitLines(textLine, tooltipTextWidth, Style.EMPTY);
|
||||||
|
// if (i == 0)
|
||||||
|
// titleLinesCount = wrappedLine.size();
|
||||||
|
//
|
||||||
|
// for (FormattedText line : wrappedLine) {
|
||||||
|
// int lineWidth = font.width(line);
|
||||||
|
// if (lineWidth > wrappedTooltipWidth)
|
||||||
|
// wrappedTooltipWidth = lineWidth;
|
||||||
|
// wrappedTextLines.add(line);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// tooltipTextWidth = wrappedTooltipWidth;
|
||||||
|
// textLines = wrappedTextLines;
|
||||||
|
//
|
||||||
|
// if (mouseX > screenWidth / 2)
|
||||||
|
// tooltipX = mouseX - 16 - tooltipTextWidth;
|
||||||
|
// else
|
||||||
|
// tooltipX = mouseX + 12;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// int tooltipY = mouseY - 12;
|
||||||
|
// int tooltipHeight = 8;
|
||||||
|
//
|
||||||
|
// if (textLines.size() > 1) {
|
||||||
|
// tooltipHeight += (textLines.size() - 1) * 10;
|
||||||
|
// if (textLines.size() > titleLinesCount)
|
||||||
|
// tooltipHeight += 2; // gap between title lines and next lines
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// if (tooltipY < 4)
|
||||||
|
// tooltipY = 4;
|
||||||
|
// else if (tooltipY + tooltipHeight + 4 > screenHeight)
|
||||||
|
// tooltipY = screenHeight - tooltipHeight - 4;
|
||||||
|
//
|
||||||
|
// final int zLevel = 400;
|
||||||
|
// RenderTooltipEvent.Color colorEvent = new RenderTooltipEvent.Color(stack, pStack, tooltipX, tooltipY,
|
||||||
|
// font, backgroundColor, borderColorStart, borderColorEnd, list);
|
||||||
|
// MinecraftForge.EVENT_BUS.post(colorEvent);
|
||||||
|
// backgroundColor = colorEvent.getBackgroundStart();
|
||||||
|
// borderColorStart = colorEvent.getBorderStart();
|
||||||
|
// borderColorEnd = colorEvent.getBorderEnd();
|
||||||
|
//
|
||||||
|
// pStack.pushPose();
|
||||||
|
// Matrix4f mat = pStack.last()
|
||||||
|
// .pose();
|
||||||
|
// GuiComponent.fillGradient(pStack, tooltipX - 3, tooltipY - 4, tooltipX + tooltipTextWidth + 3,
|
||||||
|
// tooltipY - 3, zLevel, backgroundColor, backgroundColor);
|
||||||
|
// GuiComponent.fillGradient(pStack, tooltipX - 3, tooltipY + tooltipHeight + 3,
|
||||||
|
// tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 4, zLevel, backgroundColor, backgroundColor);
|
||||||
|
// GuiComponent.fillGradient(pStack, tooltipX - 3, tooltipY - 3, tooltipX + tooltipTextWidth + 3,
|
||||||
|
// tooltipY + tooltipHeight + 3, zLevel, backgroundColor, backgroundColor);
|
||||||
|
// GuiComponent.fillGradient(pStack, tooltipX - 4, tooltipY - 3, tooltipX - 3, tooltipY + tooltipHeight + 3,
|
||||||
|
// zLevel, backgroundColor, backgroundColor);
|
||||||
|
// GuiComponent.fillGradient(pStack, tooltipX + tooltipTextWidth + 3, tooltipY - 3,
|
||||||
|
// tooltipX + tooltipTextWidth + 4, tooltipY + tooltipHeight + 3, zLevel, backgroundColor, backgroundColor);
|
||||||
|
// GuiComponent.fillGradient(pStack, tooltipX - 3, tooltipY - 3 + 1, tooltipX - 3 + 1,
|
||||||
|
// tooltipY + tooltipHeight + 3 - 1, zLevel, borderColorStart, borderColorEnd);
|
||||||
|
// GuiComponent.fillGradient(pStack, tooltipX + tooltipTextWidth + 2, tooltipY - 3 + 1,
|
||||||
|
// tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 3 - 1, zLevel, borderColorStart, borderColorEnd);
|
||||||
|
// GuiComponent.fillGradient(pStack, tooltipX - 3, tooltipY - 3, tooltipX + tooltipTextWidth + 3,
|
||||||
|
// tooltipY - 3 + 1, zLevel, borderColorStart, borderColorStart);
|
||||||
|
// GuiComponent.fillGradient(pStack, tooltipX - 3, tooltipY + tooltipHeight + 2,
|
||||||
|
// tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 3, zLevel, borderColorEnd, borderColorEnd);
|
||||||
|
//
|
||||||
|
// MultiBufferSource.BufferSource renderType = MultiBufferSource.immediate(Tesselator.getInstance()
|
||||||
|
// .getBuilder());
|
||||||
|
// pStack.translate(0.0D, 0.0D, zLevel);
|
||||||
|
//
|
||||||
|
// for (int lineNumber = 0; lineNumber < list.size(); ++lineNumber) {
|
||||||
|
// ClientTooltipComponent line = list.get(lineNumber);
|
||||||
|
//
|
||||||
|
// if (line != null)
|
||||||
|
// line.renderText(font, tooltipX, tooltipY, mat, renderType);
|
||||||
|
//
|
||||||
|
// if (lineNumber + 1 == titleLinesCount)
|
||||||
|
// tooltipY += 2;
|
||||||
|
//
|
||||||
|
// tooltipY += 10;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// renderType.endBatch();
|
||||||
|
// pStack.popPose();
|
||||||
|
//
|
||||||
|
// RenderSystem.enableDepthTest();
|
||||||
|
// }
|
||||||
|
//}
|
||||||
@@ -0,0 +1,229 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui;
|
||||||
|
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Color;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
|
public class Theme {
|
||||||
|
|
||||||
|
private static final List<Theme> THEMES = new ArrayList<>();
|
||||||
|
public static final Theme BASE = addTheme(new Theme());
|
||||||
|
|
||||||
|
public static Theme addTheme(@Nonnull Theme theme) {
|
||||||
|
THEMES.add(theme);
|
||||||
|
THEMES.sort(Comparator.comparingInt(Theme::getPriority).reversed());
|
||||||
|
return theme;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void removeTheme(Theme theme) {
|
||||||
|
THEMES.remove(theme);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void reload() {
|
||||||
|
THEMES.forEach(Theme::init);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ColorHolder resolve(String key) {
|
||||||
|
return THEMES
|
||||||
|
.stream()
|
||||||
|
.map(theme -> theme.get(key))
|
||||||
|
.filter(Objects::nonNull)
|
||||||
|
.findFirst()
|
||||||
|
.map(holder -> holder.lookupKey == null ? holder : resolve(holder.lookupKey))
|
||||||
|
.orElse(ColorHolder.MISSING);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nonnull public static Couple<Color> p(@Nonnull Key key) {return p(key.get());}
|
||||||
|
@Nonnull public static Couple<Color> p(String key) {return resolve(key).asPair();}
|
||||||
|
|
||||||
|
@Nonnull public static Color c(@Nonnull Key key, boolean first) {return c(key.get(), first);}
|
||||||
|
@Nonnull public static Color c(String key, boolean first) {return p(key).get(first);}
|
||||||
|
|
||||||
|
public static int i(@Nonnull Key key, boolean first) {return i(key.get(), first);}
|
||||||
|
public static int i(String key, boolean first) {return p(key).get(first).getRGB();}
|
||||||
|
|
||||||
|
@Nonnull public static Color c(@Nonnull Key key) {return c(key.get());}
|
||||||
|
@Nonnull public static Color c(String key) {return resolve(key).get();}
|
||||||
|
|
||||||
|
public static int i(@Nonnull Key key) {return i(key.get());}
|
||||||
|
public static int i(String key) {return resolve(key).get().getRGB();}
|
||||||
|
|
||||||
|
//-----------//
|
||||||
|
|
||||||
|
protected final Map<String, ColorHolder> colors;
|
||||||
|
private int priority = 0;
|
||||||
|
|
||||||
|
protected Theme() {
|
||||||
|
colors = new HashMap<>();
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Small note to addons: if you also want to make use of Theme,
|
||||||
|
* and add new Keys, please do not use mixins. Instead make a Theme
|
||||||
|
* subclass, override init and apply it via the static #addTheme
|
||||||
|
*
|
||||||
|
**/
|
||||||
|
|
||||||
|
protected void init() {
|
||||||
|
put(Key.BUTTON_IDLE, new Color(0xdd_8ab6d6, true), new Color(0x90_8ab6d6, true));
|
||||||
|
put(Key.BUTTON_HOVER, new Color(0xff_9ABBD3, true), new Color(0xd0_9ABBD3, true));
|
||||||
|
put(Key.BUTTON_CLICK, new Color(0xff_ffffff), new Color(0xee_ffffff));
|
||||||
|
put(Key.BUTTON_DISABLE, new Color(0x80_909090, true), new Color(0x60_909090, true));
|
||||||
|
put(Key.BUTTON_SUCCESS, new Color(0xcc_88f788, true), new Color(0xcc_20cc20, true));
|
||||||
|
put(Key.BUTTON_FAIL, new Color(0xcc_f78888, true), new Color(0xcc_cc2020, true));
|
||||||
|
put(Key.TEXT, new Color(0xff_eeeeee), new Color(0xff_a3a3a3));
|
||||||
|
put(Key.TEXT_DARKER, new Color(0xff_a3a3a3), new Color(0xff_808080));
|
||||||
|
put(Key.TEXT_ACCENT_STRONG, new Color(0xff_8ab6d6), new Color(0xff_8ab6d6));
|
||||||
|
put(Key.TEXT_ACCENT_SLIGHT, new Color(0xff_ddeeff), new Color(0xff_a0b0c0));
|
||||||
|
put(Key.STREAK, new Color(0x101010, false));
|
||||||
|
put(Key.VANILLA_TOOLTIP_BORDER, new Color(0x50_5000ff, true), new Color(0x50_28007f, true));
|
||||||
|
put(Key.VANILLA_TOOLTIP_BACKGROUND, new Color(0xf0_100010, true));
|
||||||
|
|
||||||
|
put(Key.PONDER_BUTTON_IDLE, new Color(0x60_c0c0ff, true), new Color(0x30_c0c0ff, true));
|
||||||
|
put(Key.PONDER_BUTTON_HOVER, new Color(0xf0_c0c0ff, true), new Color(0xa0_c0c0ff, true));
|
||||||
|
put(Key.PONDER_BUTTON_CLICK, new Color(0xff_ffffff), new Color(0xdd_ffffff));
|
||||||
|
put(Key.PONDER_BUTTON_DISABLE, new Color(0x80_909090, true), new Color(0x20_909090, true));
|
||||||
|
put(Key.PONDER_BACKGROUND_TRANSPARENT, new Color(0xdd_000000, true));
|
||||||
|
put(Key.PONDER_BACKGROUND_FLAT, new Color(0xff_000000, false));
|
||||||
|
put(Key.PONDER_BACKGROUND_IMPORTANT, new Color(0xdd_0e0e20, true));
|
||||||
|
put(Key.PONDER_IDLE, new Color(0x40ffeedd, true), new Color(0x20ffeedd, true));
|
||||||
|
put(Key.PONDER_HOVER, new Color(0x70ffffff, true), new Color(0x30ffffff, true));
|
||||||
|
put(Key.PONDER_HIGHLIGHT, new Color(0xf0ffeedd, true), new Color(0x60ffeedd, true));
|
||||||
|
put(Key.TEXT_WINDOW_BORDER, new Color(0x607a6000, true), new Color(0x207a6000, true));
|
||||||
|
put(Key.PONDER_BACK_ARROW, new Color(0xf0aa9999, true), new Color(0x30aa9999, true));
|
||||||
|
put(Key.PONDER_PROGRESSBAR, new Color(0x80ffeedd, true), new Color(0x50ffeedd, true));
|
||||||
|
put(Key.PONDER_MISSING_CREATE, new Color(0x70_984500, true), new Color(0x70_692400, true));
|
||||||
|
//put(Key.PONDER_MISSING_VANILLA, new Color(0x50_5000ff, true), new Color(0x50_300077, true));
|
||||||
|
lookup(Key.PONDER_MISSING_VANILLA, Key.VANILLA_TOOLTIP_BORDER);
|
||||||
|
put(Key.CONFIG_TITLE_A, new Color(0xffc69fbc, true), new Color(0xfff6b8bb, true));
|
||||||
|
put(Key.CONFIG_TITLE_B, new Color(0xfff6b8bb, true), new Color(0xfffbf994, true));
|
||||||
|
//put(Key., new Color(0x, true), new Color(0x, true));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void put(String key, Color c) {
|
||||||
|
colors.put(key, ColorHolder.single(c));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void put(Key key, Color c) {
|
||||||
|
put(key.get(), c);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void put(String key, Color c1, Color c2) {
|
||||||
|
colors.put(key, ColorHolder.pair(c1, c2));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void put(Key key, Color c1, Color c2) {
|
||||||
|
put(key.get(), c1, c2);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void lookup(Key key, Key source) {
|
||||||
|
colors.put(key.get(), ColorHolder.lookup(source.get()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable protected ColorHolder get(String key) {
|
||||||
|
return colors.get(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getPriority() {
|
||||||
|
return priority;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Theme setPriority(int priority) {
|
||||||
|
this.priority = priority;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Key {
|
||||||
|
|
||||||
|
public static final Key BUTTON_IDLE = new Key();
|
||||||
|
public static final Key BUTTON_HOVER = new Key();
|
||||||
|
public static final Key BUTTON_CLICK = new Key();
|
||||||
|
public static final Key BUTTON_DISABLE = new Key();
|
||||||
|
public static final Key BUTTON_SUCCESS = new Key();
|
||||||
|
public static final Key BUTTON_FAIL = new Key();
|
||||||
|
|
||||||
|
public static final Key TEXT = new Key();
|
||||||
|
public static final Key TEXT_DARKER = new Key();
|
||||||
|
public static final Key TEXT_ACCENT_STRONG = new Key();
|
||||||
|
public static final Key TEXT_ACCENT_SLIGHT = new Key();
|
||||||
|
|
||||||
|
public static final Key STREAK = new Key();
|
||||||
|
public static final Key VANILLA_TOOLTIP_BORDER = new Key();
|
||||||
|
public static final Key VANILLA_TOOLTIP_BACKGROUND = new Key();
|
||||||
|
|
||||||
|
public static final Key PONDER_BACKGROUND_TRANSPARENT = new Key();
|
||||||
|
public static final Key PONDER_BACKGROUND_FLAT = new Key();
|
||||||
|
public static final Key PONDER_BACKGROUND_IMPORTANT = new Key();
|
||||||
|
public static final Key PONDER_IDLE = new Key();
|
||||||
|
public static final Key PONDER_HOVER = new Key();
|
||||||
|
public static final Key PONDER_HIGHLIGHT = new Key();
|
||||||
|
public static final Key TEXT_WINDOW_BORDER = new Key();
|
||||||
|
public static final Key PONDER_BACK_ARROW = new Key();
|
||||||
|
public static final Key PONDER_PROGRESSBAR = new Key();
|
||||||
|
public static final Key PONDER_MISSING_CREATE = new Key();
|
||||||
|
public static final Key PONDER_MISSING_VANILLA = new Key();
|
||||||
|
|
||||||
|
public static final Key PONDER_BUTTON_IDLE = new Key();
|
||||||
|
public static final Key PONDER_BUTTON_HOVER = new Key();
|
||||||
|
public static final Key PONDER_BUTTON_CLICK = new Key();
|
||||||
|
public static final Key PONDER_BUTTON_DISABLE = new Key();
|
||||||
|
|
||||||
|
public static final Key CONFIG_TITLE_A = new Key();
|
||||||
|
public static final Key CONFIG_TITLE_B = new Key();
|
||||||
|
|
||||||
|
private static int index = 0;
|
||||||
|
|
||||||
|
private final String s;
|
||||||
|
|
||||||
|
protected Key() {
|
||||||
|
this.s = "_" + index++;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected Key(String s) {
|
||||||
|
this.s = s;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String get() {
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class ColorHolder {
|
||||||
|
|
||||||
|
private static final ColorHolder MISSING = ColorHolder.single(Color.BLACK);
|
||||||
|
|
||||||
|
private Couple<Color> colors;
|
||||||
|
private String lookupKey;
|
||||||
|
|
||||||
|
private static ColorHolder single(Color c) {
|
||||||
|
ColorHolder h = new ColorHolder();
|
||||||
|
h.colors = Couple.create(c.setImmutable(), c.setImmutable());
|
||||||
|
return h;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ColorHolder pair(Color first, Color second) {
|
||||||
|
ColorHolder h = new ColorHolder();
|
||||||
|
h.colors = Couple.create(first.setImmutable(), second.setImmutable());
|
||||||
|
return h;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ColorHolder lookup(String key) {
|
||||||
|
ColorHolder h = new ColorHolder();
|
||||||
|
h.lookupKey = key;
|
||||||
|
return h;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Color get() {
|
||||||
|
return colors.getFirst();
|
||||||
|
}
|
||||||
|
|
||||||
|
private Couple<Color> asPair() {
|
||||||
|
return colors;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.components.events.GuiEventListener;
|
||||||
|
|
||||||
|
public interface TickableGuiEventListener extends GuiEventListener {
|
||||||
|
void tick();
|
||||||
|
}
|
||||||
@@ -0,0 +1,325 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.pipeline.RenderTarget;
|
||||||
|
import com.mojang.blaze3d.platform.GlConst;
|
||||||
|
import com.mojang.blaze3d.platform.GlStateManager;
|
||||||
|
import com.mojang.blaze3d.platform.Window;
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.mojang.blaze3d.vertex.BufferBuilder;
|
||||||
|
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import com.mojang.blaze3d.vertex.Tesselator;
|
||||||
|
import com.mojang.blaze3d.vertex.VertexFormat;
|
||||||
|
import com.mojang.math.Axis;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.renderer.GameRenderer;
|
||||||
|
import net.minecraftforge.client.gui.ScreenUtils;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Color;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
|
||||||
|
import org.joml.Matrix4f;
|
||||||
|
import org.lwjgl.opengl.GL20;
|
||||||
|
import org.lwjgl.opengl.GL30;
|
||||||
|
|
||||||
|
public class UIRenderHelper {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An FBO that has a stencil buffer for use wherever stencil are necessary. Forcing the main FBO to have a stencil
|
||||||
|
* buffer will cause GL error spam when using fabulous graphics.
|
||||||
|
*/
|
||||||
|
public static CustomRenderTarget framebuffer;
|
||||||
|
|
||||||
|
public static void init() {
|
||||||
|
RenderSystem.recordRenderCall(() -> {
|
||||||
|
Window mainWindow = Minecraft.getInstance().getWindow();
|
||||||
|
framebuffer = CustomRenderTarget.create(mainWindow);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void updateWindowSize(Window mainWindow) {
|
||||||
|
if (framebuffer != null)
|
||||||
|
framebuffer.resize(mainWindow.getWidth(), mainWindow.getHeight(), Minecraft.ON_OSX);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void drawFramebuffer(float alpha) {
|
||||||
|
framebuffer.renderWithAlpha(alpha);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Switch from src to dst, after copying the contents of src to dst.
|
||||||
|
*/
|
||||||
|
public static void swapAndBlitColor(RenderTarget src, RenderTarget dst) {
|
||||||
|
GlStateManager._glBindFramebuffer(GL30.GL_READ_FRAMEBUFFER, src.frameBufferId);
|
||||||
|
GlStateManager._glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, dst.frameBufferId);
|
||||||
|
GlStateManager._glBlitFrameBuffer(0, 0, src.viewWidth, src.viewHeight, 0, 0, dst.viewWidth, dst.viewHeight, GL30.GL_COLOR_BUFFER_BIT, GL20.GL_LINEAR);
|
||||||
|
|
||||||
|
GlStateManager._glBindFramebuffer(GlConst.GL_FRAMEBUFFER, dst.frameBufferId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void streak(PoseStack ms, float angle, int x, int y, int breadth, int length) {
|
||||||
|
streak(ms, angle, x, y, breadth, length, Theme.i(Theme.Key.STREAK));
|
||||||
|
}
|
||||||
|
// angle in degrees; 0° -> fading to the right
|
||||||
|
// x and y specify the middle point of the starting edge
|
||||||
|
// breadth is the total width of the streak
|
||||||
|
|
||||||
|
public static void streak(PoseStack ms, float angle, int x, int y, int breadth, int length, int color) {
|
||||||
|
int a1 = 0xa0 << 24;
|
||||||
|
int a2 = 0x80 << 24;
|
||||||
|
int a3 = 0x10 << 24;
|
||||||
|
int a4 = 0x00 << 24;
|
||||||
|
|
||||||
|
color &= 0x00FFFFFF;
|
||||||
|
int c1 = a1 | color;
|
||||||
|
int c2 = a2 | color;
|
||||||
|
int c3 = a3 | color;
|
||||||
|
int c4 = a4 | color;
|
||||||
|
|
||||||
|
ms.pushPose();
|
||||||
|
ms.translate(x, y, 0);
|
||||||
|
ms.mulPose(Axis.ZP.rotationDegrees(angle - 90));
|
||||||
|
|
||||||
|
streak(ms, breadth / 2, length, c1, c2, c3, c4);
|
||||||
|
|
||||||
|
ms.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void streak(PoseStack ms, float angle, int x, int y, int breadth, int length, Color c) {
|
||||||
|
Color color = c.copy().setImmutable();
|
||||||
|
int c1 = color.scaleAlpha(0.625f).getRGB();
|
||||||
|
int c2 = color.scaleAlpha(0.5f).getRGB();
|
||||||
|
int c3 = color.scaleAlpha(0.0625f).getRGB();
|
||||||
|
int c4 = color.scaleAlpha(0f).getRGB();
|
||||||
|
|
||||||
|
ms.pushPose();
|
||||||
|
ms.translate(x, y, 0);
|
||||||
|
ms.mulPose(Axis.ZP.rotationDegrees(angle - 90));
|
||||||
|
|
||||||
|
streak(ms, breadth / 2, length, c1, c2, c3, c4);
|
||||||
|
|
||||||
|
ms.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void streak(PoseStack ms, int width, int height, int c1, int c2, int c3, int c4) {
|
||||||
|
double split1 = .5;
|
||||||
|
double split2 = .75;
|
||||||
|
Matrix4f model = ms.last().pose();
|
||||||
|
ScreenUtils.drawGradientRect(model, -width, 0, width, (int) (split1 * height), 0, c1, c2);
|
||||||
|
ScreenUtils.drawGradientRect(model, -width, (int) (split1 * height), width, (int) (split2 * height), 0, c2, c3);
|
||||||
|
ScreenUtils.drawGradientRect(model, -width, (int) (split2 * height), width, height, 0, c3, c4);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @see #angledGradient(PoseStack, float, int, int, int, int, int, Color, Color)
|
||||||
|
*/
|
||||||
|
public static void angledGradient(PoseStack ms, float angle, int x, int y, int breadth, int length, Couple<Color> c) {
|
||||||
|
angledGradient(ms, angle, x, y, 0, breadth, length, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @see #angledGradient(PoseStack, float, int, int, int, int, int, Color, Color)
|
||||||
|
*/
|
||||||
|
public static void angledGradient(PoseStack ms, float angle, int x, int y, int z, int breadth, int length, Couple<Color> c) {
|
||||||
|
angledGradient(ms, angle, x, y, z, breadth, length, c.getFirst(), c.getSecond());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @see #angledGradient(PoseStack, float, int, int, int, int, int, Color, Color)
|
||||||
|
*/
|
||||||
|
public static void angledGradient(PoseStack ms, float angle, int x, int y, int breadth, int length, Color color1, Color color2) {
|
||||||
|
angledGradient(ms, angle, x, y, 0, breadth, length, color1, color2);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* x and y specify the middle point of the starting edge
|
||||||
|
*
|
||||||
|
* @param angle the angle of the gradient in degrees; 0° means from left to right
|
||||||
|
* @param color1 the color at the starting edge
|
||||||
|
* @param color2 the color at the ending edge
|
||||||
|
* @param breadth the total width of the gradient
|
||||||
|
*/
|
||||||
|
public static void angledGradient(PoseStack ms, float angle, int x, int y, int z, int breadth, int length, Color color1, Color color2) {
|
||||||
|
ms.pushPose();
|
||||||
|
ms.translate(x, y, z);
|
||||||
|
ms.mulPose(Axis.ZP.rotationDegrees(angle - 90));
|
||||||
|
|
||||||
|
int w = breadth / 2;
|
||||||
|
Matrix4f model = ms.last().pose();
|
||||||
|
ScreenUtils.drawGradientRect(model, -w, 0, w, length, 0, color1.getRGB(), color2.getRGB());
|
||||||
|
|
||||||
|
ms.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void breadcrumbArrow(PoseStack ms, int x, int y, int z, int width, int height, int indent, Couple<Color> colors) {breadcrumbArrow(ms, x, y, z, width, height, indent, colors.getFirst(), colors.getSecond());}
|
||||||
|
|
||||||
|
// draws a wide chevron-style breadcrumb arrow pointing left
|
||||||
|
public static void breadcrumbArrow(PoseStack ms, int x, int y, int z, int width, int height, int indent, Color startColor, Color endColor) {
|
||||||
|
ms.pushPose();
|
||||||
|
ms.translate(x - indent, y, z);
|
||||||
|
|
||||||
|
breadcrumbArrow(ms, width, height, indent, startColor, endColor);
|
||||||
|
|
||||||
|
ms.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void breadcrumbArrow(PoseStack ms, int width, int height, int indent, Color c1, Color c2) {
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 0,0 x1,y1 ********************* x4,y4 ***** x7,y7
|
||||||
|
* **** ****
|
||||||
|
* **** ****
|
||||||
|
* x0,y0 x2,y2 x5,y5
|
||||||
|
* **** ****
|
||||||
|
* **** ****
|
||||||
|
* x3,y3 ********************* x6,y6 ***** x8,y8
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
float x0 = 0, y0 = height / 2f;
|
||||||
|
float x1 = indent, y1 = 0;
|
||||||
|
float x2 = indent, y2 = height / 2f;
|
||||||
|
float x3 = indent, y3 = height;
|
||||||
|
float x4 = width, y4 = 0;
|
||||||
|
float x5 = width, y5 = height / 2f;
|
||||||
|
float x6 = width, y6 = height;
|
||||||
|
float x7 = indent + width, y7 = 0;
|
||||||
|
float x8 = indent + width, y8 = height;
|
||||||
|
|
||||||
|
indent = Math.abs(indent);
|
||||||
|
width = Math.abs(width);
|
||||||
|
Color fc1 = Color.mixColors(c1, c2, 0);
|
||||||
|
Color fc2 = Color.mixColors(c1, c2, (indent) / (width + 2f * indent));
|
||||||
|
Color fc3 = Color.mixColors(c1, c2, (indent + width) / (width + 2f * indent));
|
||||||
|
Color fc4 = Color.mixColors(c1, c2, 1);
|
||||||
|
|
||||||
|
// RenderSystem.disableTexture();
|
||||||
|
RenderSystem.enableBlend();
|
||||||
|
RenderSystem.disableCull();
|
||||||
|
RenderSystem.defaultBlendFunc();
|
||||||
|
RenderSystem.setShader(GameRenderer::getPositionColorShader);
|
||||||
|
|
||||||
|
Tesselator tessellator = Tesselator.getInstance();
|
||||||
|
BufferBuilder bufferbuilder = tessellator.getBuilder();
|
||||||
|
Matrix4f model = ms.last().pose();
|
||||||
|
bufferbuilder.begin(VertexFormat.Mode.TRIANGLES, DefaultVertexFormat.POSITION_COLOR);
|
||||||
|
|
||||||
|
bufferbuilder.vertex(model, x0, y0, 0).color(fc1.getRed(), fc1.getGreen(), fc1.getBlue(), fc1.getAlpha()).endVertex();
|
||||||
|
bufferbuilder.vertex(model, x1, y1, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
|
||||||
|
bufferbuilder.vertex(model, x2, y2, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
|
||||||
|
|
||||||
|
bufferbuilder.vertex(model, x0, y0, 0).color(fc1.getRed(), fc1.getGreen(), fc1.getBlue(), fc1.getAlpha()).endVertex();
|
||||||
|
bufferbuilder.vertex(model, x2, y2, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
|
||||||
|
bufferbuilder.vertex(model, x3, y3, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
|
||||||
|
|
||||||
|
bufferbuilder.vertex(model, x3, y3, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
|
||||||
|
bufferbuilder.vertex(model, x1, y1, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
|
||||||
|
bufferbuilder.vertex(model, x4, y4, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
|
||||||
|
|
||||||
|
bufferbuilder.vertex(model, x3, y3, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
|
||||||
|
bufferbuilder.vertex(model, x4, y4, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
|
||||||
|
bufferbuilder.vertex(model, x6, y6, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
|
||||||
|
|
||||||
|
bufferbuilder.vertex(model, x5, y5, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
|
||||||
|
bufferbuilder.vertex(model, x4, y4, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
|
||||||
|
bufferbuilder.vertex(model, x7, y7, 0).color(fc4.getRed(), fc4.getGreen(), fc4.getBlue(), fc4.getAlpha()).endVertex();
|
||||||
|
|
||||||
|
bufferbuilder.vertex(model, x6, y6, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
|
||||||
|
bufferbuilder.vertex(model, x5, y5, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
|
||||||
|
bufferbuilder.vertex(model, x8, y8, 0).color(fc4.getRed(), fc4.getGreen(), fc4.getBlue(), fc4.getAlpha()).endVertex();
|
||||||
|
|
||||||
|
tessellator.end();
|
||||||
|
RenderSystem.enableCull();
|
||||||
|
RenderSystem.disableBlend();
|
||||||
|
// RenderSystem.enableTexture();
|
||||||
|
}
|
||||||
|
|
||||||
|
//just like AbstractGui#drawTexture, but with a color at every vertex
|
||||||
|
public static void drawColoredTexture(PoseStack ms, Color c, int x, int y, int tex_left, int tex_top, int width, int height) {
|
||||||
|
drawColoredTexture(ms, c, x, y, 0, (float) tex_left, (float) tex_top, width, height, 256, 256);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void drawColoredTexture(PoseStack ms, Color c, int x, int y, int z, float tex_left, float tex_top, int width, int height, int sheet_width, int sheet_height) {
|
||||||
|
drawColoredTexture(ms, c, x, x + width, y, y + height, z, width, height, tex_left, tex_top, sheet_width, sheet_height);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void drawStretched(PoseStack ms, int left, int top, int w, int h, int z, AllGuiTextures tex) {
|
||||||
|
tex.bind();
|
||||||
|
drawTexturedQuad(ms.last()
|
||||||
|
.pose(), Color.WHITE, left, left + w, top, top + h, z, tex.startX / 256f, (tex.startX + tex.width) / 256f,
|
||||||
|
tex.startY / 256f, (tex.startY + tex.height) / 256f);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void drawCropped(PoseStack ms, int left, int top, int w, int h, int z, AllGuiTextures tex) {
|
||||||
|
tex.bind();
|
||||||
|
drawTexturedQuad(ms.last()
|
||||||
|
.pose(), Color.WHITE, left, left + w, top, top + h, z, tex.startX / 256f, (tex.startX + w) / 256f,
|
||||||
|
tex.startY / 256f, (tex.startY + h) / 256f);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void drawColoredTexture(PoseStack ms, Color c, int left, int right, int top, int bot, int z, int tex_width, int tex_height, float tex_left, float tex_top, int sheet_width, int sheet_height) {
|
||||||
|
drawTexturedQuad(ms.last().pose(), c, left, right, top, bot, z, (tex_left + 0.0F) / (float) sheet_width, (tex_left + (float) tex_width) / (float) sheet_width, (tex_top + 0.0F) / (float) sheet_height, (tex_top + (float) tex_height) / (float) sheet_height);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void drawTexturedQuad(Matrix4f m, Color c, int left, int right, int top, int bot, int z, float u1, float u2, float v1, float v2) {
|
||||||
|
Tesselator tesselator = Tesselator.getInstance();
|
||||||
|
BufferBuilder bufferbuilder = tesselator.getBuilder();
|
||||||
|
RenderSystem.enableBlend();
|
||||||
|
RenderSystem.defaultBlendFunc();
|
||||||
|
RenderSystem.setShader(GameRenderer::getPositionColorTexShader);
|
||||||
|
bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR_TEX);
|
||||||
|
bufferbuilder.vertex(m, (float) left , (float) bot, (float) z).color(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha()).uv(u1, v2).endVertex();
|
||||||
|
bufferbuilder.vertex(m, (float) right, (float) bot, (float) z).color(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha()).uv(u2, v2).endVertex();
|
||||||
|
bufferbuilder.vertex(m, (float) right, (float) top, (float) z).color(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha()).uv(u2, v1).endVertex();
|
||||||
|
bufferbuilder.vertex(m, (float) left , (float) top, (float) z).color(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha()).uv(u1, v1).endVertex();
|
||||||
|
tesselator.end();
|
||||||
|
RenderSystem.disableBlend();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void flipForGuiRender(PoseStack poseStack) {
|
||||||
|
poseStack.mulPoseMatrix(new Matrix4f().scaling(1, -1, 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class CustomRenderTarget extends RenderTarget {
|
||||||
|
|
||||||
|
public CustomRenderTarget(boolean useDepth) {
|
||||||
|
super(useDepth);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static CustomRenderTarget create(Window mainWindow) {
|
||||||
|
CustomRenderTarget framebuffer = new CustomRenderTarget(true);
|
||||||
|
framebuffer.resize(mainWindow.getWidth(), mainWindow.getHeight(), Minecraft.ON_OSX);
|
||||||
|
framebuffer.setClearColor(0, 0, 0, 0);
|
||||||
|
framebuffer.enableStencil();
|
||||||
|
return framebuffer;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void renderWithAlpha(float alpha) {
|
||||||
|
Window window = Minecraft.getInstance().getWindow();
|
||||||
|
|
||||||
|
float vx = (float) window.getGuiScaledWidth();
|
||||||
|
float vy = (float) window.getGuiScaledHeight();
|
||||||
|
float tx = (float) viewWidth / (float) width;
|
||||||
|
float ty = (float) viewHeight / (float) height;
|
||||||
|
|
||||||
|
// RenderSystem.enableTexture();
|
||||||
|
RenderSystem.enableDepthTest();
|
||||||
|
RenderSystem.setShader(() -> Minecraft.getInstance().gameRenderer.blitShader);
|
||||||
|
RenderSystem.getShader().setSampler("DiffuseSampler", colorTextureId);
|
||||||
|
|
||||||
|
bindRead();
|
||||||
|
|
||||||
|
Tesselator tessellator = Tesselator.getInstance();
|
||||||
|
BufferBuilder bufferbuilder = tessellator.getBuilder();
|
||||||
|
bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR_TEX);
|
||||||
|
|
||||||
|
bufferbuilder.vertex(0, vy, 0).color(1, 1, 1, alpha).uv(0, 0).endVertex();
|
||||||
|
bufferbuilder.vertex(vx, vy, 0).color(1, 1, 1, alpha).uv(tx, 0).endVertex();
|
||||||
|
bufferbuilder.vertex(vx, 0, 0).color(1, 1, 1, alpha).uv(tx, ty).endVertex();
|
||||||
|
bufferbuilder.vertex(0, 0, 0).color(1, 1, 1, alpha).uv(0, ty).endVertex();
|
||||||
|
|
||||||
|
tessellator.end();
|
||||||
|
unbindRead();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,182 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.container;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.InputConstants;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraft.client.gui.components.AbstractWidget;
|
||||||
|
import net.minecraft.client.gui.components.EditBox;
|
||||||
|
import net.minecraft.client.gui.components.Renderable;
|
||||||
|
import net.minecraft.client.gui.components.events.GuiEventListener;
|
||||||
|
import net.minecraft.client.gui.narration.NarratableEntry;
|
||||||
|
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
|
||||||
|
import net.minecraft.client.gui.screens.inventory.ContainerScreen;
|
||||||
|
import net.minecraft.client.renderer.Rect2i;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.world.entity.player.Inventory;
|
||||||
|
import net.minecraft.world.inventory.AbstractContainerMenu;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget;
|
||||||
|
|
||||||
|
import javax.annotation.ParametersAreNonnullByDefault;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
@ParametersAreNonnullByDefault
|
||||||
|
public abstract class AbstractSimiContainerScreen<T extends AbstractContainerMenu> extends AbstractContainerScreen<T> {
|
||||||
|
|
||||||
|
protected int windowXOffset, windowYOffset;
|
||||||
|
|
||||||
|
public AbstractSimiContainerScreen(T container, Inventory inv, Component title) {
|
||||||
|
super(container, inv, title);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method must be called before {@code super.init()}!
|
||||||
|
*/
|
||||||
|
protected void setWindowSize(int width, int height) {
|
||||||
|
imageWidth = width;
|
||||||
|
imageHeight = height;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method must be called before {@code super.init()}!
|
||||||
|
*/
|
||||||
|
protected void setWindowOffset(int xOffset, int yOffset) {
|
||||||
|
windowXOffset = xOffset;
|
||||||
|
windowYOffset = yOffset;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void init() {
|
||||||
|
super.init();
|
||||||
|
leftPos += windowXOffset;
|
||||||
|
topPos += windowYOffset;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void containerTick() {
|
||||||
|
for (GuiEventListener listener : children()) {
|
||||||
|
if (listener instanceof TickableGuiEventListener tickable) {
|
||||||
|
tickable.tick();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
protected <W extends GuiEventListener & Renderable & NarratableEntry> void addRenderableWidgets(W... widgets) {
|
||||||
|
for (W widget : widgets) {
|
||||||
|
addRenderableWidget(widget);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected <W extends GuiEventListener & Renderable & NarratableEntry> void addRenderableWidgets(Collection<W> widgets) {
|
||||||
|
for (W widget : widgets) {
|
||||||
|
addRenderableWidget(widget);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void removeWidgets(GuiEventListener... widgets) {
|
||||||
|
for (GuiEventListener widget : widgets) {
|
||||||
|
removeWidget(widget);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void removeWidgets(Collection<? extends GuiEventListener> widgets) {
|
||||||
|
for (GuiEventListener widget : widgets) {
|
||||||
|
removeWidget(widget);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
partialTicks = minecraft.getFrameTime();
|
||||||
|
|
||||||
|
renderBackground(ms);
|
||||||
|
|
||||||
|
super.render(ms, mouseX, mouseY, partialTicks);
|
||||||
|
|
||||||
|
renderForeground(ms, mouseX, mouseY, partialTicks);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void renderLabels(PoseStack ms, int mouseX, int mouseY) {
|
||||||
|
// no-op to prevent screen- and inventory-title from being rendered at incorrect
|
||||||
|
// location
|
||||||
|
// could also set this.titleX/Y and this.playerInventoryTitleX/Y to the proper
|
||||||
|
// values instead
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void renderForeground(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
renderTooltip(ms, mouseX, mouseY);
|
||||||
|
for (Renderable widget : renderables) {
|
||||||
|
if (widget instanceof AbstractSimiWidget simiWidget && simiWidget.isMouseOver(mouseX, mouseY)) {
|
||||||
|
List<Component> tooltip = simiWidget.getToolTip();
|
||||||
|
if (tooltip.isEmpty())
|
||||||
|
continue;
|
||||||
|
int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.getX();
|
||||||
|
int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.getY();
|
||||||
|
renderComponentTooltip(ms, tooltip, ttx, tty);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getLeftOfCentered(int textureWidth) {
|
||||||
|
return leftPos - windowXOffset + (imageWidth - textureWidth) / 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// public void renderPlayerInventory(PoseStack graphics, int x, int y) {
|
||||||
|
// AllGuiTextures.PLAYER_INVENTORY.render(graphics, x, y);
|
||||||
|
// graphics.drawString(font, playerInventoryTitle, x + 8, y + 6, 0x404040, false);
|
||||||
|
// }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean keyPressed(int pKeyCode, int pScanCode, int pModifiers) {
|
||||||
|
InputConstants.Key mouseKey = InputConstants.getKey(pKeyCode, pScanCode);
|
||||||
|
if (getFocused() instanceof EditBox && this.minecraft.options.keyInventory.isActiveAndMatches(mouseKey))
|
||||||
|
return false;
|
||||||
|
return super.keyPressed(pKeyCode, pScanCode, pModifiers);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean mouseClicked(double pMouseX, double pMouseY, int pButton) {
|
||||||
|
if (getFocused() != null && !getFocused().isMouseOver(pMouseX, pMouseY))
|
||||||
|
setFocused(null);
|
||||||
|
return super.mouseClicked(pMouseX, pMouseY, pButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public GuiEventListener getFocused() {
|
||||||
|
GuiEventListener focused = super.getFocused();
|
||||||
|
if (focused instanceof AbstractWidget && !((AbstractWidget) focused).isFocused())
|
||||||
|
focused = null;
|
||||||
|
setFocused(focused);
|
||||||
|
return focused;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Used for moving JEI out of the way of extra things like block renders.
|
||||||
|
*
|
||||||
|
* @return the space that the GUI takes up outside the normal rectangle defined
|
||||||
|
* by {@link ContainerScreen}.
|
||||||
|
*/
|
||||||
|
public List<Rect2i> getExtraAreas() {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
protected void debugWindowArea(PoseStack ms) {
|
||||||
|
fill(ms, leftPos + imageWidth, topPos + imageHeight, leftPos, topPos, 0xD3D3D3D3);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
protected void debugExtraAreas(PoseStack ms) {
|
||||||
|
for (Rect2i area : getExtraAreas()) {
|
||||||
|
fill(ms, area.getX() + area.getWidth(), area.getY() + area.getHeight(), area.getX(), area.getY(),
|
||||||
|
0xD3D3D3D3);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.container;
|
||||||
|
|
||||||
|
import net.minecraft.network.FriendlyByteBuf;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraftforge.network.NetworkEvent.Context;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.networking.SimplePacketBase;
|
||||||
|
|
||||||
|
public class ClearMenuPacket extends SimplePacketBase {
|
||||||
|
|
||||||
|
public ClearMenuPacket() {}
|
||||||
|
|
||||||
|
public ClearMenuPacket(FriendlyByteBuf buffer) {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void write(FriendlyByteBuf buffer) {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean handle(Context context) {
|
||||||
|
context.enqueueWork(() -> {
|
||||||
|
ServerPlayer player = context.getSender();
|
||||||
|
if (player == null)
|
||||||
|
return;
|
||||||
|
if (!(player.containerMenu instanceof IClearableMenu))
|
||||||
|
return;
|
||||||
|
((IClearableMenu) player.containerMenu).clearContents();
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.container;
|
||||||
|
|
||||||
|
import net.minecraft.network.FriendlyByteBuf;
|
||||||
|
import net.minecraft.world.entity.player.Inventory;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraft.world.inventory.ClickType;
|
||||||
|
import net.minecraft.world.inventory.MenuType;
|
||||||
|
import net.minecraft.world.inventory.Slot;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraftforge.items.ItemHandlerHelper;
|
||||||
|
import net.minecraftforge.items.ItemStackHandler;
|
||||||
|
|
||||||
|
public abstract class GhostItemMenu<T> extends MenuBase<T> implements IClearableMenu {
|
||||||
|
|
||||||
|
public ItemStackHandler ghostInventory;
|
||||||
|
|
||||||
|
protected GhostItemMenu(MenuType<?> type, int id, Inventory inv, FriendlyByteBuf extraData) {
|
||||||
|
super(type, id, inv, extraData);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected GhostItemMenu(MenuType<?> type, int id, Inventory inv, T contentHolder) {
|
||||||
|
super(type, id, inv, contentHolder);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract ItemStackHandler createGhostInventory();
|
||||||
|
|
||||||
|
protected abstract boolean allowRepeats();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void initAndReadInventory(T contentHolder) {
|
||||||
|
ghostInventory = createGhostInventory();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void clearContents() {
|
||||||
|
for (int i = 0; i < ghostInventory.getSlots(); i++)
|
||||||
|
ghostInventory.setStackInSlot(i, ItemStack.EMPTY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canTakeItemForPickAll(ItemStack stack, Slot slotIn) {
|
||||||
|
return slotIn.container == playerInventory;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canDragTo(Slot slotIn) {
|
||||||
|
if (allowRepeats())
|
||||||
|
return true;
|
||||||
|
return slotIn.container == playerInventory;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void clicked(int slotId, int dragType, ClickType clickTypeIn, Player player) {
|
||||||
|
if (slotId < 36) {
|
||||||
|
super.clicked(slotId, dragType, clickTypeIn, player);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (clickTypeIn == ClickType.THROW)
|
||||||
|
return;
|
||||||
|
|
||||||
|
ItemStack held = getCarried();
|
||||||
|
int slot = slotId - 36;
|
||||||
|
if (clickTypeIn == ClickType.CLONE) {
|
||||||
|
if (player.isCreative() && held.isEmpty()) {
|
||||||
|
ItemStack stackInSlot = ghostInventory.getStackInSlot(slot)
|
||||||
|
.copy();
|
||||||
|
stackInSlot.setCount(stackInSlot.getMaxStackSize());
|
||||||
|
setCarried(stackInSlot);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ItemStack insert;
|
||||||
|
if (held.isEmpty()) {
|
||||||
|
insert = ItemStack.EMPTY;
|
||||||
|
} else {
|
||||||
|
insert = held.copy();
|
||||||
|
insert.setCount(1);
|
||||||
|
}
|
||||||
|
ghostInventory.setStackInSlot(slot, insert);
|
||||||
|
getSlot(slotId).setChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack quickMoveStack(Player playerIn, int index) {
|
||||||
|
if (index < 36) {
|
||||||
|
ItemStack stackToInsert = playerInventory.getItem(index);
|
||||||
|
for (int i = 0; i < ghostInventory.getSlots(); i++) {
|
||||||
|
ItemStack stack = ghostInventory.getStackInSlot(i);
|
||||||
|
if (!allowRepeats() && ItemHandlerHelper.canItemStacksStack(stack, stackToInsert))
|
||||||
|
break;
|
||||||
|
if (stack.isEmpty()) {
|
||||||
|
ItemStack copy = stackToInsert.copy();
|
||||||
|
copy.setCount(1);
|
||||||
|
ghostInventory.insertItem(i, copy, false);
|
||||||
|
getSlot(i + 36).setChanged();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ghostInventory.extractItem(index - 36, 1, false);
|
||||||
|
getSlot(index).setChanged();
|
||||||
|
}
|
||||||
|
return ItemStack.EMPTY;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.container;
|
||||||
|
|
||||||
|
import net.minecraft.network.FriendlyByteBuf;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraftforge.network.NetworkEvent.Context;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.networking.SimplePacketBase;
|
||||||
|
|
||||||
|
public class GhostItemSubmitPacket extends SimplePacketBase {
|
||||||
|
|
||||||
|
private final ItemStack item;
|
||||||
|
private final int slot;
|
||||||
|
|
||||||
|
public GhostItemSubmitPacket(ItemStack item, int slot) {
|
||||||
|
this.item = item;
|
||||||
|
this.slot = slot;
|
||||||
|
}
|
||||||
|
|
||||||
|
public GhostItemSubmitPacket(FriendlyByteBuf buffer) {
|
||||||
|
item = buffer.readItem();
|
||||||
|
slot = buffer.readInt();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void write(FriendlyByteBuf buffer) {
|
||||||
|
buffer.writeItem(item);
|
||||||
|
buffer.writeInt(slot);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean handle(Context context) {
|
||||||
|
context.enqueueWork(() -> {
|
||||||
|
ServerPlayer player = context.getSender();
|
||||||
|
if (player == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (player.containerMenu instanceof GhostItemMenu<?> menu) {
|
||||||
|
menu.ghostInventory.setStackInSlot(slot, item);
|
||||||
|
menu.getSlot(36 + slot).setChanged();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.container;
|
||||||
|
|
||||||
|
public interface IClearableMenu {
|
||||||
|
|
||||||
|
default void sendClearPacket() {
|
||||||
|
// PacketHandler.INSTANCE.sendToServer(new ClearMenuPacket());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void clearContents();
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.container;
|
||||||
|
|
||||||
|
import net.minecraft.network.FriendlyByteBuf;
|
||||||
|
import net.minecraft.world.entity.player.Inventory;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraft.world.inventory.AbstractContainerMenu;
|
||||||
|
import net.minecraft.world.inventory.MenuType;
|
||||||
|
import net.minecraft.world.inventory.Slot;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.IInteractionChecker;
|
||||||
|
|
||||||
|
public abstract class MenuBase<T> extends AbstractContainerMenu {
|
||||||
|
|
||||||
|
public Player player;
|
||||||
|
public Inventory playerInventory;
|
||||||
|
public T contentHolder;
|
||||||
|
|
||||||
|
protected MenuBase(MenuType<?> type, int id, Inventory inv, FriendlyByteBuf extraData) {
|
||||||
|
super(type, id);
|
||||||
|
init(inv, createOnClient(extraData));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected MenuBase(MenuType<?> type, int id, Inventory inv, T contentHolder) {
|
||||||
|
super(type, id);
|
||||||
|
init(inv, contentHolder);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void init(Inventory inv, T contentHolderIn) {
|
||||||
|
player = inv.player;
|
||||||
|
playerInventory = inv;
|
||||||
|
contentHolder = contentHolderIn;
|
||||||
|
initAndReadInventory(contentHolder);
|
||||||
|
addSlots();
|
||||||
|
broadcastChanges();
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
protected abstract T createOnClient(FriendlyByteBuf extraData);
|
||||||
|
|
||||||
|
protected abstract void initAndReadInventory(T contentHolder);
|
||||||
|
|
||||||
|
protected abstract void addSlots();
|
||||||
|
|
||||||
|
protected abstract void saveData(T contentHolder);
|
||||||
|
|
||||||
|
protected void addPlayerSlots(int x, int y) {
|
||||||
|
for (int hotbarSlot = 0; hotbarSlot < 9; ++hotbarSlot)
|
||||||
|
this.addSlot(new Slot(playerInventory, hotbarSlot, x + hotbarSlot * 18, y + 58));
|
||||||
|
for (int row = 0; row < 3; ++row)
|
||||||
|
for (int col = 0; col < 9; ++col)
|
||||||
|
this.addSlot(new Slot(playerInventory, col + row * 9 + 9, x + col * 18, y + row * 18));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void removed(Player playerIn) {
|
||||||
|
super.removed(playerIn);
|
||||||
|
saveData(contentHolder);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean stillValid(Player player) {
|
||||||
|
if (contentHolder == null)
|
||||||
|
return false;
|
||||||
|
if (contentHolder instanceof IInteractionChecker)
|
||||||
|
return ((IInteractionChecker) contentHolder).canPlayerUse(player);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.element;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.mojang.blaze3d.vertex.BufferBuilder;
|
||||||
|
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import com.mojang.blaze3d.vertex.Tesselator;
|
||||||
|
import com.mojang.blaze3d.vertex.VertexFormat;
|
||||||
|
import net.minecraft.client.renderer.GameRenderer;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Color;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
|
||||||
|
import org.joml.Matrix4f;
|
||||||
|
|
||||||
|
public class BoxElement extends RenderElement {
|
||||||
|
|
||||||
|
protected Color background = new Color(0xff000000, true);
|
||||||
|
protected Color borderTop = new Color(0x40ffeedd, true);
|
||||||
|
protected Color borderBot = new Color(0x20ffeedd, true);
|
||||||
|
protected int borderOffset = 2;
|
||||||
|
|
||||||
|
public <T extends BoxElement> T withBackground(Color color) {
|
||||||
|
this.background = color;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends BoxElement> T withBackground(int color) {
|
||||||
|
return withBackground(new Color(color, true));
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends BoxElement> T flatBorder(Color color) {
|
||||||
|
this.borderTop = color;
|
||||||
|
this.borderBot = color;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends BoxElement> T flatBorder(int color) {
|
||||||
|
return flatBorder(new Color(color, true));
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends BoxElement> T gradientBorder(Couple<Color> colors) {
|
||||||
|
this.borderTop = colors.getFirst();
|
||||||
|
this.borderBot = colors.getSecond();
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends BoxElement> T gradientBorder(Color top, Color bot) {
|
||||||
|
this.borderTop = top;
|
||||||
|
this.borderBot = bot;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends BoxElement> T gradientBorder(int top, int bot) {
|
||||||
|
return gradientBorder(new Color(top, true), new Color(bot, true));
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends BoxElement> T withBorderOffset(int offset) {
|
||||||
|
this.borderOffset = offset;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void render(PoseStack ms) {
|
||||||
|
renderBox(ms);
|
||||||
|
}
|
||||||
|
|
||||||
|
//total box width = 1 * 2 (outer border) + 1 * 2 (inner color border) + 2 * borderOffset + width
|
||||||
|
//defaults to 2 + 2 + 4 + 16 = 24px
|
||||||
|
//batch everything together to save a bunch of gl calls over ScreenUtils
|
||||||
|
protected void renderBox(PoseStack ms) {
|
||||||
|
/*
|
||||||
|
* _____________
|
||||||
|
* _|_____________|_
|
||||||
|
* | | ___________ | |
|
||||||
|
* | | | | | | |
|
||||||
|
* | | | | | | |
|
||||||
|
* | | |--* | | | |
|
||||||
|
* | | | h | | |
|
||||||
|
* | | | --w-+ | | |
|
||||||
|
* | | | | | |
|
||||||
|
* | | |_________| | |
|
||||||
|
* |_|_____________|_|
|
||||||
|
* |_____________|
|
||||||
|
*
|
||||||
|
* */
|
||||||
|
// RenderSystem.disableTexture();
|
||||||
|
RenderSystem.enableBlend();
|
||||||
|
RenderSystem.defaultBlendFunc();
|
||||||
|
RenderSystem.setShader(GameRenderer::getPositionColorShader);
|
||||||
|
|
||||||
|
Matrix4f model = ms.last().pose();
|
||||||
|
int f = borderOffset;
|
||||||
|
Color c1 = background.copy().scaleAlpha(alpha);
|
||||||
|
Color c2 = borderTop.copy().scaleAlpha(alpha);
|
||||||
|
Color c3 = borderBot.copy().scaleAlpha(alpha);
|
||||||
|
Tesselator tessellator = Tesselator.getInstance();
|
||||||
|
BufferBuilder b = tessellator.getBuilder();
|
||||||
|
|
||||||
|
b.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
|
||||||
|
//outer top
|
||||||
|
b.vertex(model, x - f - 1 , y - f - 2 , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x - f - 1 , y - f - 1 , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 1 + width, y - f - 1 , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 1 + width, y - f - 2 , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
//outer left
|
||||||
|
b.vertex(model, x - f - 2 , y - f - 1 , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x - f - 2 , y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x - f - 1 , y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x - f - 1 , y - f - 1 , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
//outer bottom
|
||||||
|
b.vertex(model, x - f - 1 , y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x - f - 1 , y + f + 2 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 1 + width, y + f + 2 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 1 + width, y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
//outer right
|
||||||
|
b.vertex(model, x + f + 1 + width, y - f - 1 , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 1 + width, y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 2 + width, y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 2 + width, y - f - 1 , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
//inner background - also render behind the inner edges
|
||||||
|
b.vertex(model, x - f - 1 , y - f - 1 , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x - f - 1 , y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 1 + width, y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 1 + width, y - f - 1 , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
|
||||||
|
tessellator.end();
|
||||||
|
b.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
|
||||||
|
//inner top - includes corners
|
||||||
|
b.vertex(model, x - f - 1 , y - f - 1 , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x - f - 1 , y - f , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 1 + width, y - f , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 1 + width, y - f - 1 , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
|
||||||
|
//inner left - excludes corners
|
||||||
|
b.vertex(model, x - f - 1 , y - f , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x - f - 1 , y + f + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x - f , y + f + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x - f , y - f , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
|
||||||
|
//inner bottom - includes corners
|
||||||
|
b.vertex(model, x - f - 1 , y + f + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x - f - 1 , y + f + 1 + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 1 + width, y + f + 1 + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 1 + width, y + f + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
|
||||||
|
//inner right - excludes corners
|
||||||
|
b.vertex(model, x + f + width, y - f , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + width, y + f + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 1 + width, y + f + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
|
||||||
|
b.vertex(model, x + f + 1 + width, y - f , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
|
||||||
|
|
||||||
|
tessellator.end();
|
||||||
|
|
||||||
|
RenderSystem.disableBlend();
|
||||||
|
// RenderSystem.enableTexture();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.element;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
|
||||||
|
public class CombinedStencilElement extends StencilElement {
|
||||||
|
|
||||||
|
private StencilElement element1;
|
||||||
|
private StencilElement element2;
|
||||||
|
private ElementMode mode;
|
||||||
|
|
||||||
|
private CombinedStencilElement() {}
|
||||||
|
|
||||||
|
public static CombinedStencilElement of(@Nonnull StencilElement element1, @Nonnull StencilElement element2) {
|
||||||
|
return of(element1, element2, ElementMode.FIRST);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static CombinedStencilElement of(@Nonnull StencilElement element1, @Nonnull StencilElement element2, ElementMode mode) {
|
||||||
|
CombinedStencilElement e = new CombinedStencilElement();
|
||||||
|
e.element1 = element1;
|
||||||
|
e.element2 = element2;
|
||||||
|
e.mode = mode;
|
||||||
|
return e;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends CombinedStencilElement> T withFirst(StencilElement element) {
|
||||||
|
this.element1 = element;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends CombinedStencilElement> T withSecond(StencilElement element) {
|
||||||
|
this.element2 = element;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends CombinedStencilElement> T withMode(ElementMode mode) {
|
||||||
|
this.mode = mode;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void renderStencil(PoseStack ms) {
|
||||||
|
ms.pushPose();
|
||||||
|
element1.transform(ms);
|
||||||
|
element1.withBounds(width, height);
|
||||||
|
element1.renderStencil(ms);
|
||||||
|
ms.popPose();
|
||||||
|
ms.pushPose();
|
||||||
|
element2.transform(ms);
|
||||||
|
element2.withBounds(width, height);
|
||||||
|
element2.renderStencil(ms);
|
||||||
|
ms.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void renderElement(PoseStack graphics) {
|
||||||
|
if (mode.rendersFirst())
|
||||||
|
element1.<StencilElement>withBounds(width, height).renderElement(graphics);
|
||||||
|
|
||||||
|
if (mode.rendersSecond())
|
||||||
|
element2.<StencilElement>withBounds(width, height).renderElement(graphics);
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum ElementMode {
|
||||||
|
FIRST, SECOND, BOTH;
|
||||||
|
|
||||||
|
boolean rendersFirst() {
|
||||||
|
return this == FIRST || this == BOTH;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean rendersSecond() {
|
||||||
|
return this == SECOND || this == BOTH;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.element;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Color;
|
||||||
|
|
||||||
|
public class DelegatedStencilElement extends StencilElement {
|
||||||
|
|
||||||
|
protected static final ElementRenderer EMPTY_RENDERER = (graphics, width, height, alpha) -> {};
|
||||||
|
protected static final ElementRenderer DEFAULT_ELEMENT = (graphics, width, height, alpha) -> UIRenderHelper.angledGradient(graphics, 0, -3, 5, height+4, width+6, new Color(0xff_10dd10).scaleAlpha(alpha), new Color(0xff_1010dd).scaleAlpha(alpha));
|
||||||
|
|
||||||
|
protected ElementRenderer stencil;
|
||||||
|
protected ElementRenderer element;
|
||||||
|
|
||||||
|
public DelegatedStencilElement() {
|
||||||
|
stencil = EMPTY_RENDERER;
|
||||||
|
element = DEFAULT_ELEMENT;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DelegatedStencilElement(ElementRenderer stencil, ElementRenderer element) {
|
||||||
|
this.stencil = stencil;
|
||||||
|
this.element = element;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends DelegatedStencilElement> T withStencilRenderer(ElementRenderer renderer) {
|
||||||
|
stencil = renderer;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends DelegatedStencilElement> T withElementRenderer(ElementRenderer renderer) {
|
||||||
|
element = renderer;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void renderStencil(PoseStack ms) {
|
||||||
|
stencil.render(ms, width, height, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void renderElement(PoseStack ms) {
|
||||||
|
element.render(ms, width, height, alpha);
|
||||||
|
}
|
||||||
|
|
||||||
|
@FunctionalInterface
|
||||||
|
public interface ElementRenderer {
|
||||||
|
void render(PoseStack ms, int width, int height, float alpha);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,298 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.element;
|
||||||
|
|
||||||
|
import com.jozufozu.flywheel.core.PartialModel;
|
||||||
|
import com.jozufozu.flywheel.core.model.ModelUtil;
|
||||||
|
import com.mojang.blaze3d.platform.GlStateManager.DestFactor;
|
||||||
|
import com.mojang.blaze3d.platform.GlStateManager.SourceFactor;
|
||||||
|
import com.mojang.blaze3d.platform.Lighting;
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import com.mojang.math.Axis;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.renderer.LightTexture;
|
||||||
|
import net.minecraft.client.renderer.MultiBufferSource;
|
||||||
|
import net.minecraft.client.renderer.RenderType;
|
||||||
|
import net.minecraft.client.renderer.Sheets;
|
||||||
|
import net.minecraft.client.renderer.block.BlockRenderDispatcher;
|
||||||
|
import net.minecraft.client.renderer.entity.ItemRenderer;
|
||||||
|
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||||
|
import net.minecraft.client.resources.model.BakedModel;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.util.RandomSource;
|
||||||
|
import net.minecraft.world.inventory.InventoryMenu;
|
||||||
|
import net.minecraft.world.item.ItemDisplayContext;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.level.ItemLike;
|
||||||
|
import net.minecraft.world.level.block.BaseFireBlock;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.LiquidBlock;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.material.Fluid;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
import net.minecraftforge.client.RenderTypeHelper;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.ILightingSettings;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Color;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.VecHelper;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
|
public class GuiGameElement {
|
||||||
|
|
||||||
|
public static GuiRenderBuilder of(ItemStack stack) {
|
||||||
|
return new GuiItemRenderBuilder(stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static GuiRenderBuilder of(ItemLike itemProvider) {
|
||||||
|
return new GuiItemRenderBuilder(itemProvider);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static GuiRenderBuilder of(BlockState state) {
|
||||||
|
return new GuiBlockStateRenderBuilder(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static GuiRenderBuilder of(PartialModel partial) {
|
||||||
|
return new GuiBlockPartialRenderBuilder(partial);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static GuiRenderBuilder of(Fluid fluid) {
|
||||||
|
return new GuiBlockStateRenderBuilder(fluid.defaultFluidState()
|
||||||
|
.createLegacyBlock()
|
||||||
|
.setValue(LiquidBlock.LEVEL, 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static abstract class GuiRenderBuilder extends RenderElement {
|
||||||
|
protected double xLocal, yLocal, zLocal;
|
||||||
|
protected double xRot, yRot, zRot;
|
||||||
|
protected double scale = 1;
|
||||||
|
protected int color = 0xFFFFFF;
|
||||||
|
protected Vec3 rotationOffset = Vec3.ZERO;
|
||||||
|
protected ILightingSettings customLighting = null;
|
||||||
|
|
||||||
|
public GuiRenderBuilder atLocal(double x, double y, double z) {
|
||||||
|
this.xLocal = x;
|
||||||
|
this.yLocal = y;
|
||||||
|
this.zLocal = z;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public GuiRenderBuilder rotate(double xRot, double yRot, double zRot) {
|
||||||
|
this.xRot = xRot;
|
||||||
|
this.yRot = yRot;
|
||||||
|
this.zRot = zRot;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public GuiRenderBuilder rotateBlock(double xRot, double yRot, double zRot) {
|
||||||
|
return this.rotate(xRot, yRot, zRot)
|
||||||
|
.withRotationOffset(VecHelper.getCenterOf(BlockPos.ZERO));
|
||||||
|
}
|
||||||
|
|
||||||
|
public GuiRenderBuilder scale(double scale) {
|
||||||
|
this.scale = scale;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public GuiRenderBuilder color(int color) {
|
||||||
|
this.color = color;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public GuiRenderBuilder withRotationOffset(Vec3 offset) {
|
||||||
|
this.rotationOffset = offset;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public GuiRenderBuilder lighting(ILightingSettings lighting) {
|
||||||
|
customLighting = lighting;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void prepareMatrix(PoseStack matrixStack) {
|
||||||
|
matrixStack.pushPose();
|
||||||
|
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
RenderSystem.enableDepthTest();
|
||||||
|
RenderSystem.enableBlend();
|
||||||
|
RenderSystem.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA);
|
||||||
|
prepareLighting(matrixStack);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void transformMatrix(PoseStack matrixStack) {
|
||||||
|
matrixStack.translate(x, y, z);
|
||||||
|
matrixStack.scale((float) scale, (float) scale, (float) scale);
|
||||||
|
matrixStack.translate(xLocal, yLocal, zLocal);
|
||||||
|
UIRenderHelper.flipForGuiRender(matrixStack);
|
||||||
|
matrixStack.translate(rotationOffset.x, rotationOffset.y, rotationOffset.z);
|
||||||
|
matrixStack.mulPose(Axis.ZP.rotationDegrees((float) zRot));
|
||||||
|
matrixStack.mulPose(Axis.XP.rotationDegrees((float) xRot));
|
||||||
|
matrixStack.mulPose(Axis.YP.rotationDegrees((float) yRot));
|
||||||
|
matrixStack.translate(-rotationOffset.x, -rotationOffset.y, -rotationOffset.z);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void cleanUpMatrix(PoseStack matrixStack) {
|
||||||
|
matrixStack.popPose();
|
||||||
|
cleanUpLighting(matrixStack);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void prepareLighting(PoseStack matrixStack) {
|
||||||
|
if (customLighting != null) {
|
||||||
|
customLighting.applyLighting();
|
||||||
|
} else {
|
||||||
|
Lighting.setupFor3DItems();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void cleanUpLighting(PoseStack matrixStack) {
|
||||||
|
if (customLighting != null) {
|
||||||
|
Lighting.setupFor3DItems();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class GuiBlockModelRenderBuilder extends GuiRenderBuilder {
|
||||||
|
|
||||||
|
protected BakedModel blockModel;
|
||||||
|
protected BlockState blockState;
|
||||||
|
|
||||||
|
public GuiBlockModelRenderBuilder(BakedModel blockmodel, @Nullable BlockState blockState) {
|
||||||
|
this.blockState = blockState == null ? Blocks.AIR.defaultBlockState() : blockState;
|
||||||
|
this.blockModel = blockmodel;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void render(PoseStack matrixStack) {
|
||||||
|
prepareMatrix(matrixStack);
|
||||||
|
|
||||||
|
Minecraft mc = Minecraft.getInstance();
|
||||||
|
BlockRenderDispatcher blockRenderer = mc.getBlockRenderer();
|
||||||
|
MultiBufferSource.BufferSource buffer = mc.renderBuffers()
|
||||||
|
.bufferSource();
|
||||||
|
|
||||||
|
transformMatrix(matrixStack);
|
||||||
|
|
||||||
|
RenderSystem.setShaderTexture(0, InventoryMenu.BLOCK_ATLAS);
|
||||||
|
renderModel(blockRenderer, buffer, matrixStack);
|
||||||
|
|
||||||
|
cleanUpMatrix(matrixStack);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void renderModel(BlockRenderDispatcher blockRenderer, MultiBufferSource.BufferSource buffer,
|
||||||
|
PoseStack ms) {
|
||||||
|
if (blockState.getBlock() == Blocks.AIR) {
|
||||||
|
RenderType renderType = Sheets.translucentCullBlockSheet();
|
||||||
|
blockRenderer.getModelRenderer()
|
||||||
|
.renderModel(ms.last(), buffer.getBuffer(renderType), blockState, blockModel, 1, 1, 1,
|
||||||
|
LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, ModelUtil.VIRTUAL_DATA, null);
|
||||||
|
} else {
|
||||||
|
int color = Minecraft.getInstance()
|
||||||
|
.getBlockColors()
|
||||||
|
.getColor(blockState, null, null, 0);
|
||||||
|
Color rgb = new Color(color == -1 ? this.color : color);
|
||||||
|
|
||||||
|
for (RenderType chunkType : blockModel.getRenderTypes(blockState, RandomSource.create(42L), ModelUtil.VIRTUAL_DATA)) {
|
||||||
|
RenderType renderType = RenderTypeHelper.getEntityRenderType(chunkType, true);
|
||||||
|
blockRenderer.getModelRenderer()
|
||||||
|
.renderModel(ms.last(), buffer.getBuffer(renderType), blockState, blockModel,
|
||||||
|
rgb.getRedAsFloat(), rgb.getGreenAsFloat(), rgb.getBlueAsFloat(),
|
||||||
|
LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, ModelUtil.VIRTUAL_DATA, chunkType);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
buffer.endBatch();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class GuiBlockStateRenderBuilder extends GuiBlockModelRenderBuilder {
|
||||||
|
|
||||||
|
public GuiBlockStateRenderBuilder(BlockState blockstate) {
|
||||||
|
super(Minecraft.getInstance()
|
||||||
|
.getBlockRenderer()
|
||||||
|
.getBlockModel(blockstate), blockstate);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void renderModel(BlockRenderDispatcher blockRenderer, MultiBufferSource.BufferSource buffer,
|
||||||
|
PoseStack ms) {
|
||||||
|
if (blockState.getBlock() instanceof BaseFireBlock) {
|
||||||
|
Lighting.setupForFlatItems();
|
||||||
|
super.renderModel(blockRenderer, buffer, ms);
|
||||||
|
Lighting.setupFor3DItems();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
super.renderModel(blockRenderer, buffer, ms);
|
||||||
|
|
||||||
|
if (blockState.getFluidState()
|
||||||
|
.isEmpty())
|
||||||
|
return;
|
||||||
|
|
||||||
|
// FluidRenderer.renderFluidBox(new FluidStack(blockState.getFluidState()
|
||||||
|
// .getType(), 1000), 0, 0, 0, 1, 1, 1, buffer, ms, LightTexture.FULL_BRIGHT, false);
|
||||||
|
// buffer.endBatch();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class GuiBlockPartialRenderBuilder extends GuiBlockModelRenderBuilder {
|
||||||
|
|
||||||
|
public GuiBlockPartialRenderBuilder(PartialModel partial) {
|
||||||
|
super(partial.get(), null);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class GuiItemRenderBuilder extends GuiRenderBuilder {
|
||||||
|
|
||||||
|
private final ItemStack stack;
|
||||||
|
|
||||||
|
public GuiItemRenderBuilder(ItemStack stack) {
|
||||||
|
this.stack = stack;
|
||||||
|
}
|
||||||
|
|
||||||
|
public GuiItemRenderBuilder(ItemLike provider) {
|
||||||
|
this(new ItemStack(provider));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void render(PoseStack matrixStack) {
|
||||||
|
prepareMatrix(matrixStack);
|
||||||
|
transformMatrix(matrixStack);
|
||||||
|
renderItemIntoGUI(matrixStack, stack, customLighting == null);
|
||||||
|
cleanUpMatrix(matrixStack);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void renderItemIntoGUI(PoseStack matrixStack, ItemStack stack, boolean useDefaultLighting) {
|
||||||
|
ItemRenderer renderer = Minecraft.getInstance().getItemRenderer();
|
||||||
|
BakedModel bakedModel = renderer.getModel(stack, null, null, 0);
|
||||||
|
|
||||||
|
renderer.textureManager.getTexture(InventoryMenu.BLOCK_ATLAS).setFilter(false, false);
|
||||||
|
RenderSystem.setShaderTexture(0, InventoryMenu.BLOCK_ATLAS);
|
||||||
|
RenderSystem.enableBlend();
|
||||||
|
RenderSystem.enableCull();
|
||||||
|
RenderSystem.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA);
|
||||||
|
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
matrixStack.pushPose();
|
||||||
|
matrixStack.translate(0, 0, 100.0F);
|
||||||
|
matrixStack.translate(8.0F, -8.0F, 0.0F);
|
||||||
|
matrixStack.scale(16.0F, 16.0F, 16.0F);
|
||||||
|
MultiBufferSource.BufferSource buffer = Minecraft.getInstance().renderBuffers().bufferSource();
|
||||||
|
boolean flatLighting = !bakedModel.usesBlockLight();
|
||||||
|
if (useDefaultLighting && flatLighting) {
|
||||||
|
Lighting.setupForFlatItems();
|
||||||
|
}
|
||||||
|
|
||||||
|
renderer.render(stack, ItemDisplayContext.GUI, false, matrixStack, buffer, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, bakedModel);
|
||||||
|
RenderSystem.disableDepthTest();
|
||||||
|
buffer.endBatch();
|
||||||
|
|
||||||
|
RenderSystem.enableDepthTest();
|
||||||
|
if (useDefaultLighting && flatLighting) {
|
||||||
|
Lighting.setupFor3DItems();
|
||||||
|
}
|
||||||
|
|
||||||
|
matrixStack.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.element;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
|
||||||
|
public abstract class RenderElement implements ScreenElement {
|
||||||
|
|
||||||
|
public static final RenderElement EMPTY = new RenderElement() {
|
||||||
|
@Override
|
||||||
|
public void render(PoseStack ms) {
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public static RenderElement of(ScreenElement renderable) {
|
||||||
|
return new SimpleRenderElement(renderable);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected int width = 16, height = 16;
|
||||||
|
protected float x = 0, y = 0, z = 0;
|
||||||
|
protected float alpha = 1f;
|
||||||
|
|
||||||
|
public <T extends RenderElement> T at(float x, float y) {
|
||||||
|
this.x = x;
|
||||||
|
this.y = y;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends RenderElement> T at(float x, float y, float z) {
|
||||||
|
this.x = x;
|
||||||
|
this.y = y;
|
||||||
|
this.z = z;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends RenderElement> T withBounds(int width, int height) {
|
||||||
|
this.width = width;
|
||||||
|
this.height = height;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends RenderElement> T withAlpha(float alpha) {
|
||||||
|
this.alpha = alpha;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getWidth() {
|
||||||
|
return width;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getHeight() {
|
||||||
|
return height;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getX() {
|
||||||
|
return x;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getY() {
|
||||||
|
return y;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getZ() {
|
||||||
|
return z;
|
||||||
|
}
|
||||||
|
|
||||||
|
public abstract void render(PoseStack ms);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void render(PoseStack ms, int x, int y) {
|
||||||
|
this.at(x, y).render(ms);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class SimpleRenderElement extends RenderElement {
|
||||||
|
|
||||||
|
private ScreenElement renderable;
|
||||||
|
|
||||||
|
public SimpleRenderElement(ScreenElement renderable) {
|
||||||
|
this.renderable = renderable;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void render(PoseStack ms) {
|
||||||
|
renderable.render(ms, (int) x, (int) y);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.element;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
|
||||||
|
public interface ScreenElement {
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
void render(PoseStack poseStack, int x, int y);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.element;
|
||||||
|
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
|
||||||
|
public abstract class StencilElement extends RenderElement {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void render(PoseStack ms) {
|
||||||
|
ms.pushPose();
|
||||||
|
transform(ms);
|
||||||
|
prepareStencil(ms);
|
||||||
|
renderStencil(ms);
|
||||||
|
prepareElement(ms);
|
||||||
|
renderElement(ms);
|
||||||
|
cleanUp(ms);
|
||||||
|
ms.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract void renderStencil(PoseStack graphics);
|
||||||
|
|
||||||
|
protected abstract void renderElement(PoseStack graphics);
|
||||||
|
|
||||||
|
protected void transform(PoseStack ms) {
|
||||||
|
ms.translate(x, y, z);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void prepareStencil(PoseStack ms) {
|
||||||
|
GL11.glDisable(GL11.GL_STENCIL_TEST);
|
||||||
|
RenderSystem.stencilMask(~0);
|
||||||
|
RenderSystem.clear(GL11.GL_STENCIL_BUFFER_BIT, Minecraft.ON_OSX);
|
||||||
|
GL11.glEnable(GL11.GL_STENCIL_TEST);
|
||||||
|
RenderSystem.stencilOp(GL11.GL_REPLACE, GL11.GL_KEEP, GL11.GL_KEEP);
|
||||||
|
RenderSystem.stencilMask(0xFF);
|
||||||
|
RenderSystem.stencilFunc(GL11.GL_NEVER, 1, 0xFF);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void prepareElement(PoseStack ms) {
|
||||||
|
GL11.glEnable(GL11.GL_STENCIL_TEST);
|
||||||
|
RenderSystem.stencilOp(GL11.GL_KEEP, GL11.GL_KEEP, GL11.GL_KEEP);
|
||||||
|
RenderSystem.stencilFunc(GL11.GL_EQUAL, 1, 0xFF);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void cleanUp(PoseStack ms) {
|
||||||
|
GL11.glDisable(GL11.GL_STENCIL_TEST);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.element;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraft.client.gui.Font;
|
||||||
|
import net.minecraft.network.chat.MutableComponent;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Components;
|
||||||
|
|
||||||
|
public class TextStencilElement extends DelegatedStencilElement {
|
||||||
|
|
||||||
|
protected Font font;
|
||||||
|
protected MutableComponent component;
|
||||||
|
protected boolean centerVertically = false;
|
||||||
|
protected boolean centerHorizontally = false;
|
||||||
|
|
||||||
|
public TextStencilElement(Font font) {
|
||||||
|
super();
|
||||||
|
this.font = font;
|
||||||
|
height = 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
public TextStencilElement(Font font, String text) {
|
||||||
|
this(font);
|
||||||
|
component = Components.literal(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
public TextStencilElement(Font font, MutableComponent component) {
|
||||||
|
this(font);
|
||||||
|
this.component = component;
|
||||||
|
}
|
||||||
|
|
||||||
|
public TextStencilElement withText(String text) {
|
||||||
|
component = Components.literal(text);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public TextStencilElement withText(MutableComponent component) {
|
||||||
|
this.component = component;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public TextStencilElement centered(boolean vertical, boolean horizontal) {
|
||||||
|
this.centerVertically = vertical;
|
||||||
|
this.centerHorizontally = horizontal;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void renderStencil(PoseStack ms) {
|
||||||
|
float x = 0, y = 0;
|
||||||
|
if (centerHorizontally)
|
||||||
|
x = width / 2f - font.width(component) / 2f;
|
||||||
|
|
||||||
|
if (centerVertically)
|
||||||
|
y = height / 2f - (font.lineHeight - 1) / 2f;
|
||||||
|
|
||||||
|
font.draw(ms, component, Math.round(x), Math.round(y), 0xff_000000);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void renderElement(PoseStack ms) {
|
||||||
|
float x = 0, y = 0;
|
||||||
|
if (centerHorizontally)
|
||||||
|
x = width / 2f - font.width(component) / 2f;
|
||||||
|
|
||||||
|
if (centerVertically)
|
||||||
|
y = height / 2f - (font.lineHeight - 1) / 2f;
|
||||||
|
|
||||||
|
ms.pushPose();
|
||||||
|
ms.translate(x, y, 0);
|
||||||
|
element.render(ms, font.width(component), font.lineHeight + 2, alpha);
|
||||||
|
ms.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
public MutableComponent getComponent() {
|
||||||
|
return component;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,102 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.widget;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraft.client.gui.components.AbstractWidget;
|
||||||
|
import net.minecraft.client.gui.narration.NarrationElementOutput;
|
||||||
|
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipPositioner;
|
||||||
|
import net.minecraft.client.gui.screens.inventory.tooltip.DefaultTooltipPositioner;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Components;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.BiConsumer;
|
||||||
|
|
||||||
|
public abstract class AbstractSimiWidget extends AbstractWidget implements TickableGuiEventListener {
|
||||||
|
|
||||||
|
public static final int HEADER_RGB = 0x5391E1;
|
||||||
|
public static final int HINT_RGB = 0x96B7E0;
|
||||||
|
|
||||||
|
protected float z;
|
||||||
|
protected boolean wasHovered = false;
|
||||||
|
protected List<Component> toolTip = new LinkedList<>();
|
||||||
|
protected BiConsumer<Integer, Integer> onClick = (_$, _$$) -> {};
|
||||||
|
|
||||||
|
public int lockedTooltipX = -1;
|
||||||
|
public int lockedTooltipY = -1;
|
||||||
|
|
||||||
|
protected AbstractSimiWidget(int x, int y) {
|
||||||
|
this(x, y, 16, 16);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected AbstractSimiWidget(int x, int y, int width, int height) {
|
||||||
|
this(x, y, width, height, Components.immutableEmpty());
|
||||||
|
}
|
||||||
|
|
||||||
|
protected AbstractSimiWidget(int x, int y, int width, int height, Component message) {
|
||||||
|
super(x, y, width, height, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected ClientTooltipPositioner createTooltipPositioner() {
|
||||||
|
return DefaultTooltipPositioner.INSTANCE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends AbstractSimiWidget> T withCallback(BiConsumer<Integer, Integer> cb) {
|
||||||
|
this.onClick = cb;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends AbstractSimiWidget> T withCallback(Runnable cb) {
|
||||||
|
return withCallback((_$, _$$) -> cb.run());
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends AbstractSimiWidget> T atZLevel(float z) {
|
||||||
|
this.z = z;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Component> getToolTip() {
|
||||||
|
return toolTip;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick() {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void renderWidget(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
beforeRender(ms, mouseX, mouseY, partialTicks);
|
||||||
|
doRender(ms, mouseX, mouseY, partialTicks);
|
||||||
|
afterRender(ms, mouseX, mouseY, partialTicks);
|
||||||
|
wasHovered = isHoveredOrFocused();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void beforeRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
ms.pushPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void doRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void afterRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
ms.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void runCallback(double mouseX, double mouseY) {
|
||||||
|
onClick.accept((int) mouseX, (int) mouseY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onClick(double mouseX, double mouseY) {
|
||||||
|
runCallback(mouseX, mouseY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateWidgetNarration(NarrationElementOutput pNarrationElementOutput) {
|
||||||
|
defaultButtonNarrationText(pNarrationElementOutput);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,226 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.widget;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.Theme;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.element.BoxElement;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Color;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.animation.LerpedFloat;
|
||||||
|
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
public class BoxWidget extends ElementWidget {
|
||||||
|
|
||||||
|
public static final Function<BoxWidget, DelegatedStencilElement.ElementRenderer> gradientFactory = (box) -> (ms, w, h, alpha) -> UIRenderHelper.angledGradient(ms, 90, w/2, -2, w + 4, h + 4, box.gradientColor1, box.gradientColor2);
|
||||||
|
|
||||||
|
protected BoxElement box;
|
||||||
|
|
||||||
|
protected Color customBorderTop;
|
||||||
|
protected Color customBorderBot;
|
||||||
|
protected Color customBackground;
|
||||||
|
protected boolean animateColors = true;
|
||||||
|
protected LerpedFloat colorAnimation = LerpedFloat.linear();
|
||||||
|
|
||||||
|
protected Color gradientColor1, gradientColor2;
|
||||||
|
private Color previousColor1, previousColor2;
|
||||||
|
private Color colorTarget1 = Theme.c(getIdleTheme(), true).copy();
|
||||||
|
private Color colorTarget2 = Theme.c(getIdleTheme(), false).copy();
|
||||||
|
|
||||||
|
public BoxWidget() {
|
||||||
|
this(0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public BoxWidget(int x, int y) {
|
||||||
|
this(x, y, 16, 16);
|
||||||
|
}
|
||||||
|
|
||||||
|
public BoxWidget(int x, int y, int width, int height) {
|
||||||
|
super(x, y, width, height);
|
||||||
|
box = new BoxElement()
|
||||||
|
.at(x, y)
|
||||||
|
.withBounds(width, height);
|
||||||
|
gradientColor1 = colorTarget1;
|
||||||
|
gradientColor2 = colorTarget2;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends BoxWidget> T withBounds(int width, int height) {
|
||||||
|
this.width = width;
|
||||||
|
this.height = height;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends BoxWidget> T withBorderColors(Couple<Color> colors) {
|
||||||
|
this.customBorderTop = colors.getFirst();
|
||||||
|
this.customBorderBot = colors.getSecond();
|
||||||
|
updateColorsFromState();
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends BoxWidget> T withBorderColors(Color top, Color bot) {
|
||||||
|
this.customBorderTop = top;
|
||||||
|
this.customBorderBot = bot;
|
||||||
|
updateColorsFromState();
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends BoxWidget> T withCustomBackground(Color color) {
|
||||||
|
this.customBackground = color;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends BoxWidget> T animateColors(boolean b) {
|
||||||
|
this.animateColors = b;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick() {
|
||||||
|
super.tick();
|
||||||
|
colorAnimation.tickChaser();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onClick(double x, double y) {
|
||||||
|
super.onClick(x, y);
|
||||||
|
|
||||||
|
gradientColor1 = Theme.c(getClickTheme(), true);
|
||||||
|
gradientColor2 = Theme.c(getClickTheme(), false);
|
||||||
|
startGradientAnimation(getColorForState(true), getColorForState(false), true, 0.15);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void beforeRender(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
super.beforeRender(ms, mouseX, mouseY, partialTicks);
|
||||||
|
|
||||||
|
if (isHovered != wasHovered) {
|
||||||
|
startGradientAnimation(
|
||||||
|
getColorForState(true),
|
||||||
|
getColorForState(false),
|
||||||
|
isHovered
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (colorAnimation.settled()) {
|
||||||
|
gradientColor1 = colorTarget1;
|
||||||
|
gradientColor2 = colorTarget2;
|
||||||
|
} else {
|
||||||
|
float animationValue = 1 - Math.abs(colorAnimation.getValue(partialTicks));
|
||||||
|
gradientColor1 = Color.mixColors(previousColor1, colorTarget1, animationValue);
|
||||||
|
gradientColor2 = Color.mixColors(previousColor2, colorTarget2, animationValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void doRender(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
float fadeValue = fade.getValue(partialTicks);
|
||||||
|
if (fadeValue < .1f)
|
||||||
|
return;
|
||||||
|
|
||||||
|
box.withAlpha(fadeValue);
|
||||||
|
box.withBackground(customBackground != null ? customBackground : Theme.c(Theme.Key.PONDER_BACKGROUND_TRANSPARENT))
|
||||||
|
.gradientBorder(gradientColor1, gradientColor2)
|
||||||
|
.at(getX(), getY(), z)
|
||||||
|
.withBounds(width, height)
|
||||||
|
.render(ms);
|
||||||
|
|
||||||
|
super.doRender(ms, mouseX, mouseY, partialTicks);
|
||||||
|
|
||||||
|
wasHovered = isHovered;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isMouseOver(double mX, double mY) {
|
||||||
|
if (!active || !visible)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
float padX = 2 + paddingX;
|
||||||
|
float padY = 2 + paddingY;
|
||||||
|
|
||||||
|
return getX() - padX <= mX && getY() - padY <= mY && mX < getX() + padX + width && mY < getY() + padY + height;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean clicked(double pMouseX, double pMouseY) {
|
||||||
|
if (!active || !visible)
|
||||||
|
return false;
|
||||||
|
return isMouseOver(pMouseX, pMouseY);
|
||||||
|
}
|
||||||
|
|
||||||
|
public BoxElement getBox() {
|
||||||
|
return box;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateColorsFromState() {
|
||||||
|
colorTarget1 = getColorForState(true);
|
||||||
|
colorTarget2 = getColorForState(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void animateGradientFromState() {
|
||||||
|
startGradientAnimation(
|
||||||
|
getColorForState(true),
|
||||||
|
getColorForState(false),
|
||||||
|
true
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void startGradientAnimation(Color c1, Color c2, boolean positive, double expSpeed) {
|
||||||
|
if (!animateColors)
|
||||||
|
return;
|
||||||
|
|
||||||
|
colorAnimation.startWithValue(positive ? 1 : -1);
|
||||||
|
colorAnimation.chase(0, expSpeed, LerpedFloat.Chaser.EXP);
|
||||||
|
colorAnimation.tickChaser();
|
||||||
|
|
||||||
|
previousColor1 = gradientColor1;
|
||||||
|
previousColor2 = gradientColor2;
|
||||||
|
|
||||||
|
colorTarget1 = c1;
|
||||||
|
colorTarget2 = c2;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void startGradientAnimation(Color c1, Color c2, boolean positive) {
|
||||||
|
startGradientAnimation(c1, c2, positive, 0.6);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Color getColorForState(boolean first) {
|
||||||
|
if (!active)
|
||||||
|
return Theme.p(getDisabledTheme()).get(first);
|
||||||
|
|
||||||
|
if (isHovered) {
|
||||||
|
if (first)
|
||||||
|
return customBorderTop != null ? customBorderTop.darker() : Theme.c(getHoverTheme(), true);
|
||||||
|
else
|
||||||
|
return customBorderBot != null ? customBorderBot.darker() : Theme.c(getHoverTheme(), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (first)
|
||||||
|
return customBorderTop != null ? customBorderTop : Theme.c(getIdleTheme(), true);
|
||||||
|
else
|
||||||
|
return customBorderBot != null ? customBorderBot : Theme.c(getIdleTheme(), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Theme.Key getDisabledTheme() {
|
||||||
|
return Theme.Key.BUTTON_DISABLE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Theme.Key getIdleTheme() {
|
||||||
|
return Theme.Key.BUTTON_IDLE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Theme.Key getHoverTheme() {
|
||||||
|
return Theme.Key.BUTTON_HOVER;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Theme.Key getClickTheme() {
|
||||||
|
return Theme.Key.BUTTON_CLICK;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,155 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.widget;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.element.RenderElement;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.animation.LerpedFloat;
|
||||||
|
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
import java.util.function.UnaryOperator;
|
||||||
|
|
||||||
|
public class ElementWidget extends AbstractSimiWidget {
|
||||||
|
|
||||||
|
protected RenderElement element = RenderElement.EMPTY;
|
||||||
|
|
||||||
|
protected boolean usesFade = false;
|
||||||
|
protected int fadeModX;
|
||||||
|
protected int fadeModY;
|
||||||
|
protected LerpedFloat fade = LerpedFloat.linear().startWithValue(1);
|
||||||
|
|
||||||
|
protected boolean rescaleElement = false;
|
||||||
|
protected float rescaleSizeX;
|
||||||
|
protected float rescaleSizeY;
|
||||||
|
|
||||||
|
protected float paddingX = 0;
|
||||||
|
protected float paddingY = 0;
|
||||||
|
|
||||||
|
public ElementWidget(int x, int y) {
|
||||||
|
super(x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ElementWidget(int x, int y, int width, int height) {
|
||||||
|
super(x, y, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends ElementWidget> T showingElement(RenderElement element) {
|
||||||
|
this.element = element;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends ElementWidget> T showing(ScreenElement renderable) {
|
||||||
|
return this.showingElement(RenderElement.of(renderable));
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends ElementWidget> T modifyElement(Consumer<RenderElement> consumer) {
|
||||||
|
if (element != null)
|
||||||
|
consumer.accept(element);
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends ElementWidget> T mapElement(UnaryOperator<RenderElement> function) {
|
||||||
|
if (element != null)
|
||||||
|
element = function.apply(element);
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends ElementWidget> T withPadding(float paddingX, float paddingY) {
|
||||||
|
this.paddingX = paddingX;
|
||||||
|
this.paddingY = paddingY;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends ElementWidget> T enableFade(int fadeModifierX, int fadeModifierY) {
|
||||||
|
this.fade.startWithValue(0);
|
||||||
|
this.usesFade = true;
|
||||||
|
this.fadeModX = fadeModifierX;
|
||||||
|
this.fadeModY = fadeModifierY;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends ElementWidget> T disableFade() {
|
||||||
|
this.fade.startWithValue(1);
|
||||||
|
this.usesFade = false;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public LerpedFloat fade() {
|
||||||
|
return fade;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends ElementWidget> T fade(float target) {
|
||||||
|
fade.chase(target, 0.1, LerpedFloat.Chaser.EXP);
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rescaling and its effects aren't properly tested with most elements.
|
||||||
|
* Thought it should work fine when using a TextStencilElement.
|
||||||
|
* Check BaseConfigScreen's title for such an example.
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
public <T extends ElementWidget> T rescaleElement(float rescaleSizeX, float rescaleSizeY) {
|
||||||
|
this.rescaleElement = true;
|
||||||
|
this.rescaleSizeX = rescaleSizeX;
|
||||||
|
this.rescaleSizeY = rescaleSizeY;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends ElementWidget> T disableRescale() {
|
||||||
|
this.rescaleElement = false;
|
||||||
|
//noinspection unchecked
|
||||||
|
return (T) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick() {
|
||||||
|
super.tick();
|
||||||
|
fade.tickChaser();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void beforeRender(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
super.beforeRender(ms, mouseX, mouseY, partialTicks);
|
||||||
|
isHovered = isMouseOver(mouseX, mouseY);
|
||||||
|
|
||||||
|
float fadeValue = fade.getValue(partialTicks);
|
||||||
|
element.withAlpha(fadeValue);
|
||||||
|
if (fadeValue < 1) {
|
||||||
|
ms.translate((1 - fadeValue) * fadeModX, (1 - fadeValue) * fadeModY, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void doRender(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
ms.pushPose();
|
||||||
|
ms.translate(getX() + paddingX, getY() + paddingY, z);
|
||||||
|
float innerWidth = width - 2 * paddingX;
|
||||||
|
float innerHeight = height - 2 * paddingY;
|
||||||
|
float eX = element.getX(), eY = element.getY();
|
||||||
|
if (rescaleElement) {
|
||||||
|
float xScale = innerWidth / rescaleSizeX;
|
||||||
|
float yScale = innerHeight / rescaleSizeY;
|
||||||
|
ms.scale(xScale, yScale, 1);
|
||||||
|
element.at(eX / xScale, eY / yScale);
|
||||||
|
innerWidth /= xScale;
|
||||||
|
innerHeight /= yScale;
|
||||||
|
}
|
||||||
|
element.withBounds((int) innerWidth, (int) innerHeight).render(ms);
|
||||||
|
ms.popPose();
|
||||||
|
if (rescaleElement) {
|
||||||
|
element.at(eX, eY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public RenderElement getRenderElement() {
|
||||||
|
return element;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.widget;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.AllGuiTextures;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
|
||||||
|
|
||||||
|
public class IconButton extends AbstractSimiWidget {
|
||||||
|
|
||||||
|
protected ScreenElement icon;
|
||||||
|
|
||||||
|
public IconButton(int x, int y, ScreenElement icon) {
|
||||||
|
this(x, y, 18, 18, icon);
|
||||||
|
}
|
||||||
|
|
||||||
|
public IconButton(int x, int y, int w, int h, ScreenElement icon) {
|
||||||
|
super(x, y, w, h);
|
||||||
|
this.icon = icon;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void doRender(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
if (visible) {
|
||||||
|
isHovered = mouseX >= getX() && mouseY >= getY() && mouseX < getX() + width && mouseY < getY() + height;
|
||||||
|
|
||||||
|
AllGuiTextures button = !active ? AllGuiTextures.BUTTON_DOWN
|
||||||
|
: isMouseOver(mouseX, mouseY) ? AllGuiTextures.BUTTON_HOVER : AllGuiTextures.BUTTON;
|
||||||
|
|
||||||
|
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
drawBg(ms, button);
|
||||||
|
icon.render(ms, getX() + 1, getY() + 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void drawBg(PoseStack ms, AllGuiTextures button) {
|
||||||
|
AllGuiTextures.BUTTON.bind();
|
||||||
|
blit(ms, getX(), getY(), button.startX, button.startY, button.width, button.height);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setToolTip(Component text) {
|
||||||
|
toolTip.clear();
|
||||||
|
toolTip.add(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setIcon(ScreenElement icon) {
|
||||||
|
this.icon = icon;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.widget;
|
||||||
|
|
||||||
|
import com.google.common.collect.ImmutableList;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.gui.AllGuiTextures;
|
||||||
|
|
||||||
|
public class Indicator extends AbstractSimiWidget {
|
||||||
|
|
||||||
|
public State state;
|
||||||
|
|
||||||
|
public Indicator(int x, int y, Component tooltip) {
|
||||||
|
super(x, y, AllGuiTextures.INDICATOR.width, AllGuiTextures.INDICATOR.height);
|
||||||
|
this.toolTip = toolTip.isEmpty() ? ImmutableList.of() : ImmutableList.of(tooltip);
|
||||||
|
this.state = State.OFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks ) {
|
||||||
|
if (!visible)
|
||||||
|
return;
|
||||||
|
AllGuiTextures toDraw;
|
||||||
|
switch (state) {
|
||||||
|
case ON: toDraw = AllGuiTextures.INDICATOR_WHITE; break;
|
||||||
|
case OFF: toDraw = AllGuiTextures.INDICATOR; break;
|
||||||
|
case RED: toDraw = AllGuiTextures.INDICATOR_RED; break;
|
||||||
|
case YELLOW: toDraw = AllGuiTextures.INDICATOR_YELLOW; break;
|
||||||
|
case GREEN: toDraw = AllGuiTextures.INDICATOR_GREEN; break;
|
||||||
|
default: toDraw = AllGuiTextures.INDICATOR; break;
|
||||||
|
}
|
||||||
|
toDraw.render(ms, getX(), getY());
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum State {
|
||||||
|
OFF, ON,
|
||||||
|
RED, YELLOW, GREEN;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.widget;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.gui.Font;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.network.chat.MutableComponent;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Components;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
|
public class Label extends AbstractSimiWidget {
|
||||||
|
|
||||||
|
public Component text;
|
||||||
|
public String suffix;
|
||||||
|
protected boolean hasShadow;
|
||||||
|
protected int color;
|
||||||
|
protected Font font;
|
||||||
|
|
||||||
|
public Label(int x, int y, Component text) {
|
||||||
|
super(x, y, Minecraft.getInstance().font.width(text), 10);
|
||||||
|
font = Minecraft.getInstance().font;
|
||||||
|
this.text = Components.literal("Label");
|
||||||
|
color = 0xFFFFFF;
|
||||||
|
hasShadow = false;
|
||||||
|
suffix = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
public Label colored(int color) {
|
||||||
|
this.color = color;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Label withShadow() {
|
||||||
|
this.hasShadow = true;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Label withSuffix(String s) {
|
||||||
|
suffix = s;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTextAndTrim(Component newText, boolean trimFront, int maxWidthPx) {
|
||||||
|
Font fontRenderer = Minecraft.getInstance().font;
|
||||||
|
|
||||||
|
if (fontRenderer.width(newText) <= maxWidthPx) {
|
||||||
|
text = newText;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String trim = "...";
|
||||||
|
int trimWidth = fontRenderer.width(trim);
|
||||||
|
|
||||||
|
String raw = newText.getString();
|
||||||
|
StringBuilder builder = new StringBuilder(raw);
|
||||||
|
int startIndex = trimFront ? 0 : raw.length() - 1;
|
||||||
|
int endIndex = !trimFront ? 0 : raw.length() - 1;
|
||||||
|
int step = (int) Math.signum(endIndex - startIndex);
|
||||||
|
|
||||||
|
for (int i = startIndex; i != endIndex; i += step) {
|
||||||
|
String sub = builder.substring(trimFront ? i : startIndex, trimFront ? endIndex + 1 : i + 1);
|
||||||
|
if (fontRenderer.width(Components.literal(sub).setStyle(newText.getStyle())) + trimWidth <= maxWidthPx) {
|
||||||
|
text = Components.literal(trimFront ? trim + sub : sub + trim).setStyle(newText.getStyle());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void doRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
if (text == null || text.getString().isEmpty())
|
||||||
|
return;
|
||||||
|
|
||||||
|
RenderSystem.setShaderColor(1, 1, 1, 1);
|
||||||
|
MutableComponent copy = text.plainCopy();
|
||||||
|
if (suffix != null && !suffix.isEmpty())
|
||||||
|
copy.append(suffix);
|
||||||
|
|
||||||
|
if (hasShadow)
|
||||||
|
font.drawShadow(ms, copy, getX(), getY(), color);
|
||||||
|
else
|
||||||
|
font.draw(ms, copy, getX(), getY(), color);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,196 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.widget;
|
||||||
|
|
||||||
|
import net.minecraft.ChatFormatting;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.network.chat.MutableComponent;
|
||||||
|
import nl.requios.effortlessbuilding.create.AllKeys;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Components;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
|
||||||
|
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
public class ScrollInput extends AbstractSimiWidget {
|
||||||
|
|
||||||
|
protected Consumer<Integer> onScroll;
|
||||||
|
protected int state;
|
||||||
|
protected Component title = Lang.translateDirect("gui.scrollInput.defaultTitle");
|
||||||
|
protected final Component scrollToModify = Lang.translateDirect("gui.scrollInput.scrollToModify");
|
||||||
|
protected final Component shiftScrollsFaster = Lang.translateDirect("gui.scrollInput.shiftScrollsFaster");
|
||||||
|
protected Component hint = null;
|
||||||
|
protected Label displayLabel;
|
||||||
|
protected boolean inverted;
|
||||||
|
protected boolean soundPlayed;
|
||||||
|
protected Function<Integer, Component> formatter;
|
||||||
|
|
||||||
|
protected int min, max;
|
||||||
|
protected int shiftStep;
|
||||||
|
Function<StepContext, Integer> step;
|
||||||
|
|
||||||
|
public ScrollInput(int xIn, int yIn, int widthIn, int heightIn) {
|
||||||
|
super(xIn, yIn, widthIn, heightIn);
|
||||||
|
state = 0;
|
||||||
|
min = 0;
|
||||||
|
max = 1;
|
||||||
|
shiftStep = 5;
|
||||||
|
step = standardStep();
|
||||||
|
formatter = i -> Components.literal(String.valueOf(i));
|
||||||
|
soundPlayed = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Function<StepContext, Integer> standardStep() {
|
||||||
|
return c -> c.shift ? shiftStep : 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScrollInput inverted() {
|
||||||
|
inverted = true;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScrollInput withRange(int min, int max) {
|
||||||
|
this.min = min;
|
||||||
|
this.max = max;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScrollInput calling(Consumer<Integer> onScroll) {
|
||||||
|
this.onScroll = onScroll;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScrollInput format(Function<Integer, Component> formatter) {
|
||||||
|
this.formatter = formatter;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScrollInput removeCallback() {
|
||||||
|
this.onScroll = null;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScrollInput titled(MutableComponent title) {
|
||||||
|
this.title = title;
|
||||||
|
updateTooltip();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScrollInput addHint(MutableComponent hint) {
|
||||||
|
this.hint = hint;
|
||||||
|
updateTooltip();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScrollInput withStepFunction(Function<StepContext, Integer> step) {
|
||||||
|
this.step = step;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScrollInput writingTo(Label label) {
|
||||||
|
this.displayLabel = label;
|
||||||
|
if (label != null)
|
||||||
|
writeToLabel();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick() {
|
||||||
|
super.tick();
|
||||||
|
soundPlayed = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getState() {
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScrollInput setState(int state) {
|
||||||
|
this.state = state;
|
||||||
|
clampState();
|
||||||
|
updateTooltip();
|
||||||
|
if (displayLabel != null)
|
||||||
|
writeToLabel();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScrollInput withShiftStep(int step) {
|
||||||
|
shiftStep = step;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
|
||||||
|
if (!this.visible || !this.isHovered) return false; //Added
|
||||||
|
|
||||||
|
if (inverted)
|
||||||
|
delta *= -1;
|
||||||
|
|
||||||
|
StepContext context = new StepContext();
|
||||||
|
context.control = AllKeys.ctrlDown();
|
||||||
|
context.shift = AllKeys.shiftDown();
|
||||||
|
context.currentValue = state;
|
||||||
|
context.forward = delta > 0;
|
||||||
|
|
||||||
|
int priorState = state;
|
||||||
|
boolean shifted = AllKeys.shiftDown();
|
||||||
|
int step = (int) Math.signum(delta) * this.step.apply(context);
|
||||||
|
|
||||||
|
state += step;
|
||||||
|
if (shifted)
|
||||||
|
state -= state % shiftStep;
|
||||||
|
|
||||||
|
clampState();
|
||||||
|
|
||||||
|
if (priorState != state) {
|
||||||
|
// if (!soundPlayed)
|
||||||
|
// Minecraft.getInstance()
|
||||||
|
// .getSoundManager()
|
||||||
|
// .play(SimpleSoundInstance.forUI(AllSoundEvents.SCROLL_VALUE.getMainEvent(),
|
||||||
|
// 1.5f + 0.1f * (state - min) / (max - min)));
|
||||||
|
// soundPlayed = true;
|
||||||
|
onChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
// return priorState != state;
|
||||||
|
return true; //Changed
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void clampState() {
|
||||||
|
if (state >= max)
|
||||||
|
state = max - 1;
|
||||||
|
if (state < min)
|
||||||
|
state = min;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onChanged() {
|
||||||
|
if (displayLabel != null)
|
||||||
|
writeToLabel();
|
||||||
|
if (onScroll != null)
|
||||||
|
onScroll.accept(state);
|
||||||
|
updateTooltip();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void writeToLabel() {
|
||||||
|
displayLabel.text = formatter.apply(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void updateTooltip() {
|
||||||
|
toolTip.clear();
|
||||||
|
if (title == null)
|
||||||
|
return;
|
||||||
|
toolTip.add(title.plainCopy()
|
||||||
|
.withStyle(s -> s.withColor(HEADER_RGB)));
|
||||||
|
if (hint != null)
|
||||||
|
toolTip.add(hint.plainCopy()
|
||||||
|
.withStyle(s -> s.withColor(HINT_RGB)));
|
||||||
|
toolTip.add(scrollToModify.plainCopy()
|
||||||
|
.withStyle(ChatFormatting.ITALIC, ChatFormatting.DARK_GRAY));
|
||||||
|
toolTip.add(shiftScrollsFaster.plainCopy()
|
||||||
|
.withStyle(ChatFormatting.ITALIC, ChatFormatting.DARK_GRAY));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class StepContext {
|
||||||
|
public int currentValue;
|
||||||
|
public boolean forward;
|
||||||
|
public boolean shift;
|
||||||
|
public boolean control;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.widget;
|
||||||
|
|
||||||
|
import net.minecraft.ChatFormatting;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.network.chat.MutableComponent;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Components;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class SelectionScrollInput extends ScrollInput {
|
||||||
|
|
||||||
|
private final MutableComponent scrollToSelect = Lang.translateDirect("gui.scrollInput.scrollToSelect");
|
||||||
|
protected List<? extends Component> options;
|
||||||
|
|
||||||
|
public SelectionScrollInput(int xIn, int yIn, int widthIn, int heightIn) {
|
||||||
|
super(xIn, yIn, widthIn, heightIn);
|
||||||
|
options = new ArrayList<>();
|
||||||
|
inverted();
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScrollInput forOptions(List<? extends Component> options) {
|
||||||
|
this.options = options;
|
||||||
|
this.max = options.size();
|
||||||
|
format(options::get);
|
||||||
|
updateTooltip();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void updateTooltip() {
|
||||||
|
toolTip.clear();
|
||||||
|
if (title == null)
|
||||||
|
return;
|
||||||
|
toolTip.add(title.plainCopy()
|
||||||
|
.withStyle(s -> s.withColor(HEADER_RGB)));
|
||||||
|
int min = Math.min(this.max - 16, state - 7);
|
||||||
|
int max = Math.max(this.min + 16, state + 8);
|
||||||
|
min = Math.max(min, this.min);
|
||||||
|
max = Math.min(max, this.max);
|
||||||
|
if (this.min + 1 == min)
|
||||||
|
min--;
|
||||||
|
if (min > this.min)
|
||||||
|
toolTip.add(Components.literal("> ...")
|
||||||
|
.withStyle(ChatFormatting.GRAY));
|
||||||
|
if (this.max - 1 == max)
|
||||||
|
max++;
|
||||||
|
for (int i = min; i < max; i++) {
|
||||||
|
if (i == state)
|
||||||
|
toolTip.add(Components.empty()
|
||||||
|
.append("-> ")
|
||||||
|
.append(options.get(i))
|
||||||
|
.withStyle(ChatFormatting.WHITE));
|
||||||
|
else
|
||||||
|
toolTip.add(Components.empty()
|
||||||
|
.append("> ")
|
||||||
|
.append(options.get(i))
|
||||||
|
.withStyle(ChatFormatting.GRAY));
|
||||||
|
}
|
||||||
|
if (max < this.max)
|
||||||
|
toolTip.add(Components.literal("> ...")
|
||||||
|
.withStyle(ChatFormatting.GRAY));
|
||||||
|
|
||||||
|
if (hint != null)
|
||||||
|
toolTip.add(hint.plainCopy()
|
||||||
|
.withStyle(s -> s.withColor(HINT_RGB)));
|
||||||
|
toolTip.add(scrollToSelect.plainCopy()
|
||||||
|
.withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.gui.widget;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
|
||||||
|
public class TooltipArea extends AbstractSimiWidget {
|
||||||
|
|
||||||
|
public TooltipArea(int x, int y, int width, int height) {
|
||||||
|
super(x, y, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void renderWidget(PoseStack graphics, int mouseX, int mouseY, float partialTicks) {
|
||||||
|
if (visible)
|
||||||
|
isHovered = mouseX >= getX() && mouseY >= getY() && mouseX < getX() + width && mouseY < getY() + height;
|
||||||
|
}
|
||||||
|
|
||||||
|
public TooltipArea withTooltip(List<Component> tooltip) {
|
||||||
|
this.toolTip = tooltip;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,182 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.item;
|
||||||
|
|
||||||
|
import net.minecraft.ChatFormatting;
|
||||||
|
import net.minecraft.client.gui.screens.Screen;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.network.chat.MutableComponent;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Components;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static net.minecraft.ChatFormatting.*;
|
||||||
|
import static nl.requios.effortlessbuilding.create.foundation.item.TooltipHelper.cutStringTextComponent;
|
||||||
|
import static nl.requios.effortlessbuilding.create.foundation.item.TooltipHelper.cutTextComponent;
|
||||||
|
|
||||||
|
public class ItemDescription {
|
||||||
|
|
||||||
|
public static final ItemDescription MISSING = new ItemDescription(null);
|
||||||
|
public static Component trim = Components.literal(" ").withStyle(WHITE, STRIKETHROUGH);
|
||||||
|
|
||||||
|
public enum Palette {
|
||||||
|
|
||||||
|
Blue(BLUE, AQUA),
|
||||||
|
Green(DARK_GREEN, GREEN),
|
||||||
|
Yellow(GOLD, YELLOW),
|
||||||
|
Red(DARK_RED, RED),
|
||||||
|
Purple(DARK_PURPLE, LIGHT_PURPLE),
|
||||||
|
Gray(DARK_GRAY, GRAY),
|
||||||
|
|
||||||
|
;
|
||||||
|
|
||||||
|
private Palette(ChatFormatting primary, ChatFormatting highlight) {
|
||||||
|
color = primary;
|
||||||
|
hColor = highlight;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ChatFormatting color;
|
||||||
|
public ChatFormatting hColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<Component> lines;
|
||||||
|
private List<Component> linesOnShift;
|
||||||
|
private List<Component> linesOnCtrl;
|
||||||
|
private Palette palette;
|
||||||
|
|
||||||
|
public ItemDescription(Palette palette) {
|
||||||
|
this.palette = palette;
|
||||||
|
lines = new ArrayList<>();
|
||||||
|
linesOnShift = new ArrayList<>();
|
||||||
|
linesOnCtrl = new ArrayList<>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemDescription withSummary(Component summary) {
|
||||||
|
addStrings(linesOnShift, cutTextComponent(summary, palette.color, palette.hColor));
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String makeProgressBar(int length, int filledLength) {
|
||||||
|
String bar = " ";
|
||||||
|
int emptySpaces = length - filledLength;
|
||||||
|
for (int i = 0; i < filledLength; i++)
|
||||||
|
bar += "\u2588";
|
||||||
|
for (int i = 0; i < emptySpaces; i++)
|
||||||
|
bar += "\u2592";
|
||||||
|
return bar + " ";
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemDescription withBehaviour(String condition, String behaviour) {
|
||||||
|
add(linesOnShift, Components.literal(condition).withStyle(GRAY));
|
||||||
|
addStrings(linesOnShift, cutStringTextComponent(behaviour, palette.color, palette.hColor, 1));
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemDescription withControl(String condition, String action) {
|
||||||
|
add(linesOnCtrl, Components.literal(condition).withStyle(GRAY));
|
||||||
|
addStrings(linesOnCtrl, cutStringTextComponent(action, palette.color, palette.hColor, 1));
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemDescription createTabs() {
|
||||||
|
boolean hasDescription = !linesOnShift.isEmpty();
|
||||||
|
boolean hasControls = !linesOnCtrl.isEmpty();
|
||||||
|
|
||||||
|
if (hasDescription || hasControls) {
|
||||||
|
String[] holdDesc = Lang.translateDirect("tooltip.holdForDescription", "$")
|
||||||
|
.getString()
|
||||||
|
.split("\\$");
|
||||||
|
String[] holdCtrl = Lang.translateDirect("tooltip.holdForControls", "$")
|
||||||
|
.getString()
|
||||||
|
.split("\\$");
|
||||||
|
MutableComponent keyShift = Lang.translateDirect("tooltip.keyShift");
|
||||||
|
MutableComponent keyCtrl = Lang.translateDirect("tooltip.keyCtrl");
|
||||||
|
for (List<Component> list : Arrays.asList(lines, linesOnShift, linesOnCtrl)) {
|
||||||
|
boolean shift = list == linesOnShift;
|
||||||
|
boolean ctrl = list == linesOnCtrl;
|
||||||
|
|
||||||
|
if (holdDesc.length != 2 || holdCtrl.length != 2) {
|
||||||
|
list.add(0, Components.literal("Invalid lang formatting!"));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hasControls) {
|
||||||
|
MutableComponent tabBuilder = Components.empty();
|
||||||
|
tabBuilder.append(Components.literal(holdCtrl[0]).withStyle(DARK_GRAY));
|
||||||
|
tabBuilder.append(keyCtrl.plainCopy()
|
||||||
|
.withStyle(ctrl ? WHITE : GRAY));
|
||||||
|
tabBuilder.append(Components.literal(holdCtrl[1]).withStyle(DARK_GRAY));
|
||||||
|
list.add(0, tabBuilder);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hasDescription) {
|
||||||
|
MutableComponent tabBuilder = Components.empty();
|
||||||
|
tabBuilder.append(Components.literal(holdDesc[0]).withStyle(DARK_GRAY));
|
||||||
|
tabBuilder.append(keyShift.plainCopy()
|
||||||
|
.withStyle(shift ? WHITE : GRAY));
|
||||||
|
tabBuilder.append(Components.literal(holdDesc[1]).withStyle(DARK_GRAY));
|
||||||
|
list.add(0, tabBuilder);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (shift || ctrl)
|
||||||
|
list.add(hasDescription && hasControls ? 2 : 1, Components.immutableEmpty());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!hasDescription)
|
||||||
|
linesOnShift = lines;
|
||||||
|
if (!hasControls)
|
||||||
|
linesOnCtrl = lines;
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String hightlight(String s, Palette palette) {
|
||||||
|
return palette.hColor + s + palette.color;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void addStrings(List<Component> infoList, List<Component> textLines) {
|
||||||
|
textLines.forEach(s -> add(infoList, s));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void add(List<Component> infoList, List<Component> textLines) {
|
||||||
|
infoList.addAll(textLines);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void add(List<Component> infoList, Component line) {
|
||||||
|
infoList.add(line);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Palette getPalette() {
|
||||||
|
return palette;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Component> addInformation(List<Component> tooltip) {
|
||||||
|
if (Screen.hasShiftDown()) {
|
||||||
|
tooltip.addAll(linesOnShift);
|
||||||
|
return tooltip;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Screen.hasControlDown()) {
|
||||||
|
tooltip.addAll(linesOnCtrl);
|
||||||
|
return tooltip;
|
||||||
|
}
|
||||||
|
|
||||||
|
tooltip.addAll(lines);
|
||||||
|
return tooltip;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Component> getLines() {
|
||||||
|
return lines;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Component> getLinesOnCtrl() {
|
||||||
|
return linesOnCtrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Component> getLinesOnShift() {
|
||||||
|
return linesOnShift;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.item;
|
||||||
|
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||||
|
|
||||||
|
public class ItemHandlerWrapper implements IItemHandlerModifiable {
|
||||||
|
|
||||||
|
private IItemHandlerModifiable wrapped;
|
||||||
|
|
||||||
|
public ItemHandlerWrapper(IItemHandlerModifiable wrapped) {
|
||||||
|
this.wrapped = wrapped;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSlots() {
|
||||||
|
return wrapped.getSlots();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack getStackInSlot(int slot) {
|
||||||
|
return wrapped.getStackInSlot(slot);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
|
||||||
|
return wrapped.insertItem(slot, stack, simulate);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack extractItem(int slot, int amount, boolean simulate) {
|
||||||
|
return wrapped.extractItem(slot, amount, simulate);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSlotLimit(int slot) {
|
||||||
|
return wrapped.getSlotLimit(slot);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isItemValid(int slot, ItemStack stack) {
|
||||||
|
return wrapped.isItemValid(slot, stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setStackInSlot(int slot, ItemStack stack) {
|
||||||
|
wrapped.setStackInSlot(slot, stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,276 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.item;
|
||||||
|
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Pair;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.NonNullList;
|
||||||
|
import net.minecraft.util.Mth;
|
||||||
|
import net.minecraft.world.Containers;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.crafting.Ingredient;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraftforge.items.IItemHandler;
|
||||||
|
import net.minecraftforge.items.ItemHandlerHelper;
|
||||||
|
import org.apache.commons.lang3.mutable.MutableInt;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.Function;
|
||||||
|
import java.util.function.Predicate;
|
||||||
|
|
||||||
|
public class ItemHelper {
|
||||||
|
|
||||||
|
public static void dropContents(Level world, BlockPos pos, IItemHandler inv) {
|
||||||
|
for (int slot = 0; slot < inv.getSlots(); slot++)
|
||||||
|
Containers.dropItemStack(world, pos.getX(), pos.getY(), pos.getZ(), inv.getStackInSlot(slot));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<ItemStack> multipliedOutput(ItemStack in, ItemStack out) {
|
||||||
|
List<ItemStack> stacks = new ArrayList<>();
|
||||||
|
ItemStack result = out.copy();
|
||||||
|
result.setCount(in.getCount() * out.getCount());
|
||||||
|
|
||||||
|
while (result.getCount() > result.getMaxStackSize()) {
|
||||||
|
stacks.add(result.split(result.getMaxStackSize()));
|
||||||
|
}
|
||||||
|
|
||||||
|
stacks.add(result);
|
||||||
|
return stacks;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void addToList(ItemStack stack, List<ItemStack> stacks) {
|
||||||
|
for (ItemStack s : stacks) {
|
||||||
|
if (!ItemHandlerHelper.canItemStacksStack(stack, s))
|
||||||
|
continue;
|
||||||
|
int transferred = Math.min(s.getMaxStackSize() - s.getCount(), stack.getCount());
|
||||||
|
s.grow(transferred);
|
||||||
|
stack.shrink(transferred);
|
||||||
|
}
|
||||||
|
if (stack.getCount() > 0)
|
||||||
|
stacks.add(stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isSameInventory(IItemHandler h1, IItemHandler h2) {
|
||||||
|
if (h1 == null || h2 == null)
|
||||||
|
return false;
|
||||||
|
if (h1.getSlots() != h2.getSlots())
|
||||||
|
return false;
|
||||||
|
for (int slot = 0; slot < h1.getSlots(); slot++) {
|
||||||
|
if (h1.getStackInSlot(slot) != h2.getStackInSlot(slot))
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int calcRedstoneFromInventory(@Nullable IItemHandler inv) {
|
||||||
|
if (inv == null)
|
||||||
|
return 0;
|
||||||
|
int i = 0;
|
||||||
|
float f = 0.0F;
|
||||||
|
int totalSlots = inv.getSlots();
|
||||||
|
|
||||||
|
for (int j = 0; j < inv.getSlots(); ++j) {
|
||||||
|
int slotLimit = inv.getSlotLimit(j);
|
||||||
|
if (slotLimit == 0) {
|
||||||
|
totalSlots--;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
ItemStack itemstack = inv.getStackInSlot(j);
|
||||||
|
if (!itemstack.isEmpty()) {
|
||||||
|
f += (float) itemstack.getCount() / (float) Math.min(slotLimit, itemstack.getMaxStackSize());
|
||||||
|
++i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (totalSlots == 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
f = f / totalSlots;
|
||||||
|
return Mth.floor(f * 14.0F) + (i > 0 ? 1 : 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<Pair<Ingredient, MutableInt>> condenseIngredients(NonNullList<Ingredient> recipeIngredients) {
|
||||||
|
List<Pair<Ingredient, MutableInt>> actualIngredients = new ArrayList<>();
|
||||||
|
Ingredients: for (Ingredient igd : recipeIngredients) {
|
||||||
|
for (Pair<Ingredient, MutableInt> pair : actualIngredients) {
|
||||||
|
ItemStack[] stacks1 = pair.getFirst()
|
||||||
|
.getItems();
|
||||||
|
ItemStack[] stacks2 = igd.getItems();
|
||||||
|
if (stacks1.length != stacks2.length)
|
||||||
|
continue;
|
||||||
|
for (int i = 0; i <= stacks1.length; i++) {
|
||||||
|
if (i == stacks1.length) {
|
||||||
|
pair.getSecond()
|
||||||
|
.increment();
|
||||||
|
continue Ingredients;
|
||||||
|
}
|
||||||
|
if (!ItemStack.matches(stacks1[i], stacks2[i]))
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
actualIngredients.add(Pair.of(igd, new MutableInt(1)));
|
||||||
|
}
|
||||||
|
return actualIngredients;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean matchIngredients(Ingredient i1, Ingredient i2) {
|
||||||
|
if (i1 == i2)
|
||||||
|
return true;
|
||||||
|
ItemStack[] stacks1 = i1.getItems();
|
||||||
|
ItemStack[] stacks2 = i2.getItems();
|
||||||
|
if (stacks1 == stacks2)
|
||||||
|
return true;
|
||||||
|
if (stacks1.length == stacks2.length) {
|
||||||
|
for (int i = 0; i < stacks1.length; i++)
|
||||||
|
if (!ItemStack.isSame(stacks1[i], stacks2[i]))
|
||||||
|
return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean matchAllIngredients(NonNullList<Ingredient> ingredients) {
|
||||||
|
if (ingredients.size() <= 1)
|
||||||
|
return true;
|
||||||
|
Ingredient firstIngredient = ingredients.get(0);
|
||||||
|
for (int i = 1; i < ingredients.size(); i++)
|
||||||
|
if (!matchIngredients(firstIngredient, ingredients.get(i)))
|
||||||
|
return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static enum ExtractionCountMode {
|
||||||
|
EXACTLY, UPTO
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemStack extract(IItemHandler inv, Predicate<ItemStack> test, boolean simulate) {
|
||||||
|
return extract(inv, test, ExtractionCountMode.UPTO, 64, simulate);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemStack extract(IItemHandler inv, Predicate<ItemStack> test, int exactAmount, boolean simulate) {
|
||||||
|
return extract(inv, test, ExtractionCountMode.EXACTLY, exactAmount, simulate);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemStack extract(IItemHandler inv, Predicate<ItemStack> test, ExtractionCountMode mode, int amount,
|
||||||
|
boolean simulate) {
|
||||||
|
ItemStack extracting = ItemStack.EMPTY;
|
||||||
|
boolean amountRequired = mode == ExtractionCountMode.EXACTLY;
|
||||||
|
boolean checkHasEnoughItems = amountRequired;
|
||||||
|
boolean hasEnoughItems = !checkHasEnoughItems;
|
||||||
|
boolean potentialOtherMatch = false;
|
||||||
|
int maxExtractionCount = amount;
|
||||||
|
|
||||||
|
Extraction: do {
|
||||||
|
extracting = ItemStack.EMPTY;
|
||||||
|
|
||||||
|
for (int slot = 0; slot < inv.getSlots(); slot++) {
|
||||||
|
int amountToExtractFromThisSlot =
|
||||||
|
Math.min(maxExtractionCount - extracting.getCount(), inv.getStackInSlot(slot)
|
||||||
|
.getMaxStackSize());
|
||||||
|
ItemStack stack = inv.extractItem(slot, amountToExtractFromThisSlot, true);
|
||||||
|
|
||||||
|
if (stack.isEmpty())
|
||||||
|
continue;
|
||||||
|
if (!test.test(stack))
|
||||||
|
continue;
|
||||||
|
if (!extracting.isEmpty() && !canItemStackAmountsStack(stack, extracting)) {
|
||||||
|
potentialOtherMatch = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (extracting.isEmpty())
|
||||||
|
extracting = stack.copy();
|
||||||
|
else
|
||||||
|
extracting.grow(stack.getCount());
|
||||||
|
|
||||||
|
if (!simulate && hasEnoughItems)
|
||||||
|
inv.extractItem(slot, stack.getCount(), false);
|
||||||
|
|
||||||
|
if (extracting.getCount() >= maxExtractionCount) {
|
||||||
|
if (checkHasEnoughItems) {
|
||||||
|
hasEnoughItems = true;
|
||||||
|
checkHasEnoughItems = false;
|
||||||
|
continue Extraction;
|
||||||
|
} else {
|
||||||
|
break Extraction;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!extracting.isEmpty() && !hasEnoughItems && potentialOtherMatch) {
|
||||||
|
ItemStack blackListed = extracting.copy();
|
||||||
|
test = test.and(i -> !ItemHandlerHelper.canItemStacksStack(i, blackListed));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (checkHasEnoughItems)
|
||||||
|
checkHasEnoughItems = false;
|
||||||
|
else
|
||||||
|
break Extraction;
|
||||||
|
|
||||||
|
} while (true);
|
||||||
|
|
||||||
|
if (amountRequired && extracting.getCount() < amount)
|
||||||
|
return ItemStack.EMPTY;
|
||||||
|
|
||||||
|
return extracting;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemStack extract(IItemHandler inv, Predicate<ItemStack> test,
|
||||||
|
Function<ItemStack, Integer> amountFunction, boolean simulate) {
|
||||||
|
ItemStack extracting = ItemStack.EMPTY;
|
||||||
|
int maxExtractionCount = 64;
|
||||||
|
|
||||||
|
for (int slot = 0; slot < inv.getSlots(); slot++) {
|
||||||
|
if (extracting.isEmpty()) {
|
||||||
|
ItemStack stackInSlot = inv.getStackInSlot(slot);
|
||||||
|
if (stackInSlot.isEmpty() || !test.test(stackInSlot))
|
||||||
|
continue;
|
||||||
|
int maxExtractionCountForItem = amountFunction.apply(stackInSlot);
|
||||||
|
if (maxExtractionCountForItem == 0)
|
||||||
|
continue;
|
||||||
|
maxExtractionCount = Math.min(maxExtractionCount, maxExtractionCountForItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
ItemStack stack = inv.extractItem(slot, maxExtractionCount - extracting.getCount(), true);
|
||||||
|
|
||||||
|
if (!test.test(stack))
|
||||||
|
continue;
|
||||||
|
if (!extracting.isEmpty() && !canItemStackAmountsStack(stack, extracting))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (extracting.isEmpty())
|
||||||
|
extracting = stack.copy();
|
||||||
|
else
|
||||||
|
extracting.grow(stack.getCount());
|
||||||
|
|
||||||
|
if (!simulate)
|
||||||
|
inv.extractItem(slot, stack.getCount(), false);
|
||||||
|
if (extracting.getCount() >= maxExtractionCount)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return extracting;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean canItemStackAmountsStack(ItemStack a, ItemStack b) {
|
||||||
|
return ItemHandlerHelper.canItemStacksStack(a, b) && a.getCount() + b.getCount() <= a.getMaxStackSize();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemStack findFirstMatch(IItemHandler inv, Predicate<ItemStack> test) {
|
||||||
|
int slot = findFirstMatchingSlotIndex(inv, test);
|
||||||
|
if (slot == -1)
|
||||||
|
return ItemStack.EMPTY;
|
||||||
|
else
|
||||||
|
return inv.getStackInSlot(slot);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int findFirstMatchingSlotIndex(IItemHandler inv, Predicate<ItemStack> test) {
|
||||||
|
for (int slot = 0; slot < inv.getSlots(); slot++) {
|
||||||
|
ItemStack toTest = inv.getStackInSlot(slot);
|
||||||
|
if (test.test(toTest))
|
||||||
|
return slot;
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.item;
|
||||||
|
|
||||||
|
import net.minecraft.tags.TagKey;
|
||||||
|
import net.minecraft.world.item.Item;
|
||||||
|
import net.minecraftforge.registries.ForgeRegistries;
|
||||||
|
import net.minecraftforge.registries.tags.ITagManager;
|
||||||
|
|
||||||
|
public class TagDependentIngredientItem extends Item {
|
||||||
|
|
||||||
|
private TagKey<Item> tag;
|
||||||
|
|
||||||
|
public TagDependentIngredientItem(Properties properties, TagKey<Item> tag) {
|
||||||
|
super(properties);
|
||||||
|
this.tag = tag;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean shouldHide() {
|
||||||
|
ITagManager<Item> tagManager = ForgeRegistries.ITEMS.tags();
|
||||||
|
return !tagManager.isKnownTagName(tag) || tagManager.getTag(tag).isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,283 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.item;
|
||||||
|
|
||||||
|
import com.google.common.base.Strings;
|
||||||
|
import net.minecraft.ChatFormatting;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.gui.Font;
|
||||||
|
import net.minecraft.client.resources.language.I18n;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.network.chat.MutableComponent;
|
||||||
|
import net.minecraft.world.item.Item;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.level.ItemLike;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.item.ItemDescription.Palette;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Components;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.FontHelper;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
|
||||||
|
|
||||||
|
import java.text.BreakIterator;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
|
public class TooltipHelper {
|
||||||
|
|
||||||
|
public static final int maxWidthPerLine = 200;
|
||||||
|
public static final Map<String, ItemDescription> cachedTooltips = new HashMap<>();
|
||||||
|
private static boolean gogglesMode;
|
||||||
|
private static final Map<Item, Supplier<String>> tooltipReferrals = new HashMap<>();
|
||||||
|
|
||||||
|
public static MutableComponent holdShift(Palette color, boolean highlighted) {
|
||||||
|
return Lang.translateDirect("tooltip.holdForDescription", Lang.translateDirect("tooltip.keyShift")
|
||||||
|
.withStyle(ChatFormatting.GRAY))
|
||||||
|
.withStyle(ChatFormatting.DARK_GRAY);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void addHint(List<Component> tooltip, String hintKey, Object... messageParams) {
|
||||||
|
Component spacing = Components.literal("");
|
||||||
|
tooltip.add(spacing.plainCopy()
|
||||||
|
.append(Lang.translateDirect(hintKey + ".title"))
|
||||||
|
.withStyle(ChatFormatting.GOLD));
|
||||||
|
Component hint = Lang.translateDirect(hintKey);
|
||||||
|
List<Component> cutComponent = TooltipHelper.cutTextComponent(hint, ChatFormatting.GRAY, ChatFormatting.WHITE);
|
||||||
|
for (Component component : cutComponent)
|
||||||
|
tooltip.add(spacing.plainCopy()
|
||||||
|
.append(component));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void referTo(ItemLike item, Supplier<? extends ItemLike> itemWithTooltip) {
|
||||||
|
tooltipReferrals.put(item.asItem(), () -> itemWithTooltip.get()
|
||||||
|
.asItem()
|
||||||
|
.getDescriptionId());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void referTo(ItemLike item, String string) {
|
||||||
|
tooltipReferrals.put(item.asItem(), () -> string);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public static List<String> cutString(Component s, ChatFormatting defaultColor, ChatFormatting highlightColor) {
|
||||||
|
return cutString(s.getString(), defaultColor, highlightColor, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public static List<String> cutString(String s, ChatFormatting defaultColor, ChatFormatting highlightColor,
|
||||||
|
int indent) {
|
||||||
|
// Apply markup
|
||||||
|
String markedUp = s.replaceAll("_([^_]+)_", highlightColor + "$1" + defaultColor);
|
||||||
|
|
||||||
|
// Split words
|
||||||
|
List<String> words = new LinkedList<>();
|
||||||
|
BreakIterator iterator = BreakIterator.getLineInstance(Minecraft.getInstance().getLocale());
|
||||||
|
iterator.setText(markedUp);
|
||||||
|
int start = iterator.first();
|
||||||
|
for (int end = iterator.next(); end != BreakIterator.DONE; start = end, end = iterator.next()) {
|
||||||
|
String word = markedUp.substring(start, end);
|
||||||
|
words.add(word);
|
||||||
|
}
|
||||||
|
|
||||||
|
Font font = Minecraft.getInstance().font;
|
||||||
|
List<String> lines = FontHelper.cutString(font, markedUp, maxWidthPerLine);
|
||||||
|
|
||||||
|
// Format
|
||||||
|
String lineStart = Strings.repeat(" ", indent);
|
||||||
|
List<String> formattedLines = new ArrayList<>(lines.size());
|
||||||
|
String format = defaultColor.toString();
|
||||||
|
for (String line : lines) {
|
||||||
|
String formattedLine = format + lineStart + line;
|
||||||
|
formattedLines.add(formattedLine);
|
||||||
|
// format = TextFormatting.getFormatString(formattedLine);
|
||||||
|
}
|
||||||
|
return formattedLines;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<Component> cutStringTextComponent(String c, ChatFormatting defaultColor,
|
||||||
|
ChatFormatting highlightColor) {
|
||||||
|
return cutTextComponent(Components.literal(c), defaultColor, highlightColor, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<Component> cutTextComponent(Component c, ChatFormatting defaultColor,
|
||||||
|
ChatFormatting highlightColor) {
|
||||||
|
return cutTextComponent(c, defaultColor, highlightColor, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<Component> cutStringTextComponent(String c, ChatFormatting defaultColor,
|
||||||
|
ChatFormatting highlightColor, int indent) {
|
||||||
|
return cutTextComponent(Components.literal(c), defaultColor, highlightColor, indent);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<Component> cutTextComponent(Component c, ChatFormatting defaultColor,
|
||||||
|
ChatFormatting highlightColor, int indent) {
|
||||||
|
String s = c.getString();
|
||||||
|
|
||||||
|
// Apply markup
|
||||||
|
String markedUp = s;// .replaceAll("_([^_]+)_", highlightColor + "$1" + defaultColor);
|
||||||
|
|
||||||
|
// Split words
|
||||||
|
List<String> words = new LinkedList<>();
|
||||||
|
BreakIterator iterator = BreakIterator.getLineInstance(Minecraft.getInstance().getLocale());
|
||||||
|
iterator.setText(markedUp);
|
||||||
|
int start = iterator.first();
|
||||||
|
for (int end = iterator.next(); end != BreakIterator.DONE; start = end, end = iterator.next()) {
|
||||||
|
String word = markedUp.substring(start, end);
|
||||||
|
words.add(word);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Apply hard wrap
|
||||||
|
Font font = Minecraft.getInstance().font;
|
||||||
|
List<String> lines = new LinkedList<>();
|
||||||
|
StringBuilder currentLine = new StringBuilder();
|
||||||
|
int width = 0;
|
||||||
|
for (String word : words) {
|
||||||
|
int newWidth = font.width(word.replaceAll("_", ""));
|
||||||
|
if (width + newWidth > maxWidthPerLine) {
|
||||||
|
if (width > 0) {
|
||||||
|
String line = currentLine.toString();
|
||||||
|
lines.add(line);
|
||||||
|
currentLine = new StringBuilder();
|
||||||
|
width = 0;
|
||||||
|
} else {
|
||||||
|
lines.add(word);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
currentLine.append(word);
|
||||||
|
width += newWidth;
|
||||||
|
}
|
||||||
|
if (width > 0) {
|
||||||
|
lines.add(currentLine.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Format
|
||||||
|
MutableComponent lineStart = Components.literal(Strings.repeat(" ", indent));
|
||||||
|
lineStart.withStyle(defaultColor);
|
||||||
|
List<Component> formattedLines = new ArrayList<>(lines.size());
|
||||||
|
Couple<ChatFormatting> f = Couple.create(highlightColor, defaultColor);
|
||||||
|
|
||||||
|
boolean currentlyHighlighted = false;
|
||||||
|
for (String string : lines) {
|
||||||
|
MutableComponent currentComponent = lineStart.plainCopy();
|
||||||
|
String[] split = string.split("_");
|
||||||
|
for (String part : split) {
|
||||||
|
currentComponent.append(Components.literal(part).withStyle(f.get(currentlyHighlighted)));
|
||||||
|
currentlyHighlighted = !currentlyHighlighted;
|
||||||
|
}
|
||||||
|
|
||||||
|
formattedLines.add(currentComponent);
|
||||||
|
currentlyHighlighted = !currentlyHighlighted;
|
||||||
|
}
|
||||||
|
|
||||||
|
return formattedLines;
|
||||||
|
}
|
||||||
|
|
||||||
|
// public static List<ITextComponent> cutTextComponentOld(ITextComponent c, TextFormatting defaultColor,
|
||||||
|
// TextFormatting highlightColor, int indent) {
|
||||||
|
// IFormattableTextComponent lineStart = StringTextComponent.EMPTY.copy();
|
||||||
|
// for (int i = 0; i < indent; i++)
|
||||||
|
// lineStart.append(" ");
|
||||||
|
// lineStart.formatted(defaultColor);
|
||||||
|
//
|
||||||
|
// List<ITextComponent> lines = new ArrayList<>();
|
||||||
|
// String rawText = getUnformattedDeepText(c);
|
||||||
|
// String[] words = rawText.split(" ");
|
||||||
|
// String word;
|
||||||
|
// IFormattableTextComponent currentLine = lineStart.copy();
|
||||||
|
//
|
||||||
|
// boolean firstWord = true;
|
||||||
|
// boolean lastWord;
|
||||||
|
//
|
||||||
|
// // Apply hard wrap
|
||||||
|
// for (int i = 0; i < words.length; i++) {
|
||||||
|
// word = words[i];
|
||||||
|
// lastWord = i == words.length - 1;
|
||||||
|
//
|
||||||
|
// if (!lastWord && !firstWord && getComponentLength(currentLine) + word.length() > maxCharsPerLine) {
|
||||||
|
// lines.add(currentLine);
|
||||||
|
// currentLine = lineStart.copy();
|
||||||
|
// firstWord = true;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// currentLine.append(new StringTextComponent((firstWord ? "" : " ") + word.replace("_", ""))
|
||||||
|
// .formatted(word.matches("_([^_]+)_") ? highlightColor : defaultColor));
|
||||||
|
// firstWord = false;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// if (!firstWord) {
|
||||||
|
// lines.add(currentLine);
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// return lines;
|
||||||
|
// }
|
||||||
|
|
||||||
|
private static boolean findTooltip(ItemStack stack) {
|
||||||
|
String key = getTooltipTranslationKey(stack);
|
||||||
|
if (I18n.exists(key)) {
|
||||||
|
cachedTooltips.put(key, buildToolTip(key, stack));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
cachedTooltips.put(key, ItemDescription.MISSING);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ItemDescription buildToolTip(String translationKey, ItemStack stack) {
|
||||||
|
ItemDescription tooltip = new ItemDescription(Palette.Blue);
|
||||||
|
String summaryKey = translationKey + ".summary";
|
||||||
|
|
||||||
|
// Summary
|
||||||
|
if (I18n.exists(summaryKey))
|
||||||
|
tooltip = tooltip.withSummary(Components.literal(I18n.get(summaryKey)));
|
||||||
|
|
||||||
|
// Requirements
|
||||||
|
// if (stack.getItem() instanceof BlockItem) {
|
||||||
|
// BlockItem item = (BlockItem) stack.getItem();
|
||||||
|
// if (item.getBlock() instanceof IRotate || item.getBlock() instanceof EngineBlock) {
|
||||||
|
// tooltip = tooltip.withKineticStats(item.getBlock());
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// Behaviours
|
||||||
|
for (int i = 1; i < 100; i++) {
|
||||||
|
String conditionKey = translationKey + ".condition" + i;
|
||||||
|
String behaviourKey = translationKey + ".behaviour" + i;
|
||||||
|
if (!I18n.exists(conditionKey))
|
||||||
|
break;
|
||||||
|
if (i == 1)
|
||||||
|
tooltip.getLinesOnShift()
|
||||||
|
.add(Components.immutableEmpty());
|
||||||
|
tooltip.withBehaviour(I18n.get(conditionKey), I18n.get(behaviourKey));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Controls
|
||||||
|
for (int i = 1; i < 100; i++) {
|
||||||
|
String controlKey = translationKey + ".control" + i;
|
||||||
|
String actionKey = translationKey + ".action" + i;
|
||||||
|
if (!I18n.exists(controlKey))
|
||||||
|
break;
|
||||||
|
tooltip.withControl(I18n.get(controlKey), I18n.get(actionKey));
|
||||||
|
}
|
||||||
|
|
||||||
|
return tooltip.createTabs();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getTooltipTranslationKey(ItemStack stack) {
|
||||||
|
Item item = stack.getItem();
|
||||||
|
if (tooltipReferrals.containsKey(item))
|
||||||
|
return tooltipReferrals.get(item)
|
||||||
|
.get() + ".tooltip";
|
||||||
|
return item.getDescriptionId(stack) + ".tooltip";
|
||||||
|
}
|
||||||
|
|
||||||
|
// private static int getComponentLength(ITextComponent component) {
|
||||||
|
// AtomicInteger l = new AtomicInteger();
|
||||||
|
// TextProcessing.visitFormatted(component, Style.EMPTY, (s, style, charConsumer) -> {
|
||||||
|
// l.getAndIncrement();
|
||||||
|
// return true;
|
||||||
|
// });
|
||||||
|
// return l.get();
|
||||||
|
// }
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.item;
|
||||||
|
|
||||||
|
import net.minecraft.world.item.BlockItem;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
|
||||||
|
public class UncontainableBlockItem extends BlockItem {
|
||||||
|
public UncontainableBlockItem(Block block, Properties properties) {
|
||||||
|
super(block, properties);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canFitInsideContainerItems() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.item.render;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import net.minecraft.client.resources.model.BakedModel;
|
||||||
|
import net.minecraft.world.item.ItemDisplayContext;
|
||||||
|
import net.minecraftforge.client.model.BakedModelWrapper;
|
||||||
|
|
||||||
|
public class CustomRenderedItemModel extends BakedModelWrapper<BakedModel> {
|
||||||
|
|
||||||
|
public CustomRenderedItemModel(BakedModel originalModel) {
|
||||||
|
super(originalModel);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isCustomRenderer() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BakedModel applyTransform(ItemDisplayContext cameraItemDisplayContext, PoseStack mat,
|
||||||
|
boolean leftHand) {
|
||||||
|
// Super call returns originalModel, but we want to return this, else BEWLR
|
||||||
|
// won't be used.
|
||||||
|
super.applyTransform(cameraItemDisplayContext, mat, leftHand);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public BakedModel getOriginalModel() {
|
||||||
|
return originalModel;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.item.render;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.renderer.MultiBufferSource;
|
||||||
|
import net.minecraft.client.renderer.RenderType;
|
||||||
|
import net.minecraft.client.renderer.entity.ItemRenderer;
|
||||||
|
import net.minecraft.client.resources.model.BakedModel;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.util.RandomSource;
|
||||||
|
import net.minecraft.world.item.ItemDisplayContext;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraftforge.client.extensions.common.IClientItemExtensions;
|
||||||
|
import net.minecraftforge.client.model.data.ModelData;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.render.RenderTypes;
|
||||||
|
import nl.requios.effortlessbuilding.create.foundation.utility.Iterate;
|
||||||
|
|
||||||
|
public class PartialItemModelRenderer {
|
||||||
|
|
||||||
|
private static final PartialItemModelRenderer INSTANCE = new PartialItemModelRenderer();
|
||||||
|
|
||||||
|
private final RandomSource random = RandomSource.create();
|
||||||
|
|
||||||
|
private ItemStack stack;
|
||||||
|
private ItemDisplayContext transformType;
|
||||||
|
private PoseStack ms;
|
||||||
|
private MultiBufferSource buffer;
|
||||||
|
private int overlay;
|
||||||
|
|
||||||
|
public static PartialItemModelRenderer of(ItemStack stack, ItemDisplayContext transformType,
|
||||||
|
PoseStack ms, MultiBufferSource buffer, int overlay) {
|
||||||
|
PartialItemModelRenderer instance = INSTANCE;
|
||||||
|
instance.stack = stack;
|
||||||
|
instance.transformType = transformType;
|
||||||
|
instance.ms = ms;
|
||||||
|
instance.buffer = buffer;
|
||||||
|
instance.overlay = overlay;
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void render(BakedModel model, int light) {
|
||||||
|
render(model, RenderTypes.getItemPartialTranslucent(), light);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void renderSolid(BakedModel model, int light) {
|
||||||
|
render(model, RenderTypes.getItemPartialSolid(), light);
|
||||||
|
}
|
||||||
|
|
||||||
|
// public void renderSolidGlowing(BakedModel model, int light) {
|
||||||
|
// render(model, RenderTypes.getGlowingSolid(), light);
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// public void renderGlowing(BakedModel model, int light) {
|
||||||
|
// render(model, RenderTypes.getGlowingTranslucent(), light);
|
||||||
|
// }
|
||||||
|
|
||||||
|
public void render(BakedModel model, RenderType type, int light) {
|
||||||
|
if (stack.isEmpty())
|
||||||
|
return;
|
||||||
|
|
||||||
|
ms.pushPose();
|
||||||
|
ms.translate(-0.5D, -0.5D, -0.5D);
|
||||||
|
|
||||||
|
if (!model.isCustomRenderer()) {
|
||||||
|
VertexConsumer vc = ItemRenderer.getFoilBufferDirect(buffer, type, true, stack.hasFoil());
|
||||||
|
for (BakedModel pass : model.getRenderPasses(stack, false)) {
|
||||||
|
renderBakedItemModel(pass, light, ms, vc);
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
IClientItemExtensions.of(stack)
|
||||||
|
.getCustomRenderer()
|
||||||
|
.renderByItem(stack, transformType, ms, buffer, light, overlay);
|
||||||
|
|
||||||
|
ms.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void renderBakedItemModel(BakedModel model, int light, PoseStack ms, VertexConsumer buffer) {
|
||||||
|
ItemRenderer ir = Minecraft.getInstance()
|
||||||
|
.getItemRenderer();
|
||||||
|
ModelData data = ModelData.EMPTY;
|
||||||
|
|
||||||
|
for (RenderType renderType : model.getRenderTypes(stack, false)) {
|
||||||
|
for (Direction direction : Iterate.directions) {
|
||||||
|
random.setSeed(42L);
|
||||||
|
ir.renderQuadList(ms, buffer, model.getQuads(null, direction, random, data, renderType), stack, light,
|
||||||
|
overlay);
|
||||||
|
}
|
||||||
|
|
||||||
|
random.setSeed(42L);
|
||||||
|
ir.renderQuadList(ms, buffer, model.getQuads(null, null, random, data, renderType), stack, light, overlay);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
package nl.requios.effortlessbuilding.create.foundation.networking;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.nbt.CompoundTag;
|
||||||
|
import net.minecraft.network.FriendlyByteBuf;
|
||||||
|
import net.minecraft.world.entity.Entity;
|
||||||
|
import net.minecraftforge.network.NetworkEvent.Context;
|
||||||
|
|
||||||
|
import java.util.HashSet;
|
||||||
|
|
||||||
|
public interface ISyncPersistentData {
|
||||||
|
|
||||||
|
void onPersistentDataUpdated();
|
||||||
|
|
||||||
|
public static class PersistentDataPacket extends SimplePacketBase {
|
||||||
|
|
||||||
|
private int entityId;
|
||||||
|
private Entity entity;
|
||||||
|
private CompoundTag readData;
|
||||||
|
|
||||||
|
public PersistentDataPacket(Entity entity) {
|
||||||
|
this.entity = entity;
|
||||||
|
this.entityId = entity.getId();
|
||||||
|
}
|
||||||
|
|
||||||
|
public PersistentDataPacket(FriendlyByteBuf buffer) {
|
||||||
|
entityId = buffer.readInt();
|
||||||
|
readData = buffer.readNbt();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void write(FriendlyByteBuf buffer) {
|
||||||
|
buffer.writeInt(entityId);
|
||||||
|
buffer.writeNbt(entity.getPersistentData());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean handle(Context context) {
|
||||||
|
context.enqueueWork(() -> {
|
||||||
|
Entity entityByID = Minecraft.getInstance().level.getEntity(entityId);
|
||||||
|
CompoundTag data = entityByID.getPersistentData();
|
||||||
|
new HashSet<>(data.getAllKeys()).forEach(data::remove);
|
||||||
|
data.merge(readData);
|
||||||
|
if (!(entityByID instanceof ISyncPersistentData))
|
||||||
|
return;
|
||||||
|
((ISyncPersistentData) entityByID).onPersistentDataUpdated();
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user