imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 03:56:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to 22w11a (#222)

Browse Source 
* Update to 22w11a

* fix aw

* update fapi ver
This commit is contained in:
Emma Pointer-Null
2022-03-19 08:58:32 -04:00
committed by GitHub
parent dc2e644ed2
commit dbb955808f
9 changed files with 19 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/dev/architectury/hooks/level/biome/BiomeHooks.java
View File

@@ -25,7 +25,6 @@ import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.MobCategory;
import net.minecraft.world.level.biome.*;
import net.minecraft.world.level.biome.Biome.BiomeCategory;
import net.minecraft.world.level.biome.BiomeSpecialEffects.GrassColorModifier;
import net.minecraft.world.level.levelgen.GenerationStep;
import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
@@ -85,11 +84,6 @@ public final class BiomeHooks {
public SpawnProperties getSpawnProperties() {
return spawnProperties;
}
@Override
public BiomeCategory getCategory() {
return biome.biomeCategory;
}
}
public static class MutableBiomeWrapped extends BiomeWrapped implements BiomeProperties.Mutable {
@@ -134,12 +128,6 @@ public final class BiomeHooks {
public SpawnProperties.Mutable getSpawnProperties() {
return (SpawnProperties.Mutable) super.getSpawnProperties();
}
@Override
public Mutable setCategory(BiomeCategory category) {
biome.biomeCategory = category;
return this;
}
}
public static class ClimateWrapped implements ClimateProperties.Mutable {

6
common/src/main/java/dev/architectury/hooks/level/biome/BiomeProperties.java
View File

@@ -19,8 +19,6 @@
package dev.architectury.hooks.level.biome;
import net.minecraft.world.level.biome.Biome.BiomeCategory;
public interface BiomeProperties {
ClimateProperties getClimateProperties();
@@ -30,8 +28,6 @@ public interface BiomeProperties {
SpawnProperties getSpawnProperties();
BiomeCategory getCategory();
interface Mutable extends BiomeProperties {
@Override
ClimateProperties.Mutable getClimateProperties();
@@ -44,7 +40,5 @@ public interface BiomeProperties {
@Override
SpawnProperties.Mutable getSpawnProperties();
Mutable setCategory(BiomeCategory category);
}
}

2
common/src/main/resources/architectury.accessWidener
View File

@@ -58,8 +58,6 @@ accessible method net/minecraft/world/entity/Entity getEncodeId ()Ljava/lang/Str
accessible field net/minecraft/server/packs/repository/PackRepository sources Ljava/util/Set;
mutable field net/minecraft/server/packs/repository/PackRepository sources Ljava/util/Set;
accessible field net/minecraft/world/level/biome/Biome climateSettings Lnet/minecraft/world/level/biome/Biome$ClimateSettings;
accessible field net/minecraft/world/level/biome/Biome biomeCategory Lnet/minecraft/world/level/biome/Biome$BiomeCategory;
mutable field net/minecraft/world/level/biome/Biome biomeCategory Lnet/minecraft/world/level/biome/Biome$BiomeCategory;
accessible field net/minecraft/world/level/biome/Biome$ClimateSettings precipitation Lnet/minecraft/world/level/biome/Biome$Precipitation;
mutable field net/minecraft/world/level/biome/Biome$ClimateSettings precipitation Lnet/minecraft/world/level/biome/Biome$Precipitation;
accessible field net/minecraft/world/level/biome/Biome$ClimateSettings temperature F

10
fabric/src/main/java/dev/architectury/mixin/fabric/MixinChunkSerializer.java
View File

@@ -21,6 +21,7 @@ package dev.architectury.mixin.fabric;
import com.mojang.serialization.Codec;
import dev.architectury.event.events.common.ChunkEvent;
import net.minecraft.core.Holder;
import net.minecraft.core.Registry;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
@@ -49,9 +50,10 @@ public class MixinChunkSerializer {
@Inject(method = "read", at = @At("RETURN"), locals = LocalCapture.CAPTURE_FAILHARD)
private static void load(ServerLevel serverLevel, PoiManager poiManager, ChunkPos chunkPos, CompoundTag compoundTag,
CallbackInfoReturnable<ProtoChunk> cir, ChunkPos chunkPos2, UpgradeData upgradeData,
boolean bl, ListTag listTag, int i, LevelChunkSection levelChunkSections[], boolean bl2, ChunkSource chunkSource,
LevelLightEngine levelLightEngine, Registry registry, Codec<PalettedContainer<Biome>> codec, long m, ChunkStatus.ChunkType chunkType,
BlendingData blendingData, ChunkAccess chunkAccess2) {
ChunkEvent.LOAD_DATA.invoker().load(chunkAccess2, serverLevel, compoundTag);
boolean bl, ListTag listTag, int i, LevelChunkSection[] levelChunkSections, boolean bl2,
ChunkSource chunkSource, LevelLightEngine levelLightEngine, Registry<Biome> registry,
Codec<PalettedContainer<Holder<Biome>>> codec, boolean bl3, long m,
ChunkStatus.ChunkType chunkType, BlendingData blendingData, ChunkAccess chunkAccess) {
ChunkEvent.LOAD_DATA.invoker().load(chunkAccess, serverLevel, compoundTag);
}
}

5
fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinScreen.java
View File

@@ -74,9 +74,8 @@ public abstract class MixinScreen implements ScreenInputDelegate {
return inputDelegate;
}
@Inject(method = "init(Lnet/minecraft/client/Minecraft;II)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;clearWidgets()V", ordinal = 0),
cancellable = true)
private void preInit(Minecraft minecraft, int i, int j, CallbackInfo ci) {
@Inject(method = "rebuildWidgets", at = @At(value = "HEAD"), cancellable = true)
private void preInit(CallbackInfo ci) {
if (ClientGuiEvent.INIT_PRE.invoker().init((Screen) (Object) this, getAccess()).isFalse()) {
ci.cancel();
}

6
fabric/src/main/java/dev/architectury/registry/level/biome/fabric/BiomeModificationsImpl.java
View File

@@ -36,7 +36,6 @@ import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.MobCategory;
import net.minecraft.world.level.biome.*;
import net.minecraft.world.level.biome.Biome.BiomeCategory;
import net.minecraft.world.level.biome.Biome.Precipitation;
import net.minecraft.world.level.biome.Biome.TemperatureModifier;
import net.minecraft.world.level.biome.BiomeSpecialEffects.GrassColorModifier;
@@ -121,11 +120,6 @@ public class BiomeModificationsImpl {
new MutableGenerationProperties(biome, context.getGenerationSettings()),
new MutableSpawnProperties(biome, context.getSpawnSettings())
) {
@Override
public BiomeProperties.Mutable setCategory(BiomeCategory category) {
context.setCategory(category);
return this;
}
};
}

2
fabric/src/main/resources/fabric.mod.json
View File

@@ -34,7 +34,7 @@
},
"icon": "icon.png",
"depends": {
"minecraft": "~1.18-",
"minecraft": "~1.19-",
"fabricloader": ">=0.13.0",
"fabric": ">=0.44.0"
},

16
gradle.properties
View File

@@ -1,20 +1,20 @@
org.gradle.jvmargs=-Xmx6G
org.gradle.daemon=false
forgeEnabled=true
forgeEnabled=false
minecraft_version=1.18.2
supported_version=1.18.2
minecraft_version=22w11a
supported_version=22w11a
cf_type=release
cf_type=alpha
archives_base_name=architectury
archives_base_name_snapshot=architectury-snapshot
base_version=4.1
base_version=5.1
maven_group=dev.architectury
fabric_loader_version=0.13.2
fabric_api_version=0.47.8+1.18.2
mod_menu_version=3.0.0
fabric_loader_version=0.13.3
fabric_api_version=0.49.2+1.19
mod_menu_version=3.1.0
forge_version=40.0.1

4
settings.gradle
View File

@@ -14,9 +14,9 @@ if (JavaVersion.current().ordinal() + 1 < 17) {
include("common")
include("fabric")
include("forge")
//include("forge")
include("testmod-common")
include("testmod-fabric")
include("testmod-forge")
//include("testmod-forge")
rootProject.name = "architectury"