diff --git a/.factorypath b/.factorypath
deleted file mode 100644
index 3376b3e8..00000000
--- a/.factorypath
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 616992df..12f86447 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,5 +23,3 @@ run
# Files from Forge MDK
forge*changelog.txt
-/.apt_generated/
-/.apt_generated_tests/
diff --git a/CREDITS.txt b/CREDITS.txt
deleted file mode 100644
index b7679581..00000000
--- a/CREDITS.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Stargate Journey: Credits/Thank You
-
-================================
-TakeruDavis - Typing out the things would take too long, so... A really good contributor
-================================
-
-Otwnt - Stargate Pedestals, Jaffa House
-Kranyolsu - Stargate Pedestals
-Carter Addon Pack - Sounds
-diesieben07 - Code for GUI shift-clicking
-TelepathicGrunt - Code for Structure spawning
-AlexandriaOL - Fixed a typo in advancements
-SquidDev - Fixed Basic Interface not working dynamically
-
-I guess I could thank the Stargate franchize for... existing... as inspiration. Yeah, let's go with that.
\ No newline at end of file
diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index 2b227fc6..00000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License
-You are free to:
-
- Share — copy and redistribute the material in any medium or format
- Adapt — remix, transform, and build upon the material for any purpose, even commercially.
- The licensor cannot revoke these freedoms as long as you follow the license terms.
-
-Under the following terms:
-
- Attribution — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
-
- ShareAlike — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
-
- No additional restrictions — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.
-
-Notices:
-
- You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
- No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index e0e685d7..00000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# StargateJourney
- A Repository for the Stargate Journey Minecraft Mod
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 867e97e4..00000000
--- a/README.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-
-Source installation information for modders
--------------------------------------------
-This code follows the Minecraft Forge installation methodology. It will apply
-some small patches to the vanilla MCP source code, giving you and it access
-to some of the data and functions you need to build a successful mod.
-
-Note also that the patches are built against "un-renamed" MCP source code (aka
-SRG Names) - this means that you will not be able to read them directly against
-normal code.
-
-Setup Process:
-==============================
-
-Step 1: Open your command-line and browse to the folder where you extracted the zip file.
-
-Step 2: You're left with a choice.
-If you prefer to use Eclipse:
-1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux)
-2. Open Eclipse, Import > Existing Gradle Project > Select Folder
- or run `gradlew eclipse` to generate the project.
-
-If you prefer to use IntelliJ:
-1. Open IDEA, and import project.
-2. Select your build.gradle file and have it import.
-3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux)
-4. Refresh the Gradle Project in IDEA if required.
-
-If at any point you are missing libraries in your IDE, or you've run into problems you can
-run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything
-{this does not affect your code} and then start the process again.
-
-Mapping Names:
-=============================
-By default, the MDK is configured to use the official mapping names from Mojang for methods and fields
-in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this
-license, if you do not agree with it you can change your mapping names to other crowdsourced names in your
-build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here:
-https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
-
-Additional Resources:
-=========================
-Community Documentation: https://mcforge.readthedocs.io/en/latest/gettingstarted/
-LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0
-Forge Forum: https://forums.minecraftforge.net/
-Forge Discord: https://discord.gg/UvedJ9m
diff --git a/build.gradle b/build.gradle
index ba9575e2..029a496d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,16 @@
plugins {
id 'eclipse'
+ id 'idea'
id 'maven-publish'
- id 'net.minecraftforge.gradle' version '5.1.+'
+ id 'net.minecraftforge.gradle' version '[6.0,6.2)'
}
-version = "${mod_version}"
-group = 'net.povstalec.sgjourney' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "${mod_name}-${mc_version}"
+version = mod_version
+group = mod_group_id
+
+base {
+ archivesName = mod_id
+}
// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
@@ -26,9 +30,30 @@ minecraft {
//
// 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.4'
-
- accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
+ mappings channel: mapping_channel, version: mapping_version
+
+ // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
+ // In most cases, it is not necessary to enable.
+ // enableEclipsePrepareRuns = true
+ // enableIdeaPrepareRuns = true
+
+ // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game.
+ // It is REQUIRED to be set to true for this template to function.
+ // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
+ copyIdeResources = true
+
+ // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations.
+ // The folder name can be set on a run configuration using the "folderName" property.
+ // By default, the folder name of a run configuration is the name of the Gradle project containing it.
+ // generateRunFolders = true
+
+ // This property enables access transformers for use in development.
+ // They will be applied to the Minecraft artifact.
+ // The access transformer file can be anywhere in the project.
+ // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge.
+ // This default location is a best practice to automatically put the file in the right place in the final jar.
+ // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information.
+ // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
// Default run configurations.
// These can be tweaked, removed, or duplicated as needed.
@@ -37,8 +62,9 @@ minecraft {
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
}
-
- client {
+
+ // applies to all the run configs below
+ configureEach {
workingDirectory project.file('run')
// Recommended logging data for a userdev environment
@@ -53,66 +79,36 @@ minecraft {
// Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
property 'forge.logging.console.level', 'debug'
- // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
- property 'forge.enabledGameTestNamespaces', 'examplemod'
-
mods {
- examplemod {
+ "${mod_id}" {
source sourceSets.main
}
}
}
- server {
- workingDirectory project.file('run')
-
- property 'forge.logging.markers', 'REGISTRIES'
-
- property 'forge.logging.console.level', 'debug'
-
- property 'forge.enabledGameTestNamespaces', 'examplemod'
+ client {
+ // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+ property 'forge.enabledGameTestNamespaces', mod_id
+ }
- mods {
- mod_id {
- source sourceSets.main
- }
- }
+ server {
+ property 'forge.enabledGameTestNamespaces', mod_id
+ args '--nogui'
}
// 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', 'examplemod'
-
- mods {
- mod_id {
- source sourceSets.main
- }
- }
+ property 'forge.enabledGameTestNamespaces', mod_id
}
data {
- workingDirectory project.file('run')
-
- property 'forge.logging.markers', 'REGISTRIES'
-
- property 'forge.logging.console.level', 'debug'
+ // example of overriding the workingDirectory set in configureEach above
+ workingDirectory project.file('run-data')
// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
- args '--mod', "${mod_id}", '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-
- mods {
- mod_id {
- source sourceSets.main
- }
- }
+ args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
}
}
}
@@ -124,7 +120,8 @@ repositories {
// Put repositories for dependencies here
// ForgeGradle automatically adds the Forge maven and Maven Central for you
- // If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
+ // If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
+ // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
// flatDir {
// dir 'libs'
// }
@@ -159,68 +156,82 @@ repositories {
}
dependencies {
- // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
- // 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.4-45.1.2'
-
- // Real mod deobf dependency examples - these get remapped to your current mappings
- // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
-
- // Examples using mod jars from ./libs
+ // Specify the version of Minecraft to use.
+ // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact.
+ // The "userdev" classifier will be requested and setup by ForgeGradle.
+ // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
+ // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
+ minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
+
+ // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
+ // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
+ // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
+ // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
+ // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
+
+ // Example mod dependency using a mod jar from ./libs with a flat dir repository
+ // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
+ // The group id is ignored when searching -- in this case, it is "blank"
// implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
- // For more info...
+ // For more info:
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html
- compileOnly(fg.deobf('com.github.Povstalec:StellarView:4b760b8eaf'))
- runtimeOnly(fg.deobf('com.github.Povstalec:StellarView:4b760b8eaf'))
-
- // compile against the JEI API but do not include it at runtime
- //compileOnly(fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}"))
- //compileOnly(fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}"))
- // at runtime, use the full JEI jar for Forge
- //runtimeOnly(fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}"))
+ compileOnly(fg.deobf('com.github.Povstalec:StellarView:c5f8ccbffd'))
+ runtimeOnly(fg.deobf('com.github.Povstalec:StellarView:c5f8ccbffd'))
- compileOnly("cc.tweaked:cc-tweaked-${mc_version}-core-api:${cct_version}")
- compileOnly(fg.deobf("cc.tweaked:cc-tweaked-${mc_version}-forge-api:${cct_version}"))
- runtimeOnly(fg.deobf("cc.tweaked:cc-tweaked-${mc_version}-forge:${cct_version}"))
-
- //runtimeOnly fg.deobf("curse.maven:mcjtylib-233105:4389808")
- //runtimeOnly fg.deobf("curse.maven:rftools-base-326041:4389811")
- //runtimeOnly fg.deobf("curse.maven:rftools-power-290209:4367297")
-
- //runtimeOnly fg.deobf("curse.maven:botarium-704113:4416456")
- //runtimeOnly fg.deobf("curse.maven:resourceful-lib-570073:4378849")
- //runtimeOnly fg.deobf("curse.maven:resourceful-config-714059:4394154")
- //runtimeOnly fg.deobf("curse.maven:ad-astra-635042:4390126")
+ compileOnly("cc.tweaked:cc-tweaked-${minecraft_version}-core-api:${cct_version}")
+ compileOnly(fg.deobf("cc.tweaked:cc-tweaked-${minecraft_version}-forge-api:${cct_version}"))
+ runtimeOnly(fg.deobf("cc.tweaked:cc-tweaked-${minecraft_version}-forge:${cct_version}"))
+}
+
+// This block of code expands all declared replace properties in the specified resource targets.
+// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
+// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
+// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
+tasks.named('processResources', ProcessResources).configure {
+ var replaceProperties = [
+ minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
+ forge_version: forge_version, forge_version_range: forge_version_range,
+ loader_version_range: loader_version_range,
+ mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
+ mod_authors: mod_authors, mod_description: mod_description,
+ ]
+ inputs.properties replaceProperties
+
+ filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
+ expand replaceProperties + [project: project]
+ }
}
// Example for how to get properties into the manifest for reading at runtime.
-jar {
+tasks.named('jar', Jar).configure {
manifest {
attributes([
- "Specification-Title" : "${mod_id}",
- "Specification-Vendor" : "${mod_authors}",
- "Specification-Version" : "1", // We are version 1 of ourselves
- "Implementation-Title" : project.name,
- "Implementation-Version" : project.jar.archiveVersion,
- "Implementation-Vendor" : "${mod_authors}",
- "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+ 'Specification-Title' : mod_id,
+ 'Specification-Vendor' : mod_authors,
+ 'Specification-Version' : '1', // We are version 1 of ourselves
+ 'Implementation-Title' : project.name,
+ 'Implementation-Version' : project.jar.archiveVersion,
+ 'Implementation-Vendor' : mod_authors,
+ 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
])
}
+
+ // This is the preferred method to reobfuscate your jar file
+ finalizedBy 'reobfJar'
}
-// Example configuration to allow publishing using the maven-publish plugin
-// This is the preferred method to reobfuscate your jar file
-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
-// publish.dependsOn('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.named('publish').configure {
+// dependsOn 'reobfJar'
+// }
+// Example configuration to allow publishing using the maven-publish plugin
publishing {
publications {
- mavenJava(MavenPublication) {
+ register('mavenJava', MavenPublication) {
artifact jar
}
}
@@ -233,4 +244,4 @@ publishing {
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
-}
\ No newline at end of file
+}
diff --git a/changelog.txt b/changelog.txt
deleted file mode 100644
index 562b6323..00000000
--- a/changelog.txt
+++ /dev/null
@@ -1,769 +0,0 @@
-1.19.x Changelog
-45.1
-====
- - 45.1.2 Add proper duplicate mod error message that includes the mod id(s) and mod files. (#9474)
- - 45.1.1 Make 1.20.x the main TC branch.
- - 45.1.0 1.19.4 Recommended Build
-
-45.0
-====
- - 45.0.66 Add method to GatherDataEvent to obtain collection of all input paths. (#9499)
- - 45.0.65 Log error when Sheets is class-loaded before registration is completed (#9475)
- - 45.0.64 [1.19.x] Re-implement RenderTooltipEvent.Color (#9497)
- * Reimplement RenderTooltipEvent.Color
- * Formatting, comments, EXC
- * Deprecate instead of replacing
- - 45.0.63 Add API for registering custom world preset editors (#9436)
- - 45.0.62 Remove unneeded extra reload of datapacks on world creation screen (#9454)
- - 45.0.61 Bump ASM to 9.5
- - 45.0.60 Fix crash when running server from root directory
- Fixes #9498
- - 45.0.59 Fix root transform matrix format, allow using all four root transform formats (#9496)
- - 45.0.58 Add missing AT lines to allow registering custom game rule boolean/integer types (#9489)
- - 45.0.57 [1.19.x] Fix SaplingGrowTreeEvent#setFeature being ignored in FungusBlock (#9485)
- Co-authored-by: Brennan Ward <3682588+Shadows-of-Fire@users.noreply.github.com>
- - 45.0.56 Restore AccessibilityOnboardingScreen
- Fixes #9488
- - 45.0.55 Update documentation on FinalizeSpawn (#9467)
- - 45.0.54 Fix fluids without sound event causing exception in tryFillContainer and tryEmptyContainer (#9445)
- - 45.0.53 Make FakePlayerFactory respect the given ServerLevel (#9479)
- - 45.0.52 Collect and log exceptions occurring in DeferredWorkQueue tasks (#9449)
- - 45.0.51 Fix `NamespacedWrapper#wrapAsHolder` (#9450)
- - 45.0.50 Fixes ChatScreen calling .setScreen (#9443)
- Fix test compile failures also.
- - 45.0.49 Determine the Forge version the PR was built against when running PR compat checks (#9374)
- - 45.0.48 Add buildscript test to error on deprecated members that should of been removed. (#9460)
- - 45.0.47 Remove erroneous brace patch in Inventory (#9462)
- Fixes #9459
- - 45.0.46 [1.19.4] Move root transform builder to ModelBuilder to allow use in ItemModelBuilder (#9456)
- - 45.0.45 Fix forge grindstone hooks allowing stacks of non-stackable items (#9457)
- - 45.0.44 [1.19.4] Fix FMLOnly (#9415)
- - 45.0.43 Fix ItemLayerModel erroneously adding particle texture to layer texture list (#9441)
- - 45.0.42 Temporary fix for Canceling ProjectileImpactEvents of Piercing ammo.
- Event needs to be re-worked to have finer control. #9370
- - 45.0.41 Fix dummy air blocks not being marked as air (#9440)
- - 45.0.40 Add support for splitting the login packet (#9367)
- It contains full copies of data registries and can easily surpass vanilla's limits
- - 45.0.39 Remove Attack Range and Reach Distance and add Block Reach and Entity Reach (#9361)
- - 45.0.38 Add default bucket sounds for milk (#9432)
- - 45.0.37 Deprecate Item.onUsingTick, as vanilla provides the same function in Item.onUseTick now. Closes #9342
- - 45.0.36 Fix ScreenEvent.Init.[Pre/Post] not working correctly (#9431)
- - 45.0.35 Allow FenceGateBlock to be used without a WoodType. Closes #9392
- - 45.0.34 Deprecate duplicate tool tags that vanilla added in 1.19.4
- We will maintain a seperate 'tools' tag until Mojang adds all relevent tool tags.
- Closes #9393
- - 45.0.33 Fix BlockEvent.Break not using ItemStack enchantment hooks.
- - 45.0.32 Move Block.onCatchFire to above block removal to allow usage of BlockEntity data. Closes #9400
- - 45.0.31 Fix FinalizeSpawn not blocking spawns during worldgen (#9420)
- - 45.0.30 Fixed issue with MutableHashedLinkedMap when removing multiple sequential entries in the middle of the map.
- Added Unit tests for MutableHashLinkedMap
- Added support for removing using the iterator
- Added concurrent modification detection to the iterator
- Added default constructor with basic hashing strategy.
- Closes #9426
- - 45.0.29 Loosen access for BucketItem's canBlockContainFluid (#9421)
- - 45.0.28 Update and Regenerate Datapacks (#9419)
- Add generation for pack.mcmeta
- - 45.0.27 Restore ability to change message in ClientChatEvent (#9377)
- - 45.0.26 Remove duplicate line in FoodData patch (#9424)
- The line was accidentally duplicated in the 1.19.4 update and patching
- process.
- Fixes #9422
- - 45.0.25 Rename RegisterParticleProviderEvent's register methods to describe what kind of particle providers they register (deprecating old methods to avoid breaking) and minor docs tweaks (#9388)
- - 45.0.24 Update pack versions (#9414)
- - 45.0.23 [1.19.4] Revamp and fix spawn events (#9133)
- - 45.0.22 [1.19.4] Replace blitOffset parameter with PoseStack in IItemDecorator (#9409)
- * Replace blitOffset with PoseStack in IItemDecorator
- * Circumvent breaking changes
- * Fix blitOffset type
- - 45.0.21 Fix JSON model root transforms (#9410)
- - 45.0.20 Fix tossed items not being able to be picked up by other players. Closes #9412 (#9404)
- - 45.0.19 Fix infinite BE render bounds failing frustum intersection test. Closes #9321 (#9407)
- - 45.0.18 Make ForgeSlider use the new vanilla texture (#9406)
- - 45.0.17 Add BlockSetType#register to accesstransformer.cfg (#9386)
- - 45.0.16 Add option to completely hide a crash-callable depending on a runtime value (#9372)
- - 45.0.15 Add isNewChunk to ChunkEvent.Load (#9369)
- - 45.0.14 Remove DistExecutor calls in PistonEventTest (#9348)
- - 45.0.13 Fix hardcoded precipitation in ClimateSettingsBuilder (#9402)
- This effectively caused all biomes to have precipitation, such as
- minecraft:desert.
- Fixes #9397
- - 45.0.12 Fix incorrect variable used for swimming check (#9403)
- Because of the incorrect variable, the check to stop sprinting (and stop
- swimming) never fired correctly.
- 1.19.3's `flag5` variable was renamed to `flag7` in 1.19.4; however,
- this was not caught during patching because of the fuzzy patcher.
- Fixes #9399
- - 45.0.11 Fix incorrect boolean used for glint effect (#9401)
- The `flag1` variable is ultimately controlled by whether the armor slot
- being rendered is for the leggings, which explains this bug where the
- leggings always had the enchantment glint but not any other armor piece.
- Fixes #9394
- - 45.0.10 Fixed ModMismatchDisconnectedScreen displaying missing mods wrongly (#9398)
- - 45.0.9 Fix misaligned text render type patch (#9391)
- - 45.0.8 Remove thread filter from processing clientside custom payloads. Closes @9390
- - 45.0.7 Fix LivingEntity patch which caused crash while entities got hurt. Closes #9389
- - 45.0.6 Fix wrong parameters in `Screen#renderTooltipInternal` patch (#9387)
- - 45.0.5 Fix misaligned patch in LevelRenderer. Closes #9385
- - 45.0.4 Remove our fix for MC-121048 as it has been fixed by Vanilla (#9381)
- - 45.0.3 Fix advancements not loading, bug seems to be fixed by vanilla now. Closes #9384
- - 45.0.2 Fixed patch verifier for cases where patches lowered access levels. Closes #9383
- - 45.0.1 Fix crouching while sprinting stopping the player when step height is modified. Closes #9376
- - 45.0.0 Forge 1.19.4
- Properly move `ServerStatusPing` to codec
- Reimplement custom display contexts
- Co-authored-by: Matyrobbrt
- Co-authored-by: coehlrich
-
-44.1
-====
- - 44.1.23 Fix experimental world warning screen appearing everytime (#9375)
- - 44.1.22 Fix continuing to use items after dropping or when a shield breaks (MC-231097, MC-168573) (#9344)
- - 44.1.21 Add onStopUsing hook to IForgeItem (#9343)
- - 44.1.20 Document RegisterParticleProvidersEvent's APIs (#9346)
- - 44.1.19 Fix incorrect ListTag.getLongArray result (MC-260378) (#9351)
- - 44.1.18 Fix missing patch that left TagBuilder#replace unused (#9354)
- - 44.1.17 Add 2 new RenderLevelStageEvent.Stage for After Entities and After Block Entities (#9259)
- - 44.1.16 Cleanup StemBlock Patch (#9337)
- - 44.1.15 Cleanup ItemProperties patch (#9332)
- - 44.1.14 Make IForgeIntrinsicHolderTagAppender methods properly chainable (#9331)
- - 44.1.13 Fix in custom fluids not respecting max height correctly. (#9319)
- - 44.1.12 Fix inconsistent vaporization in BucketItem & FluidType (#9269)
- - 44.1.11 Fix reloading event firing during server shutdown and add explicit unloading event instead (#9016)
- - 44.1.10 Homogenize and/or holdersets when serializing to prevent serializing to NBT from crashing (#9048) Fixes #9043
- - 44.1.9 [1.19.x] Fix `ForgeSlider` not respecting custom height (#9237)
- - 44.1.8 Fix stepsound for blocks in the inside_step_sound_blocks tag. (#9318)
- - 44.1.7 Fix missing hanging sign material for modded wood type (#9303)
- - 44.1.6 Fire TickEvent.LevelTickEvent on ClientLevel tick (#9299)
- - 44.1.5 Add ClientChatReceivedEvent for system messages (#9284)
- - 44.1.4 PR Action update (#9274)
- - 44.1.3 fix HangingSignEditScreen crash when using custom wood types using modid (#9294)
- - 44.1.2 Bump SecureJarHandler version, to help identify invalid mods.
- - 44.1.1 [1.19.3] Hotfix missing null check in createUnbakedItemElements (#9285)
- - 44.1.0 Mark 1.19.3 Recommended Build
-
-44.0
-====
- - 44.0.49 [1.19.3] Allow Item and Elements models to specify static color, sky light, and block light values. (#9106)
- - 44.0.48 Fix StemBlock not checking canSustainPlant for the correct block, it now checks for Melons/Pumpkins instead of the stem itself. (#9270)
- - 44.0.47 Add github shared actions for automation purposes. (#9251)
- - 44.0.46 Add translate key for Forge pack.mcmeta description (#9260)
- - 44.0.45 Fix broken link for update checker docs in mdk (#9271)
- - 44.0.44 Remove duplicate updateNeighbourForOutputSignal call Fixes #9169 (#9234)
- - 44.0.43 Add helper methods to access the set of loaded sprite locations (#9223)
- - 44.0.42 Disable guiLight3d for generated item models (#9230)
- - 44.0.41 Remove resource caching (#9254)
- - 44.0.40 Add TradeWithVillagerEvent (#9244)
- - 44.0.39 Update link for Parchment "Getting Started" (#9243)
- - 44.0.38 Allows DatapackBuiltinEntriesProvider to datagen LevelStems (#9247)
- - 44.0.37 Add a method to LootContext.Builder that allows changing the queried loot table id (#9084)
- - 44.0.36 [1.19.3] Fix Datagen Tests and Providers (#9212)
- - 44.0.35 Fix concrete powder not being hydrated by singular water sources (#9236)
- - 44.0.34 [1.19.3] Fix LootTableLoadEvent not getting fired (#9239)
- - 44.0.33 Allow using custom factories in button builders (#9238)
- - 44.0.32 Fix logspam when a root resource is requested from DelegatingPackResources, fixes #9197 (#9227)
- - 44.0.31 [1.19.3] Fix `retrieveRegistryLookup` attempting to get the registry lookup from a `HolderGetter` (#9225)
- - 44.0.30 [1.19.3] Add ability to datagen forge specific values in pack.mcmeta (#9221)
- Co-authored-by: sciwhiz12
- - 44.0.29 Add block atlas config to register forge:white texture (#9187)
- - 44.0.28 Fix ExtendedButton not being highlighted when focused (#9144)
- - 44.0.27 Separate checkAndFix from the check* tasks. (#9213)
- - 44.0.26 Fix forge resources overriding vanilla ones (#9222)
- - 44.0.25 Fix tooltip customization not working for creative inventory (#9218)
- - 44.0.24 Fix glowing item frame entity's texture (#9126)
- Fixes #9123
- - 44.0.23 Fix datapack registries not being synced to clients (#9219)
- - 44.0.22 Fix creatives tabs rendering overlapping tabs if the selected tab isn't on the current page. (#9214)
- - 44.0.21 Fix `SidedInvWrapper` not accounting for vanilla stacking special cases in brewing stands and furnaces (#9189)
- - 44.0.20 Update to the latest JarJar. (#9217)
- - 44.0.19 Specify NetworkHooks#getEntitySpawningPacket Generic Return Type (#9220)
- - 44.0.18 Fix using a DeferredRegister on a non-forge wrapped registry. Closes #9199
- - 44.0.17 Add support for custom CreativeModeTab implementations (#9210)
- - 44.0.16 Simplify tree grower patches (#9209)
- - 44.0.15 Replace AdvancementProvider patch with Forge helper (#9188)
- - 44.0.14 Allow using `PackOutput`s in Forge-added datagen classes (#9182)
- - 44.0.13 Add simpleBlockWithItem for data gens (#9170)
- - 44.0.12 Fix running test mods (#9211)
- - 44.0.11 [1.19.3] Fix models nested in custom geometries not resolving parents (#9200)
- - 44.0.10 Fix OBJ Loader caches not being thread-safe. (#9204)
- - 44.0.9 [1.19.3] Add event before baked models are cached by the BlockModelShaper (#9190)
- - 44.0.8 Fix compatibility checker task configuration (#9202)
- - 44.0.7 Fix chat offset (#9184)
- - 44.0.6 Redesign CreativeTab collection event to be a lot more straight forward. (#9198)
- - 44.0.5 Move ICondition patch placement to before MC throws an error.
- Disable the explicitly erroring test biome modifier.
- - 44.0.4 Fix BlockStateProvider not waiting for models before finishing. (#9196) Fixes #9195:
- - 44.0.3 Fix tooltips not rendering on screens. Closes #9191
- - 44.0.2 Fix merged mod resource pack not returning all resources with the same name when asked. Closes #9194
- - 44.0.1 Fix searching using the wrong prefix for items or tags. Fixes #9176 Fixes #9179 (#9177)
- - 44.0.0 Forge 1.19.3
- Created a CreativeModeTabEvent to register creative mode tabs and populate entries per tab
- Moved datapack registries to DataPackRegistryEvent.NewRegistry event instead of tying them to ForgeRegistry
- Made it easier for mods to datagen datapack builtin entries with DatapackBuiltinEntriesProvider
- Provided access to lookupProvider for datagen
- Updated dependencies to match versions used by vanilla and update JarJar to 0.3.18
- Added a test mod for the new CreativeModeTabEvent
- Throws better error message for Forge registries in tag datagen
- Deleted ForgeRegistryTagsProvider
- Updated ClientChatReceivedEvent and ServerChatEvent for Mojang changes
- Added patches for both sign related methods in ModelLayers
- Changed RegisterShadersEvent to use ResourceProvider
- Migrated old Mojang math types to JOML
- Co-authored-by: Marc Hermans
- Co-authored-by: LexManos
- Co-authored-by: sciwhiz12
- Co-authored-by: coehlrich
-
-43.2
-====
- - 43.2.0 43.2 Recommended Build.
-
-43.1
-====
- - 43.1.65 Allow discovering services from the mods folder that use java's modular definition. (#9143)
- - 43.1.64 Make Datapack Registries support ICondition(s) (#9113)
- - 43.1.63 Enable additional build types to handle pull request validation. (#9159)
- - 43.1.62 Check source permission level before selector permission (#9147)
- In some situations, such as execution of a function by an advancement as
- part of its reward, a command source stack may have a backing source of
- a ServerPlayer which may lack the entity selector permission and have an
- explicit permission level that should allow the use of entity selectors,
- through CommandSourceStack#withPermission.
- We now check if the permission level of the command source stack is
- sufficient for entity selectors _before_ checking if the source is a
- player and if they have the requisite permission.
- This means that an operator permission level of 2 will always override
- the Forge entity selector permission.
- Fixes #9137
- - 43.1.61 Fix fires spreading too/igniting custom portal frames. (#9142)
- - 43.1.60 Add supplier to FlowerBlock so it works with custom MobEffects (#9139)
- - 43.1.59 Fix some logical bugs related to the Grindstone Event (#9089)
- - 43.1.58 Call baked model's `getModelData` before `getRenderTypes` (#9163)
- - 43.1.57 Make Util.memoize thread-safe (#9155)
- - 43.1.56 Rendering tweaks and fixes: Part 4 (#9065)
- - 43.1.55 Fix `Transformation` loading `PoseStack` (#9083)
- - 43.1.54 Add simple block appearance API (#9066)
- - 43.1.53 Fix invalidated modded packets when on LAN (#9157)
- - 43.1.52 Improve extensibility of DetectorRailBlock and PoweredRailBlock (#9130)
- - 43.1.51 Fix launch handler minecraft classpath locator (#9120)
- - 43.1.50 Add HitResult to `EntityTeleportEvent$EnderPearl` (#9135)
- - 43.1.49 Throw aggregate exception for erroneous registry event dispatch (#9111)
- This means that exceptions occurring during the dispatch of the registry
- events, such as those from the suppliers of RegistryObjects, properly
- cause a crash rather than merely being logged and allowing the game to
- reach the main menu.
- Fixes #8720
- - 43.1.48 Add missing semi-colon near the Dist import statement in example mod.
- - 43.1.47 Fix ClientModEvents example not subscribing to client-sided events (#9097)
- - 43.1.46 Use GitHub action to lock issues with the `spam` label (#9087)
- - 43.1.45 Remove structures slave map to Feature registry (#9091)
- - 43.1.44 Improve logging of missing or unsupported dependencies (#9104)
- - 43.1.43 [1.19.x] Fix ValueSpec caching the return value incorrectly (#9046)
- - 43.1.42 [1.19.x] Add event for registering spawn placements, and modifying existing (#9024)
- - 43.1.41 [1.19.x] Add event for items being stacked or swapped in a GUI. (#9050)
- - 43.1.40 [1.19.x] Fix PlayerInteractEvent.EntityInteractSpecific not cancelling on a server (#9079)
- - 43.1.39 Fix canceling phantom spawns preventing any further attempts that tick. (#9041)
- - 43.1.38 Rename fluid type milk translation keys (#9077)
- - 43.1.37 Fix minecart speed with water (#9076)
- - 43.1.36 Add a cancellable event that gets fired when a Totem of Undying is used (#9069)
- - 43.1.35 Fix performance issue and logging when resource caching is enabled (#9029)
- - 43.1.34 Fix NPE when feeding wolves and cats (#9074)
- - 43.1.33 Fix logically breaking change to ForgeConfigSpec.Builder#comment where modders could not add a empty line to the start of comments. (#9061)
- - 43.1.32 Fix ServiceLoader bug
- - 43.1.31 Fix ClientChatReceivedEvent for system messages
- - 43.1.30 Make ForgeConfigSpec$Builder.comment able to be called multiple times for the same entry. (#9056)
- - 43.1.29 Fix control modifier for mac with `KeyMapping`s using Alt instead of Super (#9057)
- - 43.1.28 Fix is_desert tag not being applied correctly. (#9051)
- - 43.1.27 Fix mob griefing event for SmallFireballs not using owner entity. (#9038)
- - 43.1.26 Fix minecarts on rails not properly slowing down in water (#9033)
- - 43.1.25 Change codestyle for BookShelves tag. Closes #9027
- Add IS_CAVE tag Closes #8885
- Add IS_DESERT tag Closes #8979
- Simplify Mangrove Swamp tags Closes #8980
- - 43.1.24 Allow faces of an "elements" model to have disabled ambient occlusion (#9019)
- - 43.1.23 [1.19.x] Recipe ID-based grouping between modded and vanilla recipes. (#8876)
- - 43.1.22 Update fence_gates/wooden (#8936)
- - 43.1.21 [1.19.x] Added event for growing fungus (#8981)
- - 43.1.20 Added Bookshelves block tag (#8991)
- - 43.1.19 Create a Forge EntityType Tag for Bosses (#9017)
- - 43.1.18 Allow mods to specify shader import namespace (#9021)
- - 43.1.17 Grindstone Events (#8934)
- One to modify the output, and one to modify the input.
- - 43.1.16 Fix the serialized names of the enum (#9014)
- - 43.1.15 Fix `tryEmptyContainerAndStow` duping fluids with stackable containers (#9004)
- - 43.1.14 Add mod mismatch event (#8989)
- - 43.1.13 [1.19.x] add methods with more context to tree growers (#8956)
- - 43.1.12 [1.19.X] Adding more precise events for Advancements (#8360)
- - 43.1.11 Default IItemHandler capability for shulker box itemstacks (#8827)
- Co-authored-by: LexManos
- - 43.1.10 [1.19] Add hook for items to remain in the hotbar when picking blocks/entities (#8872)
- - 43.1.9 [1.19.x] Block Model Builder Root Transform Support (#8860)
- Co-authored-by: sciwhiz12
- - 43.1.8 [1.19.x] Make LivingSetAttackTargetEvent compatible with the Brain/Behavior system. (Port of PR #8918) (#8954)
- - 43.1.7 [1.19.x] Add IForgeBlock#onTreeGrow to replace IForgeBlock#onPlantGrow from 1.16 (#8999)
- - 43.1.6 [1.19.x] Moved Player.resetAttackStrengthTicker() to the end of Player.attack() (#9000)
- - 43.1.5 fix misplaced patch in sapling block (#9005)
- - 43.1.4 Fix failed entity interactions consuming the click. (#9007)
- - 43.1.3 Fix entity selector permission check to check original source (#8995)
- Permission checks should be against the command source and not the
- target entity, as is done in vanilla.
- Fixes #8994
- - 43.1.2 Hotfix for 1.19.2 item animation bug (#8987)
- * [HOT FIX]: Fixes #8985 by no-oping for vanilla models instead of throwing error
- - 43.1.1 Add ability to Auto register capabilities via annotation (#8972)
- - 43.1.0 1.19.2 RB
-
-43.0
-====
- - 43.0.22 Added ItemDecorator API (#8794)
- - 43.0.21 [1.19.x] Custom usage animations for items (#8932)
- - 43.0.20 Allow registering custom `ColorResolver`s (#8880)
- - 43.0.19 [1.19] Allow custom outline rendering on EntityRenderers and BlockEntityRenderers (#8938)
- - 43.0.18 Redirect checks for entity selector use to a permission (#8947)
- This allows greater flexibility for configuring servers with
- operator-like permissions to user groups through the permissions API and
- their permissions handler of choice without needing to grant the
- vanilla operator permission to any player.
- The new permission is "forge:use_entity_selectors", which is granted by
- default to players with permission level 2 (GAMEMASTERS) and above.
- The hook falls back to checking the permission level if the source of
- the command is not a ServerPlayer, such as for command blocks and
- functions.
- - 43.0.17 Allow FakePlayer to report its position (#8963)
- - 43.0.16 Add alternate version of renderEntityInInventory to allow for directly specifying the angles (#8961)
- - 43.0.15 Add cancellable ToastAddEvent (#8952)
- - 43.0.14 Modify ScreenEvent.RenderInventoryMobEffects to allow moving the effect stack left or right (#8951)
- - 43.0.13 Fix Enchantment#doPostHurt and Enchantment#doPostAttack being called twice for players. Fixes MC-248272 (#8948)
- - 43.0.12 Remove reflective implementation of ICustomPacket. (#8973)
- Make vanilla custom packets able to be sent multiple times. Closes #8969
- - 43.0.11 Filter name spaces to directories only. Closes #8413
- - 43.0.10 Fix a corner case where the UMLB can not extract a version from a library. (#8967)
- - 43.0.9 Fix worlds with removed dimension types unable to load. (#8959) Closes #8800
- - 43.0.8 Fix issue where unknown chunk generators would cause DFU to fail. (#8957)
- - 43.0.7 Fix comments and documentation that were missed during the review of #8712 (#8945)
- - 43.0.6 Make AnvilUpdateEvent fire even if the second input is empty, which means it fires even if only changing the item name. (#8905)
- - 43.0.5 Fix `LivingEntity#isBlocking` to use `ToolActions#SHIELD_BLOCK` instead of `UseAnim#BLOCK` (#8933)
- - 43.0.4 Add Custom HolderSet Types allowing for logical combining of sets. (#8928)
- - 43.0.3 Add values to VersionSupportMatrix to support loading mods that restrict versions to 1.19.1 on 1.19.2 (#8946)
- - 43.0.2 Fix certain particles not updating their bounding box when their position changes (#8925)
- - 43.0.1 Update EventBus to address concurrency issue in ModLauncher Factory. Closes #8924
- - 43.0.0 1.19.2
-
-42.0
-====
- - 42.0.9 Remove calls to getStepHeight in Player#maybeBackOffFromEdge (#8927)
- - 42.0.8 Add forge tags for tools and armors, these DO NOT replace ToolActions, and are designed just for Recipes. (#8914)
- - 42.0.7 Add Biomes.BEACH to Tags (#8892)
- - 42.0.6 Let NetworkInstance.isRemotePresent check minecraft:register for channel IDs. (#8921)
- - 42.0.5 Add an event for when the chunk ticket level is updated (#8909)
- - 42.0.4 Re-add PotentialSpawns event (#8712)
- - 42.0.3 Fix misplaced patch in ItemEntityRenderer breaking ItemEntityRenderer#shouldBob() (#8919)
- - 42.0.2 [1.19] [HotFix] Fix the dedicated server not having access to the JiJ filesystems. (#8931)
- - 42.0.1 Match Mojang's action bar fix for MC-72687 (#8917)
- - 42.0.0 Forge 1.19.1
- Load natives from classpath
- Make command argument types a forge registry
- Add `EntityMobGriefingEvent` to `Allay#wantsToPickUp`
- Overhaul `ServerChatEvent` to use `ChatDecorator` system
- Remove `ClientChatEvent#setMessage` for now
- Gradle 7.5
-
-41.1
-====
- - 41.1.0 Mark 1.19 RB
-
-41.0
-====
- - 41.0.113 Allow faces of an "elements" model to be made emissive (#8890)
- - 41.0.112 Fix invalid channel names sent from the server causing the network thread to error. (#8902)
- - 41.0.111 Fix PlayerEvent.BreakSpeed using magic block position to signify invalid position. Closes #8906
- - 41.0.110 Fix cases where URIs would not work properly with JarInJar (#8900)
- - 41.0.109 Add new hook to allow modification of lightmap via Dimension special effects (#8863)
- - 41.0.108 Fix Forge's packet handling on play messages. (#8875)
- - 41.0.107 Add API for tab list header/footer (#8803)
- - 41.0.106 Allow modded blocks overriding canStickTo prevent sticking to vanilla blocks/other modded blocks (#8837)
- - 41.0.105 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 3 (#8864)
- Fix weighted baked models not respecting children render types
- Allow fluid container model to use base texture as particle
- Fix inverted behavior in composite model building. Fixes #8871
- - 41.0.104 Fix crossbows not firing ArrowLooseEvent (#8887)
- - 41.0.103 Add User-Agent header to requests made by the update checker (#8881)
- Format: Java-http-client/ MinecraftForge/ /
- - 41.0.102 Output the full path in a crash report so it is easier to find the outer mod when a crash in Jar-In-Jar occurs. (#8856)
- - 41.0.101 Clean up the pick item ("middle mouse click") patches (#8870)
- - 41.0.100 [1.19.x] Hotfix for test mods while the refactor is ongoing
- - 41.0.99 add event to SugarCaneBlock (#8877)
- - 41.0.98 Fix Global Loot Modifiers not using Dispatch Codec (#8859)
- - 41.0.97 Allow block render types to be set in datagen (#8852)
- - 41.0.96 Fix renderBreakingTexture not using the target's model data (#8849)
- - 41.0.95 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 2 (#8854)
- * Add getter for the component names in an unbaked geometry
- * Fix render type hint not being copied in BlockGeometryBakingContext
- * Ensure BlockRenderDispatches's renderSingleBlock uses the correct buffer
- - 41.0.94 [1.19.x] Apply general renames, A SRG is provided for modders. (#8840)
- See https://gist.github.com/SizableShrimp/882a671ff74256d150776da08c89ef72
- - 41.0.93 Fix mob block breaking AI not working correctly when chunk 0,0 is unloaded. Closes #8853
- - 41.0.92 Fix crash when breaking blocks with multipart models and remove caching. Closes #8850
- - 41.0.91 Fixed `CompositeModel.Baked.Builder.build()` passing arguments in the wrong order (#8846)
- - 41.0.90 Make cutout mipmaps explicitly opt-in for item/entity rendering (#8845)
- * Make cutout mipmaps explicitly opt-in for item/entity rendering
- * Default render type domain to "minecraft" in model datagens
- - 41.0.89 Fixed multipart block models not using the new model driven render type system. (#8844)
- - 41.0.88 Update to the latest JarJar to fix a collision issue where multiple jars could provide an exact match. (#8847)
- - 41.0.87 Add FML config to disable DFU optimizations client-side. (#8842)
- * Add client-side command line argument to disable DFU optimizations.
- * Switch to using FMLConfig value instead.
- - 41.0.86 [1.19] Fixed broken BufferBuilder.putBulkData(ByteBuffer) added by Forge (#8819)
- * Fixes BufferBuilder.putBulkData(ByteBuffer)
- * use nextElementByte
- * Fixed merge conflict
- - 41.0.85 [1.19.x] Fix shulker boxes allowing input of items, that return false for Item#canFitInsideContainerItems, through hoppers. (#8823)
- * Make ShulkerBoxBlockEntity#canPlaceItemThroughFace delegate to Item#canFitInsideContainerItems.
- * Switch to using Or and add comment.
- * Switch Or to And.
- - 41.0.84 [1.19.x] Added RenderLevelStageEvent to replace RenderLevelLastEvent (#8820)
- * Ported RenderLevelStageEvent from 1.18.2
- * Updated to fix merge conflicts
- - 41.0.83 [1.19.x] Fix door datagenerator (#8821)
- * Fix door datagenerator
- Fix datagenerator for door blocks. Successor to #8687, addresses comments made there about statement complexity.
- * Fix extra space around parameter
- Fix extra space before comma around a parameter.
- - 41.0.82 Create PieceBeardifierModifier to re-enable piecewise beardifier definitions (#8798)
- - 41.0.81 Allow blocks to provide a dynamic MaterialColor for display on maps (#8812)
- - 41.0.80 [1.19.x] BiomeTags Fixes/Improvements (#8711)
- * dimension specific tag fix
- * remove forge:is_beach cause vanilla has it already
- * remove forge tags for new 1.19 vanilla tags (savanna, beach, overworld, end)
- Co-authored-by: Flemmli97
- - 41.0.79 1.19 - Remove GlobalLootModifierSerializer and move to Codecs (#8721)
- * convert GLM serializer class to codec
- * cleanup
- * GLM list needs to be sorted
- * datagen
- * simplify serialization
- * fix test mods (oops)
- * properly use suppliers for codec as they are registry obj
- - 41.0.78 Implement item hooks for potions and enchantments (#8718)
- * Implement item hooks for potions and enchantments
- * code style fixes
- - 41.0.77 Re-apply missing patch to ServerLevel.EntityCallbacks#onTrackingEnd() (#8828)
- - 41.0.76 Double Bar Rendering fixed (#8806) (#8807)
- * Double Bar Rendering fixed (#8806)
- * Added requested changes by sciwhiz12
- - 41.0.75 Multiple tweaks and fixes to the recent changes in the client refactor PR (#8836)
- * Add an easy way to get the NamedGuiOverlay from a vanilla overlay
- * Fix static member ordering crash in UnitTextureAtlasSprite
- * Allow boss bar rendering to be cancelled
- * Make fluid container datagen use the new name
- - 41.0.74 Add FogMode to ViewportEvent.RenderFog (#8825)
- - 41.0.73 Provide additional context to the getFieldOfView event (#8830)
- - 41.0.72 Pass renderType to IForgeBakedModel.useAmbientOcclusion (#8834)
- - 41.0.71 Load custom ITransformationServices from the classpath in dev (#8818)
- * Add a classpath transformer discoverer to load custom transformation services from the classpath
- * Update ClasspathTransformerDiscoverer to 1.18
- * Update license year
- * Update license header
- * Fix the other license headers
- * Update ClasspathTransformerDiscoverer to 1.19
- - 41.0.70 Handle modded packets on the network thread (#8703)
- * Handle modded packets on the network thread
- - On the server we simply need to remove the call to
- ensureRunningOnSameThread.
- - On the client side, we now handle the packet at the very start of the
- call. We make sure we're running from a network thread to prevent
- calling the handling code twice.
- While this does mean we no longer call .release(), in practice this
- doesn't cause any leaks as ClientboundCustomPayloadPacket releases
- for us.
- * Clarify behaviour a little in the documentation
- * Javadoc formatting
- * Add a helper method for handling packets on the main thread
- Also rename the network thread one. Should make it clearer the expected
- behaviour of the two, and make it clearer there's a potentially breaking
- change.
- * Add back consumer() methods
- Also document EventNetworkChannel, to clarify the thread behaviour
- there.
- * Add since = "1.19" to deprecated annotations
- - 41.0.69 Cache resource listing calls in resource packs (#8829)
- * Make the resource lookups cached.
- * Include configurability and handle patch cleanup.
- * Document and comment the cache manager.
- * Make thread selection configurable.
- * Implement a configurable loading mechanic that falls back to default behaviour when the config is not bound yet.
- * Use boolean supplier and fix wildcard import.
- * Clean up the VPR since this is more elegant.
- * Clean up the VPR since this is more elegant.
- * Address review comments.
- * Address more review comments.
- * Fix formatting on `getSource`
- * Address comments by ichtt
- * Adapt to pups requests.
- * Stupid idea.
- * Attempt this again with a copy on write list.
- * Fix a concurrency and loading issue.
- * Fix #8813
- Checks if the paths are valid resource paths.
- * Move the new methods on vanilla Patch.
- - 41.0.68 Update SJH and JIJ
- - 41.0.67 Fix #8833 (#8835)
- - 41.0.66 Fix backwards fabulous check in SimpleBakedModel (#8832)
- Yet another blunder we missed during the review of #8786.
- - 41.0.65 Make texture atlas in StandaloneGeometryBakingContext configurable (#8831)
- - 41.0.64 [1.19.X] Client code cleanup, updates, and other refactors (#8786)
- * Revert "Allow safely registering RenderType predicates at any time (#8685)"
- This reverts commit be7275443fd939db9c58bcad47079c3767789ac1.
- * Renderable API refactors
- - Rename "render values" to "context"
- - Rename SimpleRenderable to CompositeRenderable to better reflect its use
- - Remove IMultipartRenderValues since it doesn't have any real use
- - Add extensive customization options to BakedModelRenderable
- * ClientRegistry and MinecraftForgeClient refactors
- - Add sprite loader manager and registration event
- - Add spectator shader manager and registration event
- - Add client tooltip factory manager and registration event
- - Add recipe book manager and registration event
- - Add key mapping registration event
- - Remove ClientRegistry, as everything has been moved out of it
- - Remove registration methods from MinecraftForgeClient, as they have dedicated events now
- * Dimension special effects refactors
- - Fold handlers into an extension class and remove public mutable fields
- - Add dimension special effects manager and registration event
- * HUD overlay refactors
- - Rename to IGuiOverlay match vanilla (instead of Ingame)
- - Add overlay manager and registration event
- - Move vanilla overlays to a standalone enum
- * Model loader refactors
- - Rename IModelLoader to IGeometryLoader
- - Add loader manager and registration event
- - Fold all model events into one
- - Move registration of additionally loaded models to an event
- - Remove ForgeModelBakery and related classes as they served no purpose anymore
- * Render properties refactors
- - Rename all render properties to client extensions and relocate accordingly
- - Move lookups to the respective interfaces
- * Model data refactors
- - Convert model data to a final class backed by an immutable map and document mutability requirements. This addresses several thread-safety issues in the current implementation which could result in race conditions
- - Transfer ownership of the data manager to the client level. This addresses several issues that arise when multiple levels are used at once
- * GUI and widget refactors
- - Move all widgets to the correct package
- - Rename GuiUtils and children to match vanilla naming
- * New vertex pipeline API
- - Move to vanilla's VertexConsumer
- - Roll back recent PR making VertexConsumer format-aware. This is the opposite of what vanilla does, and should not be relevant with the updated lighting pipeline
- * Lighting pipeline refactors
- - Move to dedicated lighting package
- - Separate flat and smooth lighters
- - Convert from a vertex pipeline transformer to a pure vertex source (input is baked quads)
- * Model geometry API refactors
- - Rename IModelGeometry to IUnbakedGeometry
- - Rename IModelConfiguration to IGeometryBakingContext
- - Rename other elements to match vanilla naming
- - Remove current changes to ModelState, as they do not belong there. Transforms should be specified through vanilla's system. ModelState is intended to transfer state from the blockstate JSON
- - Remove multipart geometries and geometry parts. After some discussion, these should not be exposed. Instead, geometries should be baked with only the necessary parts enabled
- * Make render types a first-class citizen in baked models
- - Add named render types (block + entity + fabulous entity)
- - Add named render type manager + registration event
- - Make BakedModel aware of render types and transfer control over which ones are used to it instead of ItemBlockRenderTypes (fallback)
- - (additional) Add concatenated list view. A wrapper for multiple lists that iterates through them in order without the cost of merging them. Useful for merging lists of baked quads
- * General event refactors
- - Several renames to either match vanilla or improve clarity
- - Relocate client chat event dispatching out of common code
- * Forge model type refactors
- - Rename SeparatePerspectiveModel to SeparateTransformsModel
- - Rename ItemModelMesherForge to ForgeItemModelShaper
- - Rename DynamicBucketModel to DynamicFluidContainerModel
- - Prefix all OBJ-related classes with "Obj" and decouple parsing from construction
- - Extract ElementsModel from model loader registry
- - Add EmptyModel (baked, unbaked and loader)
- - Refactor CompositeModel to take over ItemMultiLayerBakedModel
- - Remove FluidModel as it's not used and isn't compatible with the new fluid rendering in modern versions
- - Move model loader registration to a proper event handler
- - Update names of several JSON fields (backwards-compatible)
- - Update datagens to match
- * Miscellaneous changes and overlapping patches
- - Dispatch all new registration events
- - Convert ExtendedServerListData to a record
- - Add/remove hooks from ForgeHooksClient as necessary
- * Update test mods
- * Fix VertexConsumerWrapper returning parent instead of itself
- * Additional event cleanup pass
- As discussed on Discord:
- - Remove "@hidden" and "@see " javadoc annotations from all client events and replace them with @ApiStatus.Internal annotation
- - Make all events that shouldn't be fired directly into abstract classes with protected constructors
- - Another styling pass, just in case (caught some missed classes)
- * Add proper deprecation javadocs and de-dupe some vertex consumer code
- * Replace sets of chunk render types with a faster BitSet-backed collection
- This largely addresses potential performance concerns that using a plain HashSet might involve by making lookups and iteration as linear as they can likely be (aside from using a plain byte/int/long for bit storage). Further performance concerns related to the implementation may be addressed separately, as all the implementation details are hidden from the end user
- * Requested changes
- - Remove MinecraftForgeClient and move members to Minecraft, IForgeMinecraft and StencilManager
- - Allow non-default elements to be passed into VertexConsumer and add support to derived classes
- - Move array instantiation out of quad processing in lighting pipeline
- - Fix flipped fluid container model
- - Set default UV1 to the correct values in the remapping pipeline
- - Minor documentation changes
- * Add/update EXC entries and fix AT comment
- * Add test mod as per Orion's request
- * Additional requested changes
- * Allow custom model types to request the particle texture to be loaded
- * Even more requested changes
- * Improve generics in ConcatenatedListView and add missing fallbacks
- * Fix fluid render types being bound to the fluid and not its holder
- * Remove non-contractual nullability in ChunkRenderTypeSet and add isEmpty
- Additionally, introduce chunk render type checks in ItemBlockRenderTypes
- Co-authored-by: Dennis C
- - 41.0.63 Implement full support for IPv6 (#8742)
- - 41.0.62 Fix certain user-configured options being overwritten incorrectly due to validators. (#8780)
- - 41.0.61 Allow safely registering RenderType predicates at any time (#8685)
- - 41.0.60 Fix crash after loading error due to fluid texture gathering and config lookup (#8802)
- - 41.0.59 Remove the configuration option for handling empty tags in ingredients. (#8799)
- Now empty tags are considered broken in all states.
- - 41.0.58 Fix MC-105317 Structure blocks do not rotate entities correctly when loading (#8792)
- - 41.0.57 Fire ChunkWatchEvents after sending packets (#8747)
- - 41.0.56 Add item handler capability to chest boats (#8787)
- - 41.0.55 Add getter for correct BiomeSpecialEffectsBuilder to BiomeInfo$Builder (#8781)
- - 41.0.54 Fix BlockToolModificationEvent missing cancelable annotation (#8778)
- - 41.0.53 Fix ticking chunk tickets from forge's chunk manager not causing chunks to fully tick (#8775)
- - 41.0.52 Fix default audio device config loading string comparison issue (#8767)
- - 41.0.51 Fix missed vanilla method overrides in ForgeRegistry (#8766)
- - 41.0.50 Add MinecraftServer reference to ServerTickEvent (#8765)
- - 41.0.49 Fix TagsProviders for datapack registries not recognizing existing files (#8761)
- - 41.0.48 Add callback after a BlockState was changed and the neighbors were updated (#8686)
- - 41.0.47 Add biome tag entries for 1.19 biomes (#8684)
- - 41.0.46 Make fishing rods use tool actions for relevant logic (#8681)
- - 41.0.45 Update BootstrapLauncher to 1.1.1 and remove the forced
- merge of text2speech since new BSL does it.
- - 41.0.44 Merge text2speech libs together so the natives are part of the jar
- - 41.0.43 Make Forge ConfigValues implement Supplier. (#8776)
- - 41.0.42 Fix merge derp in AbstractModProvider and logic derp in ModDiscoverer
- - 41.0.41 Add "send to mods in order" method to ModList and use it (#8759)
- * Add "send to mods in order" method to ModList and use it in RegistryEvents and DataGen..
- * Also preserve order in runAll
- * Do better comparator thanks @pupnewfster
- * postEvent as well.
- - 41.0.40 Update SJH to 2.0.2.. (#8774)
- * Update SJH to 2.0.3..
- - 41.0.39 Sanity check the version specified in the mod file (#8749)
- * Sanity check the version specified in the mod file to
- make sure it's compatible with JPMS standards for
- version strings.
- Closes #8748
- Requires SPI 6
- - 41.0.38 Fix SP-Devtime world loading crash due to missing server configs (#8757)
- - 41.0.37 Remove ForgeWorldPreset and related code (#8756)
- Vanilla has a working replacement.
- - 41.0.36 Change ConfigValue#get() to throw if called before config loaded (#8236)
- This prevents silent issues where a mod gets the value of the setting
- before configs are loaded, which means the default value is always
- returned.
- As there may be situations where the getting the config setting before
- configs are loaded is needed, and it is not preferable to hardcode the
- default value, the original behavior is made available through #getRaw.
- Implements and closes #7716
- * Remove getRaw() method
- This is effectively replaced with the expression `spec.isLoaded() ?
- configValue.get() : configValue.getDefault()`.
- * Remove forceSystemNanoTime config setting
- As implemented, it never had any effect as any place where the config
- value would be queried happens before the configs are loaded.
- - 41.0.35 Fix EnumArgument to use enum names for suggestions (#8728)
- Previously, the suggestions used the string representation of the enum
- through Enum#toString, which can differ from the name of the enum as
- required by Enum#valueOf, causing invalid suggestions (both in gui and
- through the error message).
- - 41.0.34 Jar-In-Jar (#8715)
- - 41.0.33 [1.19] Fix data-gen output path of custom data-pack registries (#8724)
- - 41.0.32 Fix player dive and surface animations in custom fluids (#8738)
- - 41.0.31 [1.19.x] Affect ItemEntity Motion in Custom Fluids (#8737)
- - 41.0.30 [1.19] Add support for items to add enchantments without setting them in NBT (#8719)
- - 41.0.29 [1.19.x] Add stock biome modifier types for adding features and spawns (#8697)
- - 41.0.28 [1.19.x] Fluid API Overhaul (#8695)
- - 41.0.27 Replace StructureSpawnListGatherEvent with StructureModifiers (#8717)
- - 41.0.26 Use stack sensitive translation key by default for FluidAttributes. (#8707)
- - 41.0.25 Delete LootItemRandomChanceCondition which added looting bonus enchantment incorrectly. (#8733)
- - 41.0.24 Update EventBus to 6.0, ModLauncher to 10.0.1 and BootstrapLauncher to 1.1 (#8725)
- - 41.0.23 Replace support bot with support action (#8700)
- - 41.0.22 Fix Reach Distance / Attack Range being clamped at 6.0 (#8699)
- - 41.0.21 [1.19.x] Fix mods' worldgen data not being loaded when creating new singleplayer worlds (#8693)
- - 41.0.20 [1.19.x] Fix experimental confirmation screen (#8727)
- - 41.0.19 Move is_mountain to forge's tag instead of vanilla's (#8726)
- - 41.0.18 [1.19.x] Add CommandBuildContext to Register Command Events (#8716)
- - 41.0.17 Only rewrite datagen cache when needed (#8709)
- - 41.0.16 Implement a simple feature system for Forge (#8670)
- * Implement a simple feature system for Forge. Allows mods to demand certain features are available in the loading system. An example for java_version is provided, but not expected to be used widely. This is more targeted to properties of the display, such as GL version and glsl profile.
- Requires https://github.com/MinecraftForge/ForgeSPI/pull/13 to be merged first in ForgeSPI, and the SPI to be updated appropriately in build.gradle files.
- * rebase onto 1.19 and add in SPI update
- - 41.0.15 displayTest option in mods.toml (#8656)
- * displayTest option in mods.toml
- * "MATCH_VERSION" (or none) is existing match version string behaviour
- * "IGNORE_SERVER_VERSION" accepts anything and sends special SERVERONLY string
- * "IGNORE_ALL_VERSION" accepts anything and sends an empty string
- * "NONE" allows the mod to supply their own displaytest using the IExtensionPoint mechanism.
- * Update display test with feedback and added the mods.toml discussion in mdk.
- - 41.0.14 Update forgeSPI to v5 (#8696)
- - 41.0.13 Make IVertexConsumers such as the lighting pipeline, be aware of which format they are dealing with. (#8692)
- Also fix Lighting pipeline ignoring the overlay coords from the block renderer.
- - 41.0.12 Fixed misaligned patch to invalidateCaps in Entity (#8705)
- - 41.0.11 Fix readAdditionalLevelSaveData (#8704)
- - 41.0.10 Fixes setPos to syncPacketPositionCodec (#8702)
- - 41.0.9 Fix wrong param passed to PlayLevelSoundEvent.AtEntity (#8688)
- - 41.0.8 Override initialize in SlotItemHandler, so it uses the itemhandler instead of container (#8679)
- - 41.0.7 Update MDK for 1.19 changes (#8675)
- - 41.0.6 Add helper to RecipeType, and fix eclipse compiler error in test class.
- - 41.0.5 Update modlauncher to latest (#8691)
- - 41.0.4 Fix getting entity data serializer id crashing due to improper port to new registry system (#8678)
- - 41.0.3 Fire registry events in the order vanilla registers to registries (#8677)
- Custom registries are still fired in alphabetical order, after all vanilla registries.
- Move forge's data_serializers registry to forge namespace.
- - 41.0.2 Add method with pre/post wrap to allow setting/clearing mod context. (#8682)
- Fixes ActiveContainer in ModContext not being present in registry events. Closes #8680
- - 41.0.1 Fix the Curlie oopsie
- - 41.0.0 Forge 1.19
- * Bump pack.mcmeta formats
- * 1.19 biome modifiers
- * Mark ClientPlayerNetworkEvent.LoggedOutEvent's getters as nullable
- * Add docs and package-info to client extension interfaces package
- * Move RenderBlockOverlayEvent hooks to ForgeHooksClient
- * Add package-infos to client events package
- * Rename SoundLoadEvent to SoundEngineLoadEvent
- This reduces confusion from consumers which may think the
- name SoundLoadEvent refers to an individual sound being loaded rather
- than the sound engine.
- * Document and change SoundLoadEvent to fire on mod bus
- Previously, it fired on both the mod bus and the Forge bus, which is
- confusing for consumers.
- * Delete SoundSetupEvent
- Looking at its original implementation shows that there isn't an
- appropriate place in the new sound code to reinsert the event, and the
- place of 'sound engine/manager initialization event' is taken already by SoundLoadEvent.
- * Perform some cleanup on client events
- - Removed nullable annotations from ClientPlayerNetworkEvent
- - Renamed #getPartialTicks methods to #getPartialTick, to be consistent
- with vanilla's naming of the partial tick
- - Cleanup documentation to remove line breaks, use the
- spelling 'cancelled' over
- 'canceled', and improve docs on existing and
- new methods.
- * Remove EntityEvent.CanUpdate
- Closes MinecraftForge/MinecraftForge#6394
- * Switch to Jetbrains nullability annotations
- * New PlayLevelSoundEvent; replaces old PlaySoundAtEntityEvent
- * Remove ForgeWorldPresetScreens
- * Remove IForgeRegistryEntry
- * Remove use of List in FML's CompletableFutures
- * Add docs to mod loading stages, stages, and phases
- * Gradle 7.4.2
- * Use SLF4J in FMLLoader and other subprojects
- * Switch dynamic versions in subprojects to pinned ones
- * Switch ForgeRoot and MDK to FG plugin markers
- * Configure Forge javadoc task
- The task now uses a custom stylesheet with MCForge elements, and
- configured to combine the generation from the four FML subprojects
- (fmlloader, fmlcore, javafmllanguage, mclanguage) and the Forge project
- into the javadoc output.
- * Update docs/md files, for 1.19 update and the move away from IRC to Discord.
- * Make "Potentially dangerous alternative prefix" a debug warning, not info.
- Co-authored-by: Curle
- Co-authored-by: sciwhiz12
-
diff --git a/gradle.properties b/gradle.properties
index 58fc638d..f859164e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,15 +3,61 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
-# Minecraft Info
-mc_version = 1.19.4
-# Mod Info
-mod_id = sgjourney
-mod_name = Stargate Journey
-mod_authors = Povstalec (A.K.A. Woldericz_Junior)
-mod_version = 0.6.5
+## Environment Properties
+
+# The Minecraft version must agree with the Forge version to get a valid artifact
+minecraft_version=1.20.1
+# The Minecraft version range can use any release version of Minecraft as bounds.
+# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
+# as they do not follow standard versioning conventions.
+minecraft_version_range=[1.20.1,1.21)
+# The Forge version must agree with the Minecraft version to get a valid artifact
+forge_version=47.1.0
+# The Forge version range can use any version of Forge as bounds or match the loader version range
+forge_version_range=[47,)
+# The loader version range can only use the major version of Forge/FML as bounds
+loader_version_range=[47,)
+# The mapping channel to use for mappings.
+# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
+# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
+#
+# | Channel | Version | |
+# |-----------|----------------------|--------------------------------------------------------------------------------|
+# | official | MCVersion | Official field/method names from Mojang mapping files |
+# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official |
+#
+# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
+# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
+#
+# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge.
+# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started
+mapping_channel=official
+# The mapping version to query from the mapping channel.
+# This must match the format required by the mapping channel.
+mapping_version=1.20.1
+
+
+## Mod Properties
+
+# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
+# Must match the String constant located in the main mod class annotated with @Mod.
+mod_id=sgjourney
+# The human-readable display name for the mod.
+mod_name=Stargate Journey
+# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
+mod_license=Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License
+# The mod version. See https://semver.org/
+mod_version=0.6.6
+# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
+# This should match the base package used for the mod sources.
+# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
+mod_group_id=net.povstalec.sgjourney
+# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
+mod_authors=Povstalec
+# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
+mod_description=Stargate in Minecraft! And much more.
+
# Dependency Info
-cct_version = 1.105.0
-jei_version = 12.1.1.13
\ No newline at end of file
+cct_version = 1.107.0
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 249e5832..943f0cbf 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661e..37aef8d3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index a69d9cb6..65dcd68d 100644
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (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.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
esac
done
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
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.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | 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" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
diff --git a/gradlew.bat b/gradlew.bat
index f127cfd4..93e3f59f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
diff --git a/settings.gradle b/settings.gradle
index 3703f364..291d399d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,13 @@
pluginManagement {
repositories {
gradlePluginPortal()
- maven { url = 'https://maven.minecraftforge.net/' }
+ maven {
+ name = 'MinecraftForge'
+ url = 'https://maven.minecraftforge.net/'
+ }
}
+}
+
+plugins {
+ id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
}
\ No newline at end of file
diff --git a/src/main/java/net/povstalec/sgjourney/StargateJourney.java b/src/main/java/net/povstalec/sgjourney/StargateJourney.java
index 57e9a34b..dcd8c1b2 100644
--- a/src/main/java/net/povstalec/sgjourney/StargateJourney.java
+++ b/src/main/java/net/povstalec/sgjourney/StargateJourney.java
@@ -104,6 +104,7 @@ public StargateJourney()
BiomeModifiers.register(eventBus);
EntityInit.register(eventBus);
SoundInit.register(eventBus);
+ TabInit.register(eventBus);
GalaxyInit.register(eventBus);
@@ -119,7 +120,6 @@ public StargateJourney()
eventBus.addListener(this::commonSetup);
eventBus.addListener(Layers::registerLayers);
- eventBus.addListener(TabInit::onRegisterModTabs);
eventBus.addListener(TabInit::addCreative);
ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, StargateJourneyConfig.CLIENT_CONFIG, "sgjourney-client.toml");
@@ -144,7 +144,7 @@ private void commonSetup(final FMLCommonSetupEvent event)
event.enqueueWork(() ->
{
PacketHandlerInit.register();
- VillagerInit.registerPOIs();
+ //VillagerInit.registerPOIs();
});
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/DHDBigButton.java b/src/main/java/net/povstalec/sgjourney/client/DHDBigButton.java
index 323683c6..9c1973a9 100644
--- a/src/main/java/net/povstalec/sgjourney/client/DHDBigButton.java
+++ b/src/main/java/net/povstalec/sgjourney/client/DHDBigButton.java
@@ -1,10 +1,10 @@
package net.povstalec.sgjourney.client;
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.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.network.chat.Component;
@@ -37,7 +37,7 @@ else if(p_93668_)
}
@Override
- public void render(PoseStack p_93676_, int x, int y, float p_93679_)
+ public void render(GuiGraphics graphics, int x, int y, float partialTick)
{
this.isHovered = x >= this.getX() && y >= this.getY() && x < this.getX() + this.width && y < this.getY() + this.height;
Minecraft minecraft = Minecraft.getInstance();
@@ -49,11 +49,11 @@ public void render(PoseStack p_93676_, int x, int y, float p_93679_)
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
RenderSystem.enableDepthTest();
- blit(p_93676_, this.getX(), this.getY(), 16, i * 32, this.width, this.height);
- blit(p_93676_, this.getX() + this.width / 2, this.getY(), 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
+ graphics.blit(WIDGETS_LOCATION, this.getX(), this.getY(), 16, i * 32, this.width, this.height);
+ graphics.blit(WIDGETS_LOCATION, this.getX() + this.width / 2, this.getY(), 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
//this.renderBg(p_93676_, minecraft, p_93677_, p_93678_);
int j = getFGColor();
- drawCenteredString(p_93676_, font, this.getMessage(), this.getX() + this.width / 2, this.getY() + (this.height - 8) / 2, j | Mth.ceil(this.alpha * 255.0F) << 24);
+ graphics.drawString(font, this.getMessage(), this.getX() + this.width / 2, this.getY() + (this.height - 8) / 2, j | Mth.ceil(this.alpha * 255.0F) << 24);
}
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/DHDButton.java b/src/main/java/net/povstalec/sgjourney/client/DHDButton.java
index 8da454a0..0940d759 100644
--- a/src/main/java/net/povstalec/sgjourney/client/DHDButton.java
+++ b/src/main/java/net/povstalec/sgjourney/client/DHDButton.java
@@ -1,10 +1,10 @@
package net.povstalec.sgjourney.client;
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.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.network.chat.Component;
@@ -40,7 +40,7 @@ else if(p_93668_)
}
@Override
- public void render(PoseStack p_93676_, int x, int y, float p_93679_)
+ public void render(GuiGraphics graphics, int x, int y, float p_93679_)
{
this.isHovered = x >= this.getX() && y >= this.getY() && x < this.getX() + this.width && y < this.getY() + this.height;
Minecraft minecraft = Minecraft.getInstance();
@@ -52,10 +52,10 @@ public void render(PoseStack p_93676_, int x, int y, float p_93679_)
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
RenderSystem.enableDepthTest();
- blit(p_93676_, this.getX(), this.getY(), 0, i * 16, this.width, this.height);
- blit(p_93676_, this.getX() + this.width / 2, this.getY(), 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
+ graphics.blit(WIDGETS_LOCATION, this.getX(), this.getY(), 0, i * 16, this.width, this.height);
+ graphics.blit(WIDGETS_LOCATION, this.getX() + this.width / 2, this.getY(), 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
int j = getFGColor();
- drawCenteredString(p_93676_, font, this.getMessage(), this.getX() + this.width / 2, this.getY() + (this.height - 8) / 2, j | Mth.ceil(this.alpha * 255.0F) << 24);
+ graphics.drawCenteredString(font, this.getMessage(), this.getX() + this.width / 2, this.getY() + (this.height - 8) / 2, j | Mth.ceil(this.alpha * 255.0F) << 24);
}
private static Component symbol(String symbolsType, int i)
diff --git a/src/main/java/net/povstalec/sgjourney/client/RingPanelButton.java b/src/main/java/net/povstalec/sgjourney/client/RingPanelButton.java
index f99d9284..ba956f4d 100644
--- a/src/main/java/net/povstalec/sgjourney/client/RingPanelButton.java
+++ b/src/main/java/net/povstalec/sgjourney/client/RingPanelButton.java
@@ -1,10 +1,10 @@
package net.povstalec.sgjourney.client;
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.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.network.chat.Component;
@@ -37,7 +37,7 @@ else if(p_93668_)
}
@Override
- public void render(PoseStack p_93676_, int x, int y, float p_93679_)
+ public void render(GuiGraphics graphics, int x, int y, float p_93679_)
{
this.isHovered = x >= this.getX() && y >= this.getY() && x < this.getX() + this.width && y < this.getY() + this.height;
Minecraft minecraft = Minecraft.getInstance();
@@ -49,10 +49,10 @@ public void render(PoseStack p_93676_, int x, int y, float p_93679_)
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
RenderSystem.enableDepthTest();
- blit(p_93676_, this.getX(), this.getY(), 0, i * 16, this.width, this.height);
- blit(p_93676_, this.getX() + this.width / 2, this.getY(), 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
+ graphics.blit(WIDGETS_LOCATION, this.getX(), this.getY(), 0, i * 16, this.width, this.height);
+ graphics.blit(WIDGETS_LOCATION, this.getX() + this.width / 2, this.getY(), 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
int j = getFGColor();
- drawCenteredString(p_93676_, font, this.getMessage(), this.getX() + this.width / 2, this.getY() + (this.height - 8) / 2, j | Mth.ceil(this.alpha * 255.0F) << 24);
+ graphics.drawString(font, this.getMessage(), this.getX() + this.width / 2, this.getY() + (this.height - 8) / 2, j | Mth.ceil(this.alpha * 255.0F) << 24);
}
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/render/level/SGJourneySkyRenderer.java b/src/main/java/net/povstalec/sgjourney/client/render/level/SGJourneySkyRenderer.java
index 8fa883d8..e21acc9d 100644
--- a/src/main/java/net/povstalec/sgjourney/client/render/level/SGJourneySkyRenderer.java
+++ b/src/main/java/net/povstalec/sgjourney/client/render/level/SGJourneySkyRenderer.java
@@ -80,7 +80,7 @@ protected void createDarkSky()
if (this.darkBuffer != null)
this.darkBuffer.close();
- this.darkBuffer = new VertexBuffer();
+ this.darkBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC);
BufferBuilder.RenderedBuffer bufferbuilder$renderedbuffer = buildSkyDisc(bufferbuilder, -16.0F);
this.darkBuffer.bind();
this.darkBuffer.upload(bufferbuilder$renderedbuffer);
@@ -94,7 +94,7 @@ protected void createLightSky()
if (this.skyBuffer != null)
this.skyBuffer.close();
- this.skyBuffer = new VertexBuffer();
+ this.skyBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC);
BufferBuilder.RenderedBuffer bufferbuilder$renderedbuffer = buildSkyDisc(bufferbuilder, 16.0F);
this.skyBuffer.bind();
this.skyBuffer.upload(bufferbuilder$renderedbuffer);
@@ -124,7 +124,7 @@ protected void createStars(long seed, int numberOfStars)
if(this.starBuffer != null)
this.starBuffer.close();
- this.starBuffer = new VertexBuffer();
+ this.starBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC);
BufferBuilder.RenderedBuffer bufferbuilder$renderedbuffer = this.drawStars(bufferbuilder, seed, numberOfStars);
this.starBuffer.bind();
this.starBuffer.upload(bufferbuilder$renderedbuffer);
diff --git a/src/main/java/net/povstalec/sgjourney/client/screens/AbstractDHDScreen.java b/src/main/java/net/povstalec/sgjourney/client/screens/AbstractDHDScreen.java
index c40c56ad..cec4a749 100644
--- a/src/main/java/net/povstalec/sgjourney/client/screens/AbstractDHDScreen.java
+++ b/src/main/java/net/povstalec/sgjourney/client/screens/AbstractDHDScreen.java
@@ -1,8 +1,8 @@
package net.povstalec.sgjourney.client.screens;
import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.network.chat.Component;
@@ -76,7 +76,7 @@ public void init()
}
@Override
- protected void renderBg(PoseStack pPoseStack, float pPartialTick, int pMouseX, int pMouseY)
+ protected void renderBg(GuiGraphics graphics, float pPartialTick, int pMouseX, int pMouseY)
{
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
@@ -84,71 +84,71 @@ protected void renderBg(PoseStack pPoseStack, float pPartialTick, int pMouseX, i
int x = (width - imageWidth) / 2;
int y = (height - imageHeight) / 2;
- this.blit(pPoseStack, x, y, 0, 0, imageWidth, imageHeight + 1);
+ graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight + 1);
}
@Override
- public void render(PoseStack matrixStack, int mouseX, int mouseY, float delta)
+ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta)
{
- renderBackground(matrixStack);
- super.render(matrixStack, mouseX, mouseY, delta);
- renderTooltip(matrixStack, mouseX, mouseY);
+ renderBackground(graphics);
+ super.render(graphics, mouseX, mouseY, delta);
+ renderTooltip(graphics, mouseX, mouseY);
- tooltip(matrixStack, 44, 6, mouseX, mouseY, "1");
- tooltip(matrixStack, 64, 6, mouseX, mouseY, "2");
- tooltip(matrixStack, 84, 6, mouseX, mouseY, "3");
- tooltip(matrixStack, 104, 6, mouseX, mouseY, "4");
- tooltip(matrixStack, 124, 6, mouseX, mouseY, "5");
+ tooltip(graphics, 44, 6, mouseX, mouseY, "1");
+ tooltip(graphics, 64, 6, mouseX, mouseY, "2");
+ tooltip(graphics, 84, 6, mouseX, mouseY, "3");
+ tooltip(graphics, 104, 6, mouseX, mouseY, "4");
+ tooltip(graphics, 124, 6, mouseX, mouseY, "5");
- tooltip(matrixStack, 10, 26, mouseX, mouseY, "6");
- tooltip(matrixStack, 30, 26, mouseX, mouseY, "7");
- tooltip(matrixStack, 50, 26, mouseX, mouseY, "8");
- tooltip(matrixStack, 70, 26, mouseX, mouseY, "9");
- tooltip(matrixStack, 90, 26, mouseX, mouseY, "10");
- tooltip(matrixStack, 110, 26, mouseX, mouseY, "11");
- tooltip(matrixStack, 130, 26, mouseX, mouseY, "12");
- tooltip(matrixStack, 150, 26, mouseX, mouseY, "13");
+ tooltip(graphics, 10, 26, mouseX, mouseY, "6");
+ tooltip(graphics, 30, 26, mouseX, mouseY, "7");
+ tooltip(graphics, 50, 26, mouseX, mouseY, "8");
+ tooltip(graphics, 70, 26, mouseX, mouseY, "9");
+ tooltip(graphics, 90, 26, mouseX, mouseY, "10");
+ tooltip(graphics, 110, 26, mouseX, mouseY, "11");
+ tooltip(graphics, 130, 26, mouseX, mouseY, "12");
+ tooltip(graphics, 150, 26, mouseX, mouseY, "13");
- tooltip(matrixStack, 10, 46, mouseX, mouseY, "14");
- tooltip(matrixStack, 30, 46, mouseX, mouseY, "15");
- tooltip(matrixStack, 50, 46, mouseX, mouseY, "16");
+ tooltip(graphics, 10, 46, mouseX, mouseY, "14");
+ tooltip(graphics, 30, 46, mouseX, mouseY, "15");
+ tooltip(graphics, 50, 46, mouseX, mouseY, "16");
- tooltip(matrixStack, 110, 46, mouseX, mouseY, "17");
- tooltip(matrixStack, 130, 46, mouseX, mouseY, "18");
- tooltip(matrixStack, 150, 46, mouseX, mouseY, "19");
+ tooltip(graphics, 110, 46, mouseX, mouseY, "17");
+ tooltip(graphics, 130, 46, mouseX, mouseY, "18");
+ tooltip(graphics, 150, 46, mouseX, mouseY, "19");
- tooltip(matrixStack, 10, 66, mouseX, mouseY, "20");
- tooltip(matrixStack, 30, 66, mouseX, mouseY, "21");
- tooltip(matrixStack, 50, 66, mouseX, mouseY, "22");
+ tooltip(graphics, 10, 66, mouseX, mouseY, "20");
+ tooltip(graphics, 30, 66, mouseX, mouseY, "21");
+ tooltip(graphics, 50, 66, mouseX, mouseY, "22");
- tooltip(matrixStack, 110, 66, mouseX, mouseY, "23");
- tooltip(matrixStack, 130, 66, mouseX, mouseY, "24");
- tooltip(matrixStack, 150, 66, mouseX, mouseY, "25");
+ tooltip(graphics, 110, 66, mouseX, mouseY, "23");
+ tooltip(graphics, 130, 66, mouseX, mouseY, "24");
+ tooltip(graphics, 150, 66, mouseX, mouseY, "25");
- tooltip(matrixStack, 10, 86, mouseX, mouseY, "26");
- tooltip(matrixStack, 30, 86, mouseX, mouseY, "27");
- tooltip(matrixStack, 50, 86, mouseX, mouseY, "28");
- tooltip(matrixStack, 70, 86, mouseX, mouseY, "29");
- tooltip(matrixStack, 90, 86, mouseX, mouseY, "30");
- tooltip(matrixStack, 110, 86, mouseX, mouseY, "31");
- tooltip(matrixStack, 130, 86, mouseX, mouseY, "32");
- tooltip(matrixStack, 150, 86, mouseX, mouseY, "33");
+ tooltip(graphics, 10, 86, mouseX, mouseY, "26");
+ tooltip(graphics, 30, 86, mouseX, mouseY, "27");
+ tooltip(graphics, 50, 86, mouseX, mouseY, "28");
+ tooltip(graphics, 70, 86, mouseX, mouseY, "29");
+ tooltip(graphics, 90, 86, mouseX, mouseY, "30");
+ tooltip(graphics, 110, 86, mouseX, mouseY, "31");
+ tooltip(graphics, 130, 86, mouseX, mouseY, "32");
+ tooltip(graphics, 150, 86, mouseX, mouseY, "33");
- tooltip(matrixStack, 44, 106, mouseX, mouseY, "34");
- tooltip(matrixStack, 64, 106, mouseX, mouseY, "35");
- tooltip(matrixStack, 84, 106, mouseX, mouseY, "36");
- tooltip(matrixStack, 104, 106, mouseX, mouseY, "37");
- tooltip(matrixStack, 124, 106, mouseX, mouseY, "38");
+ tooltip(graphics, 44, 106, mouseX, mouseY, "34");
+ tooltip(graphics, 64, 106, mouseX, mouseY, "35");
+ tooltip(graphics, 84, 106, mouseX, mouseY, "36");
+ tooltip(graphics, 104, 106, mouseX, mouseY, "37");
+ tooltip(graphics, 124, 106, mouseX, mouseY, "38");
}
- private void tooltip(PoseStack matrixStack, int x, int y, int mouseX, int mouseY, String number)
+ private void tooltip(GuiGraphics graphics, int x, int y, int mouseX, int mouseY, String number)
{
if(this.isHovering(x, y, 16, 16, (double) mouseX, (double) mouseY))
- renderTooltip(matrixStack, Component.literal(number), mouseX, mouseY);
+ graphics.renderTooltip(this.font, Component.literal(number), mouseX, mouseY);
}
@Override
- protected void renderLabels(PoseStack matrixStack, int mouseX, int mouseY)
+ protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY)
{
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/screens/BasicInterfaceScreen.java b/src/main/java/net/povstalec/sgjourney/client/screens/BasicInterfaceScreen.java
index 2a44973e..736e59e6 100644
--- a/src/main/java/net/povstalec/sgjourney/client/screens/BasicInterfaceScreen.java
+++ b/src/main/java/net/povstalec/sgjourney/client/screens/BasicInterfaceScreen.java
@@ -1,9 +1,9 @@
package net.povstalec.sgjourney.client.screens;
import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.network.chat.Component;
@@ -24,7 +24,7 @@ public BasicInterfaceScreen(BasicInterfaceMenu pMenu, Inventory pPlayerInventory
}
@Override
- protected void renderBg(PoseStack pPoseStack, float pPartialTick, int pMouseX, int pMouseY)
+ protected void renderBg(GuiGraphics graphics, float pPartialTick, int pMouseX, int pMouseY)
{
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
@@ -32,40 +32,40 @@ protected void renderBg(PoseStack pPoseStack, float pPartialTick, int pMouseX, i
int x = (width - imageWidth) / 2;
int y = (height - imageHeight) / 2;
- this.blit(pPoseStack, x, y, 0, 0, imageWidth, imageHeight);
+ graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight);
- this.renderEnergy(pPoseStack, x + 12, y + 12);
+ this.renderEnergy(graphics, x + 12, y + 12);
}
@Override
- public void render(PoseStack pPoseStack, int mouseX, int mouseY, float delta)
+ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta)
{
- renderBackground(pPoseStack);
- super.render(pPoseStack, mouseX, mouseY, delta);
- renderTooltip(pPoseStack, mouseX, mouseY);
+ renderBackground(graphics);
+ super.render(graphics, mouseX, mouseY, delta);
+ renderTooltip(graphics, mouseX, mouseY);
- this.energyTooltip(pPoseStack, 12, 12, mouseX, mouseY);
+ this.energyTooltip(graphics, 12, 12, mouseX, mouseY);
}
@Override
- protected void renderLabels(PoseStack matrixStack, int mouseX, int mouseY)
+ protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY)
{
//this.font.draw(matrixStack, this.title, (float)this.titleLabelX, (float)this.titleLabelY, 4210752);
//this.font.draw(matrixStack, this.playerInventoryTitle, (float)this.inventoryLabelX, (float)this.inventoryLabelY, 4210752);
}
- protected void renderEnergy(PoseStack matrixStack, int x, int y)
+ protected void renderEnergy(GuiGraphics graphics, int x, int y)
{
float percentage = (float) this.menu.getEnergy() / this.menu.getMaxEnergy();
int actual = Math.round(52 * percentage);
- this.blit(matrixStack, x, y, 0, 40, actual, 16);
+ graphics.blit(TEXTURE, x, y, 0, 40, actual, 16);
}
- protected void energyTooltip(PoseStack matrixStack, int x, int y, int mouseX, int mouseY)
+ protected void energyTooltip(GuiGraphics graphics, int x, int y, int mouseX, int mouseY)
{
if(this.isHovering(x, y, 52, 16, (double) mouseX, (double) mouseY))
{
- renderTooltip(matrixStack, Component.literal("Energy: " + this.menu.getEnergy() + "/" + this.menu.getMaxEnergy() + " FE").withStyle(ChatFormatting.DARK_RED), mouseX, mouseY);
+ graphics.renderTooltip(this.font, Component.literal("Energy: " + this.menu.getEnergy() + "/" + this.menu.getMaxEnergy() + " FE").withStyle(ChatFormatting.DARK_RED), mouseX, mouseY);
}
}
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/screens/CrystalInterfaceScreen.java b/src/main/java/net/povstalec/sgjourney/client/screens/CrystalInterfaceScreen.java
index 93edc657..bf65eb86 100644
--- a/src/main/java/net/povstalec/sgjourney/client/screens/CrystalInterfaceScreen.java
+++ b/src/main/java/net/povstalec/sgjourney/client/screens/CrystalInterfaceScreen.java
@@ -1,9 +1,9 @@
package net.povstalec.sgjourney.client.screens;
import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.network.chat.Component;
@@ -21,47 +21,40 @@ public CrystalInterfaceScreen(CrystalInterfaceMenu pMenu, Inventory pPlayerInven
}
@Override
- protected void renderBg(PoseStack pPoseStack, float pPartialTick, int pMouseX, int pMouseY) {
+ protected void renderBg(GuiGraphics graphics, float pPartialTick, int pMouseX, int pMouseY) {
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.setShaderTexture(0, TEXTURE);
int x = (width - imageWidth) / 2;
int y = (height - imageHeight) / 2;
- this.blit(pPoseStack, x, y, 0, 0, imageWidth, imageHeight + 1);
+ graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight + 1);
- this.renderEnergy(pPoseStack, x + 8, y + 62);
+ this.renderEnergy(graphics, x + 8, y + 62);
}
@Override
- public void render(PoseStack pPoseStack, int mouseX, int mouseY, float delta)
+ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta)
{
- renderBackground(pPoseStack);
- super.render(pPoseStack, mouseX, mouseY, delta);
- renderTooltip(pPoseStack, mouseX, mouseY);
+ renderBackground(graphics);
+ super.render(graphics, mouseX, mouseY, delta);
+ renderTooltip(graphics, mouseX, mouseY);
- this.energyTooltip(pPoseStack, 8, 62, mouseX, mouseY);
+ this.energyTooltip(graphics, 8, 62, mouseX, mouseY);
}
- @Override
- protected void renderLabels(PoseStack matrixStack, int mouseX, int mouseY)
- {
- this.font.draw(matrixStack, this.title, (float)this.titleLabelX, (float)this.titleLabelY, 4210752);
- this.font.draw(matrixStack, this.playerInventoryTitle, (float)this.inventoryLabelX, (float)this.inventoryLabelY, 4210752);
- }
-
- protected void renderEnergy(PoseStack matrixStack, int x, int y)
+ protected void renderEnergy(GuiGraphics graphics, int x, int y)
{
float percentage = (float) this.menu.getEnergy() / this.menu.getMaxEnergy();
int actual = Math.round(160 * percentage);
- this.blit(matrixStack, x, y, 0, 168, actual, 6);
+ graphics.blit(TEXTURE, x, y, 0, 168, actual, 6);
}
- protected void energyTooltip(PoseStack matrixStack, int x, int y, int mouseX, int mouseY)
+ protected void energyTooltip(GuiGraphics graphics, int x, int y, int mouseX, int mouseY)
{
if(this.isHovering(x, y, 160, 6, (double) mouseX, (double) mouseY))
{
- renderTooltip(matrixStack, Component.literal("Energy: " + this.menu.getEnergy() + "/" + this.menu.getMaxEnergy() + " FE").withStyle(ChatFormatting.DARK_RED), mouseX, mouseY);
+ graphics.renderTooltip(this.font, Component.literal("Energy: " + this.menu.getEnergy() + "/" + this.menu.getMaxEnergy() + " FE").withStyle(ChatFormatting.DARK_RED), mouseX, mouseY);
}
}
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/screens/DHDCrystalScreen.java b/src/main/java/net/povstalec/sgjourney/client/screens/DHDCrystalScreen.java
index 9dbfe4be..0a5d1607 100644
--- a/src/main/java/net/povstalec/sgjourney/client/screens/DHDCrystalScreen.java
+++ b/src/main/java/net/povstalec/sgjourney/client/screens/DHDCrystalScreen.java
@@ -3,6 +3,7 @@
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.network.chat.Component;
@@ -21,7 +22,7 @@ public DHDCrystalScreen(DHDCrystalMenu pMenu, Inventory pPlayerInventory, Compon
}
@Override
- protected void renderBg(PoseStack pPoseStack, float pPartialTick, int pMouseX, int pMouseY)
+ protected void renderBg(GuiGraphics graphics, float pPartialTick, int pMouseX, int pMouseY)
{
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
@@ -29,23 +30,23 @@ protected void renderBg(PoseStack pPoseStack, float pPartialTick, int pMouseX, i
int x = (width - imageWidth) / 2;
int y = (height - imageHeight) / 2;
- this.blit(pPoseStack, x, y, 0, 0, imageWidth, imageHeight + 1);
+ graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight + 1);
}
@Override
- public void render(PoseStack matrixStack, int mouseX, int mouseY, float delta)
+ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta)
{
- renderBackground(matrixStack);
- super.render(matrixStack, mouseX, mouseY, delta);
- renderTooltip(matrixStack, mouseX, mouseY);
+ renderBackground(graphics);
+ super.render(graphics, mouseX, mouseY, delta);
+ renderTooltip(graphics, mouseX, mouseY);
}
- @Override
- protected void renderLabels(PoseStack matrixStack, int mouseX, int mouseY)
+ /*@Override
+ protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY)
{
this.font.draw(matrixStack, this.title, (float)this.titleLabelX, (float)this.titleLabelY, 4210752);
this.font.draw(matrixStack, this.playerInventoryTitle, (float)this.inventoryLabelX, (float)this.inventoryLabelY, 4210752);
- }
+ }*/
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/screens/NaquadahGeneratorScreen.java b/src/main/java/net/povstalec/sgjourney/client/screens/NaquadahGeneratorScreen.java
index ade7c8f1..c1df0a18 100644
--- a/src/main/java/net/povstalec/sgjourney/client/screens/NaquadahGeneratorScreen.java
+++ b/src/main/java/net/povstalec/sgjourney/client/screens/NaquadahGeneratorScreen.java
@@ -4,6 +4,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.network.chat.Component;
@@ -21,55 +22,55 @@ public NaquadahGeneratorScreen(NaquadahGeneratorMenu pMenu, Inventory pPlayerInv
}
@Override
- protected void renderBg(PoseStack pPoseStack, float pPartialTick, int pMouseX, int pMouseY) {
+ protected void renderBg(GuiGraphics graphics, float pPartialTick, int pMouseX, int pMouseY) {
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.setShaderTexture(0, TEXTURE);
int x = (width - imageWidth) / 2;
int y = (height - imageHeight) / 2;
- this.blit(pPoseStack, x, y, 0, 0, imageWidth, imageHeight + 1);
+ graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight + 1);
- this.renderProgress(pPoseStack, x + 62, y + 35);
- this.renderEnergy(pPoseStack, x + 8, y + 62);
+ this.renderProgress(graphics, x + 62, y + 35);
+ this.renderEnergy(graphics, x + 8, y + 62);
}
@Override
- public void render(PoseStack pPoseStack, int mouseX, int mouseY, float delta)
+ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta)
{
- renderBackground(pPoseStack);
- super.render(pPoseStack, mouseX, mouseY, delta);
- renderTooltip(pPoseStack, mouseX, mouseY);
+ renderBackground(graphics);
+ super.render(graphics, mouseX, mouseY, delta);
+ renderTooltip(graphics, mouseX, mouseY);
- this.energyTooltip(pPoseStack, 8, 62, mouseX, mouseY);
+ this.energyTooltip(graphics, 8, 62, mouseX, mouseY);
}
- @Override
- protected void renderLabels(PoseStack matrixStack, int mouseX, int mouseY)
+ /*@Override
+ protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY)
{
this.font.draw(matrixStack, this.title, (float)this.titleLabelX, (float)this.titleLabelY, 4210752);
this.font.draw(matrixStack, this.playerInventoryTitle, (float)this.inventoryLabelX, (float)this.inventoryLabelY, 4210752);
- }
+ }*/
- protected void renderProgress(PoseStack matrixStack, int x, int y)
+ protected void renderProgress(GuiGraphics graphics, int x, int y)
{
float percentage = (float) this.menu.getReactionProgress() / this.menu.getReactionTime();
int actual = Math.round(52 * percentage);
- this.blit(matrixStack, x, y, 0, 174, actual, 16);
+ graphics.blit(TEXTURE, x, y, 0, 174, actual, 16);
}
- protected void renderEnergy(PoseStack matrixStack, int x, int y)
+ protected void renderEnergy(GuiGraphics graphics, int x, int y)
{
float percentage = (float) this.menu.getEnergy() / this.menu.getMaxEnergy();
int actual = Math.round(160 * percentage);
- this.blit(matrixStack, x, y, 0, 168, actual, 6);
+ graphics.blit(TEXTURE, x, y, 0, 168, actual, 6);
}
- protected void energyTooltip(PoseStack matrixStack, int x, int y, int mouseX, int mouseY)
+ protected void energyTooltip(GuiGraphics graphics, int x, int y, int mouseX, int mouseY)
{
if(this.isHovering(x, y, 160, 6, (double) mouseX, (double) mouseY))
- renderTooltip(matrixStack, Component.literal("Energy: " + this.menu.getEnergy() + "/" + this.menu.getMaxEnergy() + " FE").withStyle(ChatFormatting.DARK_RED), mouseX, mouseY);
+ graphics.renderTooltip(this.font, Component.literal("Energy: " + this.menu.getEnergy() + "/" + this.menu.getMaxEnergy() + " FE").withStyle(ChatFormatting.DARK_RED), mouseX, mouseY);
}
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/screens/RingPanelScreen.java b/src/main/java/net/povstalec/sgjourney/client/screens/RingPanelScreen.java
index 1ba008a9..0144f14e 100644
--- a/src/main/java/net/povstalec/sgjourney/client/screens/RingPanelScreen.java
+++ b/src/main/java/net/povstalec/sgjourney/client/screens/RingPanelScreen.java
@@ -3,6 +3,7 @@
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.network.chat.Component;
@@ -42,42 +43,42 @@ public void init()
}
@Override
- protected void renderBg(PoseStack pPoseStack, float pPartialTick, int pMouseX, int pMouseY) {
+ protected void renderBg(GuiGraphics graphics, float pPartialTick, int pMouseX, int pMouseY) {
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.setShaderTexture(0, TEXTURE);
int x = (width - imageWidth) / 2;
int y = (height - imageHeight) / 2;
- this.blit(pPoseStack, x, y, 0, 0, imageWidth, imageHeight + 1);
+ graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight + 1);
}
@Override
- public void render(PoseStack pPoseStack, int mouseX, int mouseY, float delta)
+ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta)
{
- renderBackground(pPoseStack);
- super.render(pPoseStack, mouseX, mouseY, delta);
- renderTooltip(pPoseStack, mouseX, mouseY);
+ renderBackground(graphics);
+ super.render(graphics, mouseX, mouseY, delta);
+ renderTooltip(graphics, mouseX, mouseY);
- renderButtonTooltip(pPoseStack, 1, 51, 48, mouseX, mouseY);
- renderButtonTooltip(pPoseStack, 2, 93, 48, mouseX, mouseY);
- renderButtonTooltip(pPoseStack, 3, 51, 66, mouseX, mouseY);
- renderButtonTooltip(pPoseStack, 4, 93, 66, mouseX, mouseY);
- renderButtonTooltip(pPoseStack, 5, 51, 84, mouseX, mouseY);
- renderButtonTooltip(pPoseStack, 6, 93, 84, mouseX, mouseY);
+ renderButtonTooltip(graphics, 1, 51, 48, mouseX, mouseY);
+ renderButtonTooltip(graphics, 2, 93, 48, mouseX, mouseY);
+ renderButtonTooltip(graphics, 3, 51, 66, mouseX, mouseY);
+ renderButtonTooltip(graphics, 4, 93, 66, mouseX, mouseY);
+ renderButtonTooltip(graphics, 5, 51, 84, mouseX, mouseY);
+ renderButtonTooltip(graphics, 6, 93, 84, mouseX, mouseY);
}
@Override
- protected void renderLabels(PoseStack matrixStack, int mouseX, int mouseY)
+ protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY)
{
- this.font.draw(matrixStack, this.playerInventoryTitle, (float)this.inventoryLabelX, 128.0F, 4210752);
+ graphics.drawString(this.font, this.playerInventoryTitle, this.inventoryLabelX, 128, 4210752, false);
}
- private void renderButtonTooltip(PoseStack matrixStack, int ringNumber, int xStart, int yStart, int mouseX, int mouseY)
+ private void renderButtonTooltip(GuiGraphics graphics, int ringNumber, int xStart, int yStart, int mouseX, int mouseY)
{
if(this.isHovering(xStart, yStart, 32, 16, (double) mouseX, (double) mouseY))
- renderTooltip(matrixStack, Component.literal(menu.getRingsPos(ringNumber)), mouseX, mouseY);
+ graphics.renderTooltip(this.font, Component.literal(menu.getRingsPos(ringNumber)), mouseX, mouseY);
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/screens/ZPMHubScreen.java b/src/main/java/net/povstalec/sgjourney/client/screens/ZPMHubScreen.java
index 06df2c58..b810ac62 100644
--- a/src/main/java/net/povstalec/sgjourney/client/screens/ZPMHubScreen.java
+++ b/src/main/java/net/povstalec/sgjourney/client/screens/ZPMHubScreen.java
@@ -3,6 +3,7 @@
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.network.chat.Component;
@@ -20,27 +21,27 @@ public ZPMHubScreen(ZPMHubMenu pMenu, Inventory pPlayerInventory, Component pTit
}
@Override
- protected void renderBg(PoseStack pPoseStack, float pPartialTick, int pMouseX, int pMouseY) {
+ protected void renderBg(GuiGraphics graphics, float pPartialTick, int pMouseX, int pMouseY) {
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.setShaderTexture(0, TEXTURE);
int x = (width - imageWidth) / 2;
int y = (height - imageHeight) / 2;
- this.blit(pPoseStack, x, y, 0, 0, imageWidth, imageHeight + 1);
+ graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight + 1);
}
@Override
- public void render(PoseStack pPoseStack, int mouseX, int mouseY, float delta) {
- renderBackground(pPoseStack);
- super.render(pPoseStack, mouseX, mouseY, delta);
- renderTooltip(pPoseStack, mouseX, mouseY);
+ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+ renderBackground(graphics);
+ super.render(graphics, mouseX, mouseY, delta);
+ renderTooltip(graphics, mouseX, mouseY);
}
- @Override
- protected void renderLabels(PoseStack matrixStack, int mouseX, int mouseY)
+ /*@Override
+ protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY)
{
this.font.draw(matrixStack, this.title, (float)this.titleLabelX, (float)this.titleLabelY, 4210752);
this.font.draw(matrixStack, this.playerInventoryTitle, (float)this.inventoryLabelX, (float)this.inventoryLabelY, 4210752);
- }
+ }*/
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigList.java b/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigList.java
index 9f82516e..0a2c69f7 100644
--- a/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigList.java
+++ b/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigList.java
@@ -4,6 +4,7 @@
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.AbstractButton;
import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.client.gui.components.Button;
@@ -66,11 +67,11 @@ public Component getNarration()
}
@Override
- public void render(PoseStack stack, int i, int j, int k, int l, int m, int n, int o, boolean bl, float partialTick)
+ public void render(GuiGraphics graphics, int i, int j, int k, int l, int m, int n, int o, boolean bl, float partialTick)
{
this.resetToDefault.setX(k + 210);
this.resetToDefault.setY(j);
- this.resetToDefault.render(stack, n, o, partialTick);
+ this.resetToDefault.render(graphics, n, o, partialTick);
}
}
@@ -111,12 +112,12 @@ public boolean mouseClicked(double mouseX, double mouseY, int key)
}
@Override
- public void render(PoseStack stack, int i, int j, int k, int l, int m, int n, int o, boolean bl, float partialTick)
+ public void render(GuiGraphics graphics, int i, int j, int k, int l, int m, int n, int o, boolean bl, float partialTick)
{
this.cycleButton.setX(k);
this.cycleButton.setY(j);
- this.cycleButton.render(stack, n, o, partialTick);
- super.render(stack, i, j, k, l, m, n, o, bl, partialTick);
+ this.cycleButton.render(graphics, n, o, partialTick);
+ super.render(graphics, i, j, k, l, m, n, o, bl, partialTick);
}
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreen.java b/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreen.java
index 6623e74b..5d5b97e1 100644
--- a/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreen.java
+++ b/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreen.java
@@ -2,6 +2,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.CommonComponents;
@@ -39,10 +40,10 @@ public void init()
}
@Override
- public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTick)
+ public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick)
{
- this.renderBackground(poseStack);
- drawCenteredString(poseStack, this.font, this.title, this.width / 2, 8, 16777215);
- super.render(poseStack, mouseX, mouseY, partialTick);
+ this.renderBackground(graphics);
+ graphics.drawString(this.font, this.title, this.width / 2, 8, 16777215);
+ super.render(graphics, mouseX, mouseY, partialTick);
}
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreenClient.java b/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreenClient.java
index cfb8ba08..bbd4b7fe 100644
--- a/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreenClient.java
+++ b/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreenClient.java
@@ -3,6 +3,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.CycleButton;
import net.minecraft.client.gui.screens.Screen;
@@ -43,11 +44,11 @@ public void init()
}
@Override
- public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTick)
+ public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick)
{
- this.renderBackground(poseStack);
- drawCenteredString(poseStack, this.font, this.title, this.width / 2, 8, 16777215);
- super.render(poseStack, mouseX, mouseY, partialTick);
+ this.renderBackground(graphics);
+ graphics.drawString(this.font, this.title, this.width / 2, 8, 16777215);
+ super.render(graphics, mouseX, mouseY, partialTick);
}
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreenClientStargate.java b/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreenClientStargate.java
index 285a93f7..701e01dc 100644
--- a/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreenClientStargate.java
+++ b/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreenClientStargate.java
@@ -2,6 +2,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.CommonComponents;
@@ -50,12 +51,12 @@ public void init()
}
@Override
- public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTick)
+ public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick)
{
- this.renderBackground(poseStack);
- this.configList.render(poseStack, mouseX, mouseY, partialTick);
- drawCenteredString(poseStack, this.font, this.title, this.width / 2, 8, 16777215);
- super.render(poseStack, mouseX, mouseY, partialTick);
+ this.renderBackground(graphics);
+ this.configList.render(graphics, mouseX, mouseY, partialTick);
+ graphics.drawString(this.font, this.title, this.width / 2, 8, 16777215);
+ super.render(graphics, mouseX, mouseY, partialTick);
}
}
diff --git a/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreenCommon.java b/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreenCommon.java
index ceb0c0da..7bc74c65 100644
--- a/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreenCommon.java
+++ b/src/main/java/net/povstalec/sgjourney/client/screens/config/ConfigScreenCommon.java
@@ -2,6 +2,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.CycleButton;
import net.minecraft.client.gui.screens.Screen;
@@ -41,11 +42,11 @@ public void init()
}
@Override
- public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTick)
+ public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick)
{
- this.renderBackground(poseStack);
- drawCenteredString(poseStack, this.font, this.title, this.width / 2, 8, 16777215);
- super.render(poseStack, mouseX, mouseY, partialTick);
+ this.renderBackground(graphics);
+ graphics.drawString(this.font, this.title, this.width / 2, 8, 16777215);
+ super.render(graphics, mouseX, mouseY, partialTick);
}
}
diff --git a/src/main/java/net/povstalec/sgjourney/common/block_entities/TransportRingsEntity.java b/src/main/java/net/povstalec/sgjourney/common/block_entities/TransportRingsEntity.java
index 8e5d40be..4c22067e 100644
--- a/src/main/java/net/povstalec/sgjourney/common/block_entities/TransportRingsEntity.java
+++ b/src/main/java/net/povstalec/sgjourney/common/block_entities/TransportRingsEntity.java
@@ -319,10 +319,10 @@ private int getEmptySpace()
{
for(int i = 4; i <= 16; i++)
{
- if(!level.getBlockState(pos.below(i)).getMaterial().isReplaceable() &&
- level.getBlockState(pos.below(i - 1)).getMaterial().isReplaceable() &&
- level.getBlockState(pos.below(i - 2)).getMaterial().isReplaceable() &&
- level.getBlockState(pos.below(i - 3)).getMaterial().isReplaceable())
+ if(!level.getBlockState(pos.below(i)).canBeReplaced() &&
+ level.getBlockState(pos.below(i - 1)).canBeReplaced() &&
+ level.getBlockState(pos.below(i - 2)).canBeReplaced() &&
+ level.getBlockState(pos.below(i - 3)).canBeReplaced())
{
return -i + 1;
}
@@ -332,9 +332,9 @@ private int getEmptySpace()
{
for(int i = 1; i <= 16; i++)
{
- if(level.getBlockState(pos.above(i)).getMaterial().isReplaceable() &&
- level.getBlockState(pos.above(i + 1)).getMaterial().isReplaceable() &&
- level.getBlockState(pos.above(i + 2)).getMaterial().isReplaceable())
+ if(level.getBlockState(pos.above(i)).canBeReplaced() &&
+ level.getBlockState(pos.above(i + 1)).canBeReplaced() &&
+ level.getBlockState(pos.above(i + 2)).canBeReplaced())
{
return i;
}
diff --git a/src/main/java/net/povstalec/sgjourney/common/block_entities/stargate/AbstractStargateEntity.java b/src/main/java/net/povstalec/sgjourney/common/block_entities/stargate/AbstractStargateEntity.java
index f945f35a..9641d8ee 100644
--- a/src/main/java/net/povstalec/sgjourney/common/block_entities/stargate/AbstractStargateEntity.java
+++ b/src/main/java/net/povstalec/sgjourney/common/block_entities/stargate/AbstractStargateEntity.java
@@ -18,7 +18,7 @@
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import net.minecraftforge.network.PacketDistributor;
@@ -584,7 +584,7 @@ public boolean isObstructed()
BlockPos pos = centerPos.relative(direction, width).relative(Orientation.getCenterDirection(getDirection(), getOrientation()), height);
BlockState state = level.getBlockState(pos);
- if((!state.getMaterial().isReplaceable() && !(state.getBlock() instanceof AbstractStargateRingBlock)) || state.getMaterial() == Material.LAVA)
+ if((!state.canBeReplaced() && !(state.getBlock() instanceof AbstractStargateRingBlock)) || state.getFluidState().is(Fluids.LAVA))
obstructingBlocks++;
}
}
diff --git a/src/main/java/net/povstalec/sgjourney/common/entities/Goauld.java b/src/main/java/net/povstalec/sgjourney/common/entities/Goauld.java
index 32e1b277..2da72898 100644
--- a/src/main/java/net/povstalec/sgjourney/common/entities/Goauld.java
+++ b/src/main/java/net/povstalec/sgjourney/common/entities/Goauld.java
@@ -24,7 +24,7 @@ public Goauld(EntityType type, Level level)
protected void registerGoals()
{
this.goalSelector.addGoal(1, new FloatGoal(this));
- this.goalSelector.addGoal(1, new ClimbOnTopOfPowderSnowGoal(this, this.level));
+ this.goalSelector.addGoal(1, new ClimbOnTopOfPowderSnowGoal(this, this.level()));
this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.0D, false));
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this)).setAlertOthers());
this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
diff --git a/src/main/java/net/povstalec/sgjourney/common/entities/PlasmaProjectile.java b/src/main/java/net/povstalec/sgjourney/common/entities/PlasmaProjectile.java
index 71ad1ab1..f9a8a3de 100644
--- a/src/main/java/net/povstalec/sgjourney/common/entities/PlasmaProjectile.java
+++ b/src/main/java/net/povstalec/sgjourney/common/entities/PlasmaProjectile.java
@@ -35,10 +35,10 @@ public PlasmaProjectile(EntityType type, LivingEn
protected void onHit(HitResult p_37218_)
{
super.onHit(p_37218_);
- if (!this.level.isClientSide)
+ if (!this.level().isClientSide())
{
- boolean flag = net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(this.level, this.getOwner());
- this.level.explode((Entity)null, this.getX(), this.getY(), this.getZ(), (float)this.explosionPower, flag, flag ? Level.ExplosionInteraction.TNT : Level.ExplosionInteraction.NONE);
+ boolean flag = net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(this.level(), this.getOwner());
+ this.level().explode((Entity)null, this.getX(), this.getY(), this.getZ(), (float)this.explosionPower, flag, flag ? Level.ExplosionInteraction.TNT : Level.ExplosionInteraction.NONE);
this.discard();
}
@@ -47,11 +47,11 @@ protected void onHit(HitResult p_37218_)
protected void onHitEntity(EntityHitResult p_37216_)
{
super.onHitEntity(p_37216_);
- if (!this.level.isClientSide)
+ if (!this.level().isClientSide())
{
Entity entity = p_37216_.getEntity();
Entity entity1 = this.getOwner();
- entity.hurt(level.damageSources().explosion((Player)entity1, entity), 14.0F);
+ entity.hurt(level().damageSources().explosion((Player)entity1, entity), 14.0F);
if (entity1 instanceof LivingEntity)
{
this.doEnchantDamageEffects((LivingEntity)entity1, entity);
@@ -64,15 +64,15 @@ protected void onHitBlock(BlockHitResult result)
{
super.onHitBlock(result);
- if(!this.level.isClientSide)
+ if(!this.level().isClientSide())
{
Entity entity = this.getOwner();
- if(!(entity instanceof Mob) || net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(this.level, entity))
+ if(!(entity instanceof Mob) || net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(this.level(), entity))
{
BlockPos blockpos = result.getBlockPos().relative(result.getDirection());
// Note: I don't like how this looks, but I don't have time to think of anything better, so who cares
- if (this.level.isEmptyBlock(blockpos))
+ if (this.level().isEmptyBlock(blockpos))
{
if(trySetFireToBlock(blockpos, blockpos.north()))
return;
@@ -92,9 +92,9 @@ protected void onHitBlock(BlockHitResult result)
private boolean trySetFireToBlock(BlockPos blockpos, BlockPos nearbyPos)
{
- if(this.level.getBlockState(nearbyPos).is(TagInit.Blocks.PLASMA_FLAMMABLE))
+ if(this.level().getBlockState(nearbyPos).is(TagInit.Blocks.PLASMA_FLAMMABLE))
{
- this.level.setBlockAndUpdate(blockpos, BaseFireBlock.getState(this.level, blockpos));
+ this.level().setBlockAndUpdate(blockpos, BaseFireBlock.getState(this.level(), blockpos));
return true;
}
return false;
diff --git a/src/main/java/net/povstalec/sgjourney/common/init/BlockInit.java b/src/main/java/net/povstalec/sgjourney/common/init/BlockInit.java
index 1560c4be..c04999f5 100644
--- a/src/main/java/net/povstalec/sgjourney/common/init/BlockInit.java
+++ b/src/main/java/net/povstalec/sgjourney/common/init/BlockInit.java
@@ -13,8 +13,7 @@
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.StairBlock;
import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.material.Material;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@@ -62,129 +61,129 @@ public class BlockInit
//Block Tab
public static final RegistryObject UNIVERSE_STARGATE = registerEntityBlock("universe_stargate",
- () -> new UniverseStargateBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 600.0F)
+ () -> new UniverseStargateBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 600.0F)
.sound(SoundType.METAL).noOcclusion()), Rarity.EPIC);
public static final RegistryObject UNIVERSE_RING = BLOCKS.register("universe_ring",
- () -> new UniverseStargateRingBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 600.0F)
+ () -> new UniverseStargateRingBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 600.0F)
.sound(SoundType.METAL).noOcclusion()));
public static final RegistryObject MILKY_WAY_STARGATE = registerEntityBlock("milky_way_stargate",
- () -> new MilkyWayStargateBlock(BlockBehaviour.Properties.of(Material.METAL).strength(6.0F, 1200.0F)
+ () -> new MilkyWayStargateBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(6.0F, 1200.0F)
.sound(SoundType.METAL).noOcclusion()), Rarity.EPIC);
public static final RegistryObject MILKY_WAY_RING = BLOCKS.register("milky_way_ring",
- () -> new MilkyWayStargateRingBlock(BlockBehaviour.Properties.of(Material.METAL).strength(6.0F, 1200.0F)
+ () -> new MilkyWayStargateRingBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(6.0F, 1200.0F)
.sound(SoundType.METAL).noOcclusion()));
public static final RegistryObject PEGASUS_STARGATE = registerEntityBlock("pegasus_stargate",
- () -> new PegasusStargateBlock(BlockBehaviour.Properties.of(Material.METAL).strength(6.0F, 1200.0F)
+ () -> new PegasusStargateBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(6.0F, 1200.0F)
.sound(SoundType.METAL).noOcclusion()), Rarity.EPIC);
public static final RegistryObject PEGASUS_RING = BLOCKS.register("pegasus_ring",
- () -> new PegasusStargateRingBlock(BlockBehaviour.Properties.of(Material.METAL).strength(6.0F, 1200.0F)
+ () -> new PegasusStargateRingBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(6.0F, 1200.0F)
.sound(SoundType.METAL).noOcclusion()));
public static final RegistryObject CLASSIC_STARGATE = registerEntityBlock("classic_stargate",
- () -> new ClassicStargateBlock(BlockBehaviour.Properties.of(Material.METAL).strength(6.0F, 1200.0F)
+ () -> new ClassicStargateBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(6.0F, 1200.0F)
.sound(SoundType.METAL).noOcclusion()));
public static final RegistryObject CLASSIC_RING = BLOCKS.register("classic_ring",
- () -> new ClassicStargateRingBlock(BlockBehaviour.Properties.of(Material.METAL).strength(6.0F, 1200.0F)
+ () -> new ClassicStargateRingBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(6.0F, 1200.0F)
.sound(SoundType.METAL).noOcclusion()));
public static final RegistryObject TOLLAN_STARGATE = registerEntityBlock("tollan_stargate",
- () -> new TollanStargateBlock(BlockBehaviour.Properties.of(Material.METAL).strength(6.0F, 1200.0F)
+ () -> new TollanStargateBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(6.0F, 1200.0F)
.sound(SoundType.METAL).noOcclusion()), Rarity.EPIC);
public static final RegistryObject TOLLAN_RING = BLOCKS.register("tollan_ring",
- () -> new TollanStargateRingBlock(BlockBehaviour.Properties.of(Material.METAL).strength(6.0F, 1200.0F)
+ () -> new TollanStargateRingBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(6.0F, 1200.0F)
.sound(SoundType.METAL).noOcclusion()));
public static final RegistryObject MILKY_WAY_DHD = registerDHDBlock("milky_way_dhd",
- () -> new MilkyWayDHDBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 600.0F)
+ () -> new MilkyWayDHDBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 600.0F)
.sound(SoundType.METAL).noOcclusion()), Rarity.EPIC);
public static final RegistryObject PEGASUS_DHD = registerDHDBlock("pegasus_dhd",
- () -> new PegasusDHDBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 600.0F)
+ () -> new PegasusDHDBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 600.0F)
.sound(SoundType.METAL).noOcclusion()), Rarity.EPIC);
public static final RegistryObject CLASSIC_DHD = registerDHDBlock("classic_dhd",
- () -> new ClassicDHDBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 6.0F)
+ () -> new ClassicDHDBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F)
.sound(SoundType.METAL).noOcclusion()), Rarity.COMMON);
public static final RegistryObject TRANSPORT_RINGS = registerEntityBlock("transport_rings",
- () -> new TransportRingsBlock(BlockBehaviour.Properties.of(Material.METAL).strength(6.0F)
+ () -> new TransportRingsBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(6.0F)
.sound(SoundType.METAL).noOcclusion()), Rarity.RARE);
public static final RegistryObject RING_PANEL = registerBlock("ring_panel",
- () -> new RingPanelBlock(BlockBehaviour.Properties.of(Material.METAL).strength(6.0F)
+ () -> new RingPanelBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(6.0F)
.sound(SoundType.METAL).noOcclusion()), Rarity.RARE, 1);
public static final RegistryObject NAQUADAH_ORE = registerBlock("naquadah_ore",
- () -> new ExplosiveBlock(BlockBehaviour.Properties.of(Material.STONE).strength(3.0F).requiresCorrectToolForDrops(), 4.0F));
+ () -> new ExplosiveBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(3.0F).requiresCorrectToolForDrops(), 4.0F));
public static final RegistryObject NETHER_NAQUADAH_ORE = registerBlock("nether_naquadah_ore",
- () -> new ExplosiveBlock(BlockBehaviour.Properties.of(Material.STONE).strength(3.0F).requiresCorrectToolForDrops(), 4.0F));
+ () -> new ExplosiveBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(3.0F).requiresCorrectToolForDrops(), 4.0F));
public static final RegistryObject DEEPSLATE_NAQUADAH_ORE = registerBlock("deepslate_naquadah_ore",
- () -> new ExplosiveBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.DEEPSLATE).strength(4.5F, 3.0F).requiresCorrectToolForDrops(), 4.0F));
+ () -> new ExplosiveBlock(BlockBehaviour.Properties.of().mapColor(MapColor.DEEPSLATE).strength(4.5F, 3.0F).requiresCorrectToolForDrops(), 4.0F));
public static final RegistryObject RAW_NAQUADAH_BLOCK = registerBlock("raw_naquadah_block",
- () -> new ExplosiveBlock(BlockBehaviour.Properties.of(Material.STONE).strength(5.0F, 6.0F).requiresCorrectToolForDrops(), 10.0F));
+ () -> new ExplosiveBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(5.0F, 6.0F).requiresCorrectToolForDrops(), 10.0F));
public static final RegistryObject LIQUID_NAQUADAH_BLOCK = registerBlock("liquid_naquadah",
- () -> new LiquidBlock(FluidInit.LIQUID_NAQUADAH_SOURCE, BlockBehaviour.Properties.of(Material.WATER).noCollission().strength(100.0F).noLootTable()));
+ () -> new LiquidBlock(FluidInit.LIQUID_NAQUADAH_SOURCE, BlockBehaviour.Properties.of().mapColor(MapColor.WATER).noCollission().strength(100.0F).noLootTable()));
public static final RegistryObject NAQUADAH_BLOCK = registerBlock("naquadah_block",
- () -> new Block(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 600.0F).requiresCorrectToolForDrops()));
+ () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 600.0F).requiresCorrectToolForDrops()));
public static final RegistryObject NAQUADAH_STAIRS = registerBlock("naquadah_stairs",
- () -> new StairBlock(() -> NAQUADAH_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 600.0F).requiresCorrectToolForDrops()));
+ () -> new StairBlock(() -> NAQUADAH_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 600.0F).requiresCorrectToolForDrops()));
public static final RegistryObject NAQUADAH_SLAB = registerBlock("naquadah_slab",
- () -> new SlabBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 600.0F).requiresCorrectToolForDrops()));
+ () -> new SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 600.0F).requiresCorrectToolForDrops()));
public static final RegistryObject CUT_NAQUADAH_BLOCK = registerBlock("cut_naquadah_block",
- () -> new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 600.0F).requiresCorrectToolForDrops()));
+ () -> new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 600.0F).requiresCorrectToolForDrops()));
public static final RegistryObject CUT_NAQUADAH_STAIRS = registerBlock("cut_naquadah_stairs",
- () -> new StairBlock(() -> NAQUADAH_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 600.0F).requiresCorrectToolForDrops()));
+ () -> new StairBlock(() -> NAQUADAH_BLOCK.get().defaultBlockState(), BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 600.0F).requiresCorrectToolForDrops()));
public static final RegistryObject CUT_NAQUADAH_SLAB = registerBlock("cut_naquadah_slab",
- () -> new SlabBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 600.0F).requiresCorrectToolForDrops()));
+ () -> new SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 600.0F).requiresCorrectToolForDrops()));
public static final RegistryObject GOLDEN_IDOL = registerBlock("golden_idol",
- () -> new GoldenIdolBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.GOLD).strength(3.0F, 6.0F)
+ () -> new GoldenIdolBlock(BlockBehaviour.Properties.of().mapColor(MapColor.GOLD).strength(3.0F, 6.0F)
.sound(SoundType.METAL).requiresCorrectToolForDrops()), Rarity.UNCOMMON, 1);
public static final RegistryObject ARCHEOLOGY_TABLE = registerBlock("archeology_table",
- () -> new ArcheologyTableBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.WOOD).strength(2.0F, 3.0F)
+ () -> new ArcheologyTableBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.0F, 3.0F)
.sound(SoundType.WOOD)
.noOcclusion()));
public static final RegistryObject FIRE_PIT = registerBlock("fire_pit",
- () -> new FirePitBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.TERRACOTTA_ORANGE).instabreak()
+ () -> new FirePitBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).instabreak()
.sound(SoundType.STONE).lightLevel((state) -> state.getValue(FirePitBlock.LIT) ? 15 : 0), ParticleTypes.FLAME));
public static final RegistryObject SANDSTONE_WITH_LAPIS = registerBlock("sandstone_with_lapis",
- () -> new Block(BlockBehaviour.Properties.of(Material.STONE).strength(0.8F).requiresCorrectToolForDrops()));
+ () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(0.8F).requiresCorrectToolForDrops()));
public static final RegistryObject SANDSTONE_HIEROGLYPHS = registerBlock("sandstone_hieroglyphs",
- () -> new Block(BlockBehaviour.Properties.of(Material.STONE).strength(0.8F).requiresCorrectToolForDrops()));
+ () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(0.8F).requiresCorrectToolForDrops()));
public static final RegistryObject SANDSTONE_SWITCH = registerBlock("sandstone_switch",
- () -> new SecretSwitchBlock(BlockBehaviour.Properties.of(Material.STONE).strength(0.8F).requiresCorrectToolForDrops()));
+ () -> new SecretSwitchBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(0.8F).requiresCorrectToolForDrops()));
public static final RegistryObject SANDSTONE_CARTOUCHE = registerBlock("sandstone_cartouche",
- () -> new SandstoneCartoucheBlock(BlockBehaviour.Properties.of(Material.STONE).strength(0.8F).requiresCorrectToolForDrops()), 1);
+ () -> new SandstoneCartoucheBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(0.8F).requiresCorrectToolForDrops()), 1);
public static final RegistryObject STONE_CARTOUCHE = registerBlock("stone_cartouche",
- () -> new StoneCartoucheBlock(BlockBehaviour.Properties.of(Material.STONE).strength(1.5F, 6.0F).requiresCorrectToolForDrops()), 1);
+ () -> new StoneCartoucheBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(1.5F, 6.0F).requiresCorrectToolForDrops()), 1);
public static final RegistryObject STONE_SYMBOL = registerBlock("stone_symbol",
- () -> new StoneSymbolBlock(BlockBehaviour.Properties.of(Material.STONE).strength(0.8F).requiresCorrectToolForDrops().noOcclusion()));
+ () -> new StoneSymbolBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(0.8F).requiresCorrectToolForDrops().noOcclusion()));
public static final RegistryObject SANDSTONE_SYMBOL = registerBlock("sandstone_symbol",
- () -> new SandstoneSymbolBlock(BlockBehaviour.Properties.of(Material.STONE).strength(1.5F, 6.0F).requiresCorrectToolForDrops().noOcclusion()));
+ () -> new SandstoneSymbolBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(1.5F, 6.0F).requiresCorrectToolForDrops().noOcclusion()));
public static final RegistryObject NAQUADAH_GENERATOR_MARK_I = registerBlock("naquadah_generator_mark_i",
- () -> new NaquadahGeneratorMarkIBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 6.0F)), 1);
+ () -> new NaquadahGeneratorMarkIBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F)), 1);
public static final RegistryObject NAQUADAH_GENERATOR_MARK_II = registerBlock("naquadah_generator_mark_ii",
- () -> new NaquadahGeneratorMarkIIBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 6.0F)), 1);
+ () -> new NaquadahGeneratorMarkIIBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F)), 1);
public static final RegistryObject BASIC_INTERFACE = registerBlock("basic_interface",
- () -> new BasicInterfaceBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 6.0F)), 1);
+ () -> new BasicInterfaceBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F)), 1);
public static final RegistryObject CRYSTAL_INTERFACE = registerBlock("crystal_interface",
- () -> new CrystalInterfaceBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 6.0F)), 1);
+ () -> new CrystalInterfaceBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F)), 1);
public static final RegistryObject ANCIENT_GENE_DETECTOR = registerBlock("ancient_gene_detector",
- () -> new ATAGeneDetectorBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 6.0F)), Rarity.RARE, 1);
+ () -> new ATAGeneDetectorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F)), Rarity.RARE, 1);
public static final RegistryObject ZPM_HUB = registerBlock("zpm_hub",
- () -> new ZPMHubBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 6.0F)), Rarity.RARE, 1);
+ () -> new ZPMHubBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F)), Rarity.RARE, 1);
// ZPM Plug
public static final RegistryObject CRYSTALLIZER = registerBlock("crystallizer",
- () -> new CrystallizerBlock(BlockBehaviour.Properties.of(Material.METAL).strength(5.0F, 6.0F)), 1);
+ () -> new CrystallizerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F)), 1);
private static RegistryObject registerBlock(String name, Supplier block)
diff --git a/src/main/java/net/povstalec/sgjourney/common/init/CommandInit.java b/src/main/java/net/povstalec/sgjourney/common/init/CommandInit.java
index ae56b441..331c4a80 100644
--- a/src/main/java/net/povstalec/sgjourney/common/init/CommandInit.java
+++ b/src/main/java/net/povstalec/sgjourney/common/init/CommandInit.java
@@ -71,7 +71,7 @@ public static void register(CommandDispatcher dispatcher)
private static int getAddress(CommandContext context) throws CommandSyntaxException
{
String dimension = DimensionArgument.getDimension(context, "dimension").dimension().location().toString();
- Level level = context.getSource().getPlayer().getLevel();
+ Level level = context.getSource().getPlayer().level();
String currentDimension = level.dimension().location().toString();
@@ -106,7 +106,7 @@ private static int getAddress(CommandContext context) throws
private static int getExtragalacticAddress(CommandContext context) throws CommandSyntaxException
{
String dimension = DimensionArgument.getDimension(context, "dimension").dimension().location().toString();
- Level level = context.getSource().getPlayer().getLevel();
+ Level level = context.getSource().getPlayer().level();
String address = Universe.get(level).getExtragalacticAddressFromDimension(dimension);
@@ -119,7 +119,7 @@ private static int getExtragalacticAddress(CommandContext co
private static int getStargates(CommandContext context) throws CommandSyntaxException
{
String dimension = DimensionArgument.getDimension(context, "dimension").dimension().location().toString();
- Level level = context.getSource().getPlayer().getLevel();
+ Level level = context.getSource().getPlayer().level();
String solarSystem = Universe.get(level).getSolarSystemFromDimension(dimension);
if(!solarSystem.isEmpty())
@@ -147,7 +147,7 @@ private static int getStargates(CommandContext context) thro
private static int getVersion(CommandContext context) throws CommandSyntaxException
{
- Level level = context.getSource().getPlayer().getLevel();
+ Level level = context.getSource().getPlayer().level();
int version = StargateNetwork.get(level).getVersion();
@@ -157,7 +157,7 @@ private static int getVersion(CommandContext context) throws
private static int forceStellarUpdate(CommandContext context) throws CommandSyntaxException
{
- Level level = context.getSource().getPlayer().getLevel();
+ Level level = context.getSource().getPlayer().level();
StargateNetwork.get(level).stellarUpdate(level.getServer());
@@ -170,7 +170,7 @@ private static int forceStellarUpdate(CommandContext context
private static int getTransportRings(CommandContext context) throws CommandSyntaxException
{
String dimension = DimensionArgument.getDimension(context, "dimension").dimension().location().toString();
- Level level = context.getSource().getPlayer().getLevel();
+ Level level = context.getSource().getPlayer().level();
context.getSource().getPlayer().sendSystemMessage(Component.literal("Transport Rings"));
context.getSource().getPlayer().sendSystemMessage(Component.literal("-------------------------"));
@@ -191,7 +191,7 @@ private static int getTransportRings(CommandContext context)
//Only used for console checks
private static int printStargateNetworkInfo(CommandContext context) throws CommandSyntaxException
{
- Level level = context.getSource().getPlayer().getLevel();
+ Level level = context.getSource().getPlayer().level();
System.out.println("Dimensions:\n" + Universe.get(level).getDimensions());
System.out.println("Solar Systems:\n" + Universe.get(level).getSolarSystems());
diff --git a/src/main/java/net/povstalec/sgjourney/common/init/TabInit.java b/src/main/java/net/povstalec/sgjourney/common/init/TabInit.java
index 32969d03..ddf66e47 100644
--- a/src/main/java/net/povstalec/sgjourney/common/init/TabInit.java
+++ b/src/main/java/net/povstalec/sgjourney/common/init/TabInit.java
@@ -1,12 +1,15 @@
package net.povstalec.sgjourney.common.init;
+import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.event.CreativeModeTabEvent;
+import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
+import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.RegistryObject;
import net.povstalec.sgjourney.StargateJourney;
import net.povstalec.sgjourney.common.blocks.SGJourneyBaseEntityBlock;
import net.povstalec.sgjourney.common.blocks.dhd.MilkyWayDHDBlock;
@@ -15,144 +18,137 @@
import net.povstalec.sgjourney.common.items.SyringeItem;
import net.povstalec.sgjourney.common.items.armor.PersonalShieldItem;
-@Mod.EventBusSubscriber(modid = StargateJourney.MODID)
public class TabInit
{
+ public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, StargateJourney.MODID);
+
+ public static RegistryObject STARGATE_ITEMS = CREATIVE_MODE_TABS.register("stargate_items", () ->
+ CreativeModeTab.builder().icon(() -> new ItemStack(ItemInit.NAQUADAH.get()))
+ .title(Component.translatable("creativemodetab.stargate_items")).build());
+
+ public static RegistryObject STARGATE_BLOCKS = CREATIVE_MODE_TABS.register("stargate_blocks", () ->
+ CreativeModeTab.builder().icon(() -> new ItemStack(BlockInit.MILKY_WAY_STARGATE.get()))
+ .title(Component.translatable("creativemodetab.stargate_blocks")).build());
+
@SubscribeEvent
- public static void onRegisterModTabs(final CreativeModeTabEvent.Register event)
+ public static void addCreative(final BuildCreativeModeTabContentsEvent event)
{
- event.registerCreativeModeTab(new ResourceLocation(StargateJourney.MODID, "stargate_items"), (builder) ->
+ if(event.getTab() == STARGATE_ITEMS.get())
{
- builder.title(Component.translatable("itemGroup.stargate_items"))
- .icon(() -> new ItemStack(ItemInit.NAQUADAH.get()))
- .displayItems((parameters, output) ->
- {
- output.accept(ItemInit.RAW_NAQUADAH.get());
- output.accept(ItemInit.NAQUADAH_ALLOY.get());
- output.accept(ItemInit.PURE_NAQUADAH.get());
- output.accept(ItemInit.NAQUADAH.get());
- output.accept(ItemInit.LIQUID_NAQUADAH_BUCKET.get());
- //items.accept(ItemInit.LIQUID_NAQUADAH_BOTTLE.get());
- output.accept(NaquadahBottleItem.liquidNaquadahSetup());
+ event.accept(ItemInit.RAW_NAQUADAH.get());
+ event.accept(ItemInit.NAQUADAH_ALLOY.get());
+ event.accept(ItemInit.PURE_NAQUADAH.get());
+ event.accept(ItemInit.NAQUADAH.get());
+ event.accept(ItemInit.LIQUID_NAQUADAH_BUCKET.get());
+ //event.accept(ItemInit.LIQUID_NAQUADAH_BOTTLE.get());
+ event.accept(NaquadahBottleItem.liquidNaquadahSetup());
- output.accept(ItemInit.NAQUADAH_ROD.get());
- output.accept(ItemInit.REACTION_CHAMBER.get());
- output.accept(ItemInit.PLASMA_CONVERTER.get());
-
- output.accept(ItemInit.PDA.get());
-
- output.accept(ItemInit.NAQUADAH_SWORD.get());
- output.accept(ItemInit.NAQUADAH_PICKAXE.get());
- output.accept(ItemInit.NAQUADAH_AXE.get());
- output.accept(ItemInit.NAQUADAH_SHOVEL.get());
- output.accept(ItemInit.NAQUADAH_HOE.get());
-
- output.accept(ItemInit.NAQUADAH_HELMET.get());
- output.accept(ItemInit.NAQUADAH_CHESTPLATE.get());
- output.accept(ItemInit.NAQUADAH_LEGGINGS.get());
- output.accept(ItemInit.NAQUADAH_BOOTS.get());
-
- output.accept(ItemInit.KARA_KESH.get());
- output.accept(ItemInit.RING_REMOTE.get());
-
- output.accept(ItemInit.MATOK.get());
-
- output.accept(ItemInit.JACKAL_HELMET.get());
- //items.accept(ItemInit.HORUS_HELMET.get());
- output.accept(ItemInit.JAFFA_HELMET.get());
- output.accept(ItemInit.JAFFA_CHESTPLATE.get());
- output.accept(ItemInit.JAFFA_LEGGINGS.get());
- output.accept(ItemInit.JAFFA_BOOTS.get());
+ event.accept(ItemInit.NAQUADAH_ROD.get());
+ event.accept(ItemInit.REACTION_CHAMBER.get());
+ event.accept(ItemInit.PLASMA_CONVERTER.get());
+
+ event.accept(ItemInit.PDA.get());
+
+ event.accept(ItemInit.NAQUADAH_SWORD.get());
+ event.accept(ItemInit.NAQUADAH_PICKAXE.get());
+ event.accept(ItemInit.NAQUADAH_AXE.get());
+ event.accept(ItemInit.NAQUADAH_SHOVEL.get());
+ event.accept(ItemInit.NAQUADAH_HOE.get());
+
+ event.accept(ItemInit.NAQUADAH_HELMET.get());
+ event.accept(ItemInit.NAQUADAH_CHESTPLATE.get());
+ event.accept(ItemInit.NAQUADAH_LEGGINGS.get());
+ event.accept(ItemInit.NAQUADAH_BOOTS.get());
+
+ event.accept(ItemInit.KARA_KESH.get());
+ event.accept(ItemInit.RING_REMOTE.get());
+
+ event.accept(ItemInit.MATOK.get());
+
+ event.accept(ItemInit.JACKAL_HELMET.get());
+ //items.accept(ItemInit.HORUS_HELMET.get());
+ event.accept(ItemInit.JAFFA_HELMET.get());
+ event.accept(ItemInit.JAFFA_CHESTPLATE.get());
+ event.accept(ItemInit.JAFFA_LEGGINGS.get());
+ event.accept(ItemInit.JAFFA_BOOTS.get());
- output.accept(ItemInit.ZPM.get());
- //items.accept(ItemInit.PERSONAL_SHIELD_EMITTER.get());
- output.accept(PersonalShieldItem.personalShieldSetup());
+ event.accept(ItemInit.ZPM.get());
+ //event.accept(ItemInit.PERSONAL_SHIELD_EMITTER.get());
+ event.accept(PersonalShieldItem.personalShieldSetup());
- output.accept(ItemInit.SYRINGE.get());
- output.accept(SyringeItem.addContents(SyringeItem.Contents.PROTOTYPE_ATA));
- output.accept(SyringeItem.addContents(SyringeItem.Contents.ATA));
+ event.accept(ItemInit.SYRINGE.get());
+ event.accept(SyringeItem.addContents(SyringeItem.Contents.PROTOTYPE_ATA));
+ event.accept(SyringeItem.addContents(SyringeItem.Contents.ATA));
- output.accept(ItemInit.LARGE_CONTROL_CRYSTAL.get());
- output.accept(ItemInit.CONTROL_CRYSTAL.get());
- output.accept(ItemInit.ADVANCED_CONTROL_CRYSTAL.get());
- output.accept(ItemInit.MEMORY_CRYSTAL.get());
- output.accept(ItemInit.ADVANCED_MEMORY_CRYSTAL.get());
- //items.accept(MemoryCrystalItem.atlantisAddress());
- //items.accept(MemoryCrystalItem.abydosAddress());
- output.accept(ItemInit.MATERIALIZATION_CRYSTAL.get());
- output.accept(ItemInit.ADVANCED_MATERIALIZATION_CRYSTAL.get());
- output.accept(ItemInit.ENERGY_CRYSTAL.get());
- output.accept(ItemInit.ADVANCED_ENERGY_CRYSTAL.get());
- output.accept(ItemInit.COMMUNICATION_CRYSTAL.get());
- output.accept(ItemInit.ADVANCED_COMMUNICATION_CRYSTAL.get());
- });
- });
-
- event.registerCreativeModeTab(new ResourceLocation(StargateJourney.MODID, "stargate_blocks"), (builder) ->
+ event.accept(ItemInit.LARGE_CONTROL_CRYSTAL.get());
+ event.accept(ItemInit.CONTROL_CRYSTAL.get());
+ event.accept(ItemInit.ADVANCED_CONTROL_CRYSTAL.get());
+ event.accept(ItemInit.MEMORY_CRYSTAL.get());
+ event.accept(ItemInit.ADVANCED_MEMORY_CRYSTAL.get());
+ //event.accept(MemoryCrystalItem.atlantisAddress());
+ //event.accept(MemoryCrystalItem.abydosAddress());
+ event.accept(ItemInit.MATERIALIZATION_CRYSTAL.get());
+ event.accept(ItemInit.ADVANCED_MATERIALIZATION_CRYSTAL.get());
+ event.accept(ItemInit.ENERGY_CRYSTAL.get());
+ event.accept(ItemInit.ADVANCED_ENERGY_CRYSTAL.get());
+ event.accept(ItemInit.COMMUNICATION_CRYSTAL.get());
+ event.accept(ItemInit.ADVANCED_COMMUNICATION_CRYSTAL.get());
+ }
+ else if(event.getTab() == STARGATE_BLOCKS.get())
{
- builder.title(Component.translatable("itemGroup.stargate_blocks"))
- .icon(() -> new ItemStack(BlockInit.NAQUADAH_BLOCK.get()))
- .displayItems((parameters, output) ->
- {
- output.accept(BlockInit.UNIVERSE_STARGATE.get());
- output.accept(BlockInit.MILKY_WAY_STARGATE.get());
- //items.accept(BlockInit.MILKY_WAY_DHD.get());
- output.accept(MilkyWayDHDBlock.milkyWayCrystalSetup());
- output.accept(BlockInit.PEGASUS_STARGATE.get());
- //items.accept(BlockInit.PEGASUS_DHD.get());
- output.accept(PegasusDHDBlock.pegasusCrystalSetup());
- output.accept(BlockInit.CLASSIC_STARGATE.get());
- output.accept(BlockInit.CLASSIC_DHD.get());
- output.accept(BlockInit.TOLLAN_STARGATE.get());
+ event.accept(BlockInit.UNIVERSE_STARGATE.get());
+ event.accept(BlockInit.MILKY_WAY_STARGATE.get());
+ //items.accept(BlockInit.MILKY_WAY_DHD.get());
+ event.accept(MilkyWayDHDBlock.milkyWayCrystalSetup());
+ event.accept(BlockInit.PEGASUS_STARGATE.get());
+ //items.accept(BlockInit.PEGASUS_DHD.get());
+ event.accept(PegasusDHDBlock.pegasusCrystalSetup());
+ event.accept(BlockInit.CLASSIC_STARGATE.get());
+ event.accept(BlockInit.CLASSIC_DHD.get());
+ event.accept(BlockInit.TOLLAN_STARGATE.get());
- output.accept(BlockInit.TRANSPORT_RINGS.get());
- output.accept(BlockInit.RING_PANEL.get());
-
- output.accept(BlockInit.ARCHEOLOGY_TABLE.get());
- output.accept(BlockInit.GOLDEN_IDOL.get());
+ event.accept(BlockInit.TRANSPORT_RINGS.get());
+ event.accept(BlockInit.RING_PANEL.get());
+
+ event.accept(BlockInit.ARCHEOLOGY_TABLE.get());
+ event.accept(BlockInit.GOLDEN_IDOL.get());
- output.accept(BlockInit.NAQUADAH_ORE.get());
- output.accept(BlockInit.DEEPSLATE_NAQUADAH_ORE.get());
- output.accept(BlockInit.NETHER_NAQUADAH_ORE.get());
- output.accept(BlockInit.RAW_NAQUADAH_BLOCK.get());
-
- output.accept(BlockInit.NAQUADAH_BLOCK.get());
- output.accept(BlockInit.NAQUADAH_STAIRS.get());
- output.accept(BlockInit.NAQUADAH_SLAB.get());
- output.accept(BlockInit.CUT_NAQUADAH_BLOCK.get());
- output.accept(BlockInit.CUT_NAQUADAH_STAIRS.get());
- output.accept(BlockInit.CUT_NAQUADAH_SLAB.get());
-
- output.accept(BlockInit.SANDSTONE_HIEROGLYPHS.get());
- output.accept(BlockInit.SANDSTONE_SWITCH.get());
- output.accept(BlockInit.SANDSTONE_WITH_LAPIS.get());
- output.accept(BlockInit.SANDSTONE_SYMBOL.get());
- output.accept(BlockInit.STONE_SYMBOL.get());
-
- output.accept(BlockInit.SANDSTONE_CARTOUCHE.get());
- output.accept(BlockInit.STONE_CARTOUCHE.get());
-
- output.accept(BlockInit.FIRE_PIT.get());
+ event.accept(BlockInit.NAQUADAH_ORE.get());
+ event.accept(BlockInit.DEEPSLATE_NAQUADAH_ORE.get());
+ event.accept(BlockInit.NETHER_NAQUADAH_ORE.get());
+ event.accept(BlockInit.RAW_NAQUADAH_BLOCK.get());
+
+ event.accept(BlockInit.NAQUADAH_BLOCK.get());
+ event.accept(BlockInit.NAQUADAH_STAIRS.get());
+ event.accept(BlockInit.NAQUADAH_SLAB.get());
+ event.accept(BlockInit.CUT_NAQUADAH_BLOCK.get());
+ event.accept(BlockInit.CUT_NAQUADAH_STAIRS.get());
+ event.accept(BlockInit.CUT_NAQUADAH_SLAB.get());
+
+ event.accept(BlockInit.SANDSTONE_HIEROGLYPHS.get());
+ event.accept(BlockInit.SANDSTONE_SWITCH.get());
+ event.accept(BlockInit.SANDSTONE_WITH_LAPIS.get());
+ event.accept(BlockInit.SANDSTONE_SYMBOL.get());
+ event.accept(BlockInit.STONE_SYMBOL.get());
+
+ event.accept(BlockInit.SANDSTONE_CARTOUCHE.get());
+ event.accept(BlockInit.STONE_CARTOUCHE.get());
+
+ event.accept(BlockInit.FIRE_PIT.get());
- output.accept(BlockInit.NAQUADAH_GENERATOR_MARK_I.get());
- output.accept(BlockInit.NAQUADAH_GENERATOR_MARK_II.get());
-
- output.accept(BlockInit.BASIC_INTERFACE.get());
- output.accept(BlockInit.CRYSTAL_INTERFACE.get());
+ event.accept(BlockInit.NAQUADAH_GENERATOR_MARK_I.get());
+ event.accept(BlockInit.NAQUADAH_GENERATOR_MARK_II.get());
+
+ event.accept(BlockInit.BASIC_INTERFACE.get());
+ event.accept(BlockInit.CRYSTAL_INTERFACE.get());
- output.accept(BlockInit.ANCIENT_GENE_DETECTOR.get());
-
- output.accept(BlockInit.ZPM_HUB.get());
+ event.accept(BlockInit.ANCIENT_GENE_DETECTOR.get());
+
+ event.accept(BlockInit.ZPM_HUB.get());
- //items.accept(BlockInit.CRYSTALLIZER.get());
- });
- });
- }
-
- @SubscribeEvent
- public static void addCreative(final CreativeModeTabEvent.BuildContents event)
- {
- if(event.getTab() == CreativeModeTabs.OP_BLOCKS)
+ //items.accept(BlockInit.CRYSTALLIZER.get());
+ }
+ else if(event.getTabKey() == CreativeModeTabs.OP_BLOCKS)
{
event.accept(SGJourneyBaseEntityBlock.excludeFromNetwork(new ItemStack(BlockInit.UNIVERSE_STARGATE.get())));
event.accept(SGJourneyBaseEntityBlock.excludeFromNetwork(new ItemStack(BlockInit.MILKY_WAY_STARGATE.get())));
@@ -160,4 +156,9 @@ public static void addCreative(final CreativeModeTabEvent.BuildContents event)
event.accept(SGJourneyBaseEntityBlock.excludeFromNetwork(new ItemStack(BlockInit.TRANSPORT_RINGS.get())));
}
}
+
+ public static void register(IEventBus eventBus)
+ {
+ CREATIVE_MODE_TABS.register(eventBus);
+ }
}
diff --git a/src/main/java/net/povstalec/sgjourney/common/init/VillagerInit.java b/src/main/java/net/povstalec/sgjourney/common/init/VillagerInit.java
index 52ee28c0..f624ea8a 100644
--- a/src/main/java/net/povstalec/sgjourney/common/init/VillagerInit.java
+++ b/src/main/java/net/povstalec/sgjourney/common/init/VillagerInit.java
@@ -30,7 +30,7 @@ public class VillagerInit
() -> new VillagerProfession("archeologist", x -> x.get() == ARCHEOLOGIST_POI.get(), x -> x.get() == ARCHEOLOGIST_POI.get(),
ImmutableSet.of(), ImmutableSet.of(), SoundEvents.VILLAGER_WORK_CARTOGRAPHER));
- public static void registerPOIs()
+ /*public static void registerPOIs()
{
try
{
@@ -40,7 +40,7 @@ public static void registerPOIs()
{
exception.printStackTrace();
}
- }
+ }*/
public static void register(IEventBus eventBus)
{
diff --git a/src/main/java/net/povstalec/sgjourney/common/items/PDAItem.java b/src/main/java/net/povstalec/sgjourney/common/items/PDAItem.java
index 48375a5f..3b3bec95 100644
--- a/src/main/java/net/povstalec/sgjourney/common/items/PDAItem.java
+++ b/src/main/java/net/povstalec/sgjourney/common/items/PDAItem.java
@@ -68,7 +68,7 @@ public InteractionResultHolder use(Level level, Player player, Intera
@Override
public InteractionResult interactLivingEntity(ItemStack stack, Player player, LivingEntity target, InteractionHand hand)
{
- if(!player.getLevel().isClientSide())
+ if(!player.level().isClientSide())
this.scanEntity(player, target);
return super.interactLivingEntity(stack, player, target, hand);
diff --git a/src/main/java/net/povstalec/sgjourney/common/menu/AbstractDHDMenu.java b/src/main/java/net/povstalec/sgjourney/common/menu/AbstractDHDMenu.java
index b3a6242f..c531b707 100644
--- a/src/main/java/net/povstalec/sgjourney/common/menu/AbstractDHDMenu.java
+++ b/src/main/java/net/povstalec/sgjourney/common/menu/AbstractDHDMenu.java
@@ -20,7 +20,7 @@ public abstract class AbstractDHDMenu extends AbstractContainerMenu
public AbstractDHDMenu(MenuType menu, int containerId, Inventory inv, FriendlyByteBuf extraData)
{
- this(menu, containerId, inv, inv.player.level.getBlockEntity(extraData.readBlockPos()));
+ this(menu, containerId, inv, inv.player.level().getBlockEntity(extraData.readBlockPos()));
}
public AbstractDHDMenu(MenuType menu, int containerId, Inventory inv, BlockEntity entity)
@@ -28,7 +28,7 @@ public AbstractDHDMenu(MenuType menu, int containerId, Inventory inv, BlockEn
super(menu, containerId);
checkContainerSize(inv, 6);
blockEntity = ((AbstractDHDEntity) entity);
- this.level = inv.player.level;
+ this.level = inv.player.level();
}
public void engageChevron(int symbol)
diff --git a/src/main/java/net/povstalec/sgjourney/common/menu/BasicInterfaceMenu.java b/src/main/java/net/povstalec/sgjourney/common/menu/BasicInterfaceMenu.java
index 42a195af..51f481d4 100644
--- a/src/main/java/net/povstalec/sgjourney/common/menu/BasicInterfaceMenu.java
+++ b/src/main/java/net/povstalec/sgjourney/common/menu/BasicInterfaceMenu.java
@@ -18,13 +18,13 @@ public class BasicInterfaceMenu extends AbstractContainerMenu
private final Level level;
public BasicInterfaceMenu(int containerId, Inventory inv, FriendlyByteBuf extraData) {
- this(containerId, inv, inv.player.level.getBlockEntity(extraData.readBlockPos()));
+ this(containerId, inv, inv.player.level().getBlockEntity(extraData.readBlockPos()));
}
public BasicInterfaceMenu(int containerId, Inventory inv, BlockEntity entity) {
super(MenuInit.BASIC_INTERFACE.get(), containerId);
blockEntity = ((BasicInterfaceEntity) entity);
- this.level = inv.player.level;
+ this.level = inv.player.level();
}
public long getEnergy()
diff --git a/src/main/java/net/povstalec/sgjourney/common/menu/CrystalInterfaceMenu.java b/src/main/java/net/povstalec/sgjourney/common/menu/CrystalInterfaceMenu.java
index 94bb75db..1a309e0a 100644
--- a/src/main/java/net/povstalec/sgjourney/common/menu/CrystalInterfaceMenu.java
+++ b/src/main/java/net/povstalec/sgjourney/common/menu/CrystalInterfaceMenu.java
@@ -22,7 +22,7 @@ public class CrystalInterfaceMenu extends AbstractContainerMenu
public CrystalInterfaceMenu(int containerId, Inventory inv, FriendlyByteBuf extraData)
{
- this(containerId, inv, inv.player.level.getBlockEntity(extraData.readBlockPos()));
+ this(containerId, inv, inv.player.level().getBlockEntity(extraData.readBlockPos()));
}
public CrystalInterfaceMenu(int containerId, Inventory inv, BlockEntity entity)
@@ -30,7 +30,7 @@ public CrystalInterfaceMenu(int containerId, Inventory inv, BlockEntity entity)
super(MenuInit.CRYSTAL_INTERFACE.get(), containerId);
checkContainerSize(inv, 8);
blockEntity = ((CrystalInterfaceEntity) entity);
- this.level = inv.player.level;
+ this.level = inv.player.level();
addPlayerInventory(inv);
addPlayerHotbar(inv);
diff --git a/src/main/java/net/povstalec/sgjourney/common/menu/DHDCrystalMenu.java b/src/main/java/net/povstalec/sgjourney/common/menu/DHDCrystalMenu.java
index 8b3596af..3c114e2b 100644
--- a/src/main/java/net/povstalec/sgjourney/common/menu/DHDCrystalMenu.java
+++ b/src/main/java/net/povstalec/sgjourney/common/menu/DHDCrystalMenu.java
@@ -22,7 +22,7 @@ public class DHDCrystalMenu extends AbstractContainerMenu
public DHDCrystalMenu(int containerId, Inventory inv, FriendlyByteBuf extraData)
{
- this(containerId, inv, inv.player.level.getBlockEntity(extraData.readBlockPos()));
+ this(containerId, inv, inv.player.level().getBlockEntity(extraData.readBlockPos()));
}
public DHDCrystalMenu(int containerId, Inventory inv, BlockEntity entity)
@@ -30,7 +30,7 @@ public DHDCrystalMenu(int containerId, Inventory inv, BlockEntity entity)
super(MenuInit.DHD_CRYSTAL.get(), containerId);
checkContainerSize(inv, 9);
blockEntity = ((AbstractDHDEntity) entity);
- this.level = inv.player.level;
+ this.level = inv.player.level();
addPlayerInventory(inv);
addPlayerHotbar(inv);
diff --git a/src/main/java/net/povstalec/sgjourney/common/menu/NaquadahGeneratorMenu.java b/src/main/java/net/povstalec/sgjourney/common/menu/NaquadahGeneratorMenu.java
index ad70e754..ef90a4bb 100644
--- a/src/main/java/net/povstalec/sgjourney/common/menu/NaquadahGeneratorMenu.java
+++ b/src/main/java/net/povstalec/sgjourney/common/menu/NaquadahGeneratorMenu.java
@@ -21,14 +21,14 @@ public class NaquadahGeneratorMenu extends AbstractContainerMenu
private final Level level;
public NaquadahGeneratorMenu(int containerId, Inventory inv, FriendlyByteBuf extraData) {
- this(containerId, inv, inv.player.level.getBlockEntity(extraData.readBlockPos()));
+ this(containerId, inv, inv.player.level().getBlockEntity(extraData.readBlockPos()));
}
public NaquadahGeneratorMenu(int containerId, Inventory inv, BlockEntity entity) {
super(MenuInit.NAQUADAH_GENERATOR.get(), containerId);
checkContainerSize(inv, 1);
blockEntity = ((NaquadahGeneratorEntity) entity);
- this.level = inv.player.level;
+ this.level = inv.player.level();
addPlayerInventory(inv);
addPlayerHotbar(inv);
diff --git a/src/main/java/net/povstalec/sgjourney/common/menu/RingPanelMenu.java b/src/main/java/net/povstalec/sgjourney/common/menu/RingPanelMenu.java
index 9e5460e4..6b47095f 100644
--- a/src/main/java/net/povstalec/sgjourney/common/menu/RingPanelMenu.java
+++ b/src/main/java/net/povstalec/sgjourney/common/menu/RingPanelMenu.java
@@ -24,14 +24,14 @@ public class RingPanelMenu extends AbstractContainerMenu
private final Level level;
public RingPanelMenu(int containerId, Inventory inv, FriendlyByteBuf extraData) {
- this(containerId, inv, inv.player.level.getBlockEntity(extraData.readBlockPos()));
+ this(containerId, inv, inv.player.level().getBlockEntity(extraData.readBlockPos()));
}
public RingPanelMenu(int containerId, Inventory inv, BlockEntity entity) {
super(MenuInit.RING_PANEL.get(), containerId);
checkContainerSize(inv, 6);
blockEntity = ((RingPanelEntity) entity);
- this.level = inv.player.level;
+ this.level = inv.player.level();
addPlayerInventory(inv);
addPlayerHotbar(inv);
diff --git a/src/main/java/net/povstalec/sgjourney/common/menu/ZPMHubMenu.java b/src/main/java/net/povstalec/sgjourney/common/menu/ZPMHubMenu.java
index 3b0aa1ea..8b3104c9 100644
--- a/src/main/java/net/povstalec/sgjourney/common/menu/ZPMHubMenu.java
+++ b/src/main/java/net/povstalec/sgjourney/common/menu/ZPMHubMenu.java
@@ -21,14 +21,14 @@ public class ZPMHubMenu extends AbstractContainerMenu
private final Level level;
public ZPMHubMenu(int containerId, Inventory inv, FriendlyByteBuf extraData) {
- this(containerId, inv, inv.player.level.getBlockEntity(extraData.readBlockPos()));
+ this(containerId, inv, inv.player.level().getBlockEntity(extraData.readBlockPos()));
}
public ZPMHubMenu(int containerId, Inventory inv, BlockEntity entity) {
super(MenuInit.ZPM_HUB.get(), containerId);
checkContainerSize(inv, 1);
blockEntity = ((ZPMHubEntity) entity);
- this.level = inv.player.level;
+ this.level = inv.player.level();
addPlayerInventory(inv);
addPlayerHotbar(inv);
diff --git a/src/main/java/net/povstalec/sgjourney/common/misc/InventoryUtil.java b/src/main/java/net/povstalec/sgjourney/common/misc/InventoryUtil.java
index 61582d08..3b932ad9 100644
--- a/src/main/java/net/povstalec/sgjourney/common/misc/InventoryUtil.java
+++ b/src/main/java/net/povstalec/sgjourney/common/misc/InventoryUtil.java
@@ -12,7 +12,7 @@ public static boolean hasPlayerStackInInventory(Player player, Item item)
for(int i = 0; i < player.getInventory().getContainerSize(); i++)
{
ItemStack currentStack = player.getInventory().getItem(i);
- if (!currentStack.isEmpty() && currentStack.sameItem(new ItemStack(item)))
+ if (!currentStack.isEmpty() && currentStack.is(item))
{
return true;
}
@@ -26,7 +26,7 @@ public static int getFirstInventoryIndex(Player player, Item item)
for(int i = 0; i < player.getInventory().getContainerSize(); i++)
{
ItemStack currentStack = player.getInventory().getItem(i);
- if (!currentStack.isEmpty() && currentStack.sameItem(new ItemStack(item)))
+ if (!currentStack.isEmpty() && currentStack.is(item))
{
return i;
}
diff --git a/src/main/java/net/povstalec/sgjourney/common/misc/TreasureMapForEmeraldsTrade.java b/src/main/java/net/povstalec/sgjourney/common/misc/TreasureMapForEmeraldsTrade.java
index d5129f1e..b04451aa 100644
--- a/src/main/java/net/povstalec/sgjourney/common/misc/TreasureMapForEmeraldsTrade.java
+++ b/src/main/java/net/povstalec/sgjourney/common/misc/TreasureMapForEmeraldsTrade.java
@@ -35,12 +35,12 @@ public TreasureMapForEmeraldsTrade(int p_207767_, TagKey p_207768_, S
}
@Nullable
- public MerchantOffer getOffer(Entity p_219708_, RandomSource p_219709_) {
- if (!(p_219708_.level instanceof ServerLevel)) {
+ public MerchantOffer getOffer(Entity entity, RandomSource p_219709_) {
+ if (!(entity.level() instanceof ServerLevel)) {
return null;
} else {
- ServerLevel serverlevel = (ServerLevel)p_219708_.level;
- BlockPos blockpos = serverlevel.findNearestMapStructure(this.destination, p_219708_.blockPosition(), 100, true);
+ ServerLevel serverlevel = (ServerLevel)entity.level();
+ BlockPos blockpos = serverlevel.findNearestMapStructure(this.destination, entity.blockPosition(), 100, true);
if (blockpos != null) {
ItemStack itemstack = MapItem.create(serverlevel, blockpos.getX(), blockpos.getZ(), (byte)2, true, true);
MapItem.renderBiomePreviewMap(serverlevel, itemstack);
diff --git a/src/main/java/net/povstalec/sgjourney/common/packets/ServerboundDHDUpdatePacket.java b/src/main/java/net/povstalec/sgjourney/common/packets/ServerboundDHDUpdatePacket.java
index ec0af539..57e77d7d 100644
--- a/src/main/java/net/povstalec/sgjourney/common/packets/ServerboundDHDUpdatePacket.java
+++ b/src/main/java/net/povstalec/sgjourney/common/packets/ServerboundDHDUpdatePacket.java
@@ -33,7 +33,7 @@ public void encode(FriendlyByteBuf buffer)
public boolean handle(Supplier ctx)
{
ctx.get().enqueueWork(() -> {
- final BlockEntity blockEntity = ctx.get().getSender().level.getBlockEntity(blockPos);
+ final BlockEntity blockEntity = ctx.get().getSender().level().getBlockEntity(blockPos);
if(blockEntity instanceof AbstractDHDEntity dhd)
{
dhd.engageChevron(this.symbol);
diff --git a/src/main/java/net/povstalec/sgjourney/common/packets/ServerboundRingPanelUpdatePacket.java b/src/main/java/net/povstalec/sgjourney/common/packets/ServerboundRingPanelUpdatePacket.java
index 1b3ed7b8..ecd563a3 100644
--- a/src/main/java/net/povstalec/sgjourney/common/packets/ServerboundRingPanelUpdatePacket.java
+++ b/src/main/java/net/povstalec/sgjourney/common/packets/ServerboundRingPanelUpdatePacket.java
@@ -33,7 +33,7 @@ public void encode(FriendlyByteBuf buffer)
public boolean handle(Supplier ctx)
{
ctx.get().enqueueWork(() -> {
- final BlockEntity blockEntity = ctx.get().getSender().level.getBlockEntity(blockPos);
+ final BlockEntity blockEntity = ctx.get().getSender().level().getBlockEntity(blockPos);
if(blockEntity instanceof RingPanelEntity ringPanel)
{
ringPanel.activateRings(number);
diff --git a/src/main/java/net/povstalec/sgjourney/common/stargate/Wormhole.java b/src/main/java/net/povstalec/sgjourney/common/stargate/Wormhole.java
index 29caa178..ad4a1fdb 100644
--- a/src/main/java/net/povstalec/sgjourney/common/stargate/Wormhole.java
+++ b/src/main/java/net/povstalec/sgjourney/common/stargate/Wormhole.java
@@ -132,7 +132,7 @@ public double reverseIfNeeded(boolean shouldReverse, double number)
public void doWormhole(AbstractStargateEntity initialStargate, AbstractStargateEntity targetStargate, Entity traveler, Vec3 momentum, Stargate.WormholeTravel twoWayWormhole)
{
- Level level = traveler.getLevel();
+ Level level = traveler.level();
playWormholeSound(level, traveler);
if(level.isClientSide())
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 2cef9e7b..9544dada 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
modLoader="javafml"
-loaderVersion="[44,)"
+loaderVersion="[47,)"
license="Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License"
issueTrackerURL="https://github.com/Povstalec/StargateJourney/issues"
[[mods]]
@@ -17,13 +17,13 @@ Stargate in Minecraft! And much more.
[[dependencies.sgjourney]]
modId="forge"
mandatory=true
- versionRange="[45,)"
+ versionRange="[47,)"
ordering="NONE"
side="BOTH"
[[dependencies.sgjourney]]
modId="minecraft"
mandatory=true
- versionRange="[1.19.4,1.20)"
+ versionRange="[1.20.1,1.21)"
ordering="NONE"
side="BOTH"
[[dependencies.sgjourney]]
@@ -32,16 +32,10 @@ Stargate in Minecraft! And much more.
versionRange="[1.104.0,)"
ordering="AFTER"
side="BOTH"
-[[dependencies.sgjourney]]
- modId="computercraft"
- mandatory=false
- versionRange="[1.104.0,)"
- ordering="AFTER"
- side="BOTH"
[[dependencies.sgjourney]]
modId="stellarview"
mandatory=false
- versionRange="[0.1.2,)"
+ versionRange="[0.1.5,)"
ordering="AFTER"
side="CLIENT"