1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-26 15:32:17 +00:00

1475 Commits

Author SHA1 Message Date
Toad-Dev
c158c4babb Bump version -> 1.97.5 v1.17.1-1.97.5-ccr 2022-01-24 15:18:49 -08:00
Cloud Chagnon
47e7fc25b3 Fix #16, clients now use server configured terminal dimensions. (#55)
Adds `TerminalDimensionsClientMessage` that:
- is sent to each player on server join.
- syncs computer, pocket, and maximum monitor sizes.
2022-01-24 15:03:35 -08:00
Toad-Dev
ef171c2e22 Fix mouse_up events not firing
- deja vu
2022-01-24 14:42:46 -08:00
Toad-Dev
9ef4601472 Bump version to 1.97.4 v1.17.1-1.97.4-ccr 2022-01-04 23:05:17 -08:00
E. Kim
bfbd157ffa Update ko_kr.json 2022-01-04 22:51:11 -08:00
Toad-Dev
222197175b Update lang files.
Some of these keys aren't used in the versions that our 1.16 and 1.17
branches are based on, but they will be there in case we ever do a
feature update for those branches.
2022-01-04 22:37:52 -08:00
Toad-Dev
767a919ad5 Fix: register missing data pack reload listener.
Fixes "ComputerCraft may be installed incorrectly" and "File not found"
errors that sometimes happened after switching single player worlds or
running /reload.
2022-01-04 20:25:10 -08:00
Toad-Dev
6982841f6c Update license headers for 2022. 2022-01-04 20:24:14 -08:00
Toad-Dev
05fbf0eb5b Fix NPE when pistons extend (#43).
- MixinLevel was needed in <= 1.16 to make sure pending block entities
had a valid world, but in 1.17 and up all block entities have their
world set immediately (after checking that their blockPos is valid).
- Unfortunately, this bug leaves broken pistons in the world :(
A piston will never seem to extend in the block location where the game
hit the NPE, even if other block entities are put in that position
and replaced with a new piston...
2021-12-20 09:10:30 -08:00
Toad-Dev
8737d4f6a8
Add key collision resolution strategy to MixinLanguage
Clawing this code back from an ill-thought-out Fabric PR. Now our mixin
will load all mod's en_us lang files into the default language instance
and not crash if mods provide different values for the same key. I
don't know if this resolution strategy is good, but it is *something*.
2021-12-19 21:47:08 +00:00
Merith
26f0ad9fa7
Merge pull request #40 from cc-tweaked/git-template-update
[1.17.1] sync github issue_template's from cc-tweaked
2021-12-19 13:17:07 -08:00
Merith
4e37e8fac5
Merge pull request #42 from Jummit/fix-pocket-textures
Fix pocket comuter textures
2021-12-19 13:06:51 -08:00
Jonathan Coates
6dec1711b4
Fix some items not being dyable 2021-12-19 14:16:15 +00:00
Jummit
a815d59486 Fix pocket comuter textures 2021-12-19 15:04:47 +01:00
Jonathan Coates
cfc9e2ad0d
Fix some problems with pocket computer model properties
- We were setting state twice, rather than state and coloured.
 - Fabric forces us to use the clamped item property getter, which
   doesn't work with our computer state, as it takes a value [0, 2].

Solves half of #26, but will require some texture fixups too.
2021-12-19 13:04:19 +00:00
Jonathan Coates
6a4b5927bf
Correctly instantiate blocks with their BE type
Previously new blocks were being passed their BlockEntityType directly
when constructed. However, due to the circular dependency between block
entities and blocks, the BlocKEntityType was null.

Normally this'd mean that no BE was created when the block is placed.
However, Block.newBlockEntity was overridden on all subclasses to ensure
that the correct BE was created, /except/ for command computers, which
just returned a normal computer TE.

This changes all the block constructrs to accept a
Supplier<BlockEntityType<?>>, and always uses this to create the block
entity.

Fixes #23.
2021-12-19 12:40:09 +00:00
Merith
c58195eb9e swap tweaked with restitched 2021-12-18 22:58:27 +00:00
Merith
d5dfcead4d fix newline at end of file 2021-12-18 22:42:46 +00:00
Merith
6358a6006d sync github issue_template's from cc-tweaked 2021-12-18 22:36:39 +00:00
ToadDev
7f2758c3ef
Merge pull request #38 from MCJack123/patch-1 2021-12-18 12:41:14 -08:00
JackMacWindows
4a3e112a8d
Require Fabric 0.39.0 due to BlockEntityRendererRegistry 2021-12-18 15:36:52 -05:00
Merith
89cabd5b3e update version number for mojmap release v1.97.3 2021-12-16 02:56:11 +00:00
Merith
19d12a4706
Merge pull request #24 from Merith-TK/1.17.1-mojmap
mojmap port + make codebase closer to CC:T codebase
2021-12-15 18:31:54 -08:00
Merith
58dfd56e4b
Merge pull request #30 from Toad-Dev/1.17.1-typos
Fix typos, tighten up README.
2021-12-10 21:40:58 -08:00
Toad-Dev
796ea63151 Fix typos, tighten up README. 2021-12-07 14:11:12 -08:00
Merith
6f30754edb update overhaul textures 2021-11-29 04:34:53 +00:00
Merith
0eab552127
Merge pull request #25 from Jummit/texture-tweaks
Tweak advanced computer block and GUI
2021-11-27 10:55:20 -08:00
Merith
1b643c5ccc
Merge pull request #27 from Lupus590/patch-1
Suggest where to implement lua changes
2021-11-27 09:38:11 -08:00
Jonathan Coates
8983ecd03a
Reset more files 2021-11-27 15:50:37 +00:00
Lupus590
23ad24e4c1
Suggest where to implement lua changes 2021-11-27 13:19:35 +00:00
Jonathan Coates
58e747506e
Update core, api and ROM to match latest CC:T
Mostly fine, but breaking change in that getWorld -> getLevel. Possibly
worth deferring to 1.18
2021-11-27 10:14:46 +00:00
Jummit
27b47c494b Tweak advanced computer block and GUI 2021-11-27 11:00:03 +01:00
Jonathan Coates
70a24d371d
Update build.gradle to more closely match CC:T's
- Adds cct-javadoc fun and renables checkstyle (yay?)
 - Fixes a few javadoc and formatting issues
 - Cherry pick the docs so illuaminate doesn't complain
2021-11-27 09:32:25 +00:00
Merith
73e3e237ad apply squiddev mojmap patches, temporarily disable checkstyle 2021-11-27 04:16:29 +00:00
Merith
dbbbe96df2 attempt to use mojmap
currently does not compile
2021-11-26 20:54:21 +00:00
Merith
55347fb464
fix gitpod link in readme 2021-11-26 12:42:09 -08:00
Merith
bae502e8ea
fix gitpod link in readme 2021-11-26 12:39:07 -08:00
Merith
ed9e823f3f
update version number for new release v1.97.2 2021-11-17 13:19:25 -08:00
Merith
2b8fea5b35
Merge pull request #20 from Wiggles1305/Wiggles1305-patch-1
Recipe parity with CC: Tweaked
2021-11-11 18:30:31 -08:00
Zachbutwithak
b3e6b4c29a
Recipe parity with CC: Tweaked 2021-11-11 18:08:09 -08:00
Merith
c94ff68e7f
Merge pull request #19 from Wiggles1305/1.17.1
Fix en_us.json
2021-11-11 17:19:22 -08:00
Wiggles1305
3fb96a3438
Added to en_us.json
Added "upgrade.minecraft.netherite_pickaxe.adjective": "Netherite Mining", because apparently there is a netherite pickaxe mining turtle
2021-11-11 14:53:17 -08:00
Merith
7a2b7c0701
Merge pull request #13 from 3prm3/1.17.1
Added links to ever instance of Fabric.
2021-10-31 12:47:28 -07:00
Merith
fa7a731ad1
Merge pull request #14 from joecharamut/1.17.1
Fix drag-and-drop file uploading
2021-10-31 12:45:18 -07:00
Joseph Charamut
8be48ebcf0 Fix drag-and-drop file uploading 2021-10-31 10:55:50 -04:00
ƐqɿmƐ
123f3abcaa
Added links to ever instance of Fabric.
Also capitalized the word "Forge".
2021-10-30 11:21:58 -07:00
Merith
9f2e43f00a
Merge pull request #9 from joecharamut/1.17.1
Force Jitpack to actually use Java 16 instead of Java 8
2021-10-28 10:22:25 -07:00
Merith
9fb35b2799
Merge pull request #11 from ga2mer/1.17.1
Wired Modem/Cable breaking and creative picking of sided modem and cable
2021-10-28 10:10:36 -07:00
Nikita Savyolov
272572dbf2
fix: creative picking sided modem/cable 2021-10-28 01:10:47 +03:00
Nikita Savyolov
702e4fc787
fix: correct (maybe) modem properties
something changed in 1.17 and the modem now slowly breaks with hand or pickaxe, so we set this manually
2021-10-28 01:08:31 +03:00