Commit Graph

1478 Commits

Author SHA1 Message Date
dfsek ab9f98994d Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0 2021-06-24 15:02:56 -07:00
ajgeiss0702 c4de7e578a Remove bukkit-style biome IDs 2021-06-24 13:27:10 -07:00
dfsek 255e4396dd refactor registries 2021-06-24 08:16:15 -07:00
dfsek 4bac67b8d7 fix imports 2021-06-24 00:19:18 -07:00
dfsek f69fdbe37e fix EntityMixin 2021-06-23 23:59:38 -07:00
dfsek 918ff28ed4 bukkit pass 2 2021-06-23 15:56:41 -07:00
dfsek 2906a4f891 fabric pass 2 2021-06-23 15:35:52 -07:00
dfsek d4d2b659dc fabric pass 1 2021-06-23 14:53:00 -07:00
dfsek f380247613 API compiles now 2021-06-23 12:43:16 -07:00
dfsek 686680d731 location garbage 2021-06-23 12:03:17 -07:00
dfsek 24b8fc859c more refactors, create platform module 2021-06-23 10:39:37 -07:00
dfsek a5f879ae7a ConfigPack interfaceification 2021-06-23 10:09:55 -07:00
dfsek bb888380aa more refactors 2021-06-23 10:05:29 -07:00
dfsek 7495a6b4a1 begin refactor 2021-06-23 09:42:17 -07:00
dfsek cf214cc274 split common 2021-06-22 23:56:34 -07:00
dfsek 10f633be9a resolve merge conflicts 2021-06-22 22:09:46 -07:00
dfsek 43aa3fc086 Merge remote-tracking branch 'origin/master' into ver/6.0.0
# Conflicts:
#	build.gradle.kts
#	common/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteHolder.java
#	common/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteHolderBuilder.java
#	common/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java
#	common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java
#	common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java
#	common/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java
#	gradle.properties
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java
2021-06-22 21:59:27 -07:00
dfsek 40e950732b bukkit version 1_17 2021-06-19 14:05:06 -07:00
dfsek 2316043c1e implement BukkitWorld#getMinHeight 2021-06-19 13:47:51 -07:00
dfsek ec20387aea update dependency versions 2021-06-19 13:39:43 -07:00
dfsek fa01c47f43 fix re-registering issue 2021-06-19 13:25:20 -07:00
dfsek b85880fc92 server only mixins 2021-06-18 14:11:25 -07:00
dfsek d5dc37629e fabric lifecycle api 2021-06-18 14:08:27 -07:00
dfsek b3e2685564 init biomes on server 2021-06-18 12:18:08 -07:00
dfsek b948202ef2 cleanup FabricChunkGeneratorWrapper 2021-06-18 09:07:56 -07:00
dfsek 9ba544bf71 dont hold static biomes 2021-06-17 00:07:06 -07:00
dfsek 392ad207d9 use getUngeneratedBlock in getColumnSample 2021-06-15 01:58:46 -07:00
dfsek 01e47b0bab fix getHeight crash 2021-06-15 01:56:23 -07:00
dfsek c7cbf11631 override ChunkGenerator#getEntitySpawnList 2021-06-15 01:42:53 -07:00
dfsek afdb4fbfa2 late init biomes 2021-06-15 01:37:28 -07:00
dfsek 6027c282ab 1.17 full release 2021-06-08 10:17:39 -07:00
dfsek 0068f69982 move chunkified populators to earlier generation stage 2021-06-07 21:54:01 -07:00
dfsek 20d45a4b1e 1.17 pre-2 2021-06-07 14:33:54 -07:00
dfsek a9c252f91c 1.17 rc1 2021-06-05 00:58:05 -07:00
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 ec3b0e5d04 implement vanilla mob override 2021-05-22 21:37:16 -07:00
dfsek 4c63c2681f implement ForgeChunkGeneratorWrapper#getBaseColumn 2021-05-22 21:34:28 -07:00
dfsek dd661feaf1 implement dimension type injection/caching 2021-05-22 21:24:25 -07:00
dfsek 1f17bfff1b delegate strongholds to vanilla if vanilla structures are enabled 2021-05-22 21:12:44 -07:00
dfsek 809a0b375d implement identifier loader 2021-05-22 21:11:52 -07:00
dfsek d55b3415ac implement structure locate override on Forge 2021-05-22 21:08:51 -07:00
dfsek edcb818842 basic compatibility stuff on Forge 2021-05-22 18:03:34 -07:00
dfsek 1e429e1bb3 create forge compatibility configs 2021-05-22 17:11:50 -07:00
dfsek 3472859afb remove unused event handlers 2021-05-22 17:10:50 -07:00
dfsek 26025ec276 remove unused class 2021-05-22 00:19:38 -07:00