285 Commits

Author SHA1 Message Date
dfsek
86ad5b5041 1.17 pre3 2021-06-01 23:25:39 -07:00
dfsek
7061328cc7 1.17 pre2 2021-05-31 12:16:59 -07:00
dfsek
3f56da3a65 correct mixin compatibility level 2021-05-28 15:19:55 -07:00
dfsek
16fcf09c78 gradle 7 (temporarily remove Forge module) 2021-05-28 15:10:30 -07:00
dfsek
cba3388cb1 resolve merge conflicts 2021-05-28 14:50:24 -07:00
dfsek
94611913c3 Merge remote-tracking branch 'origin/master' into fabric/1.17-dev
# Conflicts:
#	platforms/fabric/build.gradle.kts
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/state/FabricBlockState.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/state/FabricMobSpawner.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/state/FabricSign.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/features/PopulatorFeature.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/FabricWorld.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunk.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricSeededWorldAccess.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldHandle.java
#	platforms/fabric/src/main/resources/fabric.mod.json
#	platforms/fabric/src/main/resources/terra.accesswidener
#	platforms/fabric/src/main/resources/terra.mixins.json
2021-05-28 13:50:59 -07:00
dfsek
26025ec276 remove unused class 2021-05-22 00:19:38 -07:00
dfsek
2dc7b50141 implement getColumnSample 2021-05-18 19:50:05 -07:00
dfsek
bbe53cbca3 fix height again 2021-05-18 18:25:31 -07:00
dfsek
5287323865 only inject carvers if vanilla.caves is enabled 2021-05-18 09:24:20 -07:00
dfsek
b09d0e42aa fix biome specific exclusions 2021-05-18 09:06:43 -07:00
dfsek
a3f14061dd fix structure location 2021-05-17 23:04:21 -07:00
dfsek
557098de17 use debug logger for feature info 2021-05-17 22:48:03 -07:00
dfsek
2fdb96a850 cleanup and add per-biome exclusions 2021-05-17 22:45:39 -07:00
dfsek
d93d064d97 fix getHeight 2021-05-17 20:50:27 -07:00
dfsek
ae76fb7dc4 use dimensiontype to get world 2021-05-17 20:16:32 -07:00
dfsek
2626afd066 override entity generation 2021-05-17 19:41:45 -07:00
dfsek
c0042cfb6b switch to DimensionType map 2021-05-17 19:39:46 -07:00
dfsek
a549d2ef34 move client init code to MinecraftClientMixin 2021-05-17 19:26:25 -07:00
dfsek
4aa20c32b8 fix fabric debuglogger 2021-05-17 17:35:56 -07:00
dfsek
ce7033b4ca filter out non-Terra biomes in TerraBiomeSource 2021-05-17 10:07:22 -07:00
dfsek
41a54f4b25 vanilla structures 2021-05-17 10:07:06 -07:00
dfsek
f96740f1fa refactor util classes 2021-05-17 08:38:03 -07:00
dfsek
800d846af4 carver and structure compatibility options 2021-05-16 16:47:17 -07:00
dfsek
95d50a0391 resolve merge conflicts 2021-05-16 00:42:29 -07:00
dfsek
5a83eab1fe Merge remote-tracking branch 'origin/master' into dev/fabric-compat
# Conflicts:
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java
2021-05-16 00:34:42 -07:00
dfsek
65482c493a remove dependency on Fabric API 2021-05-15 20:30:06 -07:00
dfsek
6fbb5d712e add license, wiki, source and issue URLs to properties 2021-05-14 23:30:36 -07:00
dfsek
43095d0df1 add version stuff to plugin/mod manifests 2021-05-14 23:05:22 -07:00
dfsek
632409050b Merge remote-tracking branch 'origin/master' into dev/forge-mixins
# Conflicts:
#	gradle.properties
2021-05-14 17:47:50 -07:00
dfsek
5fd2fc59f4 worldedit integration on Fabric 2021-05-13 21:28:49 -07:00
dfsek
97d7ccacbf add worldedit dependency 2021-05-13 18:15:07 -07:00
dfsek
242e56b1d8 conditional biome injection 2021-05-12 09:27:20 -07:00
dfsek
4c7aa11353 clean up TerraFabricPlugin 2021-05-12 08:39:43 -07:00
dfsek
cac84ffe03 fix typo 2021-05-12 00:55:14 -07:00
dfsek
cf66e1e226 registry injection 2021-05-12 00:53:25 -07:00
dfsek
fa647e1e2c make loadConfig less jank 2021-05-12 00:48:38 -07:00
dfsek
4203121d40 basic feature loading implementation 2021-05-12 00:33:00 -07:00
dfsek
32db83f091 remove NotNullValidator 2021-05-11 23:56:08 -07:00
dfsek
76bf245e16 type check ChunkGenerator in PopulatorFeature 2021-05-10 22:52:34 -07:00
Astrashh
9551a1e875
Merge pull request #1 from PolyhedralDev/ver/6.0.0
Ver/6.0.0
2021-05-11 10:59:44 +10:00
dfsek
37e441206a fix getHandle overwrite conflicts and annotate getHandle methods as @Intrinsic. 2021-05-10 01:11:22 -07:00
dfsek
5376f7e22e fix server init 2021-05-10 01:03:13 -07:00
dfsek
97aa9d9a91 resolve merge conflicts 2021-05-09 22:28:52 -07:00
dfsek
526049523f Merge remote-tracking branch 'origin/master' into ver/6.0.0
# Conflicts:
#	build.gradle.kts
#	common/src/main/java/com/dfsek/terra/api/TerraPlugin.java
#	common/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java
#	common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java
#	common/src/main/java/com/dfsek/terra/profiler/Profiler.java
#	common/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java
#	common/src/main/java/com/dfsek/terra/registry/OpenRegistry.java
#	common/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java
#	common/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java
#	common/src/main/java/com/dfsek/terra/world/population/OrePopulator.java
#	common/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java
#	common/src/main/java/com/dfsek/terra/world/population/TreePopulator.java
#	common/src/test/java/biome/DistributionTest.java
#	common/src/test/java/biome/ImageTest.java
#	platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
2021-05-09 22:20:47 -07:00
dfsek
a1b3680643 initialize later 2021-05-05 15:22:02 -07:00
dfsek
501399919f implement vanilla carver/structure options on Fabric & Forge (we will still yell at you if you use them) 2021-05-04 22:40:37 -07:00
dfsek
77a4c95c4a override structure location on Fabric 2021-05-04 16:44:43 -07:00
dfsek
6866084872 SignBlockEntityMixin cleanup 2021-05-04 16:10:37 -07:00
dfsek
4c77419dcd fix sign getText on server 2021-05-04 15:04:53 -07:00