24w06a

Author: gnembon

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check https://fabricmc.net/develop/
-	minecraft_version=24w05a
+	minecraft_version=24w06a
 	loader_version=0.15.6
 	jsr305_version=3.0.2
 	fabric_version=0.91.1+1.20.3

src/main/java/carpet/mixins/HopperBlockEntity_counterMixin.java

@@ -1,6 +1,7 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
+import net.minecraft.core.Direction;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -29,22 +30,26 @@ protected HopperBlockEntity_counterMixin(BlockEntityType<?> blockEntityType, Blo
         super(blockEntityType, blockPos, blockState);
     }
 
-    @Shadow public abstract int getContainerSize();
+    //@Shadow public abstract int getContainerSize();
 
-    @Shadow public abstract void setItem(int slot, ItemStack stack);
+    //@Shadow public abstract void setItem(int slot, ItemStack stack);
+
+    @Shadow private Direction facing;
 
     /**
      * A method to remove items from hoppers pointing into wool and count them via {@link HopperCounter#add} method
      */
     @Inject(method = "ejectItems", at = @At("HEAD"), cancellable = true)
-    private static void onInsert(Level world, BlockPos blockPos, BlockState blockState, Container inventory, CallbackInfoReturnable<Boolean> cir)
+    private static void onInsert(Level world, BlockPos blockPos, HopperBlockEntity hopperBlockEntity, CallbackInfoReturnable<Boolean> cir)
     {
         if (CarpetSettings.hopperCounters) {
+            Direction hopperFacing = world.getBlockState(blockPos).getValue(HopperBlock.FACING);
             DyeColor woolColor = WoolTool.getWoolColorAtPosition(
                     world,
-                    blockPos.relative(blockState.getValue(HopperBlock.FACING)));
+                    blockPos.relative(hopperFacing));
             if (woolColor != null)
             {
+                Container inventory = HopperBlockEntity.getContainerAt(world, blockPos);
                 for (int i = 0; i < inventory.getContainerSize(); ++i)
                 {
                     if (!inventory.getItem(i).isEmpty())

src/main/java/carpet/mixins/PrimedTntMixin.java

@@ -84,7 +84,7 @@ private void onExplode(CallbackInfo ci)
 
     @Inject(method = "tick", at = @At(value = "INVOKE",
                                         target = "Lnet/minecraft/world/entity/item/PrimedTnt;setDeltaMovement(Lnet/minecraft/world/phys/Vec3;)V",
-                                        ordinal = 2))
+                                        ordinal = 1))
     private void tryMergeTnt(CallbackInfo ci)
     {
         // Merge code for combining tnt into a single entity if they happen to exist in the same spot, same fuse, no motion CARPET-XCOM

src/main/java/carpet/script/api/Auxiliary.java

@@ -1201,7 +1201,7 @@ else if (fdesc.type == FileArgument.Type.JSON)
                         throw new IOException();
                     }
                     List<Pack> list = Lists.newArrayList(packManager.getSelectedPacks());
-                    resourcePackProfile.getDefaultPosition().insert(list, resourcePackProfile, p -> p, false);
+                    resourcePackProfile.getDefaultPosition().insert(list, resourcePackProfile, Pack::selectionConfig, false);
 
 
                     server.reloadResources(list.stream().map(Pack::getId).collect(Collectors.toList())).

src/main/java/carpet/script/utils/WorldTools.java

@@ -26,6 +26,7 @@
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.storage.RegionFile;
+import net.minecraft.world.level.chunk.storage.RegionStorageInfo;
 import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.dimension.LevelStem;
 import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
@@ -77,7 +78,8 @@ public static boolean canHasChunk(ServerLevel world, ChunkPos chpos, @Nullable M
         }
         try
         {
-            RegionFile region = new RegionFile(regionPath, regionsFolder, true);
+            RegionStorageInfo levelStorageInfo = new RegionStorageInfo(Vanilla.MinecraftServer_storageSource(world.getServer()).getLevelId(), world.dimension(), "chunk");
+            RegionFile region = new RegionFile(levelStorageInfo, regionPath, regionsFolder, true);
             if (regionCache != null)
             {
                 regionCache.put(currentRegionName, region);