Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.5.1 Patch F Port 1.20 #1182

Merged
merged 148 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
bda6257
fix contact offset added twice
laxadeR Jul 22, 2023
1ea64cb
Update modded_stripped_logs.json
Tempystral Aug 1, 2023
1a6125d
Update modded_stripped_wood.json
Tempystral Aug 1, 2023
31c189c
Merge pull request #1 from Tempystral/patch-2
Tempystral Aug 1, 2023
22ca1c1
Add the mods correctly this time
Tempystral Aug 1, 2023
eece9b6
Fix Deployers not using item's useOn method
Cyvack Aug 3, 2023
be66f2b
Lang merger generic rollback (#5270)
oierbravo Aug 4, 2023
104985d
Server-friendly Item Groups
simibubi Aug 5, 2023
dc2b7c5
Remove incorrectly merged CreateRegistry
PepperCode1 Aug 7, 2023
c336c92
Add tag to ban recipe serializers from automation (#5298)
daedalus4096 Aug 10, 2023
1bf201e
Refine PR changes and improve Mods class
PepperCode1 Aug 10, 2023
56923db
Remove unnecessary files
PepperCode1 Aug 16, 2023
c052807
Fix copycat model modifying potentially immutable list
PepperCode1 Aug 17, 2023
8f5031c
Added support of other packet size optimisation mods. (#5362)
KostromDan Aug 19, 2023
2a1c6e6
Allow registration of custom fan processing types
PepperCode1 Aug 21, 2023
c5e7ad6
Update Flywheel
PepperCode1 Aug 23, 2023
282181c
Fix Various Bugs relating to Cherry and Bamboo wood not being include…
Attack8 Aug 23, 2023
3bafe6f
Merge branch 'mc1.18/dev' into mc1.19/dev
PepperCode1 Aug 25, 2023
78cf451
Merge branch 'mc1.19/dev' into mc1.20.1/dev
PepperCode1 Aug 25, 2023
e5e0477
Update crowdin.yml
zelophed Aug 25, 2023
7021a17
Remove Entity#level AT
PepperCode1 Aug 25, 2023
9a70cff
Refactor damage types
PepperCode1 Aug 26, 2023
0ee8e18
The last lang merge
PepperCode1 Aug 30, 2023
4cda09e
Controllable Catalysts
PepperCode1 Sep 1, 2023
6ea0776
Fourth state of matter
PepperCode1 Sep 9, 2023
bb21fbf
PipeCollisionEvents
Notenoughmail Sep 17, 2023
46b5a84
Update crowdin.yml
zelophed Sep 19, 2023
9d74a40
Fan and other tweaks
PepperCode1 Sep 19, 2023
6299147
Merge branch 'mc1.18/dev' of https://github.com/Creators-of-Create/Cr…
PepperCode1 Sep 19, 2023
07883a5
Try to remove lang postprocessor
PepperCode1 Sep 19, 2023
31ed333
New Crowdin translations by Github Action
crowdin-bot Sep 19, 2023
7f60ae9
Hell's Rollers
simibubi Sep 20, 2023
cfee3af
Prevent Spectators from interacting with some create blocks/items (#5…
Attack8 Sep 20, 2023
f327f0b
Merge branch 'mc1.18/dev' of https://github.com/Creators-of-Create/Cr…
simibubi Sep 20, 2023
72882f8
Merge pull request #5192 from laxadeR/fix-elevator-contacts
simibubi Sep 20, 2023
a6a3c72
Merge pull request #5266 from NovaStarter/mc1.18/dev
simibubi Sep 20, 2023
b6e8f01
Merge branch 'pr/5254' into mc1.18/dev
simibubi Sep 20, 2023
416a509
PR fix-up
simibubi Sep 20, 2023
70e8bc8
Merge pull request #5512 from Notenoughmail/mc1.18/dev
simibubi Sep 20, 2023
332455a
Move fallback behaviour back to FluidReactions
simibubi Sep 20, 2023
7be2d61
Advancement tweaks
simibubi Sep 20, 2023
1439a52
3D
simibubi Sep 20, 2023
8b5c3a9
Merge pull request #5519 from Creators-of-Create/l10n_crowdin_transla…
simibubi Sep 20, 2023
cfff4e4
Merge branch 'mc1.18/dev' into mc1.19/dev
simibubi Sep 20, 2023
7e7cc05
Port fixups
simibubi Sep 20, 2023
f181799
Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev
simibubi Sep 20, 2023
eb1377b
Port fixups
simibubi Sep 20, 2023
ef1851e
Port fixups II
simibubi Sep 20, 2023
0510ea3
Perform over Function
simibubi Sep 21, 2023
e4c7d39
Remove lang post processor from javadoc
simibubi Sep 21, 2023
2d0bf81
Merge branch 'mc1.18/dev' into mc1.19/dev
simibubi Sep 21, 2023
26510ac
Deprecate LangEntry
simibubi Sep 21, 2023
3e2aa3b
Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev
simibubi Sep 21, 2023
5d4961a
Update more javadoc
PepperCode1 Sep 21, 2023
61cb5cc
Merge branch 'mc1.18/dev' into mc1.19/dev
PepperCode1 Sep 21, 2023
8be9b2d
Update even more javadoc
PepperCode1 Sep 21, 2023
f8bd8d6
Merge branch 'mc1.19/dev' into mc1.20.1/dev
PepperCode1 Sep 21, 2023
9923732
Restore LangMerger#attachToRegistrateProvider
PepperCode1 Sep 21, 2023
e81b0d8
Actually remove attachToRegistrateProvider
PepperCode1 Sep 21, 2023
52efa49
Heavens, no!
simibubi Sep 21, 2023
2e1bcdb
Frame breaker
simibubi Sep 21, 2023
da9f15c
Merge branch 'mc1.18/dev' into mc1.19/dev
simibubi Sep 21, 2023
32e50c9
Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev
simibubi Sep 21, 2023
ebff770
Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev
simibubi Sep 21, 2023
6ef310a
Mixin't
simibubi Sep 22, 2023
486b2f6
rename to doRender
TropheusJ Sep 27, 2023
fc56003
generalized getFogDensity
Robocraft999 Oct 7, 2023
8078535
generalized checking in NetheriteDivingHandler
Robocraft999 Oct 7, 2023
a5ce9ab
Use appropriate method for sneaky players
SFort Oct 20, 2023
7eea028
Add create debuginfo command (#5531)
TropheusJ Oct 22, 2023
8672231
Debuginfo Tweaks
simibubi Oct 22, 2023
2b2b6cf
Merge pull request #5558 from TropheusJ/mc1.20.1/rename-renderButton
simibubi Oct 22, 2023
0d6d4b7
Merge pull request #5606 from Robocraft999/patch-1
simibubi Oct 22, 2023
99dff66
Netherite Diving PR Tweaks
simibubi Oct 22, 2023
26c9af5
Merge pull request #5656 from SFort/FixShiftConflict
simibubi Oct 22, 2023
67ebc8a
Rewrite to remove unneeded pathfind call
TimovVeen Oct 24, 2023
57fbe3c
Optimize navigation refresh
TimovVeen Oct 24, 2023
29358d2
A* priority heuristic
TimovVeen Oct 25, 2023
bb11cd7
Fix distance estimator
TimovVeen Oct 25, 2023
b0d1a9e
cleanup
TimovVeen Oct 25, 2023
2597812
Keep old FrontierEntry constructor
TimovVeen Oct 26, 2023
aa03346
Remove comments
TimovVeen Oct 26, 2023
0014ea6
Cache position in search method
TimovVeen Oct 26, 2023
1b2f3b1
Remove unused lines
TimovVeen Oct 26, 2023
740ec90
Use octile distance instead of euclidean
TimovVeen Oct 28, 2023
8bf42ff
Fixes and tweaks
PepperCode1 Oct 28, 2023
2cf7d17
Vertical threshold switch redstone fix
PepperCode1 Oct 29, 2023
321056b
Fix penalties not applying on station edge
TimovVeen Oct 29, 2023
d6781ac
Multiple stations 1 call
TimovVeen Oct 30, 2023
2565fa7
Fix #4756
TimovVeen Oct 30, 2023
aff05bf
cleanup
TimovVeen Oct 30, 2023
30a90a6
Fix crash on invalid schedule regex (e.g. "station \\E1\\Q")
TimovVeen Oct 30, 2023
bc340c7
Implement #5666 on main branch
simibubi Nov 1, 2023
3c3ce93
final cleanup
TimovVeen Nov 1, 2023
77ba1e8
Merge pull request #5681 from TimovVeen/mc1.18/pathfinding
simibubi Nov 1, 2023
d6708ce
Collide on sight
simibubi Nov 1, 2023
eea8bb2
Filter code caused global warming
simibubi Nov 1, 2023
962f03c
Sisyphus's broken printer
simibubi Nov 2, 2023
6e5aced
New Crowdin translations by Github Action
crowdin-bot Nov 2, 2023
f8ef93f
Merge pull request #5523 from Creators-of-Create/l10n_crowdin_transla…
simibubi Nov 2, 2023
0440669
Merge branch 'mc1.18/dev' into mc1.19/dev
simibubi Nov 2, 2023
6e19661
Port Changes
simibubi Nov 2, 2023
8e323d0
1.19 datagen
simibubi Nov 2, 2023
fff2512
Bump version
simibubi Nov 2, 2023
aef8947
Merge branch 'mc1.18/dev' into mc1.19/dev
simibubi Nov 2, 2023
1e666e4
Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev
simibubi Nov 2, 2023
2201d87
Asset patches
simibubi Nov 2, 2023
26fc820
Merge branch 'mc1.18/dev' into mc1.19/dev
simibubi Nov 2, 2023
a41053b
Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev
simibubi Nov 2, 2023
4f480db
First Merge, Still needs work
IThundxr Nov 4, 2023
5bd577d
quick fix
IThundxr Nov 4, 2023
2636209
It Builds!
techno-sam Nov 4, 2023
88d7d96
minor cleanup
IThundxr Nov 4, 2023
f21322b
bump version
IThundxr Nov 4, 2023
eda0246
changelog
IThundxr Nov 4, 2023
d064e49
flywheel 0.6.10
IThundxr Nov 4, 2023
863fff8
Merge branch 'mc1.18/fabric/dev' into mc1.19/fabric/dev
IThundxr Nov 4, 2023
1683aa9
Lé port of 1.19
IThundxr Nov 4, 2023
664b92b
remove deprecated code
IThundxr Nov 4, 2023
14750fa
switch to other flywheel
IThundxr Nov 4, 2023
79161cc
the merge once again
IThundxr Nov 4, 2023
870b86a
Merge remote-tracking branch 'forge/mc1.20.1/dev' into mc1.20.1/fabri…
IThundxr Nov 5, 2023
0f2300d
yippee im getting GLFW GLX errors now!
IThundxr Nov 5, 2023
c66d5d3
bump version
IThundxr Nov 5, 2023
4335db2
Portals Trains dont work
IThundxr Nov 5, 2023
664eacd
fix .is wackness
IThundxr Nov 11, 2023
bed91a5
null check
IThundxr Nov 11, 2023
d5a87a2
attempt to fix portal trains
IThundxr Nov 14, 2023
b63be24
Merge branch 'mc1.19/fabric/dev' into mc1.20.1/fabric/dev
IThundxr Nov 14, 2023
4209bfa
Fix Portal Tracks Imports
IThundxr Nov 19, 2023
a23a36f
update maven
IThundxr Nov 19, 2023
5ab85ae
update maven
IThundxr Nov 19, 2023
93aa4c9
fix creative tabs
IThundxr Nov 19, 2023
d3538fb
Merge branch 'mc1.19/fabric/dev' into mc1.20.1/fabric/dev
IThundxr Nov 19, 2023
45d1993
chore: Bump Version
IThundxr Nov 19, 2023
d0d5e56
Merge branch 'mc1.19/fabric/dev' into mc1.20.1/fabric/dev
IThundxr Nov 19, 2023
74678bf
Merge branch 'mc1.20.1/fabric/dev' into mc1.20.1/fabric/dev
IThundxr Dec 16, 2023
f6ca4e3
fix tabs
IThundxr Dec 21, 2023
f3ee2fa
Merge remote-tracking branch 'fabric/mc1.20.1/fabric/dev' into mc1.20…
IThundxr Dec 21, 2023
75ffe5b
Match updated Porting-Lib version
sschr15 Oct 29, 2023
4e30335
fixes
IThundxr Jan 1, 2024
f1bd312
update loom & gradle
IThundxr Jan 1, 2024
3215f98
update loom & gradle
IThundxr Jan 1, 2024
4d8357e
Revert "Match updated Porting-Lib version"
IThundxr Jan 22, 2024
c025b3f
remove deprecated uses & fix errors
IThundxr Jan 22, 2024
3b15a0c
update dependencies
IThundxr Jan 23, 2024
c7b1daf
relax requirements and republish flywheel to me maven
IThundxr Jan 28, 2024
ddc7537
flywheel from tterrag's maven
IThundxr Jan 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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