1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-07 12:57:55 +00:00
Commit Graph

1189 Commits

Author SHA1 Message Date
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
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
JackMacWindows
4a3e112a8d Require Fabric 0.39.0 due to BlockEntityRendererRegistry 2021-12-18 15:36:52 -05: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
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
Jonathan Coates
8983ecd03a Reset more files 2021-11-27 15:50:37 +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
Zachbutwithak
b3e6b4c29a Recipe parity with CC: Tweaked 2021-11-11 18:08:09 -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
Joseph Charamut
8be48ebcf0 Fix drag-and-drop file uploading 2021-10-31 10:55:50 -04: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
Nikita Savyolov
6fd8331e94 fix: BlockCable removedByPlayer 2021-10-18 21:47:43 +03:00
Nikita Savyolov
7a667b9028 fix: correct cable with wired modem highlight
The right thing would be to fix Mixin, just like it is done in Forge, but I think that's enough for now
2021-10-18 21:45:33 +03:00
Nikita Savyolov
67b7cd7a14 fix: wired modem direction 2021-10-17 21:10:10 +03:00
Nikita Savyolov
960d79803d fix: MixinWorld more correct height check
I think this Mixin need to be revisiting
2021-10-17 21:08:48 +03:00
Merith-TK
43ef36fa15 Update links to repo 2021-10-15 16:08:55 -07:00
Joseph Charamut
f6e4122f7f Fix NPE when activating piston 2021-10-14 01:33:12 -04:00
Nikita Savyolov
6e5e682e3a fix: more correct mouseReleased event
WidgetTerminal still calls mouseReleased on every container click instead of terminal only (like Forge does)
2021-10-12 19:14:03 +03:00
Jacob Farley
fd24d89f89 my bad 2021-10-11 19:12:07 -05:00
Jacob Farley
685d33a2dd fix github actions 2021-10-11 19:09:41 -05:00
Jacob Farley
ca40c9cf19 needs further testing, but presumably fixes #55 2021-10-11 18:26:20 -05:00
Nikita Savyolov
1832028dfd fix: remove generated recipes and fix pocket upgrades nbt 2021-10-11 22:50:31 +03:00
Nikita Savyolov
316889dab7 fix: recipe util set nbt correct nbt parsing 2021-10-11 22:49:37 +03:00
Nikita Savyolov
96c80a6549 fix: play sounds using Identifier rather than SoundEvent
6dd33f7099
2021-10-11 22:49:05 +03:00
Nikita Savyolov
fb274e2ed6 fix: recipes with nbt
it looks like the recipes need to be regenerated
2021-10-11 10:06:15 +03:00
Nikita Savyolov
ebe847c04b fix: mouseUp (mouseReleased) event
mouseReleased doesn't work at ClickableWidget, why?
2021-10-10 23:28:07 +03:00
Nikita Savyolov
fdbf41b3c4 fix: MixinLanguage remove keys if they exists in vanilla 2021-10-10 17:26:25 +03:00
Nikita Savyolov
9dcb9f9537 fix: ModelTransformer return old code, it was wrong get offset length 2021-10-10 08:41:23 +03:00
Nikita Savyolov
259c8d57f5 fix: removed some imports 2021-10-09 21:08:59 +03:00
Nikita Savyolov
2ee07283fa Merge branch 'fabric' into 1.17-alpha 2021-10-09 21:02:41 +03:00
Nikita Savyolov
c85a80617a fix: some tile write nbt returns 2021-10-09 20:52:45 +03:00
Nikita Savyolov
5aa8611e43 fix: return cc:r textures except advanced gui corners 2021-10-09 20:30:33 +03:00
Nikita Savyolov
86aecd945e fix: mixins 2021-10-08 23:08:03 +03:00
Nikita Savyolov
a7a9f4fa13 license: imatrix4f 2021-10-08 18:42:29 +03:00
Nikita Savyolov
22e4c0603b fix: remove unused imports 2021-10-08 18:35:01 +03:00