Commit graph

4243 commits

Author SHA1 Message Date
drcrazy
af62a85677 Chunkloader handles wrench properly. Closes #2308 2020-12-18 16:40:15 +03:00
drcrazy
b720fa99b9 Recycler should use energy. Closes #2304 2020-12-18 16:07:39 +03:00
drcrazy
c9c1850e43 Use internal map in RebornRegistry.registerBlockNoItem method 2020-11-20 16:26:32 +03:00
drcrazy
c3aa9761c2 Oh The Biomes You'll Go Compat. Closes #2276 2020-11-19 16:56:28 +03:00
drcrazy
0c6513b252 Nerf Jackhammer speed on ores. Closes #2246 2020-11-17 15:31:33 +03:00
drcrazy
2407286b58 Fix unpowered speed for chainsaw. Closes #2268 2020-11-17 00:58:11 +03:00
drcrazy
d84a0133a4 Batteries can't get mending anymore. Closes #2263 2020-11-16 20:09:27 +03:00
drcrazy
a836f45600 Fix drop for solid canning machine. Closes #2290 2020-11-16 16:18:51 +03:00
Kat
b96e64365d
Recipe fixes for Grinding head, wrench and painting tool. Kudos to Birgliss
* Remove Bronze Nuggets from recipes.
* Buff Diamond Grinding Head output.
2020-11-16 16:14:22 +03:00
drcrazy
3ad9f87a6a Do not start craft until it recipe is locked. 2020-11-14 16:57:15 +03:00
drcrazy
05a55a3294 Partially recipe output zindex. Closes #2288 2020-11-14 16:25:25 +03:00
drcrazy
69506d82f4 Astromine compat plates. Closes #2259 2020-11-14 11:44:09 +03:00
modmuss50
d835a8be01 CableElectrocutionEvent 2020-11-13 17:19:05 +00:00
drcrazy
9fc506b517 Fix blockus barrels in storage unit recipe. Closes #2274 2020-11-12 21:58:54 +03:00
drcrazy
4512800eff No title for inventory. Closes #2287 2020-11-12 21:40:33 +03:00
drcrazy
7b47304ec0 Grinder compat for astromine. Closes #2257 2020-11-12 21:33:55 +03:00
drcrazy
aa7caec935 Translation for Fusion Coil tooltip 2020-11-12 15:28:00 +03:00
drcrazy
6f21bc9fd5 Tags for silicon plates. Closes #2284 2020-11-10 19:11:09 +03:00
drcrazy
b460e0791e Tooltip refactoring 2020-11-10 18:38:25 +03:00
modmuss50
82f8a13f15 Fix rubber sapling, closes #2281 2020-11-09 18:41:36 +00:00
modmuss50
0695250078 Pass the worlgen json's through the ConditionManager 2020-11-09 18:34:52 +00:00
DaFuqs
9e78f8910e
Use tags for all vanilla ores in grinding recipes (unearthed compat) (#2283) 2020-11-09 18:42:26 +03:00
drcrazy
3cf57044ce Rubber sapling could be potted. Closes #2279 2020-11-08 20:53:58 +03:00
drcrazy
86765feb92 Grinder tag for diamond ore. Closes #2275 2020-11-08 19:02:59 +03:00
Justin Vitale
81f033ceec Add smeltable items to fuel registry closes #2278 2020-11-08 21:46:44 +11:00
drcrazy
4a74cdf506 More tags in recipes. Closes #2270 2020-11-05 14:39:03 +03:00
drcrazy
d36a61be39 Update to release version of 1.16.4 2020-11-05 14:31:28 +03:00
modmuss50
234250fca2 Nerf solar panels 2020-11-01 20:17:27 +00:00
modmuss50
883d2773fd Remove recipe exploit 2020-11-01 20:15:37 +00:00
modmuss50
5d41fe7d7c Nerf gem tools, remove config option to skip registering them as conditional registration is a bad idea, use mods such as KubeJS to hide the items. 2020-11-01 20:15:07 +00:00
modmuss50
98857f5119 First pass on data driven worldgen 2020-11-01 20:08:19 +00:00
modmuss50
1d00090cb4 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-10-30 21:03:04 +00:00
modmuss50
416cd647a2 Dep updates 2020-10-30 21:02:41 +00:00
drcrazy
a4d1ff03f5 No sap from player placed rubber wood. Closes #2212 2020-10-30 02:15:50 +03:00
drcrazy
81aa7e7ec2 More translations for TR & RC 2020-10-30 00:41:14 +03:00
drcrazy
c41be06bf1 Translation for powered items. 2020-10-29 21:22:04 +03:00
drcrazy
3645c156be Added translation for upgrades 2020-10-29 17:24:38 +03:00
drcrazy
f5107cacd0 Couple of warnings 2020-10-29 15:13:05 +03:00
drcrazy
fae818db1c Charge-o-Mat back in business. Closes #2264 2020-10-29 15:06:53 +03:00
drcrazy
3f0bd099d5 Fix drain container. Closes #2261 2020-10-27 15:23:08 +03:00
Roman Hubenkov
8fba862e2a
Update en_us.json (#2260) Thanks to Romz24 for spotting
* Update en_us.json
2020-10-27 00:27:19 +03:00
drcrazy
fef6d8f149 Added recipes for ancient debris. Closes #2254 2020-10-26 14:31:03 +03:00
drcrazy
75e7e626f9 Fix cells to tank drain. Closes #2239 2020-10-24 15:40:08 +03:00
drcrazy
ebc45ff9f8 Fix warnings in GUI 2020-10-24 10:29:05 +03:00
drcrazy
ca24d58f86 Fix tooltip 2020-10-24 00:30:37 +03:00
drcrazy
342917851b Fix license 2020-10-21 01:37:31 +03:00
drcrazy
aa18079315 Use new canAccept/canProvide methods 2020-10-21 01:15:36 +03:00
drcrazy
df974ef5da Fixes due to PowerAcceptorBE changes. 2020-10-20 17:21:27 +03:00
drcrazy
09d9d6e7ea Recipe for chunkloader. Some work on #2244 2020-10-15 11:38:33 +03:00
drcrazy
1aea09d7c9 Use tags in some recipes. Closes #2245 and #2247 2020-10-14 14:14:51 +03:00
drcrazy
bf603744a5 Jackhammers can't break obsidan anymore. Closes #2235 2020-10-06 23:00:49 +03:00
drcrazy
742046095b Jackhammers can't break obsidan anymore. Closes #2235 2020-10-06 23:00:19 +03:00
drcrazy
b6641ad2ba Fix omni-tool ore mining. Closes #2196 2020-10-05 17:16:54 +03:00
drcrazy
3a159d7437 Fix drill speed on non-stone blocks. Closes #2225 2020-10-03 21:38:15 +03:00
Virtuoel
a4bceb32a8
Fix properties being recreated for several blocks (#2238) 2020-10-02 12:57:12 +01:00
drcrazy
7ba962196b Lamps require energy to work. Again. Closes #2227 2020-09-25 00:54:48 +03:00
drcrazy
22b0cdfe23 Should fix crash with wrenched storage units. Closes #2183 2020-09-24 23:30:25 +03:00
modmuss50
19f7e17f7d 1.16.3 - just mappings 2020-09-19 14:30:12 +01:00
drcrazy
86014001ba Batteries should be able to charge items when active. Closes #2099 2020-09-18 20:40:42 +03:00
drcrazy
0b13213489 Jackhammers should have correct speed. Closes #2223, #2217 2020-09-16 03:21:12 +03:00
drcrazy
b1fee2e741 JackHammers should respect ores when AoE mining. 2020-09-16 00:43:28 +03:00
drcrazy
1360187f16 Creative tank will void excessive fluid. Closes #2205 2020-09-10 16:19:55 +03:00
modmuss50
1c376d4aea Merge remote-tracking branch 'origin/1.16' into 1.16 2020-09-09 17:58:30 +01:00
modmuss50
4b6036530c Remove LibCD support due to it needing a rewirite.
I will happyily accept a PR to bring this back, right now I dont have the time to do so and its causing major issues (hard crashes)
2020-09-09 17:57:43 +01:00
drcrazy
92bdb4112f Creative storage unit will void excessive input items. Some work on #2205 2020-09-09 14:33:52 +03:00
drcrazy
efad3e6411 Formatting for PlayerDetectorBlock 2020-09-08 16:00:20 +03:00
Justin Vitale
bb13b2cafc Improve cell/bucket withdrawing from tank closes #2209
Not perfect but solved the problem on the issue
2020-09-07 02:10:50 +10:00
drcrazy
c05819729f Fix Greenhouse hologram. Closes #2195 2020-09-01 20:44:52 +03:00
drcrazy
25632466ed Rubber wood strip logic moved to a separate class 2020-08-28 13:09:14 +03:00
shartte
f733ec3065
Added back initial Applied Energistics 2 compatibility. (#2199) 2020-08-23 23:25:30 +01:00
drcrazy
2eef16080b Fix FoV for quantum leggings. Closes #2198 2020-08-23 20:30:04 +03:00
drcrazy
75617a7d72 Drop wooden plate on cover remove. Closes #2190 2020-08-20 21:52:05 +03:00
drcrazy
2daf57e19c Cleanup of CableBlockEntity 2020-08-20 21:42:29 +03:00
Justin Vitale
5df411f26d Revert back to OG getMiningSpeedMultiplier closes #2185 2020-08-20 20:42:10 +10:00
Justin Vitale
80049c8c62 Fix #2197 and add ability to withdraw via right click [only bucket/cell] 2020-08-19 20:55:38 +10:00
modmuss50
527ea72382 Fix rubber saplings 2020-08-14 08:42:40 +01:00
modmuss50
bd88aabe68 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-08-12 08:36:56 +01:00
drcrazy
dc1e459ad6 Discharge cable on shock. Closes #2178 2020-08-09 21:01:07 +03:00
modmuss50
0b3cb646ce Fix major worldgen issues 2020-08-08 17:01:48 +01:00
modmuss50
6e001dd9cc 1.16.2-rc1 2020-08-07 21:51:48 +01:00
modmuss50
cfd9c7f10c Rewrite world gen, in preperation for json based config files 2020-08-02 15:41:28 +01:00
modmuss50
46fe49ebe5 Fix ore gen 2020-08-02 14:05:52 +01:00
modmuss50
619fd39df3 Mappings update 2020-08-02 13:44:25 +01:00
modmuss50
6e0fc6af61 first pass on 1.16.2 - no world gen 2020-07-29 19:42:39 +01:00
Deximus-Maximus
a0644ac434
AutoSwitch support (#2175). Thanks to dexman545 2020-07-28 15:13:19 +03:00
KnatteAnka
d0c32e8efb
Add rails and minecart to blast furnace to get iron back. (#2177) Thanks to KnatteAnka
* Adding Iron from Mincart 
* Adding Iron from Rail
2020-07-28 13:56:07 +03:00
modmuss50
ec1ae17134 Show a bounding box around all the blocks that are going to be broken.
Also fixes some slight issues.
2020-07-26 17:04:45 +01:00
modmuss50
b5707b144e Some general cleanup 2020-07-26 16:19:33 +01:00
modmuss50
bbc9dd3b37 Cleanup jackhammer code a bit 2020-07-26 16:08:19 +01:00
modmuss50
a1e3df3c4a Rebalance drill speed and mining level 2020-07-26 15:56:05 +01:00
modmuss50
481634d29f Add a basic fallback model for the bucket and cells when no renderer is present. 2020-07-25 19:22:15 +01:00
modmuss50
e7e4f8dcd8 remove pack.mcmeta fabric api handles it 2020-07-25 14:32:35 +01:00
modmuss50
18a08b798e Merge remote-tracking branch 'origin/1.16' into 1.16
# Conflicts:
#	src/main/java/techreborn/init/TRContent.java
2020-07-25 00:23:59 +01:00
modmuss50
65a15910cd Fix #2170 2020-07-25 00:12:39 +01:00
modmuss50
b4a0e147e1 Fix #2147 2020-07-25 00:06:44 +01:00
modmuss50
ec7935570f Remove stack hud its annoying, and I have better ideas 2020-07-25 00:01:15 +01:00
modmuss50
0106b00add Fix (well add) ore mining levels 2020-07-24 23:56:47 +01:00
Kato
4e196f6b58
Create soul_soil.json (#2168)
* Create soul_soil.json

Copy of the centrifuge soul_sand recipe, but for soul_soil
I'm sorry, I don't know if I need to add a reference to this recipe anywhere else.

* Update soul_soil.json

Adjusted the recipe to return 8 minecraft:dirt instead of 10 minecraft:sand.  Lowered the amount of dirt, because it's more dynamic than sand for processing it further.  According to REI, this would be the first TR recipe to provide dirt. (besides the scrapbox)
2020-07-19 21:48:46 +10:00
drcrazy
90521007bb Small cleanup 2020-07-18 19:30:08 +03:00
shedaniel
01663648c4
Epic REI displays. Thanks to shedaniel! (#2167)
* Epic REI displays

Signed-off-by: shedaniel <daniel@shedaniel.me>

* use the AbstractEnergyConsumingMachineCategory for ElectrolyzerCategory

Signed-off-by: shedaniel <daniel@shedaniel.me>
2020-07-18 18:58:35 +03:00
KnatteAnka
140ff2f365
wool > string (extractor), gravel > flint (extractor) and gravel > sand (grinder) closes #2164 (#2165)
* Add Flint to Extractor

* Add String from Wool

* Delete Flint in Grinder moved to Extractor

* Update string_from_wool.json

Co-authored-by: Justin Vitale <4002351+justinvvitale@users.noreply.github.com>
2020-07-17 13:52:03 +10:00
Prospector
011d43fefd
Fix #2163 2020-07-13 09:16:47 -07:00
Justin Vitale
64bf5edd57 Tidy up Storage Unit Renderer with new found knowledge 2020-07-13 22:01:41 +10:00
drcrazy
7643220d4b Stairs, Walls and Slabs got their names 2020-07-11 21:34:37 +03:00
drcrazy
c1863694f1 Update datapack version 2020-07-11 20:57:22 +03:00
drcrazy
246789c30c FabricBlockSettings updated to v1 2020-07-11 20:53:39 +03:00
Justin Vitale
c4ef977f16 Refactor and import cleanup (Excluding network PR changed files) 2020-07-09 23:04:42 +10:00
Justin Vitale
a36a0e6f4a Check multiblock before crafting vacuum freezer 2020-07-09 22:55:00 +10:00
ramidzkh
4b2042a100
Deduplicate multiblock verification from BlockEntities and Guis (#2133)
* Deduplicate multiblock verification from BlockEntities and Guis

* Update REI

* Remove unneeded calls
2020-07-09 22:45:04 +10:00
Justin Vitale
c89d6941ae Get state from blockstate instead of saving it as NBT resin basin 2020-07-09 20:23:06 +10:00
Justin Vitale
08245d8578
Cable distribution hotfix (#2159)
Temp fix till networks
2020-07-09 19:06:46 +10:00
Justin Vitale
f7f2903e39 Don't sync stack greater than 1 for locked item stack (byte overflow) 2020-07-09 17:17:14 +10:00
Justin Vitale
da8875de59 Only allow items to be inserted if empty and not locked or issametype 2020-07-09 17:06:53 +10:00
Justin Vitale
ff4ea7393b fix accessing storage unit with nothing in hand 2020-07-09 17:00:08 +10:00
Justin Vitale
501c2d68c4 Sync storedStack via NBT instead of registry (Keep tags) 2020-07-09 16:32:03 +10:00
Justin Vitale
bd860d8073 Allow players to rightclick tank unit with fluid to deposit (initial) 2020-07-09 05:02:36 +10:00
Justin Vitale
fdc5a629d8 Return if client 2020-07-09 04:46:36 +10:00
Justin Vitale
61345c0fa4 Storage unit text display, QOL withdraw by attacking, misc sync fixes 2020-07-09 04:21:25 +10:00
Justin Vitale
75e31a5d4f fix lock and optimize client-side sync for stored item 2020-07-09 01:03:12 +10:00
Justin Vitale
22fdd89e4c Uncomment the actual fix 2020-07-08 21:59:56 +10:00
Justin Vitale
95f68b1b7c Storage unit cleanup, optimization and fix displayed item 2020-07-08 21:59:09 +10:00
Justin Vitale
92eafec301 add Spearkiller's retextures 2020-07-08 21:15:53 +10:00
Justin Vitale
48bf8ae0f2 Have chance to yield two sap closes #2014 2020-07-08 19:43:19 +10:00
Justin Vitale
e6e9b8bcfe Fix holding position, fix chat sending on server, drop sap if broken 2020-07-08 19:15:23 +10:00
Justin Vitale
80716876b2 Cleanup and drop when no log connected 2020-07-08 03:34:36 +10:00
Justin Vitale
7d04348853 Fix sound 2020-07-08 01:40:41 +10:00
Justin Vitale
cfefac1418 Put back original sap generation speed 2020-07-08 01:10:02 +10:00
Justin Vitale
856f66eeb0 Resin basin finished (Recipe, functionality, textures, models) 2020-07-08 01:06:34 +10:00
Justin Vitale
1c07084416 Merge branch '1.16' into feature/sapper 2020-07-07 19:07:44 +10:00
modmuss50
616f470532 Fix sulfur recipes 2020-07-06 17:31:28 +01:00
Justin Vitale
5985b5b6cb Random crash complaining about no sulfur_ores.json, add placeholder 2020-07-07 02:10:43 +10:00
Justin Vitale
bcfb8d3b02 fix storage unit bugs with locking closes #2155 2020-07-06 04:23:05 +10:00
Will Toll
852cd1c496
Create basic sulfur grinding recipes for compatibility with Cinderscapes (#2153)
* Create sulfur_dust_from_ore.json

* Create sulfur_dust.json
2020-07-05 00:14:56 +10:00
Justin Vitale
90c23b9d57 Refactor and cleanup, awaiting new model. 2020-07-02 17:20:50 +10:00
Justin Vitale
55fbcb712e Reference issue #2014 2020-07-02 02:38:51 +10:00
Justin Vitale
6dc00090d1 Add sapper base logic code (MVP) along with rest of it 2020-07-02 02:37:36 +10:00
Justin Vitale
b176230f77 Make drill break blocks slower when it's flat #2147 2020-07-02 01:13:01 +10:00
Justin Vitale
8335b932b4 Fix rubber door dupe closes #2149 2020-07-01 17:15:34 +10:00
modmuss50
4670d6813e Recipes 2020-06-28 16:25:17 +01:00
modmuss50
d92343f5a7 Add stair, slab and wall blocks for all metal storage blocks 2020-06-28 16:13:39 +01:00
Justin Vitale
f15d3bd8f7 Fix Nuke flying away when lit
Still reverts back to tnt texture when lit, don't know how to fix it.
2020-06-25 02:10:35 +10:00
Raul Tambre
b309635eaa
Fix crash opening GUIs on dedicated servers (#2139)
ExtendedClientHandlerFactory.create() is client-only.
Simply copy the relevant code into createMenu().

This is pretty terrible like the rest of the GUI code in GuiType.java, but this fixes the issue for now.

Fixes #2138.
2020-06-24 14:27:16 +10:00
Justin Vitale
134152913f Tank/Storage unit stat squish 2020-06-20 00:02:04 +10:00
Justin Vitale
d230088e03 Remove ugly shadows from IN/OUT on units 2020-06-19 23:01:12 +10:00
Justin Vitale
c0f1e50ecd Remove everything related to depreciated digital & quantum chest + tank 2020-06-19 22:37:44 +10:00
modmuss50
6c20fa69bf Fix #2137 2020-06-18 16:13:47 +01:00
modmuss50
483c5f4724 Merge remote-tracking branch 'remotes/origin/screeenhandler_pr' into 1.16
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/GuiType.java
2020-06-18 16:08:59 +01:00
Justin Vitale
4d91f08279 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-06-18 23:29:59 +10:00
Justin Vitale
5171cd30e8 Fix in/out position and translation for percent on storage/tank unit 2020-06-18 23:29:52 +10:00
modmuss50
14075b0409 Fix #2135 2020-06-18 13:50:56 +01:00