- * An "invoker" is an object which hides multiple registered + * + *
An "invoker" is an object which hides multiple registered * listeners of type T under one instance of type T, executing * them and leaving early as necessary. * diff --git a/fabric-api-base/src/main/java/net/fabricmc/fabric/api/event/EventFactory.java b/fabric-api-base/src/main/java/net/fabricmc/fabric/api/event/EventFactory.java index 826e62780..aab0cbbdd 100644 --- a/fabric-api-base/src/main/java/net/fabricmc/fabric/api/event/EventFactory.java +++ b/fabric-api-base/src/main/java/net/fabricmc/fabric/api/event/EventFactory.java @@ -16,19 +16,17 @@ package net.fabricmc.fabric.api.event; -import net.fabricmc.fabric.impl.event.EventFactoryImpl; - import java.util.function.Function; +import net.fabricmc.fabric.impl.event.EventFactoryImpl; + /** * Helper for creating {@link Event} classes. */ public final class EventFactory { private static boolean profilingEnabled = true; - private EventFactory() { - - } + private EventFactory() { } /** * @return True if events are supposed to be profiled. @@ -61,8 +59,8 @@ public final class EventFactory { /** * Create an "array-backed" Event instance with a custom empty invoker. - *
- * Having a custom empty invoker (of type (...) -> {}) increases performance + * + *
Having a custom empty invoker (of type (...) -> {}) increases performance * relative to iterating over an empty array; however, it only really matters * if the event is executed thousands of times a second. * diff --git a/fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/NbtType.java b/fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/NbtType.java index 931124495..1329371c2 100644 --- a/fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/NbtType.java +++ b/fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/NbtType.java @@ -22,10 +22,10 @@ import net.minecraft.nbt.Tag; /** * NBT type ID constants. Useful for filtering by value type in a few cases. * + *
For the current list of types, check with {@link Tag#TYPES}. + * * @see CompoundTag#containsKey(String, int) * @see Tag#idToString(int) - *
- * For the current list of types, check with {@link Tag#TYPES}.
*/
public final class NbtType {
public static final int END = 0;
@@ -49,7 +49,5 @@ public final class NbtType {
*/
public static final int NUMBER = 99;
- private NbtType() {
-
- }
+ private NbtType() { }
}
diff --git a/fabric-api-base/src/main/java/net/fabricmc/fabric/impl/event/ArrayBackedEvent.java b/fabric-api-base/src/main/java/net/fabricmc/fabric/impl/event/ArrayBackedEvent.java
index 8a86c8a62..8f6b376e3 100644
--- a/fabric-api-base/src/main/java/net/fabricmc/fabric/impl/event/ArrayBackedEvent.java
+++ b/fabric-api-base/src/main/java/net/fabricmc/fabric/impl/event/ArrayBackedEvent.java
@@ -16,12 +16,12 @@
package net.fabricmc.fabric.impl.event;
-import net.fabricmc.fabric.api.event.Event;
-
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.function.Function;
+import net.fabricmc.fabric.api.event.Event;
+
class ArrayBackedEvent For example, addBiomeVariant(Biomes.JUNGLE, Biomes.DESERT, 0.2) will replace 20% of jungles with deserts.
* This method is rather useful for replacing biomes not generated through standard methods, such as oceans,
* deep oceans, jungles, mushroom islands, etc. When replacing ocean and deep ocean biomes, one must specify
* the biome without temperature (Biomes.OCEAN / Biomes.DEEP_OCEAN) only, as ocean temperatures have not been
@@ -107,5 +107,4 @@ public final class OverworldBiomes {
public static void setRiverBiome(Biome parent, Biome river) {
InternalBiomeData.setOverworldRiverBiome(parent, river);
}
-
}
diff --git a/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/api/biomes/v1/OverworldClimate.java b/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/api/biomes/v1/OverworldClimate.java
index d40a428b6..7637dea3e 100644
--- a/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/api/biomes/v1/OverworldClimate.java
+++ b/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/api/biomes/v1/OverworldClimate.java
@@ -17,27 +17,26 @@
package net.fabricmc.fabric.api.biomes.v1;
/**
- * Represents the climates of biomes on the overworld continents
+ * Represents the climates of biomes on the overworld continents.
*/
public enum OverworldClimate {
-
/**
- * Includes Snowy Tundra (with a weight of 3) and Snowy Taiga (with a weight of 1)
+ * Includes Snowy Tundra (with a weight of 3) and Snowy Taiga (with a weight of 1).
*/
SNOWY,
/**
- * Includes Forest, Taiga, Mountains, and Plains (all with weights of 1)
+ * Includes Forest, Taiga, Mountains, and Plains (all with weights of 1).
*/
COOL,
/**
- * Includes Forest, Dark Forest, Mountains, Plains, Birch Forest, and Swamp (all with weights of 1)
+ * Includes Forest, Dark Forest, Mountains, Plains, Birch Forest, and Swamp (all with weights of 1).
*/
TEMPERATE,
/**
- * Includes Desert (with a weight of 3), Savanna (with a weight of 2), and Plains (with a weight of 1)
+ * Includes Desert (with a weight of 3), Savanna (with a weight of 2), and Plains (with a weight of 1).
*/
DRY
}
diff --git a/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biomes/BiomeVariant.java b/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biomes/BiomeVariant.java
index 854823f2c..cf95f581e 100644
--- a/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biomes/BiomeVariant.java
+++ b/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biomes/BiomeVariant.java
@@ -19,10 +19,9 @@ package net.fabricmc.fabric.impl.biomes;
import net.minecraft.world.biome.Biome;
/**
- * Represents a biome variant and its corresponding chance
+ * Represents a biome variant and its corresponding chance.
*/
final class BiomeVariant {
-
private final Biome variant;
private final double chance;
@@ -48,5 +47,4 @@ final class BiomeVariant {
double getChance() {
return chance;
}
-
}
diff --git a/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biomes/ContinentalBiomeEntry.java b/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biomes/ContinentalBiomeEntry.java
index 17e41caa9..dbefa3836 100644
--- a/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biomes/ContinentalBiomeEntry.java
+++ b/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biomes/ContinentalBiomeEntry.java
@@ -19,7 +19,7 @@ package net.fabricmc.fabric.impl.biomes;
import net.minecraft.world.biome.Biome;
/**
- * Represents a biome and its corresponding weight
+ * Represents a biome and its corresponding weight.
*/
final class ContinentalBiomeEntry {
private final Biome biome;
diff --git a/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biomes/InternalBiomeData.java b/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biomes/InternalBiomeData.java
index c6b557850..268de271c 100644
--- a/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biomes/InternalBiomeData.java
+++ b/fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biomes/InternalBiomeData.java
@@ -16,26 +16,30 @@
package net.fabricmc.fabric.impl.biomes;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
-import net.fabricmc.fabric.api.biomes.v1.OverworldClimate;
+
import net.minecraft.util.registry.Registry;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.Biomes;
import net.minecraft.world.biome.layer.BiomeLayers;
import net.minecraft.world.biome.source.VanillaLayeredBiomeSource;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
+import net.fabricmc.fabric.api.biomes.v1.OverworldClimate;
/**
* Lists and maps for internal use only! Stores data that is used by the various mixins into the world generation
*/
public final class InternalBiomeData {
-
- private InternalBiomeData() {
- }
+ private InternalBiomeData() { }
private static final EnumMap
- *
- * {@code BlockRenderLayer} controls how sprite pixels for fluids and blocks are blended
- * with the scene. Consult the vanilla {@code BlockRenderLayer} implementation for examples.
- *
- * The Fabric Renderer API can be used to control this at a per-quad level at the code
- * via {@code BlendMode}.
- *
- * Client-side only.
+ * Use to associate blocks or fluids with block render layer other than default.
+ * Replaces the {@code renderLayer} property previously on {@code Block}.
+ *
+ * {@code BlockRenderLayer} controls how sprite pixels for fluids and blocks are blended
+ * with the scene. Consult the vanilla {@code BlockRenderLayer} implementation for examples.
+ *
+ * The Fabric Renderer API can be used to control this at a per-quad level at the code
+ * via {@code BlendMode}.
+ *
+ * Client-side only.
*/
public interface BlockRenderLayerMap {
BlockRenderLayerMap INSTANCE = BlockRenderLayerMapImpl.INSTANCE;
-
+
/**
* Map (or re-map) a block state with a render layer. Re-mapping is not recommended but if done, last one in wins.
* Must be called from client thread prior to world load/rendering. Best practice will be to call from mod's client initializer.
- *
+ *
* @param block Identifies block to be mapped.
* @param renderLayer Render layer. Should be one of the layers used for terrain rendering.
*/
@@ -58,7 +59,7 @@ public interface BlockRenderLayerMap {
/**
* Map (or re-map) a fluid state with a render layer. Re-mapping is not recommended but if done, last one in wins.
* Must be called from client thread prior to world load/rendering. Best practice will be to call from mod's client initializer.
- *
+ *
* @param fluid Identifies fluid to be mapped.
* @param renderLayer Render layer. Should be one of the layers used for terrain rendering.
*/
diff --git a/fabric-blockrenderlayer-v1/src/main/java/net/fabricmc/fabric/impl/blockrenderlayer/BlockRenderLayerMapImpl.java b/fabric-blockrenderlayer-v1/src/main/java/net/fabricmc/fabric/impl/blockrenderlayer/BlockRenderLayerMapImpl.java
index da0d4bf16..65da1d043 100644
--- a/fabric-blockrenderlayer-v1/src/main/java/net/fabricmc/fabric/impl/blockrenderlayer/BlockRenderLayerMapImpl.java
+++ b/fabric-blockrenderlayer-v1/src/main/java/net/fabricmc/fabric/impl/blockrenderlayer/BlockRenderLayerMapImpl.java
@@ -20,16 +20,16 @@ import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
+import net.minecraft.block.Block;
import net.minecraft.client.render.RenderLayer;
+import net.minecraft.fluid.Fluid;
import net.minecraft.item.Item;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
-import net.minecraft.block.Block;
-import net.minecraft.fluid.Fluid;
public class BlockRenderLayerMapImpl implements BlockRenderLayerMap {
- private BlockRenderLayerMapImpl() {}
-
+ private BlockRenderLayerMapImpl() { }
+
@Override
public void putBlock(Block block, RenderLayer renderLayer) {
if (block == null) throw new IllegalArgumentException("Request to map null block to BlockRenderLayer");
@@ -53,7 +53,7 @@ public class BlockRenderLayerMapImpl implements BlockRenderLayerMap {
fluidHandler.accept(fluid, renderLayer);
}
-
+
public static final BlockRenderLayerMap INSTANCE = new BlockRenderLayerMapImpl();
private static Map This method may have side effects such as the creation of a portal in the target dimension,
+ * This method may have side effects such as the creation of a portal in the target dimension,
* or the creation of a chunk loading ticket.
*
* @param portalDir the direction the portal is facing, meaningless if no portal was used
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/api/dimension/v1/FabricDimensionType.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/api/dimension/v1/FabricDimensionType.java
index 435cbeb43..3c43bfd6d 100644
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/api/dimension/v1/FabricDimensionType.java
+++ b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/api/dimension/v1/FabricDimensionType.java
@@ -16,6 +16,8 @@
package net.fabricmc.fabric.api.dimension.v1;
+import java.util.function.BiFunction;
+
import com.google.common.base.Preconditions;
import net.minecraft.entity.Entity;
@@ -29,8 +31,6 @@ import net.minecraft.world.biome.VoronoiBiomeAccessType;
import net.minecraft.world.dimension.Dimension;
import net.minecraft.world.dimension.DimensionType;
-import java.util.function.BiFunction;
-
/**
* An extended version of {@link DimensionType} with automatic raw id management and default placement settings.
* {@code FabricDimensionType} instances are constructed and registered through a {@link Builder}.
@@ -42,7 +42,7 @@ import java.util.function.BiFunction;
public final class FabricDimensionType extends DimensionType {
private final EntityPlacer defaultPlacement;
private int desiredRawId;
- /** The fixed raw id for this dimension type, set through reflection */
+ /** The fixed raw id for this dimension type, set through reflection. */
private int fixedRawId;
/**
@@ -77,7 +77,7 @@ public final class FabricDimensionType extends DimensionType {
/**
* Return the current raw id for this dimension type.
*
- * The returned id is guaranteed to be unique and persistent in a save,
+ * The returned id is guaranteed to be unique and persistent in a save,
* as well as synchronized between a server and its connected clients.
* It may change when connecting to a different server or opening a new save.
*
@@ -131,7 +131,7 @@ public final class FabricDimensionType extends DimensionType {
* Set the default placer used when teleporting entities to dimensions of the built type.
* The default placer must be set before building a dimension type.
*
- * A dimension type's default placer must never return {@code null} when its
+ * A dimension type's default placer must never return {@code null} when its
* {@link EntityPlacer#placeEntity(Entity, ServerWorld, Direction, double, double) placeEntity} method
* is called.
*
@@ -194,7 +194,7 @@ public final class FabricDimensionType extends DimensionType {
* If this method is not called, the value defaults to the raw registry id
* of the dimension type.
*
- * A Fabric Dimension's desired raw id is used as its actual raw id
+ * A Fabric Dimension's desired raw id is used as its actual raw id
* when it does not conflict with any existing id, and the world
* save does not map the dimension to a different raw id.
*
@@ -212,7 +212,7 @@ public final class FabricDimensionType extends DimensionType {
/**
* Build and register a {@code FabricDimensionType}.
*
- * The {@code dimensionId} is used as a registry ID, and as
+ * The {@code dimensionId} is used as a registry ID, and as
* a unique name both for the dimension suffix and the save directory.
*
* @param dimensionId the id used to name and register the dimension
@@ -225,7 +225,7 @@ public final class FabricDimensionType extends DimensionType {
Preconditions.checkArgument(Registry.DIMENSION.get(dimensionId) == null);
Preconditions.checkState(this.defaultPlacer != null, "No defaultPlacer has been specified!");
Preconditions.checkState(this.factory != null, "No dimension factory has been specified!");
-
+
String suffix = dimensionId.getNamespace() + "_" + dimensionId.getPath();
String saveDir = "DIM_" + dimensionId.getNamespace() + "_" + dimensionId.getPath();
FabricDimensionType built = new FabricDimensionType(suffix, saveDir, this);
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/api/dimension/v1/FabricDimensions.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/api/dimension/v1/FabricDimensions.java
index d948e0ae1..379b81406 100644
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/api/dimension/v1/FabricDimensions.java
+++ b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/api/dimension/v1/FabricDimensions.java
@@ -17,10 +17,12 @@
package net.fabricmc.fabric.api.dimension.v1;
import com.google.common.base.Preconditions;
-import net.fabricmc.fabric.impl.dimension.FabricDimensionInternals;
+
import net.minecraft.entity.Entity;
import net.minecraft.world.dimension.DimensionType;
+import net.fabricmc.fabric.impl.dimension.FabricDimensionInternals;
+
/**
* This class consists exclusively of static methods that operate on world dimensions.
*/
@@ -32,10 +34,10 @@ public final class FabricDimensions {
/**
* Teleports an entity to a different dimension, using custom placement logic.
*
- * This method behaves as if:
+ * This method behaves as if:
* If {@code destination} is a {@link FabricDimensionType}, the placement logic used
+ * If {@code destination} is a {@link FabricDimensionType}, the placement logic used
* is {@link FabricDimensionType#getDefaultPlacement()}. If {@code destination} is
* the nether or the overworld, the default logic is the vanilla path.
* For any other dimension, the default placement behaviour is undefined.
@@ -43,7 +45,7 @@ public final class FabricDimensions {
* {@code lastPortalDirectionVector}, and {@code lastPortalDirection} fields should be updated
* before calling this method.
*
- * After calling this method, {@code teleported} may be invalidated. Callers should use
+ * After calling this method, {@code teleported} may be invalidated. Callers should use
* the returned entity for any further manipulation.
*
* @param teleported the entity to teleport
@@ -58,12 +60,12 @@ public final class FabricDimensions {
/**
* Teleports an entity to a different dimension, using custom placement logic.
*
- * If {@code customPlacement} is {@code null}, this method behaves as if:
+ * If {@code customPlacement} is {@code null}, this method behaves as if:
* If {@code destination} is a {@link FabricDimensionType}, the default placement logic
+ * If {@code destination} is a {@link FabricDimensionType}, the default placement logic
* is {@link FabricDimensionType#getDefaultPlacement()}. If {@code destination} is the nether
* or the overworld, the default logic is the vanilla path.
* For any other dimension, the default placement behaviour is undefined.
@@ -71,7 +73,7 @@ public final class FabricDimensions {
* {@code lastPortalDirectionVector}, and {@code lastPortalDirection} fields should be updated
* before calling this method.
*
- * After calling this method, {@code teleported} may be invalidated. Callers should use
+ * After calling this method, {@code teleported} may be invalidated. Callers should use
* the returned entity for any further manipulation.
*
* @param teleported the entity to teleport
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/DimensionIdsFixer.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/DimensionIdsFixer.java
index b4f525dbb..e4d5a224c 100644
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/DimensionIdsFixer.java
+++ b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/DimensionIdsFixer.java
@@ -16,12 +16,15 @@
package net.fabricmc.fabric.impl.dimension;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
import io.netty.buffer.Unpooled;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import net.fabricmc.fabric.api.dimension.v1.FabricDimensionType;
-import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
-import net.fabricmc.fabric.impl.registry.RemapException;
+
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.Packet;
import net.minecraft.util.Identifier;
@@ -30,10 +33,9 @@ import net.minecraft.util.registry.Registry;
import net.minecraft.world.dimension.DimensionType;
import net.minecraft.world.level.LevelProperties;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import net.fabricmc.fabric.api.dimension.v1.FabricDimensionType;
+import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
+import net.fabricmc.fabric.impl.registry.RemapException;
/**
* Handles fixing raw dimension ids between saves and servers,
@@ -72,6 +74,7 @@ public class DimensionIdsFixer {
setFixedRawId(fabricDimension, fabricDimension.getDesiredRawId());
} else {
Identifier existing = fixedIds.put(dimensionType.getRawId(), id);
+
if (existing != null) {
throw new RemapException("Two non-fabric dimensions have the same raw dim id (" + dimensionType.getRawId() + ") : " + existing + " and " + id);
}
@@ -89,6 +92,7 @@ public class DimensionIdsFixer {
}
DimensionType dim = DimensionType.byId(dimId);
+
if (dim instanceof FabricDimensionType) {
setFixedRawId((FabricDimensionType) dim, savedRawId);
} else {
@@ -100,6 +104,7 @@ public class DimensionIdsFixer {
// step 3: de-duplicate raw ids for dimensions which ids are not fixed yet
int nextFreeId = 0;
+
for (FabricDimensionType fabricDimension : fabricDimensions) {
int rawDimId = fabricDimension.getRawId();
Identifier dimId = Objects.requireNonNull(DimensionType.getId(fabricDimension));
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/DimensionIdsHolder.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/DimensionIdsHolder.java
index dce5ed674..a115202d3 100644
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/DimensionIdsHolder.java
+++ b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/DimensionIdsHolder.java
@@ -19,7 +19,7 @@ package net.fabricmc.fabric.impl.dimension;
import net.minecraft.nbt.CompoundTag;
/**
- * An object holding a raw id -> full id map for fabric dimensions
+ * An object holding a raw id -> full id map for fabric dimensions.
*/
public interface DimensionIdsHolder {
CompoundTag fabric_getDimensionIds();
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FabricDimensionClientInit.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FabricDimensionClientInit.java
index 8593513b6..a2f229a94 100644
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FabricDimensionClientInit.java
+++ b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FabricDimensionClientInit.java
@@ -16,18 +16,20 @@
package net.fabricmc.fabric.impl.dimension;
-import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
-import net.fabricmc.fabric.api.network.PacketContext;
-import net.fabricmc.fabric.impl.registry.RemapException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.text.LiteralText;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+
+import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
+import net.fabricmc.fabric.api.network.PacketContext;
+import net.fabricmc.fabric.impl.registry.RemapException;
/**
- * Client entry point for fabric-dimensions
+ * Client entry point for fabric-dimensions.
*/
public final class FabricDimensionClientInit {
private static final Logger LOGGER = LogManager.getLogger();
@@ -55,8 +57,7 @@ public final class FabricDimensionClientInit {
LOGGER.error("Dimension id remapping failed!", e);
MinecraftClient.getInstance().execute(() -> ((ClientPlayerEntity) ctx.getPlayer()).networkHandler.getConnection().disconnect(
- new LiteralText("Dimension id remapping failed: " + e)
+ new LiteralText("Dimension id remapping failed: " + e)
));
}
-
}
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FabricDimensionInternals.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FabricDimensionInternals.java
index 1b9e32e44..359dc3375 100644
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FabricDimensionInternals.java
+++ b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FabricDimensionInternals.java
@@ -17,17 +17,19 @@
package net.fabricmc.fabric.impl.dimension;
import com.google.common.base.Preconditions;
-import net.fabricmc.fabric.api.dimension.v1.EntityPlacer;
-import net.fabricmc.fabric.api.dimension.v1.FabricDimensionType;
-import net.fabricmc.fabric.api.dimension.v1.FabricDimensions;
-import net.fabricmc.fabric.mixin.EntityHooks;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
import net.minecraft.block.pattern.BlockPattern;
import net.minecraft.entity.Entity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.Direction;
import net.minecraft.world.dimension.DimensionType;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+
+import net.fabricmc.fabric.api.dimension.v1.EntityPlacer;
+import net.fabricmc.fabric.api.dimension.v1.FabricDimensionType;
+import net.fabricmc.fabric.api.dimension.v1.FabricDimensions;
+import net.fabricmc.fabric.mixin.EntityHooks;
public final class FabricDimensionInternals {
private FabricDimensionInternals() {
@@ -38,11 +40,11 @@ public final class FabricDimensionInternals {
public static final Logger LOGGER = LogManager.getLogger();
/**
- * The entity currently being transported to another dimension
+ * The entity currently being transported to another dimension.
*/
private static final ThreadLocal
- * Upon return:
- * - SUCCESS cancels further processing and, on the client, sends a packet to the server.
- * - PASS falls back to further processing.
- * - FAIL cancels further processing and does not send a packet to the server.
- *
- * ATTACK_BLOCK does not let you control the packet sending process yet.
+ *
+ * Upon return:
+ * ATTACK_BLOCK does not let you control the packet sending process yet.
*/
public interface AttackBlockCallback {
- public static final Event
- * Upon return:
- * - SUCCESS cancels further processing and, on the client, sends a packet to the server.
- * - PASS falls back to further processing.
- * - FAIL cancels further processing and does not send a packet to the server.
+ *
+ * Upon return:
+ *
- * Upon return:
- * - SUCCESS cancels further processing and, on the client, sends a packet to the server.
- * - PASS falls back to further processing.
- * - FAIL cancels further processing and does not send a packet to the server.
+ *
+ * Upon return:
+ *
- * Upon return:
- * - SUCCESS cancels further processing and, on the client, sends a packet to the server.
- * - PASS falls back to further processing.
- * - FAIL cancels further processing and does not send a packet to the server.
+ *
+ * Upon return:
+ *
- * Upon return:
- * - SUCCESS cancels further processing and, on the client, sends a packet to the server.
- * - PASS falls back to further processing.
- * - FAIL cancels further processing and does not send a packet to the server.
+ *
+ * Upon return:
+ *
- * *ALL* instantiated FabricKeyBindings should be registered in
+ *
+ * *ALL* instantiated FabricKeyBindings should be registered in
* {@link KeyBindingRegistry#register(FabricKeyBinding)}!
*/
public class FabricKeyBinding extends KeyBinding {
diff --git a/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/api/client/keybinding/KeyBindingRegistry.java b/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/api/client/keybinding/KeyBindingRegistry.java
index 213fc8ee3..f7bf5945c 100644
--- a/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/api/client/keybinding/KeyBindingRegistry.java
+++ b/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/api/client/keybinding/KeyBindingRegistry.java
@@ -16,16 +16,17 @@
package net.fabricmc.fabric.api.client.keybinding;
-import net.fabricmc.fabric.impl.client.keybinding.KeyBindingRegistryImpl;
import net.minecraft.client.options.KeyBinding;
+import net.fabricmc.fabric.impl.client.keybinding.KeyBindingRegistryImpl;
+
/**
* Interface for registering key bindings.
*
* @see KeyBinding
*/
public interface KeyBindingRegistry {
- static KeyBindingRegistry INSTANCE = KeyBindingRegistryImpl.INSTANCE;
+ KeyBindingRegistry INSTANCE = KeyBindingRegistryImpl.INSTANCE;
/**
* Add a new key binding category.
diff --git a/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java b/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java
index 3f66538dc..eba0d8b83 100644
--- a/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java
+++ b/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java
@@ -16,18 +16,20 @@
package net.fabricmc.fabric.impl.client.keybinding;
-import net.fabricmc.fabric.api.client.keybinding.FabricKeyBinding;
-import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry;
-import net.minecraft.client.options.KeyBinding;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import net.minecraft.client.options.KeyBinding;
+
+import net.fabricmc.fabric.api.client.keybinding.FabricKeyBinding;
+import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry;
+
public class KeyBindingRegistryImpl implements KeyBindingRegistry {
public static final KeyBindingRegistryImpl INSTANCE = new KeyBindingRegistryImpl();
private static final Logger LOGGER = LogManager.getLogger();
@@ -67,6 +69,7 @@ public class KeyBindingRegistryImpl implements KeyBindingRegistry {
@Override
public boolean addCategory(String categoryName) {
Map This is equal to {@code copyFrom(pool, false)}.
*/
public FabricLootPoolBuilder copyFrom(LootPool pool) {
return copyFrom(pool, false);
@@ -85,7 +86,7 @@ public class FabricLootPoolBuilder extends LootPool.Builder {
* Copies the entries, conditions and functions of the {@code pool} to this
* builder.
*
- * If {@code copyRolls} is true, the {@link FabricLootPool#getRollsRange rolls} of the pool are also copied.
+ * If {@code copyRolls} is true, the {@link FabricLootPool#getRollsRange rolls} of the pool are also copied.
*/
public FabricLootPoolBuilder copyFrom(LootPool pool, boolean copyRolls) {
FabricLootPool extendedPool = (FabricLootPool) pool;
diff --git a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootSupplier.java b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootSupplier.java
index b65ad7bc7..184d7c9c5 100644
--- a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootSupplier.java
+++ b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootSupplier.java
@@ -16,13 +16,13 @@
package net.fabricmc.fabric.api.loot.v1;
+import java.util.List;
+
import net.minecraft.world.loot.LootPool;
import net.minecraft.world.loot.LootTable;
import net.minecraft.world.loot.context.LootContextType;
import net.minecraft.world.loot.function.LootFunction;
-import java.util.List;
-
/**
* An interface implemented by all {@code net.minecraft.world.loot.LootSupplier} instances when
* Fabric API is present. Contains accessors for various fields.
@@ -31,6 +31,7 @@ public interface FabricLootSupplier {
default LootTable asVanilla() {
return (LootTable) this;
}
+
List
- * Please note that the game engine keeps track of circular model loading calls on its own.
+ *
+ * Please note that the game engine keeps track of circular model loading calls on its own.
*
* @param id The model identifier.
* @return The UnbakedModel. Can return a missing model if it's not present!
diff --git a/fabric-models-v0/src/main/java/net/fabricmc/fabric/api/client/model/ModelResourceProvider.java b/fabric-models-v0/src/main/java/net/fabricmc/fabric/api/client/model/ModelResourceProvider.java
index e52e531a0..b6544414c 100644
--- a/fabric-models-v0/src/main/java/net/fabricmc/fabric/api/client/model/ModelResourceProvider.java
+++ b/fabric-models-v0/src/main/java/net/fabricmc/fabric/api/client/model/ModelResourceProvider.java
@@ -21,27 +21,26 @@ import net.minecraft.util.Identifier;
/**
* Interface for model resource providers.
- *
- * Model resource providers hook the loading of model *files* from the resource tree;
+ *
+ * Model resource providers hook the loading of model *files* from the resource tree;
* that is, in vanilla, it handles going from "minecraft:block/stone" to a
* "assets/minecraft/models/block/stone.json" file.
- *
- * This is where you want to add your own custom model formats.
- *
- * As providers are instantiated with a new provider, it is safe
+ *
+ * This is where you want to add your own custom model formats.
+ *
+ * As providers are instantiated with a new provider, it is safe
* (and recommended!) to cache information inside a loader.
- *
- * Keep in mind that only *one* ModelResourceProvider may respond to a given model
+ *
+ * Keep in mind that only *one* ModelResourceProvider may respond to a given model
* at any time. If you're writing, say, an OBJ loader, this means you could
* easily conflict with another OBJ loader unless you take some precautions,
* for example:
- *
- * a) Only load files with a mod-suffixed name, such as .architect.obj,
- * b) Only load files from an explicit list of namespaces, registered elsewhere.
+ *
+ *
- * Model variant providers hook the resolution of ModelIdentifiers. In vanilla, this is
+ *
+ * Model variant providers hook the resolution of ModelIdentifiers. In vanilla, this is
* the part where a "minecraft:stone#normal" identifier triggers the loading of a
* "minecraft:models/stone" model ({@link ModelResourceProvider} handles the later step).
- *
- * The most common use of this is to cooperate with a {@link ModelAppender}, but it can
+ *
+ * The most common use of this is to cooperate with a {@link ModelAppender}, but it can
* also allow you to add your own block- or item-state formats. To trigger the loading
* of another model, use the passed {@link ModelProviderContext}.
- *
- * As every model loading is instantiated with a new provider, it is safe
+ *
+ * As every model loading is instantiated with a new provider, it is safe
* (and recommended!) to cache information.
- *
- * Keep in mind that only *one* ModelVariantProvider may respond to a given model
+ *
+ * Keep in mind that only *one* ModelVariantProvider may respond to a given model
* at any time.
*/
@FunctionalInterface
public interface ModelVariantProvider {
-
/**
* @param modelId The model identifier, complete with variant.
* @return The loaded UnbakedModel, or null if this ModelVariantProvider doesn't handle a specific Identifier
diff --git a/fabric-models-v0/src/main/java/net/fabricmc/fabric/impl/client/model/ModelLoadingRegistryImpl.java b/fabric-models-v0/src/main/java/net/fabricmc/fabric/impl/client/model/ModelLoadingRegistryImpl.java
index 33ba824ad..8951aec57 100644
--- a/fabric-models-v0/src/main/java/net/fabricmc/fabric/impl/client/model/ModelLoadingRegistryImpl.java
+++ b/fabric-models-v0/src/main/java/net/fabricmc/fabric/impl/client/model/ModelLoadingRegistryImpl.java
@@ -16,17 +16,6 @@
package net.fabricmc.fabric.impl.client.model;
-import com.google.common.collect.Lists;
-import net.fabricmc.fabric.api.client.model.*;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.render.model.ModelLoader;
-import net.minecraft.client.render.model.UnbakedModel;
-import net.minecraft.client.util.ModelIdentifier;
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.util.Identifier;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -35,9 +24,27 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
+import com.google.common.collect.Lists;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import net.minecraft.client.render.model.ModelLoader;
+import net.minecraft.client.render.model.UnbakedModel;
+import net.minecraft.client.util.ModelIdentifier;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.util.Identifier;
+
+import net.fabricmc.fabric.api.client.model.ModelAppender;
+import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry;
+import net.fabricmc.fabric.api.client.model.ModelProviderContext;
+import net.fabricmc.fabric.api.client.model.ModelProviderException;
+import net.fabricmc.fabric.api.client.model.ModelResourceProvider;
+import net.fabricmc.fabric.api.client.model.ModelVariantProvider;
+import net.fabricmc.loader.api.FabricLoader;
+
public class ModelLoadingRegistryImpl implements ModelLoadingRegistry {
private static final boolean DEBUG_MODEL_LOADING = FabricLoader.getInstance().isDevelopmentEnvironment()
- || Boolean.valueOf(System.getProperty("fabric.debugModelLoading", "false"));
+ || Boolean.valueOf(System.getProperty("fabric.debugModelLoading", "false"));
@FunctionalInterface
private interface CustomModelItf This is preferable to
* {@link World#updateListeners(net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState, net.minecraft.block.BlockState, int)}
* because it does not cause entities to update their pathing as a side effect.
diff --git a/fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/mixin/networkingblockentity/MixinBlockEntity.java b/fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/mixin/networkingblockentity/MixinBlockEntity.java
index 756cababd..72e8164ec 100644
--- a/fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/mixin/networkingblockentity/MixinBlockEntity.java
+++ b/fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/mixin/networkingblockentity/MixinBlockEntity.java
@@ -16,18 +16,20 @@
package net.fabricmc.fabric.mixin.networkingblockentity;
-import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.client.network.packet.BlockEntityUpdateS2CPacket;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable;
@Mixin(BlockEntity.class)
public abstract class MixinBlockEntity {
@@ -39,7 +41,7 @@ public abstract class MixinBlockEntity {
@Inject(at = @At("HEAD"), method = "toUpdatePacket", cancellable = true)
public void toUpdatePacket(CallbackInfoReturnable
- * It is used for:
- *
- * - registering client-side packet receivers (server -> client packets)
- * - sending packets to the server (client -> server packets).
+ *
+ * It is used for:
+ *
+ * The PacketByteBuf received will be released as soon as the method exits,
* meaning that you have to call .retain()/.release() on it if you want to
* keep it around after that.
*
- * Please keep in mind that this CAN be called OUTSIDE of the main thread!
+ * Please keep in mind that this CAN be called OUTSIDE of the main thread!
* Most game operations are not thread-safe, so you should look into using
* the thread task queue ({@link PacketContext#getTaskQueue()}) to split
* the "reading" (which should happen within this method's execution)
diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketContext.java b/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketContext.java
index d70ecb8f4..782045a42 100644
--- a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketContext.java
+++ b/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketContext.java
@@ -16,10 +16,11 @@
package net.fabricmc.fabric.api.network;
-import net.fabricmc.api.EnvType;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.ThreadExecutor;
+import net.fabricmc.api.EnvType;
+
/**
* Interface defining a context used during packet processing. Allows access
* to additional information, such as the source/target of the player, or
@@ -36,8 +37,8 @@ public interface PacketContext {
/**
* Get the player associated with the packet.
- *
- * On the client side, this always returns the client-side player instance.
+ *
+ * On the client side, this always returns the client-side player instance.
* On the server side, it returns the player belonging to the client this
* packet was sent by.
*
@@ -47,15 +48,15 @@ public interface PacketContext {
/**
* Get the task queue for a given side.
- *
- * As Minecraft networking I/O is asynchronous, but a lot of its logic is
+ *
+ * As Minecraft networking I/O is asynchronous, but a lot of its logic is
* not thread-safe, it is recommended to do the following:
- *
- * - read and parse the PacketByteBuf,
- * - run the packet response logic through the main thread task queue via
+ *
+ *
- * It is used for:
- *
- * - registering server-side packet receivers (client -> server packets)
- * - sending packets to clients (server -> client packets).
- *
- * For iterating over clients in a server, see {@link PlayerStream}.
+ *
+ * It is used for:
+ *
+ * For iterating over clients in a server, see {@link PlayerStream}.
*/
public interface ServerSidePacketRegistry extends PacketRegistry {
- static final ServerSidePacketRegistry INSTANCE = new ServerSidePacketRegistryImpl();
+ ServerSidePacketRegistry INSTANCE = new ServerSidePacketRegistryImpl();
/**
* Check if a given client declared the ability to receive a given packet ID
diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/server/PlayerStream.java b/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/server/PlayerStream.java
index 1d4092e1f..f9d181605 100644
--- a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/server/PlayerStream.java
+++ b/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/server/PlayerStream.java
@@ -16,7 +16,8 @@
package net.fabricmc.fabric.api.server;
-import net.fabricmc.fabric.impl.server.EntityTrackerStorageAccessor;
+import java.util.stream.Stream;
+
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
@@ -31,17 +32,15 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraft.world.chunk.ChunkManager;
-import java.util.stream.Stream;
+import net.fabricmc.fabric.impl.server.EntityTrackerStorageAccessor;
/**
* Helper streams for looking up players on a server.
- *
- * In general, most of these methods will only function with a {@link ServerWorld} instance.
+ *
+ * In general, most of these methods will only function with a {@link ServerWorld} instance.
*/
public final class PlayerStream {
- private PlayerStream() {
-
- }
+ private PlayerStream() { }
public static Stream As PacketByteBuf getters in vanilla create a copy (to allow releasing the original packet buffer without
* breaking other, potentially delayed accesses), we use a Supplier to generate those copies and release them
* when needed.
*
@@ -167,8 +184,10 @@ public abstract class PacketRegistryImpl implements PacketRegistry {
}
PacketConsumer consumer = consumerMap.get(id);
+
if (consumer != null) {
PacketByteBuf buf = bufSupplier.get();
+
try {
consumer.accept(context, buf);
} catch (Throwable t) {
@@ -178,6 +197,7 @@ public abstract class PacketRegistryImpl implements PacketRegistry {
buf.release();
}
}
+
return true;
} else {
return false;
diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/network/ServerSidePacketRegistryImpl.java b/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/network/ServerSidePacketRegistryImpl.java
index 5492cb1f6..b10198409 100644
--- a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/network/ServerSidePacketRegistryImpl.java
+++ b/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/network/ServerSidePacketRegistryImpl.java
@@ -16,11 +16,18 @@
package net.fabricmc.fabric.impl.network;
+import java.lang.ref.WeakReference;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.function.Consumer;
+
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
-import net.fabricmc.fabric.api.event.network.C2SPacketTypeCallback;
-import net.fabricmc.fabric.api.network.PacketContext;
-import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
+
import net.minecraft.client.network.packet.CustomPayloadS2CPacket;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.Packet;
@@ -30,9 +37,9 @@ import net.minecraft.server.network.packet.LoginQueryResponseC2SPacket;
import net.minecraft.util.Identifier;
import net.minecraft.util.PacketByteBuf;
-import java.lang.ref.WeakReference;
-import java.util.*;
-import java.util.function.Consumer;
+import net.fabricmc.fabric.api.event.network.C2SPacketTypeCallback;
+import net.fabricmc.fabric.api.network.PacketContext;
+import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
public class ServerSidePacketRegistryImpl extends PacketRegistryImpl implements ServerSidePacketRegistry {
private final WeakHashMap
- * To use it, simply replace Block.Settings.create() with
+ *
+ * To use it, simply replace Block.Settings.create() with
* FabricBlockSettings.create() and add .build() at the end to return the
* vanilla Block.Settings instance beneath.
*/
@@ -46,47 +47,49 @@ public class FabricBlockSettings {
BlockConstructedCallback.EVENT.register(FabricBlockSettings::onBuild);
}
- private static final Map Custom sprites registered using ParticleFactoryRegistry have the options
* to supply a particle factory which will recieve an instance of this
* interface containing the sprites set loaded for their particle from the
* active resourcepacks.
*
- * @see ParticleFactoryRegistry.register(type, constructor)
- * @see ParticleFactoryRegistry.PendingParticleFactory The factory method will be called with a sprite provider to use for that particle when it comes time.
*
- * Particle sprites will be loaded from domain:/particles/particle_name.json as per vanilla minecraft behaviour.
+ * Particle sprites will be loaded from domain:/particles/particle_name.json as per vanilla minecraft behaviour.
*/
- public Particle sprites will be loaded from domain:/particles/particle_name.json as per vanilla minecraft behaviour.
*
* @param provider The sprite provider used to supply sprite textures when drawing the mod's particle.
*
* @return A new particle factory.
*/
- public ParticleFactory Usage:
+ * Usage:
+ * RegistryIdRemapCallback is called on every remapping operation, if you want to do your own processing in one swoop
* (say, rebuild the ID map from scratch).
*
- * Generally speaking, a remap can only cause object *removals*; object *additions* are necessary to reverse remaps.
+ * Generally speaking, a remap can only cause object *removals*; object *additions* are necessary to reverse remaps.
*
* @param {@code teleported.changeDimension(destination)}
*
- * {@code teleported.changeDimension(destination)}
* The {@code customPlacement} may itself return {@code null}, in which case
* the default placement logic for that dimension will be run.
*
- *
+ *
+ *
*/
public interface AttackEntityCallback {
- public static final Event
*/
public interface UseBlockCallback {
- public static final Event
*/
public interface UseEntityCallback {
- public static final Event
*/
public interface UseItemCallback {
- public static final Event
*/
@FunctionalInterface
public interface ModelResourceProvider {
-
/**
* @param resourceId The resource identifier to be loaded.
* @return The loaded UnbakedModel, or null if this ModelResourceProvider doesn't handle a specific Identifier
diff --git a/fabric-models-v0/src/main/java/net/fabricmc/fabric/api/client/model/ModelVariantProvider.java b/fabric-models-v0/src/main/java/net/fabricmc/fabric/api/client/model/ModelVariantProvider.java
index 476ad7065..81bcf0dc3 100644
--- a/fabric-models-v0/src/main/java/net/fabricmc/fabric/api/client/model/ModelVariantProvider.java
+++ b/fabric-models-v0/src/main/java/net/fabricmc/fabric/api/client/model/ModelVariantProvider.java
@@ -21,24 +21,23 @@ import net.minecraft.client.util.ModelIdentifier;
/**
* Interface for model variant providers.
- *
*/
public interface ClientSidePacketRegistry extends PacketRegistry {
- static final ClientSidePacketRegistry INSTANCE = new ClientSidePacketRegistryImpl();
+ ClientSidePacketRegistry INSTANCE = new ClientSidePacketRegistryImpl();
/**
* Check if the server declared the ability to receive a given packet ID
diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketConsumer.java b/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketConsumer.java
index 7064b9f8c..b6d42c55d 100644
--- a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketConsumer.java
+++ b/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketConsumer.java
@@ -26,11 +26,11 @@ public interface PacketConsumer {
/**
* Receive a CustomPayload-based packet.
*
- * The PacketByteBuf received will be released as soon as the method exits,
+ *
*
* @return The thread task queue.
*/
diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/ServerSidePacketRegistry.java b/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/ServerSidePacketRegistry.java
index b26dd2614..cb12d9fca 100644
--- a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/ServerSidePacketRegistry.java
+++ b/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/ServerSidePacketRegistry.java
@@ -18,25 +18,27 @@ package net.fabricmc.fabric.api.network;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
-import net.fabricmc.fabric.api.server.PlayerStream;
-import net.fabricmc.fabric.impl.network.ServerSidePacketRegistryImpl;
+
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.Packet;
import net.minecraft.util.Identifier;
import net.minecraft.util.PacketByteBuf;
+import net.fabricmc.fabric.api.server.PlayerStream;
+import net.fabricmc.fabric.impl.network.ServerSidePacketRegistryImpl;
+
/**
* The server-side packet registry.
- *
+ *
+ * {@code
+ * public static final DefaultParticleType SIMPLE_TEST_PARTICLE = FabricParticleTypes.simple();
+ * public static final DefaultParticleType CUSTOM_TEST_PARTICLE = FabricParticleTypes.simple();
*
- * public static final DefaultParticleType SIMPLE_TEST_PARTICLE = FabricParticleTypes.simple();
- * public static final DefaultParticleType CUSTOM_TEST_PARTICLE = FabricParticleTypes.simple();
- *
- * @Override
- * public void onInitialize() {
- * Registry.register(Registry.PARTICLE_TYPE, new Identifier("testmod", "simple"), SIMPLE_TEST_PARTICLE);
- * Registry.register(Registry.PARTICLE_TYPE, new Identifier("testmod", "custom"), CUSTOM_TEST_PARTICLE);
- * }
+ * @Override
+ * public void onInitialize() {
+ * Registry.register(Registry.PARTICLE_TYPE, new Identifier("testmod", "simple"), SIMPLE_TEST_PARTICLE);
+ * Registry.register(Registry.PARTICLE_TYPE, new Identifier("testmod", "custom"), CUSTOM_TEST_PARTICLE);
+ * }}
*
* @see ParticleModClient in the fabric example mods for a more complete usage.
*/
@@ -55,7 +55,7 @@ public final class FabricParticleTypes {
* @param alwaysSpawn True to always spawn the particle regardless of distance.
*/
public static DefaultParticleType simple(boolean alwaysSpawn) {
- return new DefaultParticleType(alwaysSpawn) {};
+ return new DefaultParticleType(alwaysSpawn) { };
}
/**
@@ -76,6 +76,6 @@ public final class FabricParticleTypes {
* @param factory A factory for serializing packet data and string command parameters into a particle effect.
*/
public static {@code
+ * SpriteAtlasTexture atlas = ((VanillaParticleManager)MinecraftClient.getInstance().particleManager).getAtlas()
+ * }
*/
public interface VanillaParticleManager {
- public SpriteAtlasTexture getAtlas();
+ SpriteAtlasTexture getAtlas();
- public Int2ObjectMap
*
- * RegistryIdRemapCallback is called on every remapping operation, if you want to do your own processing in one swoop
+ *