Skip to content

Commit

Permalink
0.5.1 Patch F Port 1.20 (#1182)
Browse files Browse the repository at this point in the history
* fix contact offset added twice

* Update modded_stripped_logs.json

Add stripped logs for Environmental, Atmospheric, Infernal Expansion, Good Ending, and Biome Makeover

* Update modded_stripped_wood.json

* Add the mods correctly this time

* Fix Deployers not using item's useOn method

* Lang merger generic rollback (Creators-of-Create#5270)

* Server-friendly Item Groups

* Remove incorrectly merged CreateRegistry

This class was renamed to AttachedRegistry during the 0.5.1 update.

* Add tag to ban recipe serializers from automation (Creators-of-Create#5298)

* Refine PR changes and improve Mods class

* Remove unnecessary files

* Fix copycat model modifying potentially immutable list

- Perform minor mod initialization clean up
- Bump version to patch E
- Organize imports

* Added support of other packet size optimisation mods. (Creators-of-Create#5362)

* Added support of other packet size optimisation mods. (Connectivity and Packet Fixer)

* Added comment why we need min (not max) value.

* Finalize changes

---------

Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>

* Allow registration of custom fan processing types

- Fix crash on startup

* Update Flywheel

- Fix too many implementations of ProcessingRecipe#canSpecifyDuration
returning true

* Fix Various Bugs relating to Cherry and Bamboo wood not being included in the Create Mod (Creators-of-Create#5099)

* Fixed Cherry wood not being encase-able

* Fixed Bamboo wood not being encase-able

* Fixed Cherry and Bamboo Wood Not Having Cutting Recipes

* Move bamboo block to log and fix recipe

* Finalize changes

- Add recipe to cut bamboo planks into bamboo mosaic

---------

Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>

* Update crowdin.yml

- add estonian and 	vietnamese

* Remove Entity#level AT

Use an invoker for Entity#setLevel() instead

* Refactor damage types

- Replace DamageTypeData with DamageTypeBuilder and CreateDamageSources;
make DamageType- and DamageSource-related code more like vanilla
- Fix generated DamageType tags assigning all entries as optional
- Combine DamageTypeDataProvider and WorldgenDataProvider into
GeneratedEntriesProvider

* The last lang merge

- Add CreateRegistrate#addLangPostprocessor to arbitrarily transform
lang entry map generated by Registrate
- Remove all uses of and deprecate LangMerger and LangPartial
- Move additional tag definitions from TagGen to CreateRegistrateTags
- Move GatherDataEvent handler to CreateDatagen class
- Move some Create-specific datagen classes to infrastructure package

* Controllable Catalysts

- Add tags to allow controlling which blocks and fluids act as catalysts
for certain fan processing types
- Fix unexpected and incorrect fan processing air current behaviors
- Fix unlit campfires providing boiler heat
- Rename consumeLang to provideLang in all places
- Remove unused advancement-related classes

* Fourth state of matter

- Fix some blocks incorrectly being not solid
- Slightly clean up creative mode tab item collection and related code

* PipeCollisionEvents

-Add Flow and Spill events to allow for easy custom fluid collision results

* Update crowdin.yml

- add belarusian

* Fan and other tweaks

- Fix zero-length air current causing NPE
- Fix vertical air currents sometimes checking blocks for handlers
multiple times
- Fix blocking handlers at end of air flow not receiving processing
- Use Registrate namespace instead of "create" in fluid-related methods
in CreateRegistrate
- Flatten block property configuration in AllBlocks
- Make crushing wheel controller material solid
- Add note to Create.REGISTRATE

* Try to remove lang postprocessor

Removes the lang postprocessor system and adds additional lang using a
standard ProviderType.LANG generator. This commit will be reverted if it
causes issues.

* New Crowdin translations by Github Action

* Hell's Rollers

- Removed tooltip markers and examples from lang file
- Address Creators-of-Create#5124
- Added a bunch of safety checks for active rollers passing through a portal
- Fixed rollers in fill mode consuming blocks from a train without placing any

* Prevent Spectators from interacting with some create blocks/items (Creators-of-Create#5414)

- Spectators can no longer interact with Super Glue and Valve Handles

* PR fix-up

* Move fallback behaviour back to FluidReactions

* Advancement tweaks

- Change lava diving advancement from hidden to challenge, as it is an actual intended player ability since 0.5.1
- Changed title of speed controller advancement

* 3D

- Trains can now travel through Aether Portals

* Port fixups

* Port fixups

* Port fixups II

* Perform over Function

- Chutes, (Extracting) Funnels, Smart Observers and Threshold Switches no longer search vault contents unless the vault contents have changed
- Extracting Funnels no longer search their inventories' contents if their target depot or belt is occupied

* Remove lang post processor from javadoc

* Deprecate LangEntry

* Update more javadoc

* Update even more javadoc

* Restore LangMerger#attachToRegistrateProvider

* Actually remove attachToRegistrateProvider

Addons do not need it because it only attached Create's LangMerger and
not an arbitrary LangMerger.

* Heavens, no!

- Hotfix track placement not working when aether is not installed

* Frame breaker

- Rollers no longer break blocks adjacent to blocks tagged minecraft:portals

* Mixin't

- Fixed crash on startup when Optifine is installed

* rename to doRender

* generalized getFogDensity

- removed explicit check for the netherite diving helmet
- added check for netherite armor instead (check for diving helmet is ensured)

* generalized checking in NetheriteDivingHandler

- allows for using custom diving helmets and backtanks out of netherite

* Use appropriate method for sneaky players

* Add create debuginfo command (Creators-of-Create#5531)

* Debuginfo Tweaks

* Netherite Diving PR Tweaks

* Rewrite to remove unneeded pathfind call

* Optimize navigation refresh

* A* priority heuristic

* Fix distance estimator

* cleanup

* Keep old FrontierEntry constructor

* Remove comments

* Cache position in search method

* Remove unused lines

* Use octile distance instead of euclidean

* Fixes and tweaks

- Add #create:blaze_burner_capturable entity type tag
- Make it so blocks that do not implement IWrenchable and that are
tagged can only be picked up with a wrench while sneaking
- Fix AnalogLeverInstance not rendering indicator on 1.18 and 1.19 and
rendering indicator at wrong place in 1.20
- Change AirCurrent entity distance calculation to fix issues with some
items not being processed
- Simplify AirCurrent max VoxelShape depth calculation by using min and
max instead of raycasting
- Fix pipe cobblestone generation
- Fix vertical smart observers outputting redstone signal from wrong
sides
- Fix smart observer using wrong bottom texture

* Vertical threshold switch redstone fix

- Fix vertical threshold switches outputting redstone signal from wrong
sides

* Fix penalties not applying on station edge

* Multiple stations 1 call

* Fix Creators-of-Create#4756

* cleanup

* Fix crash on invalid schedule regex (e.g. "station \\E1\\Q")

* Implement Creators-of-Create#5666 on main branch

* final cleanup

* Collide on sight

- Trains check their distance before running full collision tests
- Trains can no longer collide when on separate track networks
- Micro-optimised some streams and map value iterators

* Filter code caused global warming

- Contents of a filter are no longer deserialised from item nbt each time a stack is tested
- FilteringBehaviour.getFilter() no longer creates a copy of the item
- MovementContext for contraption actors now have a shortcut to a cached filter from their corresponding BlockEntity

* Sisyphus's broken printer

- Fixed Schematics failing to load when containing items with sensitive nbt Creators-of-Create#5680
- Fixed Turntable handler causing a crash during world shutdown Creators-of-Create#5696
- Cached outputs of BeltHelper.isItemUpright()

* New Crowdin translations by Github Action

* Port Changes

* 1.19 datagen

* Bump version

* Asset patches

- Fixed uvs on stress- and speedometers' block models
- Toolbox hotbar slot overlay now uses the revised brass palette from 0.5.1

* quick fix

* It Builds!

* minor cleanup

* bump version

* changelog

* flywheel 0.6.10

* remove deprecated code

* switch to other flywheel

* yippee im getting GLFW GLX errors now!

* bump version

* Portals Trains dont work

* fix .is wackness

* null check

* attempt to fix portal trains

* Fix Portal Tracks Imports

* update maven

* update maven

* fix creative tabs

* chore: Bump Version

* fix tabs

* Match updated Porting-Lib version

For some reason, the fake player API doesn't match the rest of Porting-Lib, meaning I had to fight painfully with the build process

* fixes

* update loom & gradle

* update loom & gradle

* Revert "Match updated Porting-Lib version"

This reverts commit 75ffe5b.

* remove deprecated uses & fix errors

* update dependencies

* relax requirements and republish flywheel to me maven

* flywheel from tterrag's maven

---------

Co-authored-by: laxadeR <alexlarex@yandex.ru>
Co-authored-by: Tempystral <elijah.doern@gmail.com>
Co-authored-by: Nova_starter <cyvack@outlook.com>
Co-authored-by: Oier Bravo Urtasun <oierbravo@gmail.com>
Co-authored-by: simibubi <31564874+simibubi@users.noreply.github.com>
Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
Co-authored-by: Michael Bunting <michael.a.bunting@gmail.com>
Co-authored-by: KostromDan <90044015+KostromDan@users.noreply.github.com>
Co-authored-by: attackeight <71084901+Attack8@users.noreply.github.com>
Co-authored-by: zelophed <github@zelophed.me>
Co-authored-by: Notenoughmail <78008321+Notenoughmail@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: TropheusJ <jverrellijr@icloud.com>
Co-authored-by: Robocraft999 <Alexakeil987@gmail.com>
Co-authored-by: SFort <github@ssf.tf>
Co-authored-by: TropheusJ <60247969+TropheusJ@users.noreply.github.com>
Co-authored-by: Timo van Veen <t.v.veen1@student.tue.nl>
Co-authored-by: techno-sam <77073745+techno-sam@users.noreply.github.com>
Co-authored-by: sschr15 <steven.sschr15@hotmail.com>
  • Loading branch information
20 people authored Jan 29, 2024
1 parent c1ba622 commit 86cc5ca
Show file tree
Hide file tree
Showing 313 changed files with 70,078 additions and 63,252 deletions.
138 changes: 0 additions & 138 deletions ## Changes.md

This file was deleted.

2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ body:
label: Mod Version
description: The version of the mod you were using when the bug occured
options:
- "0.5.1f"
- "0.5.1e"
- "0.5.1d"
- "0.5.1c"
- "0.5.1b"
Expand Down
10 changes: 2 additions & 8 deletions FABRIC_CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,5 @@ No formatting, just plain text. CurseForge support for it is terrible.

Change logging starts below:
----------
- updated to 1.20.1 and patch D
- hopefully fix overlays rendering out of order (#783)
- fix overlays rendering twice, noticeable with Double Hotbar (#790)
- stop the rogue Deployer uprising, for now (#1013)
- fix plant-ness not being checked properly in some places (#1032)
- fix debug stick (#831)
- fix crash breaking blocks with wand of symmetry (#1048)
- fix performance issues with pipe connections (#935)
- update to patch F

14 changes: 3 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
//file:noinspection GrMethodMayBeStatic
plugins {
id "fabric-loom" version "1.3.+"
id "fabric-loom" version "1.4.+"

id "io.github.juuxel.loom-vineflower" version "1.+" // Vineflower, a better decompiler
id "io.github.p03w.machete" version "1.1.4" // automatic jar compressing on build

id "com.modrinth.minotaur" version "2.+" // modrinth publishing
Expand Down Expand Up @@ -40,15 +39,6 @@ repositories {
maven { url = "https://maven.ladysnake.org/releases" } // CCA, for Trinkets
}

configurations.configureEach {
resolutionStrategy.eachDependency {
switch (requested.module.name) { // some dependencies pull in broken, outdated versions of these.
case "fabric-loader": useVersion(loader_version); break
case "fabric-api": useVersion(fabric_version); break
}
}
}

dependencies {
setup(dependencies)
devEnv(dependencies)
Expand Down Expand Up @@ -86,6 +76,8 @@ def setup(DependencyHandler deps) {
it.officialMojangMappings { nameSyntheticMembers = false }
})
deps.modImplementation("net.fabricmc:fabric-loader:$loader_version")

deps.implementation(deps.annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.3.5"))
}

// setup mods that enhance development
Expand Down
3 changes: 3 additions & 0 deletions crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"translation": "src/main/resources/assets/create/lang/%locale_with_underscore%.json",
"languages_mapping": {
"locale_with_underscore": {
"be": "be_by",
"cs": "cs_cz",
"cy": "cy_gb",
"da": "da_dk",
Expand All @@ -18,6 +19,7 @@
"es-CL": "es_cl",
"es-ES": "es_es",
"es-MX": "es_mx",
"et": "et_ee",
"fa": "fa_ir",
"fi": "fi_fi",
"fr": "fr_fr",
Expand All @@ -41,6 +43,7 @@
"tok": "tok",
"tr": "tr_tr",
"uk": "uk_ua",
"vi": "vi_vn",
"zh-CN": "zh_cn",
"zh-TW": "zh_tw",
}
Expand Down
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@ org.gradle.jvmargs = -Xmx4G
# Fabric Properties
# check these on https://fabricmc.net/develop/
minecraft_version = 1.20.1
loader_version = 0.14.21
fabric_version = 0.86.0+1.20.1
loader_version = 0.15.3
fabric_version = 0.90.0+1.20.1

# Mod Properties
mod_version = 0.5.1-d
mod_version = 0.5.1-f
maven_group = com.simibubi.create

# Dependencies

# Mappings
# https://lambdaurora.dev/tools/import_quilt.html
qm_version = 20
qm_version = 23
# https://parchmentmc.org/docs/getting-started
parchment_version = 2023.07.09
parchment_version = 2023.09.03

# Dependencies
# https://www.curseforge.com/minecraft/mc-mods/forge-config-api-port-fabric/files
config_api_id = 4583000
forge_config_api_port_version = 4.2.9
# https://ci.tterrag.com/job/Flywheel/job/Fabric/
flywheel_minecraft_version = 1.20.1
flywheel_version = 0.6.9-1
flywheel_version = 0.6.10-2
# https://maven.jamieswhiteshirt.com/libs-release/com/jamieswhiteshirt/reach-entity-attributes/
reach_entity_attributes_version = 2.4.0

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
29 changes: 17 additions & 12 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,8 @@ done
# 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"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,26 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,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
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# 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"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// 1.20.1 2023-09-20T19:47:44.9018689 Create's Damage Type Tags
7884716b2f4bb1330ff215366bb4bab06e4728c2 data/minecraft/tags/damage_type/bypasses_armor.json
1fcad1f89265fba8bdb05b03a1dfcc88d7b7a550 data/minecraft/tags/damage_type/is_explosion.json
08324c61115b72bb8a6370d7f34d84d9a31afd16 data/minecraft/tags/damage_type/is_fire.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// 1.20.1 2023-09-20T19:40:25.4461939 Create's Recipe Serializer Tags
0d8718f7383761bc5d7bc45306ed266ebf25dc1d data/create/tags/recipe_serializer/automation_ignore.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "create:backtank",
"parent": "create:foods",
"criteria": {
"0": {
"conditions": {},
Expand All @@ -13,9 +13,9 @@
"translate": "advancement.create.diving_suit_lava.desc"
},
"frame": "goal",
"hidden": true,
"hidden": false,
"icon": {
"item": "create:copper_diving_helmet",
"item": "create:netherite_diving_helmet",
"nbt": "{Damage:0}"
},
"show_toast": true,
Expand All @@ -29,4 +29,4 @@
]
],
"sends_telemetry_event": true
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "minecraft:bamboo_block"
}
],
"processingTime": 50,
"results": [
{
"item": "minecraft:stripped_bamboo_block"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "minecraft:bamboo_planks"
}
],
"processingTime": 20,
"results": [
{
"item": "minecraft:bamboo_mosaic"
}
]
}
Loading

0 comments on commit 86cc5ca

Please sign in to comment.