Skip to content

Commit

Permalink
1.18-pre2 & Java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
@modmuss50
modmuss50 committed Nov 16, 2021
1 parent e899b67 commit e77d3ea
Show file tree
Hide file tree
Showing 45 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
build:
strategy:
matrix:
java: [16-jdk, 17-jdk]
java: [17-jdk]
runs-on: ubuntu-20.04
container:
image: eclipse-temurin:${{ matrix.java }}
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ allprojects {
apply plugin: "org.cadixdev.licenser"

tasks.withType(JavaCompile).configureEach {
it.options.release = 16
it.options.release = 17
}

group = "net.fabricmc.fabric-api"
Expand Down Expand Up @@ -159,7 +159,7 @@ apply from: "gradle/module-versioning.gradle"

javadoc {
options {
source = "16"
source = "17"
encoding = "UTF-8"
charSet = "UTF-8"
memberLevel = JavadocMemberLevel.PACKAGE
Expand Down
2 changes: 1 addition & 1 deletion fabric-api-lookup-api-v1/src/main/resources/fabric-api-lookup-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.lookup",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"BlockEntityTypeAccessor",
"ServerWorldMixin"
Expand Down
2 changes: 1 addition & 1 deletion fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.biome",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"modification.BiomeAccessor",
"modification.BiomeEffectsAccessor",
Expand Down
2 changes: 1 addition & 1 deletion fabric-biome-api-v1/src/testmod/resources/fabric-biome-testmod-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.test.biome.mixin",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"DecoratorsAccessor"
],
Expand Down
2 changes: 1 addition & 1 deletion fabric-blockrenderlayer-v1/src/main/resources/fabric-blockrenderlayer-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.blockrenderlayer",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"client": [
"MixinBlockRenderLayer"
],
Expand Down
2 changes: 1 addition & 1 deletion fabric-command-api-v1/src/main/resources/fabric-command-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.command",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"CommandManagerMixin",
"HelpCommandAccessor"
Expand Down
2 changes: 1 addition & 1 deletion fabric-containers-v0/src/main/resources/fabric-containers-v0.accurate.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": false,
"package": "net.fabricmc.fabric.mixin.container",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"MixinServerPlayerEntity"
],
Expand Down
2 changes: 1 addition & 1 deletion fabric-containers-v0/src/main/resources/fabric-containers-v0.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": false,
"package": "net.fabricmc.fabric.mixin.container",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"ServerPlayerEntityAccessor"
],
Expand Down
2 changes: 1 addition & 1 deletion fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.content.registry",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"AxeItemAccessor",
"HoeItemAccessor",
Expand Down
2 changes: 1 addition & 1 deletion fabric-crash-report-info-v1/src/main/resources/fabric-crash-report-info-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.crash.report.info",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"MixinCrashReport"
],
Expand Down
2 changes: 1 addition & 1 deletion fabric-dimensions-v1/src/main/resources/fabric-dimensions-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.dimension",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"EntityMixin",
"ServerBugfixMixin"
Expand Down
2 changes: 1 addition & 1 deletion fabric-entity-events-v1/src/main/resources/fabric-entity-events-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.entity.event",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"BedBlockMixin",
"EntityMixin",
Expand Down
2 changes: 1 addition & 1 deletion fabric-events-interaction-v0/src/main/resources/fabric-events-interaction-v0.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.event.interaction",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"MixinServerPlayerEntity",
"MixinServerPlayerInteractionManager",
Expand Down
2 changes: 1 addition & 1 deletion fabric-game-rule-api-v1/src/main/resources/fabric-game-rule-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.gamerule",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"BooleanRuleAccessor",
"GameRuleCommandAccessor",
Expand Down
2 changes: 1 addition & 1 deletion fabric-gametest-api-v1/src/main/resources/fabric-gametest-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.gametest",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"CommandManagerMixin",
"MinecraftServerMixin",
Expand Down
2 changes: 1 addition & 1 deletion fabric-item-api-v1/src/main/resources/fabric-item-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.item",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"ItemStackMixin",
"ItemMixin",
Expand Down
2 changes: 1 addition & 1 deletion fabric-item-groups-v0/src/main/resources/fabric-item-groups-v0.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.item.group",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"MixinItemGroup"
],
Expand Down
2 changes: 1 addition & 1 deletion fabric-key-binding-api-v1/src/main/resources/fabric-key-binding-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.client.keybinding",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"client": [
"KeyBindingAccessor",
"KeyCodeAccessor",
Expand Down
2 changes: 1 addition & 1 deletion fabric-lifecycle-events-v1/src/main/resources/fabric-lifecycle-events-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.event.lifecycle",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"MinecraftServerMixin",
"ServerWorldEntityLoaderMixin",
Expand Down
2 changes: 1 addition & 1 deletion fabric-loot-tables-v1/src/main/resources/fabric-loot-tables-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.loot.table",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"LootPoolBuilderHooks",
"LootPoolEntryTypesAccessor",
Expand Down
2 changes: 1 addition & 1 deletion fabric-mining-level-api-v1/src/main/resources/fabric-mining-level-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.mininglevel",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"MiningToolItemMixin",
"ShearsItemMixin",
Expand Down
2 changes: 1 addition & 1 deletion fabric-models-v0/src/main/resources/fabric-models-v0.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.client.model",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"client": [
"MixinBakedModelManager",
"MixinModelLoader"
Expand Down
2 changes: 1 addition & 1 deletion fabric-networking-api-v1/src/main/resources/fabric-networking-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.networking",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"ClientConnectionMixin",
"EntityTrackerEntryMixin",
Expand Down
2 changes: 1 addition & 1 deletion fabric-object-builder-api-v1/src/main/resources/fabric-object-builder-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.object.builder",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"AbstractBlockAccessor",
"AbstractBlockSettingsAccessor",
Expand Down
2 changes: 1 addition & 1 deletion fabric-object-builders-v0/src/main/resources/fabric-object-builders-v0.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.object.builder",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"OldMixinBlock",
"OldMixinItem"
Expand Down
2 changes: 1 addition & 1 deletion fabric-particles-v1/src/main/resources/fabric-particles-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.client.particle",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"client": [
"MixinParticleManager",
"ParticleManagerAccessor",
Expand Down
2 changes: 1 addition & 1 deletion fabric-registry-sync-v0/src/main/resources/fabric-registry-sync-v0.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.registry.sync",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"AccessorLevelStorageSession",
"AccessorRegistry",
Expand Down
2 changes: 1 addition & 1 deletion fabric-renderer-api-v1/src/main/resources/fabric-renderer-api-v1.debughud.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": false,
"package": "net.fabricmc.fabric.mixin.renderer.client.debughud",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"client": [
"MixinDebugHud"
],
Expand Down
2 changes: 1 addition & 1 deletion fabric-renderer-api-v1/src/main/resources/fabric-renderer-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.renderer",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"client": [
"client.MixinBakedModel",
"client.MixinMultipartBakedModel",
Expand Down
2 changes: 1 addition & 1 deletion fabric-renderer-api-v1/src/testmod/resources/fabric-renderer-api-v1-testmod.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.test.renderer.mixin",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"WorldMixin"
],
Expand Down
2 changes: 1 addition & 1 deletion fabric-renderer-indigo/src/main/resources/fabric-renderer-indigo.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.client.indigo.renderer",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"plugin": "net.fabricmc.fabric.impl.client.indigo.IndigoMixinConfigPlugin",
"mixins": [
],
Expand Down
2 changes: 1 addition & 1 deletion ...ing-data-attachment-v1/src/main/resources/fabric-rendering-data-attachment-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.rendering.data.attachment",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"MixinBlockEntity",
"MixinViewableWorld"
Expand Down
2 changes: 1 addition & 1 deletion fabric-rendering-fluids-v1/src/main/resources/fabric-rendering-fluids-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.client.rendering.fluid",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"client": [
"MixinFluidRenderer"
],
Expand Down
2 changes: 1 addition & 1 deletion fabric-rendering-v1/src/main/resources/fabric-rendering-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.client.rendering",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"client": [
"MixinArmorFeatureRenderer",
"MixinBlockColorMap",
Expand Down
2 changes: 1 addition & 1 deletion fabric-resource-loader-v0/src/main/resources/fabric-resource-loader-v0.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.resource.loader",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"FileResourcePackProviderAccessor",
"DefaultResourcePackMixin",
Expand Down
2 changes: 1 addition & 1 deletion fabric-screen-api-v1/src/main/resources/fabric-screen-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.screen",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"client": [
"GameRendererMixin",
"MinecraftClientMixin",
Expand Down
2 changes: 1 addition & 1 deletion fabric-screen-handler-api-v1/src/main/resources/fabric-screen-handler-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.screenhandler",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"ServerPlayerEntityMixin"
],
Expand Down
2 changes: 1 addition & 1 deletion fabric-structure-api-v1/src/main/resources/fabric-structure-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.structure",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"ChunkSerializerMixin",
"FlatChunkGeneratorConfigMixin",
Expand Down
2 changes: 1 addition & 1 deletion fabric-structure-api-v1/src/testmod/resources/fabric-structure-api-v1-testmod.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.test.structure.mixin",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"ChunkSerializerMixin",
"MixinConfiguredStructureFeatures"
Expand Down
2 changes: 1 addition & 1 deletion fabric-tag-extensions-v0/src/main/resources/fabric-tag-extensions-v0.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.tag.extension",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"DynamicRegistryManagerAccessor",
"MixinMinecraftServer",
Expand Down
2 changes: 1 addition & 1 deletion fabric-textures-v0/src/main/resources/fabric-textures-v0.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.client.texture",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"client": [
"MixinSpriteAtlasTexture"
],
Expand Down
2 changes: 1 addition & 1 deletion fabric-tool-attribute-api-v1/src/main/resources/fabric-tool-attribute-api-v1.mixins.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.fabricmc.fabric.mixin.tool.attribute",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"BambooBlockMixin",
"LivingEntityMixin",
Expand Down
Loading

0 comments on commit e77d3ea

Please sign in to comment.