1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-27 16:02:17 +00:00

1461 Commits

Author SHA1 Message Date
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
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
Merith
511327effe
Merge pull request #10 from 3prm3/1.17.1
Fixed grammar errors like your/you're added a link.
2021-10-27 08:44:12 -07:00
ƐqɿmƐ
940e35caea
Fixed grammar errors like your/you're added a link. 2021-10-26 19:14:04 -07:00
Joseph Charamut
fca01693dd
Update jitpack.yml 2021-10-26 21:21:31 -04:00
Joseph Charamut
8846a3f36f
Create jitpack.yml 2021-10-26 21:19:36 -04:00
Merith
8002c9e932
Merge pull request #2 from ga2mer/1.17.1
Mainly WiredModem/Cable fixes
2021-10-26 13:29:33 -07: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
Merith
f037d9539e update to beta-1 2021-10-14 06:35:57 +00:00
Merith
a3b2f7b5bd
please the linter
fix excess whitespace in readme
2021-10-13 23:25:52 -07:00
Merith
0859145d18
Merge pull request #80 from joecharamut/1.17.1
Fix NPE when activating piston
2021-10-13 23:25:14 -07:00
Joseph Charamut
f6e4122f7f Fix NPE when activating piston 2021-10-14 01:33:12 -04:00