MC 1.21

.github/workflows/deploy.yaml

@@ -44,8 +44,8 @@ jobs:
           echo "GIT_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
           echo "BUILD_NUMBER=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
       - name: Publish to Sponge Maven & GitHub Packages
-        run: ./gradlew -s -PenableSpongeForge=true :publish :SpongeVanilla:publish :SpongeForge:publish
-        # run: ./gradlew -s -PenableSpongeForge=true :publish :SpongeVanilla:publish
+        # run: ./gradlew -s -PenableSpongeForge=true :publish :SpongeVanilla:publish :SpongeForge:publish
+        run: ./gradlew -s -PenableSpongeForge=true :publish :SpongeVanilla:publish
         env:
           CI_SYSTEM: Github Actions
           GITHUB_USERNAME: "${{ github.actor }}"

forge/src/mixins/java/org/spongepowered/forge/mixin/core/server/level/ServerPlayerMixin_Forge.java

@@ -44,23 +44,6 @@
 @Mixin(ServerPlayer.class)
 public abstract class ServerPlayerMixin_Forge extends LivingEntityMixin_Forge {
 
-    /**
-     * @author dualspiral - 18th December 2020 - 1.16.4
-     * @reason Redirects the Forge changeDimension method to our own
-     *         to support our event and other logic (see
-     *         ServerPlayerEntityMixin on the common mixin sourceset for
-     *         details).
-     *
-     *         This will get called on the nether dimension changes, as the
-     *         end portal teleport call itself has been redirected to provide
-     *         the correct type.
-     */
-    @Overwrite
-    @Nullable // should be javax.annotations.Nullable
-    public Entity changeDimension(final ServerLevel serverLevel, final ITeleporter teleporter) {
-        return ((EntityBridge) this).bridge$changeDimension(serverLevel, (PortalLogic) teleporter);
-    }
-
     // override from LivingEntityMixin_Forge
     @Override
     protected void forge$onElytraUse(final CallbackInfo ci) {

generator/src/main/java/org/spongepowered/vanilla/generator/EnumEntriesValidator.java

@@ -119,7 +119,7 @@ public void generate(final Context ctx) {
             } catch (Exception e) {
                 throw new IllegalStateException("Failed to name for enum field in class " + this.clazz.getName(), e);
             }
-            final ResourceLocation key = new ResourceLocation(this.namespace, name);
+            final ResourceLocation key = ResourceLocation.fromNamespaceAndPath(this.namespace, name);
 
             final FieldDeclaration existing = fields.remove(key);
             if (existing != null) {
@@ -150,24 +150,24 @@ private ResourceLocation extractFieldIdentifier(final FieldDeclaration declarati
         final VariableDeclarator var = declaration.getVariable(0);
         final Expression initializer = var.getInitializer().orElse(null);
         if (!(initializer instanceof MethodCallExpr) || ((MethodCallExpr) initializer).getArguments().size() != 1) {
-            return new ResourceLocation(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
+            return ResourceLocation.parse(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
         }
 
         final Expression argument = ((MethodCallExpr) initializer).getArgument(0);
         if (!(argument instanceof final MethodCallExpr keyInitializer)
                 || keyInitializer.getArguments().size() < 1) {
-            return new ResourceLocation(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
+            return ResourceLocation.parse(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
         }
 
         if (keyInitializer.getArguments().size() == 1) { // method name as namespace
-            return new ResourceLocation(keyInitializer.getNameAsString(), keyInitializer.getArgument(0).asStringLiteralExpr().asString());
+            return ResourceLocation.fromNamespaceAndPath(keyInitializer.getNameAsString(), keyInitializer.getArgument(0).asStringLiteralExpr().asString());
         } else if (keyInitializer.getArguments().size() == 2) { // (namespace, path)
-            return new ResourceLocation(
+            return ResourceLocation.fromNamespaceAndPath(
                     keyInitializer.getArgument(0).asStringLiteralExpr().asString(),
                     keyInitializer.getArgument(1).asStringLiteralExpr().asString()
             );
         } else {
-            return new ResourceLocation(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
+            return ResourceLocation.parse(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
         }
 
     }

generator/src/main/java/org/spongepowered/vanilla/generator/GeneratorMain.java

@@ -212,7 +212,7 @@ private static List<Generator> generators(final Context context) {
                     final Map<ResourceLocation, Object> out = new HashMap<>(map.size());
                     map.forEach((BiConsumer<Object, Object>) (k, v) -> {
                         var key = (GameRules.Key<?>) k;
-                        out.put(new ResourceLocation("sponge:" + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, key.getId())), v);
+                        out.put(ResourceLocation.fromNamespaceAndPath("sponge", CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, key.getId())), v);
                     });
                     return out;
                 }
@@ -320,7 +320,8 @@ private static List<Generator> generators(final Context context) {
                 "ArtTypes",
                 "ART_TYPE",
                 context.relativeClass("data.type", "ArtType"),
-                Registries.PAINTING_VARIANT
+                Registries.PAINTING_VARIANT,
+                a -> true, RegistryScope.SERVER
             ),
             new RegistryEntriesGenerator<>(
                 "entity.attribute.type",
@@ -419,7 +420,7 @@ private static List<Generator> generators(final Context context) {
                 "EntityTypes",
                 Registries.ENTITY_TYPE,
                 $ -> true,
-                Set.of(new ResourceLocation("sponge", "human")) // Sponge's Human type is an extra addition
+                Set.of(ResourceLocation.fromNamespaceAndPath("sponge", "human")) // Sponge's Human type is an extra addition
             ),
             new RegistryEntriesGenerator<>(
                 "fluid",
@@ -653,6 +654,13 @@ private static List<Generator> generators(final Context context) {
                     "tag",
                     "FluidTypeTags"
             ),
+            new TagGenerator(
+                    "ENCHANTMENT_TYPE",
+                    Registries.ENCHANTMENT,
+                    context.relativeClass("item.enchantment", "EnchantmentType"),
+                    "tag",
+                    "EnchantmenTypeTags"
+            ),
             new RegistryEntriesGenerator<>(
                     "event.cause.entity.damage",
                     "DamageTypes",

generator/src/main/java/org/spongepowered/vanilla/generator/MapEntriesValidator.java

@@ -161,24 +161,24 @@ private ResourceLocation extractFieldIdentifier(final FieldDeclaration declarati
         final VariableDeclarator var = declaration.getVariable(0);
         final Expression initializer = var.getInitializer().orElse(null);
         if (!(initializer instanceof MethodCallExpr) || ((MethodCallExpr) initializer).getArguments().size() != 1) {
-            return new ResourceLocation(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
+            return ResourceLocation.parse(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
         }
 
         final Expression argument = ((MethodCallExpr) initializer).getArgument(0);
         if (!(argument instanceof final MethodCallExpr keyInitializer)
                 || keyInitializer.getArguments().size() < 1) {
-            return new ResourceLocation(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
+            return ResourceLocation.parse(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
         }
 
         if (keyInitializer.getArguments().size() == 1) { // method name as namespace
-            return new ResourceLocation(keyInitializer.getNameAsString(), keyInitializer.getArgument(0).asStringLiteralExpr().asString());
+            return ResourceLocation.fromNamespaceAndPath(keyInitializer.getNameAsString(), keyInitializer.getArgument(0).asStringLiteralExpr().asString());
         } else if (keyInitializer.getArguments().size() == 2) { // (namespace, path)
-            return new ResourceLocation(
+            return ResourceLocation.fromNamespaceAndPath(
                     keyInitializer.getArgument(0).asStringLiteralExpr().asString(),
                     keyInitializer.getArgument(1).asStringLiteralExpr().asString()
             );
         } else {
-            return new ResourceLocation(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
+            return ResourceLocation.parse(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
         }
 
     }

generator/src/main/java/org/spongepowered/vanilla/generator/RegistryEntriesValidator.java

@@ -163,24 +163,24 @@ private ResourceLocation extractFieldIdentifier(final FieldDeclaration declarati
         final VariableDeclarator var = declaration.getVariable(0);
         final Expression initializer = var.getInitializer().orElse(null);
         if (!(initializer instanceof MethodCallExpr) || ((MethodCallExpr) initializer).getArguments().size() != 1) {
-            return new ResourceLocation(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
+            return ResourceLocation.parse(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
         }
 
         final Expression argument = ((MethodCallExpr) initializer).getArgument(0);
         if (!(argument instanceof final MethodCallExpr keyInitializer)
                 || keyInitializer.getArguments().size() < 1) {
-            return new ResourceLocation(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
+            return ResourceLocation.parse(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
         }
 
         if (keyInitializer.getArguments().size() == 1) { // method name as namespace
-            return new ResourceLocation(keyInitializer.getNameAsString(), keyInitializer.getArgument(0).asStringLiteralExpr().asString());
+            return ResourceLocation.fromNamespaceAndPath(keyInitializer.getNameAsString(), keyInitializer.getArgument(0).asStringLiteralExpr().asString());
         } else if (keyInitializer.getArguments().size() == 2) { // (namespace, path)
-            return new ResourceLocation(
+            return ResourceLocation.fromNamespaceAndPath(
                 keyInitializer.getArgument(0).asStringLiteralExpr().asString(),
                 keyInitializer.getArgument(1).asStringLiteralExpr().asString()
             );
         } else {
-            return new ResourceLocation(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
+            return ResourceLocation.parse(var.getNameAsString().toLowerCase(Locale.ROOT)); // a best guess
         }
 
     }

gradle.properties

@@ -12,7 +12,7 @@ mixinConfigs=mixins.sponge.accessors.json,mixins.sponge.api.json,mixins.sponge.c
   mixins.sponge.tracker.json,mixins.sponge.ipforward.json,mixins.sponge.optimization.json
 superClassChanges=common.superclasschange
 
-minecraftVersion=1.20.6
+minecraftVersion=1.21
 recommendedVersion=0-SNAPSHOT
 
 org.gradle.dependency.verification.console=verbose

gradle/verification-metadata.xml

@@ -1038,6 +1038,14 @@
             <sha256 value="c02b5c9dddaee986319bb916c2084f0b058ece6c0d486dffcd4f66b262331490" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.mojang" name="datafixerupper" version="8.0.16">
+         <artifact name="datafixerupper-8.0.16.jar">
+            <sha256 value="ffc138bc2596c291781b0d5e211ccac51f0f2345f27fc2742f335cedf7e2870d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="datafixerupper-8.0.16.module">
+            <sha256 value="1004a7c99d09653f528ed6ac884808a7245264a33d6f3c6a3f8c092c35df20c9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.mojang" name="logging" version="1.1.1">
          <artifact name="logging-1.1.1.jar">
             <sha256 value="c1756eaf0685da94142bacc84309bb7ccddf65e004638c3299ab645710b5938c" origin="Generated by Gradle"/>

settings.gradle.kts

@@ -89,7 +89,7 @@ if (spongeForge.exists()) {
     ).joinToString(separator = System.lineSeparator(), postfix = System.lineSeparator()))
 }
 val spongeForgeEnabledInCi: String = startParameter.projectProperties.getOrDefault("enableSpongeForge", "false")
-if (spongeForgeEnabledInCi.toBoolean()) {
+if (false && spongeForgeEnabledInCi.toBoolean()) {
     include(":SpongeForge")
     project(":SpongeForge").projectDir = file("forge")
 }

src/accessors/java/org/spongepowered/common/accessor/world/entity/EntityAccessor.java

@@ -24,18 +24,11 @@
  */
 package org.spongepowered.common.accessor.world.entity;
 
-import com.google.common.collect.ImmutableList;
-import net.minecraft.BlockUtil;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.syncher.EntityDataAccessor;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.entity.EntityInLevelCallback;
-import net.minecraft.world.level.portal.PortalInfo;
-import net.minecraft.world.phys.Vec3;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -83,22 +76,9 @@ public interface EntityAccessor {
 
     @Accessor("random") RandomSource accessor$random();
 
-    @Accessor("isInsidePortal") void accessor$isInsidePortal(final boolean isInsidePortal);
-
-    @Accessor("portalTime") int accessor$portalTime();
-
-    @Accessor("portalTime") void accessor$portalTime(final int portalTime);
-
-    @Accessor("portalEntrancePos") BlockPos accessor$portalEntrancePos();
-
-    @Accessor("portalEntrancePos") void accessor$portalEntrancePos(final BlockPos portalEntrancePos);
-
-    @Accessor("passengers") ImmutableList<Entity> accessor$passengers();
 
     @Accessor("levelCallback") EntityInLevelCallback accessor$levelCallback();
 
-    @Invoker("setRot") void invoker$setRot(final float yRot, final float xRot);
-
     @Invoker("getEncodeId") @Nullable String invoker$getEncodeId();
 
     @Invoker("removePassenger") void invoker$removePassenger(final Entity passenger);
@@ -109,12 +89,6 @@ public interface EntityAccessor {
 
     @Invoker("getPermissionLevel") int invoker$getPermissionLevel();
 
-    @Invoker("removeAfterChangingDimensions") void invoker$removeAfterChangingDimensions();
-
-    @Invoker("getRelativePortalPosition") Vec3 invoker$getRelativePortalPosition(Direction.Axis axis, BlockUtil.FoundRectangle result);
-
-    @Invoker("findDimensionEntryPoint") PortalInfo invoker$findDimensionEntryPoint(ServerLevel targetWorld);
-
     @Invoker("unsetRemoved") void invoker$unsetRemoved();
 
 }

src/accessors/java/org/spongepowered/common/accessor/world/entity/LivingEntityAccessor.java

@@ -86,6 +86,8 @@ public interface LivingEntityAccessor {
     @Accessor("lastHurtByMob") @Nullable LivingEntity accessor$lastHurtByMob();
 
     @Accessor("autoSpinAttackTicks") int accessor$autoSpinAttackTicks();
+    @Accessor("autoSpinAttackDmg") float accessor$autoSpinAttackDmg();
+    @Accessor("autoSpinAttackItemStack") ItemStack accessor$autoSpinAttackItemStack();
 
     @Accessor("useItem") void accessor$useItem(final ItemStack useItem);
 

src/accessors/java/org/spongepowered/common/accessor/world/entity/projectile/AbstractArrowAccessor.java → src/accessors/java/org/spongepowered/common/accessor/world/entity/PortalProcessorAccessor.java

@@ -22,15 +22,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.common.accessor.world.entity.projectile;
+package org.spongepowered.common.accessor.world.entity;
 
-import net.minecraft.world.entity.projectile.AbstractArrow;
+import net.minecraft.world.entity.PortalProcessor;
+import net.minecraft.world.level.block.Portal;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-@Mixin(AbstractArrow.class)
-public interface AbstractArrowAccessor {
-
-    @Accessor("knockback") int accessor$knockback();
-
+@Mixin(PortalProcessor.class)
+public interface PortalProcessorAccessor {
+    @Accessor("portal") Portal accessor$portal();
 }

src/accessors/java/org/spongepowered/common/accessor/world/entity/decoration/PaintingAccessor.java → src/accessors/java/org/spongepowered/common/accessor/world/inventory/SmithingMenuAccessor.java

@@ -22,17 +22,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.common.accessor.world.entity.decoration;
+package org.spongepowered.common.accessor.world.inventory;
 
-import net.minecraft.core.Holder;
-import net.minecraft.world.entity.decoration.Painting;
-import net.minecraft.world.entity.decoration.PaintingVariant;
+import net.minecraft.world.inventory.SmithingMenu;
+import net.minecraft.world.item.crafting.SmithingRecipeInput;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-@Mixin(Painting.class)
-public interface PaintingAccessor {
-
-    @Invoker("setVariant") void invoker$setVariant(final Holder<PaintingVariant> direction);
+@Mixin(SmithingMenu.class)
+public interface SmithingMenuAccessor {
 
+    @Invoker("createRecipeInput") SmithingRecipeInput invoker$createRecipeInput();
 }

src/accessors/java/org/spongepowered/common/accessor/world/inventory/StonecutterMenuAccessor.java

@@ -0,0 +1,41 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.accessor.world.inventory;
+
+import net.minecraft.world.Container;
+import net.minecraft.world.inventory.StonecutterMenu;
+import net.minecraft.world.item.crafting.SingleRecipeInput;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+import org.spongepowered.common.UntransformedInvokerError;
+
+@Mixin(StonecutterMenu.class)
+public interface StonecutterMenuAccessor {
+
+    @Invoker("createRecipeInput") static SingleRecipeInput invoker$createRecipeInput(Container $$0) {
+        throw new UntransformedInvokerError();
+    }
+
+}

src/accessors/java/org/spongepowered/common/accessor/world/level/BaseSpawnerAccessor.java

@@ -42,6 +42,7 @@ public interface BaseSpawnerAccessor {
     @Accessor("spawnPotentials") void accessor$spawnPotentials(SimpleWeightedRandomList<SpawnData> newData);
 
     @Accessor("nextSpawnData") SpawnData accessor$nextSpawnData();
+    @Accessor("nextSpawnData") void accessor$nextSpawnData(SpawnData spawnData);
 
     @Accessor("minSpawnDelay") int accessor$minSpawnDelay();