mirror of
https://github.com/FabricMC/fabric.git
synced 2025-04-11 22:45:38 -04:00
Port to 25w08a (#4453)
* Port to 25w08a * Don't use config cache for now. * Bump version
This commit is contained in:
modmuss
GitHub
parent
95c3bccbab
commit
fd5bf1a075
9 changed files with 152 additions and 130 deletions
.github/workflows
fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context
fabric-data-generation-api-v1/src/main/resources
fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader
fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item
fabric-transitive-access-wideners-v1
gradle.properties
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
|
@ -15,7 +15,7 @@ jobs:
|
|||
with:
|
||||
fetch-depth: 0
|
||||
- uses: gradle/wrapper-validation-action@v2
|
||||
- run: ./gradlew check build :buildSrc:check publishToMavenLocal --stacktrace --configuration-cache
|
||||
- run: ./gradlew check build :buildSrc:check publishToMavenLocal --stacktrace
|
||||
- uses: Juuxel/publish-checkstyle-report@v1
|
||||
if: ${{ failure() }}
|
||||
with:
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ import java.nio.file.Path;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.function.BiPredicate;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Predicate;
|
||||
|
|
@ -288,11 +290,7 @@ public final class ClientGameTestContextImpl implements ClientGameTestContext {
|
|||
Preconditions.checkNotNull(options, "options");
|
||||
|
||||
TestScreenshotOptionsImpl optionsImpl = (TestScreenshotOptionsImpl) options;
|
||||
return computeOnClient(client -> {
|
||||
try (NativeImage screenshot = doTakeScreenshot(client, optionsImpl)) {
|
||||
return saveScreenshot(screenshot, optionsImpl.name, optionsImpl);
|
||||
}
|
||||
});
|
||||
return doTakeScreenshot(optionsImpl, screenshot -> saveScreenshot(screenshot, optionsImpl.name, optionsImpl));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -314,83 +312,108 @@ public final class ClientGameTestContextImpl implements ClientGameTestContext {
|
|||
BiPredicate<TestScreenshotComparisonAlgorithm.RawImage<?>, TestScreenshotComparisonAlgorithm.RawImage<?>> preCheck
|
||||
) {
|
||||
TestScreenshotComparisonOptionsImpl optionsImpl = (TestScreenshotComparisonOptionsImpl) options;
|
||||
return this.computeOnClient(client -> {
|
||||
try (NativeImage screenshot = doTakeScreenshot(client, optionsImpl)) {
|
||||
Rect2i region = optionsImpl.region == null ? new Rect2i(0, 0, screenshot.getWidth(), screenshot.getHeight()) : optionsImpl.region;
|
||||
Preconditions.checkState(region.getX() + region.getWidth() <= screenshot.getWidth() && region.getY() + region.getHeight() <= screenshot.getHeight(), "Screenshot comparison region extends outside the screenshot");
|
||||
return doTakeScreenshot(optionsImpl, screenshot -> {
|
||||
Rect2i region = optionsImpl.region == null ? new Rect2i(0, 0, screenshot.getWidth(), screenshot.getHeight()) : optionsImpl.region;
|
||||
Preconditions.checkState(region.getX() + region.getWidth() <= screenshot.getWidth() && region.getY() + region.getHeight() <= screenshot.getHeight(), "Screenshot comparison region extends outside the screenshot");
|
||||
|
||||
try (NativeImage subScreenshot = new NativeImage(region.getWidth(), region.getHeight(), false)) {
|
||||
screenshot.resizeSubRectTo(region.getX(), region.getY(), region.getWidth(), region.getHeight(), subScreenshot);
|
||||
try (NativeImage subScreenshot = new NativeImage(region.getWidth(), region.getHeight(), false)) {
|
||||
screenshot.resizeSubRectTo(region.getX(), region.getY(), region.getWidth(), region.getHeight(), subScreenshot);
|
||||
|
||||
if (optionsImpl.savedFileName != null) {
|
||||
saveScreenshot(subScreenshot, optionsImpl.savedFileName, optionsImpl);
|
||||
}
|
||||
|
||||
Vector2i result;
|
||||
|
||||
if (optionsImpl.grayscale) {
|
||||
TestScreenshotComparisonAlgorithm.RawImage<byte[]> templateImage = optionsImpl.getGrayscaleTemplateImage();
|
||||
|
||||
if (templateImage == null) {
|
||||
onTemplateImageDoesntExist(subScreenshot, optionsImpl);
|
||||
return new Vector2i(region.getX(), region.getY());
|
||||
}
|
||||
|
||||
TestScreenshotComparisonAlgorithm.RawImage<byte[]> haystackImage = TestScreenshotComparisonAlgorithms.RawImageImpl.fromGrayscaleNativeImage(subScreenshot);
|
||||
|
||||
if (preCheck.test(haystackImage, templateImage)) {
|
||||
result = optionsImpl.algorithm.findGrayscale(haystackImage, templateImage);
|
||||
} else {
|
||||
result = null;
|
||||
}
|
||||
} else {
|
||||
TestScreenshotComparisonAlgorithm.RawImage<int[]> templateImage = optionsImpl.getColorTemplateImage();
|
||||
|
||||
if (templateImage == null) {
|
||||
onTemplateImageDoesntExist(subScreenshot, optionsImpl);
|
||||
return new Vector2i(region.getX(), region.getY());
|
||||
}
|
||||
|
||||
TestScreenshotComparisonAlgorithm.RawImage<int[]> haystackImage = TestScreenshotComparisonAlgorithms.RawImageImpl.fromColorNativeImage(subScreenshot);
|
||||
|
||||
if (preCheck.test(haystackImage, templateImage)) {
|
||||
result = optionsImpl.algorithm.findColor(haystackImage, templateImage);
|
||||
} else {
|
||||
result = null;
|
||||
}
|
||||
}
|
||||
|
||||
if (result == null) {
|
||||
throw new AssertionError("Screenshot does not contain template" + optionsImpl.getTemplateImagePath().map(" '%s'"::formatted).orElse(""));
|
||||
}
|
||||
|
||||
return result.add(region.getX(), region.getY());
|
||||
if (optionsImpl.savedFileName != null) {
|
||||
saveScreenshot(subScreenshot, optionsImpl.savedFileName, optionsImpl);
|
||||
}
|
||||
|
||||
Vector2i result;
|
||||
|
||||
if (optionsImpl.grayscale) {
|
||||
TestScreenshotComparisonAlgorithm.RawImage<byte[]> templateImage = optionsImpl.getGrayscaleTemplateImage();
|
||||
|
||||
if (templateImage == null) {
|
||||
onTemplateImageDoesntExist(subScreenshot, optionsImpl);
|
||||
return new Vector2i(region.getX(), region.getY());
|
||||
}
|
||||
|
||||
TestScreenshotComparisonAlgorithm.RawImage<byte[]> haystackImage = TestScreenshotComparisonAlgorithms.RawImageImpl.fromGrayscaleNativeImage(subScreenshot);
|
||||
|
||||
if (preCheck.test(haystackImage, templateImage)) {
|
||||
result = optionsImpl.algorithm.findGrayscale(haystackImage, templateImage);
|
||||
} else {
|
||||
result = null;
|
||||
}
|
||||
} else {
|
||||
TestScreenshotComparisonAlgorithm.RawImage<int[]> templateImage = optionsImpl.getColorTemplateImage();
|
||||
|
||||
if (templateImage == null) {
|
||||
onTemplateImageDoesntExist(subScreenshot, optionsImpl);
|
||||
return new Vector2i(region.getX(), region.getY());
|
||||
}
|
||||
|
||||
TestScreenshotComparisonAlgorithm.RawImage<int[]> haystackImage = TestScreenshotComparisonAlgorithms.RawImageImpl.fromColorNativeImage(subScreenshot);
|
||||
|
||||
if (preCheck.test(haystackImage, templateImage)) {
|
||||
result = optionsImpl.algorithm.findColor(haystackImage, templateImage);
|
||||
} else {
|
||||
result = null;
|
||||
}
|
||||
}
|
||||
|
||||
if (result == null) {
|
||||
throw new AssertionError("Screenshot does not contain template" + optionsImpl.getTemplateImagePath().map(" '%s'"::formatted).orElse(""));
|
||||
}
|
||||
|
||||
return result.add(region.getX(), region.getY());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private static NativeImage doTakeScreenshot(MinecraftClient client, TestScreenshotCommonOptionsImpl<?> options) {
|
||||
int prevWidth = client.getWindow().getFramebufferWidth();
|
||||
int prevHeight = client.getWindow().getFramebufferHeight();
|
||||
private <T> T doTakeScreenshot(TestScreenshotCommonOptionsImpl<?> options, Function<NativeImage, T> screenshotConsumer) {
|
||||
ThreadingImpl.checkOnGametestThread("doTakeScreenshot");
|
||||
|
||||
if (options.size != null) {
|
||||
client.getWindow().setFramebufferWidth(options.size.x);
|
||||
client.getWindow().setFramebufferHeight(options.size.y);
|
||||
client.getFramebuffer().resize(options.size.x, options.size.y);
|
||||
}
|
||||
Vector2i prevSize = computeOnClient(client -> {
|
||||
int prevWidth = client.getWindow().getFramebufferWidth();
|
||||
int prevHeight = client.getWindow().getFramebufferHeight();
|
||||
|
||||
if (options.size != null) {
|
||||
client.getWindow().setFramebufferWidth(options.size.x);
|
||||
client.getWindow().setFramebufferHeight(options.size.y);
|
||||
client.getFramebuffer().resize(options.size.x, options.size.y);
|
||||
}
|
||||
|
||||
return new Vector2i(prevWidth, prevHeight);
|
||||
});
|
||||
|
||||
try {
|
||||
client.gameRenderer.render(RenderTickCounterConstantAccessor.create(options.tickDelta), true);
|
||||
CompletableFuture<T> future = computeOnClient(client -> {
|
||||
client.gameRenderer.render(RenderTickCounterConstantAccessor.create(options.tickDelta), true);
|
||||
CompletableFuture<T> resultFuture = new CompletableFuture<>();
|
||||
|
||||
// The vanilla panorama screenshot code has a Thread.sleep(10) here, is this needed?
|
||||
ScreenshotRecorder.takeScreenshot(client.getFramebuffer(), screenshot -> {
|
||||
try {
|
||||
resultFuture.complete(screenshotConsumer.apply(screenshot));
|
||||
} catch (Throwable e) {
|
||||
resultFuture.completeExceptionally(e);
|
||||
}
|
||||
});
|
||||
|
||||
return ScreenshotRecorder.takeScreenshot(client.getFramebuffer());
|
||||
return resultFuture;
|
||||
});
|
||||
|
||||
// Keep ticking until the screenshot is done
|
||||
while (!future.isDone()) {
|
||||
waitTick();
|
||||
}
|
||||
|
||||
return future.get();
|
||||
} catch (ExecutionException | InterruptedException e) {
|
||||
throw new RuntimeException(e);
|
||||
} finally {
|
||||
if (options.size != null) {
|
||||
client.getWindow().setFramebufferWidth(prevWidth);
|
||||
client.getWindow().setFramebufferHeight(prevHeight);
|
||||
client.getFramebuffer().resize(prevWidth, prevHeight);
|
||||
computeOnClient(client -> {
|
||||
client.getWindow().setFramebufferWidth(prevSize.x);
|
||||
client.getWindow().setFramebufferHeight(prevSize.y);
|
||||
client.getFramebuffer().resize(prevSize.x, prevSize.y);
|
||||
return null;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -142,15 +142,15 @@ transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createSha
|
|||
transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createShapeless (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/data/recipe/ShapelessRecipeJsonBuilder;
|
||||
transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createShapeless (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/data/recipe/ShapelessRecipeJsonBuilder;
|
||||
transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createShapeless (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;I)Lnet/minecraft/data/recipe/ShapelessRecipeJsonBuilder;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator method_67806 (Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/json/ModelVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator method_67822 (Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator method_67833 ([Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator method_67835 (Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator method_67834 ()Lnet/minecraft/class_10795;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator method_67832 ([Lnet/minecraft/class_10795;)Lnet/minecraft/client/render/model/json/MultipartModelSelector;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createStoneState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/ModelVariant;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createMudBrickState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/ModelVariant;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createDeepslateState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/ModelVariant;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createModelVariant (Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/json/ModelVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createModel (Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createModel ([Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createModel (Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createMultipartConditionBuilder ()Lnet/minecraft/client/render/model/json/MultipartModelConditionBuilder;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator or ([Lnet/minecraft/client/render/model/json/MultipartModelConditionBuilder;)Lnet/minecraft/client/render/model/json/MultipartModelCondition;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createStoneState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/ModelVariant;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createMudBrickState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/ModelVariant;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createDeepslateState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/ModelVariant;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerItemModel (Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerParentedItemModel (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTintedItemModel (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/render/item/tint/TintSource;)V
|
||||
|
|
@ -162,34 +162,34 @@ transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator
|
|||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerItemModel (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerItemModel (Lnet/minecraft/block/Block;Ljava/lang/String;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTwoLayerItemModel (Lnet/minecraft/block/Block;Ljava/lang/String;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator method_67839 (Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator method_67823 (Lnet/minecraft/client/render/model/json/ModelVariant;Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator modelWithYRotation (Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator modelWithMirroring (Lnet/minecraft/client/render/model/json/ModelVariant;Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createBooleanModelMap (Lnet/minecraft/state/property/BooleanProperty;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateVariantMap;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerMirrorable (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerRotatable (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBrushableBlock (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createButtonBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createDoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createCustomFenceBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createFenceBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createWallBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createFenceGateBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Z)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createStairsBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createOrientableTrapdoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createTrapdoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSingletonBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/VariantsBlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createButtonBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createDoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createCustomFenceBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createFenceBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createWallBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createFenceGateBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Z)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createStairsBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createOrientableTrapdoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createTrapdoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSingletonBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/VariantsBlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createAxisRotatedVariantMap ()Lnet/minecraft/client/data/BlockStateVariantMap;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createUvLockedColumnBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createAxisRotatedBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createUvLockedColumnBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createAxisRotatedBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerAxisRotated (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerNorthDefaultHorizontalRotated (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TexturedModel$Factory;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createAxisRotatedBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createAxisRotatedBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerAxisRotated (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TexturedModel$Factory;Lnet/minecraft/client/data/TexturedModel$Factory;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCreakingHeart (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createCreakingHeartModel (Lnet/minecraft/client/data/TexturedModel$Factory;Lnet/minecraft/block/Block;Ljava/lang/String;)Lnet/minecraft/util/Identifier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSubModel (Lnet/minecraft/block/Block;Ljava/lang/String;Lnet/minecraft/client/data/Model;Ljava/util/function/Function;)Lnet/minecraft/util/Identifier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createPressurePlateBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSlabBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createPressurePlateBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSlabBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerGrassTinted (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCubeAllModelTexturePool (Lnet/minecraft/block/Block;)Lnet/minecraft/client/data/BlockStateModelGenerator$BlockTexturePool;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerDoor (Lnet/minecraft/block/Block;)V
|
||||
|
|
@ -242,7 +242,7 @@ transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator
|
|||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerNorthDefaultHorizontalRotatable (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TextureMap;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerDispenserLikeOrientable (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCopperBulb (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createCopperBulbBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createCopperBulbBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerWaxedCopperBulb (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerAmethyst (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getDripstoneVariant (Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/enums/Thickness;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
|
|
@ -262,16 +262,16 @@ transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator
|
|||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getTurtleEggModel (II)Lnet/minecraft/client/render/model/json/ModelVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerMultifaceBlock (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerMultifaceBlock (Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator method_67809 (Lnet/minecraft/state/State;Ljava/util/function/Function;)Ljava/util/Map;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator collectMultifaceOperators (Lnet/minecraft/state/State;Ljava/util/function/Function;)Ljava/util/Map;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerMultifaceBlockModel (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerPaleMossCarpet (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerHangingMoss (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator supplyChiseledBookshelfModels (Lnet/minecraft/client/data/MultipartBlockStateSupplier;Lnet/minecraft/client/render/model/json/MultipartModelSelector;Lnet/minecraft/class_10804;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator supplyChiseledBookshelfModel (Lnet/minecraft/client/data/MultipartBlockStateSupplier;Lnet/minecraft/client/render/model/json/MultipartModelSelector;Lnet/minecraft/class_10804;Lnet/minecraft/state/property/BooleanProperty;Lnet/minecraft/client/data/Model;Z)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator supplyChiseledBookshelfModels (Lnet/minecraft/client/data/MultipartBlockModelDefinitionCreator;Lnet/minecraft/client/render/model/json/MultipartModelCondition;Lnet/minecraft/client/render/model/json/ModelVariantOperator;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator supplyChiseledBookshelfModel (Lnet/minecraft/client/data/MultipartBlockModelDefinitionCreator;Lnet/minecraft/client/render/model/json/MultipartModelCondition;Lnet/minecraft/client/render/model/json/ModelVariantOperator;Lnet/minecraft/state/property/BooleanProperty;Lnet/minecraft/client/data/Model;Z)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerShulkerBox (Lnet/minecraft/block/Block;Lnet/minecraft/util/DyeColor;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerPlantPart (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/client/data/BlockStateModelGenerator$CrossType;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerRoots (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator addJigsawOrientationToVariant (Lnet/minecraft/block/enums/Orientation;)Lnet/minecraft/class_10804;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator addJigsawOrientationToVariant (Lnet/minecraft/block/enums/Orientation;)Lnet/minecraft/client/render/model/json/ModelVariantOperator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerSkull (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/SkullBlock$SkullType;Lnet/minecraft/util/Identifier;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBanner (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/util/DyeColor;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerChest (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Z)V
|
||||
|
|
@ -364,7 +364,6 @@ transitive-accessible method net/minecraft/client/data/ItemModelGenerator regist
|
|||
transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerPotion (Lnet/minecraft/item/Item;)V
|
||||
transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerTippedArrow (Lnet/minecraft/item/Item;)V
|
||||
transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerDyeable (Lnet/minecraft/item/Item;I)V
|
||||
transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerSpawnEgg (Lnet/minecraft/item/Item;II)V
|
||||
transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerWithDyeableOverlay (Lnet/minecraft/item/Item;)V
|
||||
transitive-extendable method net/minecraft/client/data/ModelProvider getName ()Ljava/lang/String;
|
||||
transitive-extendable method net/minecraft/data/DynamicRegistriesProvider getName ()Ljava/lang/String;
|
||||
|
|
|
|||
|
|
@ -105,8 +105,8 @@ abstract class ServerPlayerEntityMixin extends LivingEntityMixin {
|
|||
}
|
||||
}
|
||||
|
||||
@WrapOperation(method = "trySleep", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;setSpawnPoint(Lnet/minecraft/server/network/ServerPlayerEntity$class_10766;Z)V"))
|
||||
private void onSetSpawnPoint(ServerPlayerEntity player, ServerPlayerEntity.class_10766 spawnPoint, boolean sendMessage, Operation<Void> original) {
|
||||
@WrapOperation(method = "trySleep", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;setSpawnPoint(Lnet/minecraft/server/network/ServerPlayerEntity$Respawn;Z)V"))
|
||||
private void onSetSpawnPoint(ServerPlayerEntity player, ServerPlayerEntity.Respawn spawnPoint, boolean sendMessage, Operation<Void> original) {
|
||||
if (EntitySleepEvents.ALLOW_SETTING_SPAWN.invoker().allowSettingSpawn(player, spawnPoint.pos())) {
|
||||
original.call(player, spawnPoint, sendMessage);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,21 +42,21 @@ public class SimpleResourceReloadMixin {
|
|||
@Unique
|
||||
private static final ThreadLocal<ResourceType> fabric_resourceType = new ThreadLocal<>();
|
||||
|
||||
@Inject(method = "start", at = @At("HEAD"))
|
||||
@Inject(method = "start(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Z)Lnet/minecraft/resource/ResourceReload;", at = @At("HEAD"))
|
||||
private static void method_40087(ResourceManager resourceManager, List<ResourceReloader> list, Executor executor, Executor executor2, CompletableFuture<Unit> completableFuture, boolean bl, CallbackInfoReturnable<ResourceReload> cir) {
|
||||
if (resourceManager instanceof FabricLifecycledResourceManager flrm) {
|
||||
fabric_resourceType.set(flrm.fabric_getResourceType());
|
||||
}
|
||||
}
|
||||
|
||||
@ModifyArg(method = "start", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/SimpleResourceReload;create(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/resource/ResourceReload;"))
|
||||
@ModifyArg(method = "start(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Z)Lnet/minecraft/resource/ResourceReload;", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/SimpleResourceReload;create(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/resource/ResourceReload;"))
|
||||
private static List<ResourceReloader> sortSimple(List<ResourceReloader> reloaders) {
|
||||
List<ResourceReloader> sorted = ResourceManagerHelperImpl.sort(fabric_resourceType.get(), reloaders);
|
||||
fabric_resourceType.remove();
|
||||
return sorted;
|
||||
}
|
||||
|
||||
@ModifyArg(method = "start", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/ProfiledResourceReload;method_67569(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/resource/ResourceReload;"))
|
||||
@ModifyArg(method = "start(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Z)Lnet/minecraft/resource/ResourceReload;", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/SimpleResourceReload;create(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/resource/ResourceReload;"))
|
||||
private static List<ResourceReloader> sortProfiled(List<ResourceReloader> reloaders) {
|
||||
List<ResourceReloader> sorted = ResourceManagerHelperImpl.sort(fabric_resourceType.get(), reloaders);
|
||||
fabric_resourceType.remove();
|
||||
|
|
|
|||
|
|
@ -84,6 +84,6 @@ class SidedInventorySlotWrapper implements SingleSlotStorage<ItemVariant> {
|
|||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "SidedInventorySlotWrapper[%s#%d/%s]".formatted(DebugMessages.forInventory(sidedInventory), slotWrapper.slot, direction.getName());
|
||||
return "SidedInventorySlotWrapper[%s#%d/%s]".formatted(DebugMessages.forInventory(sidedInventory), slotWrapper.slot, direction.name());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@ transitive-accessible class net/minecraft/client/model/ModelPart$Vertex
|
|||
transitive-accessible class net/minecraft/client/model/ModelPart$Quad
|
||||
|
||||
# Creating custom render layers
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;ILnet/minecraft/class_10785;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;IZZLnet/minecraft/class_10785;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;ILnet/minecraft/client/gl/ShaderProgramLayer;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;IZZLnet/minecraft/client/gl/ShaderProgramLayer;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible class net/minecraft/client/render/RenderLayer$MultiPhase
|
||||
transitive-accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
|
||||
transitive-accessible class net/minecraft/client/render/RenderLayer$OutlineMode
|
||||
|
|
@ -310,7 +310,7 @@ transitive-accessible field net/minecraft/client/render/RenderPhase VIEW_OFFSET_
|
|||
transitive-accessible field net/minecraft/client/render/RenderPhase VIEW_OFFSET_Z_LAYERING_FORWARD Lnet/minecraft/client/render/RenderPhase$Layering;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase WORLD_BORDER_LAYERING Lnet/minecraft/client/render/RenderPhase$Layering;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase MAIN_TARGET Lnet/minecraft/client/render/RenderPhase$Target;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase field_56917 Lnet/minecraft/client/render/RenderPhase$Target;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase LIGHT_TEXTURE_TARGET Lnet/minecraft/client/render/RenderPhase$Target;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase OUTLINE_TARGET Lnet/minecraft/client/render/RenderPhase$Target;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase TRANSLUCENT_TARGET Lnet/minecraft/client/render/RenderPhase$Target;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase PARTICLES_TARGET Lnet/minecraft/client/render/RenderPhase$Target;
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ transitive-accessible class net/minecraft/client/model/ModelPart$Vertex
|
|||
transitive-accessible class net/minecraft/client/model/ModelPart$Quad
|
||||
|
||||
# Creating custom render layers
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;ILnet/minecraft/class_10785;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;IZZLnet/minecraft/class_10785;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;ILnet/minecraft/client/gl/ShaderProgramLayer;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;IZZLnet/minecraft/client/gl/ShaderProgramLayer;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible class net/minecraft/client/render/RenderLayer$MultiPhase
|
||||
transitive-accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
|
||||
transitive-accessible class net/minecraft/client/render/RenderLayer$OutlineMode
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
org.gradle.jvmargs=-Xmx2560M
|
||||
org.gradle.parallel=true
|
||||
|
||||
version=0.117.3
|
||||
minecraft_version=25w07a
|
||||
version=0.117.4
|
||||
minecraft_version=25w08a
|
||||
yarn_version=+build.1
|
||||
loader_version=0.16.10
|
||||
installer_version=1.0.1
|
||||
|
|
@ -17,30 +17,30 @@ fabric-biome-api-v1-version=16.0.6
|
|||
fabric-block-api-v1-version=1.0.36
|
||||
fabric-block-view-api-v2-version=1.0.24
|
||||
fabric-blockrenderlayer-v1-version=2.0.15
|
||||
fabric-client-gametest-api-v1-version=4.1.4
|
||||
fabric-client-gametest-api-v1-version=4.1.5
|
||||
fabric-command-api-v1-version=1.2.69
|
||||
fabric-command-api-v2-version=2.2.48
|
||||
fabric-commands-v0-version=0.2.86
|
||||
fabric-content-registries-v0-version=10.0.8
|
||||
fabric-content-registries-v0-version=10.0.9
|
||||
fabric-crash-report-info-v1-version=0.3.11
|
||||
fabric-data-attachment-api-v1-version=1.5.10
|
||||
fabric-data-generation-api-v1-version=22.2.17
|
||||
fabric-data-attachment-api-v1-version=1.5.11
|
||||
fabric-data-generation-api-v1-version=22.2.18
|
||||
fabric-dimensions-v1-version=4.0.15
|
||||
fabric-entity-events-v1-version=2.0.21
|
||||
fabric-entity-events-v1-version=2.0.22
|
||||
fabric-events-interaction-v0-version=4.0.10
|
||||
fabric-game-rule-api-v1-version=1.0.69
|
||||
fabric-gametest-api-v1-version=3.0.7
|
||||
fabric-item-api-v1-version=11.2.5
|
||||
fabric-item-group-api-v1-version=4.2.5
|
||||
fabric-gametest-api-v1-version=3.0.8
|
||||
fabric-item-api-v1-version=11.2.6
|
||||
fabric-item-group-api-v1-version=4.2.6
|
||||
fabric-key-binding-api-v1-version=1.0.62
|
||||
fabric-keybindings-v0-version=0.2.60
|
||||
fabric-lifecycle-events-v1-version=2.5.12
|
||||
fabric-loot-api-v2-version=3.0.44
|
||||
fabric-loot-api-v3-version=1.0.32
|
||||
fabric-loot-api-v2-version=3.0.45
|
||||
fabric-loot-api-v3-version=1.0.33
|
||||
fabric-message-api-v1-version=6.0.32
|
||||
fabric-model-loading-api-v1-version=4.3.0
|
||||
fabric-networking-api-v1-version=4.3.17
|
||||
fabric-object-builder-api-v1-version=20.0.4
|
||||
fabric-object-builder-api-v1-version=20.0.5
|
||||
fabric-particles-v1-version=4.0.21
|
||||
fabric-recipe-api-v1-version=8.1.3
|
||||
fabric-registry-sync-v0-version=6.1.15
|
||||
|
|
@ -48,15 +48,15 @@ fabric-renderer-api-v1-version=5.0.6
|
|||
fabric-renderer-indigo-version=2.0.6
|
||||
fabric-rendering-data-attachment-v1-version=0.3.62
|
||||
fabric-rendering-fluids-v1-version=3.1.26
|
||||
fabric-rendering-v1-version=11.1.5
|
||||
fabric-rendering-v1-version=11.1.6
|
||||
fabric-resource-conditions-api-v1-version=5.0.20
|
||||
fabric-resource-loader-v0-version=3.1.3
|
||||
fabric-resource-loader-v0-version=3.1.4
|
||||
fabric-screen-api-v1-version=2.0.45
|
||||
fabric-screen-handler-api-v1-version=1.3.122
|
||||
fabric-sound-api-v1-version=1.0.37
|
||||
fabric-tag-api-v1-version=1.0.13
|
||||
fabric-transfer-api-v1-version=5.4.20
|
||||
fabric-transitive-access-wideners-v1-version=6.3.11
|
||||
fabric-tag-api-v1-version=1.0.14
|
||||
fabric-transfer-api-v1-version=5.4.21
|
||||
fabric-transitive-access-wideners-v1-version=6.3.12
|
||||
fabric-convention-tags-v1-version=2.1.22
|
||||
fabric-convention-tags-v2-version=2.12.6
|
||||
fabric-client-tags-api-v1-version=1.1.36
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue