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.

Sign up for GitHub

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

Pulling over new stuff. #1

Merged
merged 241 commits into from
Apr 28, 2017
Merged

Pulling over new stuff. #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
241 commits
Select commit Hold shift + click to select a range
07cf9ad
Updated Forge version and mcp mappings
Deadrik Sep 23, 2016
1a4be7f
Skills and the Skill UI re-added.
Deadrik Sep 23, 2016
4475d2a
Fixed recipes not working and updated recipes to use ore dictionary.
Deadrik Oct 13, 2016
5a59a18
Fixed rain sounds still playing during snowstorms
Deadrik Oct 16, 2016
1ad15e2
Modified worldgen to spawn loose rocks underground.
Deadrik Nov 7, 2016
00eafee
Added some grass variants
Deadrik Nov 12, 2016
8df8cb1
Added ASMHelper submodule to replace my own asm helper code.
Deadrik Nov 12, 2016
c3e88b6
Corrected the island seed being sent to the client for local map gene…
Deadrik Nov 12, 2016
c7e8fb5
Fixed the ASMHelper submodule
Deadrik Nov 12, 2016
65f9960
Updated forge version and disabled some tfc2 food stuff
Deadrik Nov 12, 2016
9e0b8e4
Enabled support for pams harvestcraft gardens to spawn and disabled v…
Deadrik Nov 13, 2016
b0a374e
Added hooks to make all food added by other mods automatically compat…
Deadrik Nov 17, 2016
f9d313a
tweaked grass generation
Deadrik Nov 17, 2016
f3dc61e
Mod specific food settings(Foodgroups, decay timers) are now loaded f…
Deadrik Nov 17, 2016
18247f9
More food stuff
Deadrik Nov 18, 2016
714fd05
Re-added Nutrition values via ASM, as well as hooks into FoodStats so…
Deadrik Nov 18, 2016
ae17bd8
Re-added Nutrition. Nutrition now ticks down hourly at a rate of 0.03…
Deadrik Nov 18, 2016
b763096
Can now drink water by right clicking in fresh water with an empty ha…
Deadrik Nov 19, 2016
bbd6a30
Pams crops now properly grow on TFC Farmland blocks. Also tweaked wat…
Deadrik Nov 19, 2016
7b38eb7
Added Stalactites and Stalagmites
Deadrik Nov 21, 2016
b46892f
Switched to using vanilla water since the forge liquids renderer has …
Deadrik Nov 29, 2016
93e8960
Fixed drinking salt water
Deadrik Nov 30, 2016
6095a30
Ported to MC 1.11
Deadrik Mar 8, 2017
adc7c7a
fixed a number of small issues.
Deadrik Mar 9, 2017
13e928f
Tweaked rivers to smooth hex borders more unless the cliff is very steep
Deadrik Mar 9, 2017
c269da6
Tweaked rivers and lake generation.
Deadrik Mar 9, 2017
fd09e54
RegenChunkCommand not recreates chunks almost exactly the same each t…
Deadrik Mar 11, 2017
7ba5b2a
Added some missing textures and increased tree generation to fill out…
Deadrik Mar 11, 2017
9d29bd6
Bug fixes
Deadrik Mar 11, 2017
00e0cc6
Fixes rotation when going through portals
Deadrik Mar 11, 2017
4deb7f9
The foodreader now reads food definitions from the "/mods/tfc/food/" …
Deadrik Mar 11, 2017
6ab2c5b
More harvestcraft foods added to food definitions.
Deadrik Mar 11, 2017
aa217bd
Seperated harvestcraft food to its own file and added most of the bas…
Deadrik Mar 11, 2017
31f1730
Fixed up the anvil a bit. Recipes in the gui now filter based on the …
Deadrik Mar 17, 2017
4d030bd
Deleting uppercase duplicate assets.
Kittychanley Mar 19, 2017
97014fc
Fixed instances of some blocks not updating when neighbors changed du…
Deadrik Mar 28, 2017
11bf962
Added basic firepit code. Needs a lot more work to even be functional…
Deadrik Mar 28, 2017
f05f7f6
Firepit now technically functions for cooking purposes. Still needs w…
Deadrik Mar 28, 2017
e26048e
Attempted to tweak beaches a bit to make them less uniform.
Deadrik Mar 29, 2017
d1b0602
Fixed a number of compilation errors.
Deadrik Mar 29, 2017
b59f94c
Fixed more compilation issues.
Deadrik Mar 30, 2017
1c8de97
fixed rivers creating gravel riverbanks outlines into the ocean
Deadrik Mar 30, 2017
5088d68
Fixed anvil inventory rendering.
Deadrik Mar 30, 2017
3650cf7
Added new art for the firepit courtesy of Darmo. Just needs a lit tex…
Deadrik Mar 30, 2017
54c1dbd
Let there be light (for the firepit)
Deadrik Mar 30, 2017
146da2c
Added the firepit lit texture
Deadrik Mar 30, 2017
e0b4272
A quick fix for sprint-jumping crashes
Precision-Smelter Mar 31, 2017
bd35ad3
A quick fix for sprint-jumping crashes
Precision-Smelter Mar 31, 2017
1203ae4
Getting thirsty will no longer apply a compounding debuff that never …
Deadrik Mar 31, 2017
83a027c
Renamed lang file en_us to en_US.
Deadrik Mar 31, 2017
8f9a22e
Added some localization entries.
Deadrik Mar 31, 2017
3469162
Food dropped by Pam's gardens now properly have a decay tag. and won'…
Deadrik Mar 31, 2017
489dd85
Fixed rivers not generating gravel banks.
Deadrik Mar 31, 2017
bd1fd83
oops
Deadrik Mar 31, 2017
b508259
Fixed a number of crafting manager related bugs. Should be possible t…
Deadrik Mar 31, 2017
b939640
Added firestarter and a way to make firepits without creative. Works …
Deadrik Apr 1, 2017
194e211
Firestarter is now not a guaranteed start one each use and must be he…
Deadrik Apr 2, 2017
3f6b38f
Bring this brunch up-to-date with Deadrik/master
Precision-Smelter Apr 3, 2017
454c4c4
Merge pull request #1 from Deadrik/master
Precision-Smelter Apr 3, 2017
889ca6e
Fixes crash: shift-clicking crafting result items out of Knapping GUI.
Precision-Smelter Apr 3, 2017
f236ba8
Merge pull request #20 from Precision-Smelter/Precision-Smelter-knapp…
Deadrik Apr 5, 2017
a371214
Made sand textures slightly lighter in color to not blend into stone …
Deadrik Apr 5, 2017
0ca9fa0
Firepit now heats items.
Deadrik Apr 5, 2017
5696fae
Fixed a number of longstanding portal issues.
Deadrik Apr 5, 2017
64c3616
Fixed a few more portal bugs and some crashes
Deadrik Apr 5, 2017
cbc5081
Large rocks no longer spawn in trees.
Deadrik Apr 5, 2017
b53aff6
Numerous small changes and fixes
Deadrik Apr 6, 2017
210f102
Fixed some issues with rivers.
Deadrik Apr 6, 2017
fb3fe64
Disabled firepit heating individual items until temperature code is m…
Deadrik Apr 6, 2017
f95ac27
Fixed grass not breaking when suspended
Deadrik Apr 6, 2017
945aa76
version bump
Deadrik Apr 6, 2017
0e908c0
Attempted to fix some instances of stalagmites hanging form non-stone…
Deadrik Apr 6, 2017
86acf75
Fixed knapping with only 1 rock.
Deadrik Apr 6, 2017
52e62f1
Used some reflection to disable pams native garden and fruit tree gen…
Deadrik Apr 6, 2017
33041e8
Got rid of unneeded firepit recipe.
Deadrik Apr 6, 2017
db7bb0e
Fixed small recipes not working in the players crafting grid. This fi…
Deadrik Apr 6, 2017
0b981f6
Punching now does no damage to entities.
Deadrik Apr 6, 2017
0e6eaf1
version bump
Deadrik Apr 6, 2017
5c4b104
Axe now takes damage when chopping down trees.
Deadrik Apr 6, 2017
06ed5b7
Fixed islands sometimes generating as locked when they should be unlo…
Deadrik Apr 7, 2017
f5380ba
Items with heat now decrease in the player's inventory
Deadrik Apr 7, 2017
9f72adc
Merge pull request #3 from Deadrik/master
Precision-Smelter Apr 7, 2017
0c0354a
Fixed shift-clicking from crafting result slot in player inventory no…
Deadrik Apr 7, 2017
8b93c51
Fixed firestarter consuming items erroneously when when making a fire.
Deadrik Apr 7, 2017
9748d5f
Fixes several server crashes because I'm an idiot and forgot to test …
Deadrik Apr 7, 2017
e749267
Fixes rocks not being replaced by trees as they generate.
Deadrik Apr 7, 2017
559a0c5
Updated localization
Deadrik Apr 7, 2017
94c5f3d
Fixed a number of server crashes
Deadrik Apr 7, 2017
6550b3c
Fixed some wood item issues
Deadrik Apr 7, 2017
b0c7b5d
Fixed food item definitions not being read once compiled.
Deadrik Apr 7, 2017
ab24abd
Version Bump
Deadrik Apr 7, 2017
f0b9187
Expanded the search area for portals. Should fix players being telepo…
Deadrik Apr 7, 2017
fb3e041
Version Bump
Deadrik Apr 7, 2017
6e8f99f
Merge pull request #5 from Deadrik/master
Precision-Smelter Apr 7, 2017
ffcab91
Crafting Exploits Fix (CraftingManagerTFC.java)
Precision-Smelter Apr 7, 2017
c3f74ca
Fixes multiple inventory crafting exploits.
Precision-Smelter Apr 7, 2017
47e211a
Hopefully fixed portals not spawning and spawning in bad locations.
Deadrik Apr 8, 2017
e5adc57
Firepit now has a particle texture assigned
Deadrik Apr 8, 2017
c26e5ea
Added tool harvest type definitions to a number of blocks.
Deadrik Apr 8, 2017
93194d1
Fixes several knapping exploits via Hotbar 1-9 HotKeys
Precision-Smelter Apr 8, 2017
5179d19
toying with noise
Deadrik Apr 8, 2017
95a5701
Fixed ContainerPlayer layout bugs
Precision-Smelter Apr 8, 2017
d9366aa
Merge pull request #8 from Precision-Smelter/Precision-Smelter-crafti…
Precision-Smelter Apr 8, 2017
5e7c7d7
Add files via upload
Precision-Smelter Apr 9, 2017
eea8983
Merge pull request #9 from Precision-Smelter/PS-knapping-patch-2.2
Precision-Smelter Apr 9, 2017
8b0f8ae
Fixes minor crafting glicthes
Precision-Smelter Apr 9, 2017
f5942a4
Merge pull request #10 from Precision-Smelter/crafting-patch-2.3
Precision-Smelter Apr 9, 2017
a94e27f
Add files via upload
Precision-Smelter Apr 10, 2017
57e30b9
A few minor adjustments
Precision-Smelter Apr 10, 2017
2addc45
A few mnor fixes
Precision-Smelter Apr 10, 2017
d7fe456
A few minor fixes
Precision-Smelter Apr 10, 2017
ead9d42
Radically altered island shape generation to use a min and max bounde…
Deadrik Apr 10, 2017
adb9322
PrintImageMapCommand now requires CreativeMode to function
Deadrik Apr 10, 2017
d2476ca
Rewrote how Spawn position is found.
Deadrik Apr 10, 2017
10e825c
Rewrote portal location selection during IslandMap generation to gene…
Deadrik Apr 10, 2017
745e229
Tweaked coastal generation slightly. Coastal hexes now have a uniform…
Deadrik Apr 10, 2017
7f4829a
Fixed some leaves crashes that affected tropical woods.
Deadrik Apr 10, 2017
8b2fda5
vanilla and pams trees should no longer generate unexpectedly
Deadrik Apr 10, 2017
6dfc113
Updated Access Transformer. Fixed player armor going in the wrong slots.
Deadrik Apr 11, 2017
18e69b8
Disabled vanilla Crafting Table recipe for now
Deadrik Apr 11, 2017
8fcd2f4
Fixes a few gravel issues.
Deadrik Apr 11, 2017
62c86e9
Version Bump
Deadrik Apr 11, 2017
10d97e1
Fixed Drag-Splitting item stacks in Knapping GUI
Precision-Smelter Apr 11, 2017
4be1dea
Merge pull request #14 from Precision-Smelter/Precision-Smelter-patch-1
Precision-Smelter Apr 11, 2017
79202d9
Fixed Drag-Splitting item stacks in Knapping GUI
Precision-Smelter Apr 11, 2017
1f12676
Formatting...
Precision-Smelter Apr 11, 2017
92b75e5
Merge pull request #15 from Precision-Smelter/Precision-Smelter-patch-1
Precision-Smelter Apr 11, 2017
94d34ce
Fixed SlotForShowOnly issues
Precision-Smelter Apr 11, 2017
15b2c39
Fixed SlotForShowOnly issues
Precision-Smelter Apr 11, 2017
0881169
Merge branch 'master' into Precision-Smelter-crafting-patch-2
Precision-Smelter Apr 11, 2017
1a72cd9
Borrowed some schematics for oak trees to be used for ash and hickory
Deadrik Apr 11, 2017
fdc7268
Renamed a some misspelled methods
Deadrik Apr 11, 2017
0d5f230
Adjusted parameters for choosing tree size during generation.
Deadrik Apr 11, 2017
68c75e1
Incorporated Bioxx's changes
Precision-Smelter Apr 11, 2017
42d8fe5
Incorporated Bioxx's changes
Precision-Smelter Apr 11, 2017
f950f9a
Formatting...
Precision-Smelter Apr 11, 2017
017016b
Formatting...
Precision-Smelter Apr 11, 2017
5c7118e
Formatting...
Precision-Smelter Apr 11, 2017
2359854
Formatting...
Precision-Smelter Apr 11, 2017
0279423
Added a short timer to portals to try and prevent getting caught in a…
Deadrik Apr 12, 2017
b2a599c
Trying to reduce unneeded block ticks.
Deadrik Apr 13, 2017
7190fce
Added some desert vegetation courtesy of Darmo
Deadrik Apr 13, 2017
50a4f3d
Replaced all Ash tree schematics with schematics from the Oak tree si…
Deadrik Apr 13, 2017
3132f44
Fixed a very longstanding lag issue caused by trees causing a massive…
Deadrik Apr 13, 2017
8dcded3
Clientside island generation should now match server side
Deadrik Apr 14, 2017
37f9205
Fixed/added more desert plants
Deadrik Apr 14, 2017
33fbf38
Clients now generate the full Island map instead of a stripped down f…
Deadrik Apr 14, 2017
32c96b1
IslandMap BiomeTypes now correspond to vanilla Biomes. These are roug…
Deadrik Apr 14, 2017
1f501f9
Don't know if this fixes the sand reverting to Andesite when it falls…
Deadrik Apr 14, 2017
bdd84ce
Fixed client receiving bad seed when requesting map data
Deadrik Apr 14, 2017
515496b
Tweaked beaches some more
Deadrik Apr 14, 2017
74b907c
Fixed an instance of the client getting the wrong map seed when first…
Deadrik Apr 14, 2017
0f5041f
Stopped client from queuing map generation.
Deadrik Apr 14, 2017
92ba582
Split islandmap generation for clients into its own thread. Fixed a f…
Deadrik Apr 14, 2017
5e2bd68
Tweaked Lake spawning.
Deadrik Apr 14, 2017
70a1fda
Fixed another instance of rivers flowing upward.
Deadrik Apr 14, 2017
fa67d22
Version Bump
Deadrik Apr 14, 2017
f733693
Fixed palm tree missing particle texture. Removed palm tree schematic…
Deadrik Apr 15, 2017
84b8c51
fixed some palm wood issues
Deadrik Apr 15, 2017
35d37f5
Blocks should no longer slide if they have a something above them(unl…
Deadrik Apr 15, 2017
1f5bd91
Blocks that slide will now hold themselves better when next to and un…
Deadrik Apr 15, 2017
df84444
Added new "/dbg report" command which will gather world location info…
Deadrik Apr 15, 2017
53ea493
Fixed portals spawning on river tiles.
Deadrik Apr 15, 2017
9c9d098
Grass blocks now come in a sparse variant
Deadrik Apr 15, 2017
6c96011
Added some tall grass art courtesy of Konlii
Deadrik Apr 15, 2017
d94250b
Implemented sparse variety of tall grass to dry areas.
Deadrik Apr 15, 2017
20d8b4f
Fixed Sapling2 growth crash, Fixed WoodSupport crash, Stone Axe will …
emris Apr 15, 2017
75fa076
Added Comments
Precision-Smelter Apr 15, 2017
e5241d9
Added Comments
Precision-Smelter Apr 15, 2017
57f4904
Added Comments
Precision-Smelter Apr 15, 2017
317959e
Added Comments
Precision-Smelter Apr 15, 2017
49e0bed
Added Bison sounds.
emris Apr 15, 2017
ea0e6b7
Added barrel cactus and Cactus Block thanks to Darmo. Reordered some …
Deadrik Apr 16, 2017
e054483
The firepit now causes damage if you step on it while lit.
Deadrik Apr 16, 2017
9897db5
Fixed bad fuel registrations for firepit.
Deadrik Apr 16, 2017
4893611
Merge pull request #25 from Precision-Smelter/Precision-Smelter-knapp…
Deadrik Apr 16, 2017
006d3c4
Merge pull request #24 from Precision-Smelter/Precision-Smelter-craft…
Deadrik Apr 16, 2017
844c8f8
Firestarter is now required to light an unlit firepit
Deadrik Apr 16, 2017
97b8c29
stonegrass now generates as sparse grass
Deadrik Apr 16, 2017
d11cb0b
Version Bump
Deadrik Apr 16, 2017
2ace8e5
Fixed incorrect soil texture assignment for Grass
Deadrik Apr 16, 2017
97792ee
fixed oceanwater rarely spawning at hex height instead of sealevel
Deadrik Apr 16, 2017
8074f3a
Added TFC Creative Tabs and moved all TFC blocks+items to the new tabs.
emris Apr 16, 2017
c38e010
Added Thatch block, added Straw item, added Block Flammability
emris Apr 16, 2017
bbf7b81
Fixed Portal Stone placing the portal gate blocks incorrectly and upd…
Deadrik Apr 17, 2017
7f6e7f0
Added toquilla palms to worldgen
Deadrik Apr 17, 2017
2f10cd5
fixed swapped hammer/shovel head art
Deadrik Apr 17, 2017
8a8c19c
Fixes crash when using getPickBlock on portals
Deadrik Apr 17, 2017
9bc9316
Added vanilla clay to worldgen.
Deadrik Apr 17, 2017
c4f207a
Added clay/ceramic Jug.
emris Apr 17, 2017
d87754f
Added Marshes as valid locations for clay
Deadrik Apr 17, 2017
b92edee
Added clay/ceramic pot, mold, vessel, bowl and fire brick.
emris Apr 17, 2017
d4f1a11
Fixed up the water jug. It is now fillable and completely usable
Deadrik Apr 17, 2017
e0c7429
Added all mold items.
emris Apr 17, 2017
5fa60f4
Added all tool head items. Used the same method as mold items.
emris Apr 17, 2017
fcdb2f7
Firepits now require 4 straw to create.
Deadrik Apr 18, 2017
65ee66e
Fixed lakes spawning at an incorrect height when a valley attempts to…
Deadrik Apr 18, 2017
844363c
removed some unneeded code
Deadrik Apr 19, 2017
cb029ab
Added basics of the pitkiln.
Deadrik Apr 19, 2017
08dd095
disabled thirst drain while in creative
Deadrik Apr 19, 2017
2a94bef
Finished implementing the pit kiln.
Deadrik Apr 19, 2017
292a3b1
Fixed compile crash and upped the pitkiln timer to 8hrs
Deadrik Apr 19, 2017
2a5f50b
Version Bump
Deadrik Apr 19, 2017
492f653
Fixed water jug not filling the player's water
Deadrik Apr 19, 2017
773b3de
Fixed food with decay no longer stacking since the port from 1.10 to …
Deadrik Apr 20, 2017
5ee3842
Added Clientside caching of generated islandmaps. This should help re…
Deadrik Apr 20, 2017
4e25ac6
Hopefully fixed PlayerInfo sometimes not being found when attempting …
Deadrik Apr 20, 2017
8461a50
Double vegetation should now drop the appropriate amount of straw whe…
Deadrik Apr 20, 2017
9236095
Fixed weird behavior when activating a loose rock with something in y…
Deadrik Apr 20, 2017
44bf1c2
When generating an islandmap on the client there is now a message to …
Deadrik Apr 20, 2017
7052765
Forgot to make the client thread load a previously built map if possible
Deadrik Apr 20, 2017
d0299ee
Map generation message now properly clears if a map is loaded instead…
Deadrik Apr 20, 2017
7b43b93
Changed mapgen message to white and added it to localization file.
Deadrik Apr 20, 2017
10e7f64
Breaking a placed pottery item now no longer destroys the item.
Deadrik Apr 20, 2017
cdebb55
Version bump
Deadrik Apr 20, 2017
92ec8ce
Fixed not being able to to knap in SMP
Deadrik Apr 20, 2017
6c34cde
Version Bump
Deadrik Apr 20, 2017
2807ac6
Fixed some issues with attempting to load cached islands from older v…
Deadrik Apr 20, 2017
0ebbeae
Fixed use of a client-only method causing a crash when generating palms
Deadrik Apr 20, 2017
40df4f2
Fixed ASM Transformer responsible for shutting off pam's gardens from…
Deadrik Apr 21, 2017
e7a58d6
Fixed portals for the final time hopefully.
Deadrik Apr 22, 2017
72c8637
Fixed pams gardens not spawning and upped the spawn rate.
Deadrik Apr 24, 2017
c0afdbe
Fixed double grass straw harvesting for real this time.
Deadrik Apr 24, 2017
e2061b7
Thatch is now affected by Gravity and requires support. Enemies can n…
Deadrik Apr 24, 2017
57dfcae
Raw stone now gets supported by dirt. This should help prevent some s…
Deadrik Apr 24, 2017
faab89b
Clamped Beaches to elevation < 0.035
Deadrik Apr 24, 2017
dc6496c
moved the while loop in dungeon generation to an earlier point so tha…
Deadrik Apr 24, 2017
48179e1
Rewrote spires generation.
Deadrik Apr 24, 2017
5582520
Added Clearing Marker(No Trees) and Mesa terrain feature. Caves are n…
Deadrik Apr 25, 2017
bbbfdaf
Made the guide for knapping slightly darker to help when knapping aga…
Deadrik Apr 25, 2017
e8ea3c8
Altered garden gen once more.
Deadrik Apr 25, 2017
9a6012e
Portals should no longer generate with dirt or other terrain in the …
Deadrik Apr 25, 2017
5af7900
Dungeons now use the proper stair type for their island.
Deadrik Apr 25, 2017
182ba6d
Added cat tails to worldgen.
Deadrik Apr 25, 2017
a521534
Forgot this commit
Deadrik Apr 25, 2017
b980dcb
Added sagebrush and new tackweed textures. Sagebrush is now the preva…
Deadrik Apr 25, 2017
389e168
Version bump
Deadrik Apr 25, 2017
62192cb
Fixed compiler error
Deadrik Apr 25, 2017
34486c6
removed forced deserts oops
Deadrik Apr 25, 2017
22ce8ee
Tweaked collapses a bit so that blocks won't instantly break when the…
Deadrik Apr 26, 2017
960c5e9
More collapse tweaks to fix some bugs.
Deadrik Apr 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bug fixes
  • Loading branch information
@Deadrik
Deadrik committed Mar 11, 2017
commit 9d29bd6428e07ba492c6322f1e3727068dc78555
6 changes: 5 additions & 1 deletion src/API/com/bioxx/jmapgen/dungeon/RoomSchematic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,11 @@ else if(matchesTranslation(block.state, templateMap.get("dungeon_smoothstone")))
if(templateMap.get(s) == block.state || (meta == -1 && templateMap.get(s).getBlock() == block.state.getBlock()))
{
Block b = Block.getBlockFromName(blockString[0]);

if(b == null)
{
TFC.log.warn("Block not found for dungeon generation: "+blockString[0]);
break;
}
/*if((block.state.getBlock().getMaterial(block.state) == Material.WATER || block.state.getBlock().getMaterial(block.state) == Material.LAVA))
{
if(block.state.getBlock().getMetaFromState(block.state) != 0)
Expand Down
2 changes: 1 addition & 1 deletion src/Common/com/bioxx/tfc2/world/ChunkProviderSurface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ protected void carveRiver(ChunkPrimer chunkprimer, Center dnCenter, Center cente
riverHeightUpDiff = convertElevation(upCenter.getElevation()) - hexElev;

terrainElev = this.elevationMap[(localBlockPos.getZ() << 4) | localBlockPos.getX()];
waterLevel = Math.max(terrainElev-1, Global.SEALEVEL-1);
waterLevel = Math.max(terrainElev-1, Global.SEALEVEL);

/*if(i < 0.2 && riverHeightUpDiff > 5 || terrainElev > hexElev)
{
Expand Down
3 changes: 1 addition & 2 deletions src/Resources/assets/tfc2/schematics/dungeons/generic/Generic_BigRoom01_BottomSouth_NS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
"dungeon_ceiling|minecraft:wool 11",
"dungeon_stairs_floor|minecraft:stone_brick_stairs",
"dungeon_stairs_wall|minecraft:brick_stairs",
"dungeon_smoothstone|minecraft:wool 14",
"tfc2:freshwater_static -1|minecraft:water"
"dungeon_smoothstone|minecraft:wool 14"
],
"floory" : 0,
"connections" : ["north","south", "up"],
Expand Down
3 changes: 1 addition & 2 deletions src/Resources/assets/tfc2/schematics/dungeons/generic/generic_bigroom01_bottomsouth_ns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
"dungeon_ceiling|minecraft:wool 11",
"dungeon_stairs_floor|minecraft:stone_brick_stairs",
"dungeon_stairs_wall|minecraft:brick_stairs",
"dungeon_smoothstone|minecraft:wool 14",
"tfc2:freshwater_static -1|minecraft:water"
"dungeon_smoothstone|minecraft:wool 14"
],
"floory" : 0,
"connections" : ["north","south", "up"],
Expand Down