mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-18 23:01:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fabric/1.17-dev

Browse Source 
# 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
This commit is contained in:
dfsek
2021-05-28 13:50:59 -07:00
parent 709180de13 fa164e5281
commit 94611913c3
256 changed files with 6971 additions and 2866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/fabric/src/main/resources/fabric.mod.json
+5 -5
View File
@@ -3,15 +3,16 @@
"id": "terra",
"version": "@VERSION@",
"name": "Terra",
"description": "An insanely powerful free & open-source data-driven world generator.",
"description": "@DESCRIPTION@",
"authors": [
"dfsek"
],
"contact": {
"homepage": "https://github.com/PolyhedralDev/Terra/wiki",
"sources": "https://github.com/PolyhedralDev/Terra"
"homepage": "@WIKI@",
"sources": "@SOURCE@",
"issues": "@ISSUES@"
},
"license": "GPL-3.0",
"license": "@LICENSE@",
"icon": "assets/terra/icon.png",
"environment": "*",
"entrypoints": {
@@ -24,7 +25,6 @@
],
"depends": {
"fabricloader": ">=0.7.4",
"fabric": "*",
"minecraft": "1.17.x"
},
"accessWidener": "terra.accesswidener"
platforms/fabric/src/main/resources/terra-refmap.json
-16
View File
@@ -1,16 +0,0 @@
{
"mappings": {
"com/dfsek/terra/fabric/mixin/GeneratorTypeAccessor": {
"VALUES": "field_25052:Ljava/util/List;",
"translationKey": "field_25060:Lnet/minecraft/class_2561;"
}
},
"data": {
"named:intermediary": {
"com/dfsek/terra/fabric/mixin/GeneratorTypeAccessor": {
"VALUES": "field_25052:Ljava/util/List;",
"translationKey": "field_25060:Lnet/minecraft/class_2561;"
}
}
}
}
platforms/fabric/src/main/resources/terra.accesswidener
-17
View File
@@ -1,20 +1,3 @@
accessWidener v1 named
extendable method net/minecraft/client/world/GeneratorType <init> (Ljava/lang/String;)V
accessible field net/minecraft/server/world/ServerWorld worldProperties Lnet/minecraft/world/level/ServerWorldProperties;
accessible method net/minecraft/world/MobSpawnerLogic getEntityId (Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/Identifier;
accessible field net/minecraft/state/State PROPERTY_MAP_PRINTER Ljava/util/function/Function;
accessible field net/minecraft/world/biome/BiomeEffects fogColor I
accessible field net/minecraft/world/biome/BiomeEffects waterColor I
accessible field net/minecraft/world/biome/BiomeEffects waterFogColor I
accessible field net/minecraft/world/biome/BiomeEffects skyColor I
accessible field net/minecraft/world/biome/BiomeEffects foliageColor Ljava/util/Optional;
accessible field net/minecraft/world/biome/BiomeEffects grassColor Ljava/util/Optional;
accessible field net/minecraft/world/biome/BiomeEffects grassColorModifier Lnet/minecraft/world/biome/BiomeEffects$GrassColorModifier;
platforms/fabric/src/main/resources/terra.mixins.json
+34 -2
View File
@@ -5,11 +5,43 @@
"compatibilityLevel": "JAVA_8",
"mixins": [
"StructureAccessorAccessor"
"CommandManagerMixin",
"GeneratorOptionsMixin",
"ServerWorldMixin",
"access.BiomeEffectsAccessor",
"access.MobSpawnerLogicAccessor",
"access.StateAccessor",
"implementations.BiomeMixin",
"implementations.ChunkGeneratorMixin",
"implementations.ConfiguredFeatureMixin",
"implementations.block.BlockEntityMixin",
"implementations.block.BlockMixin",
"implementations.block.state.LootableContainerBlockEntityMixin",
"implementations.block.state.MobSpawnerBlockEntityMixin",
"implementations.block.state.SignBlockEntityMixin",
"implementations.chunk.ChunkRegionMixin",
"implementations.chunk.WorldChunkMixin",
"implementations.chunk.data.ProtoChunkMixin",
"implementations.entity.EntityMixin",
"implementations.entity.EntityTypeMixin",
"implementations.entity.PlayerEntityMixin",
"implementations.entity.ServerCommandSourceMixin",
"implementations.inventory.LockableContainerBlockEntityMixin",
"implementations.inventory.item.ItemMixin",
"implementations.inventory.item.ItemStackMixin",
"implementations.inventory.meta.EnchantmentMixin",
"implementations.inventory.meta.ItemStackDamageableMixin",
"implementations.inventory.meta.ItemStackMetaMixin",
"implementations.world.ChunkRegionMixin",
"implementations.world.ServerWorldMixin"
],
"client": [
"GeneratorTypeAccessor"
"access.GeneratorTypeAccessor",
"init.MinecraftClientMixin"
],
"server": [
"init.ServerMainMixin"
],
"server": [],
"injectors": {
"defaultRequire": 1
},