Skip to content

Commit 1074095

Browse files
modmuss50modmuss50
committed
26.1-snapshot-4
1 parent 6757b72 commit 1074095

File tree

6 files changed

+17
-18
lines changed

6 files changed

+17
-18
lines changed

‎fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/FabricDataGenerator.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import org.jetbrains.annotations.ApiStatus;
2424

25-
import net.minecraft.SharedConstants;
2625
import net.minecraft.core.HolderLookup;
2726
import net.minecraft.core.RegistrySetBuilder;
2827
import net.minecraft.data.DataGenerator;
@@ -37,15 +36,15 @@
3736
/**
3837
* An extension to vanilla's {@link DataGenerator} providing mod specific data, and helper functions.
3938
*/
40-
public final class FabricDataGenerator extends DataGenerator {
39+
public final class FabricDataGenerator extends DataGenerator.Uncached {
4140
private final ModContainer modContainer;
4241
private final boolean strictValidation;
4342
private final FabricPackOutput fabricOutput;
4443
private final CompletableFuture<HolderLookup.Provider> registriesFuture;
4544

4645
@ApiStatus.Internal
4746
public FabricDataGenerator(Path output, ModContainer mod, boolean strictValidation, CompletableFuture<HolderLookup.Provider> registriesFuture) {
48-
super(output, SharedConstants.getCurrentVersion(), true);
47+
super(output);
4948
this.modContainer = Objects.requireNonNull(mod);
5049
this.strictValidation = strictValidation;
5150
this.fabricOutput = new FabricPackOutput(mod, output, strictValidation);

‎fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/BlockFeatureRendererMixin.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ abstract class BlockFeatureRendererMixin {
5252
private PoseStack poseStack;
5353

5454
// Support multi-chunk layer models (MovingBlockSubmit).
55-
@Inject(method = "render", at = @At(value = "INVOKE", target = "Ljava/util/Iterator;hasNext()Z", ordinal = 0))
56-
private void beforeRenderMovingBlocks(SubmitNodeCollection nodeCollection, MultiBufferSource.BufferSource bufferSource, BlockRenderDispatcher blockRenderDispatcher, OutlineBufferSource outlineBufferSource, CallbackInfo ci, @Local Iterator<SubmitNodeStorage.MovingBlockSubmit> iterator) {
55+
@Inject(method = "renderMovingBlockSubmits", at = @At(value = "INVOKE", target = "Ljava/util/Iterator;hasNext()Z", ordinal = 0))
56+
private void beforeRenderMovingBlocks(SubmitNodeCollection nodeCollection, MultiBufferSource.BufferSource bufferSource, BlockRenderDispatcher blockRenderDispatcher, boolean translucent, CallbackInfo ci, @Local Iterator<SubmitNodeStorage.MovingBlockSubmit> iterator) {
5757
while (iterator.hasNext()) {
5858
SubmitNodeStorage.MovingBlockSubmit command = iterator.next();
5959
MovingBlockRenderState renderState = command.movingBlockRenderState();
@@ -69,8 +69,8 @@ private void beforeRenderMovingBlocks(SubmitNodeCollection nodeCollection, Multi
6969
}
7070

7171
// Support ExtendedBlockSubmit and ExtendedBlockModelSubmit.
72-
@Inject(method = "render", at = @At("RETURN"))
73-
private void onReturnRender(SubmitNodeCollection nodeCollection, MultiBufferSource.BufferSource bufferSource, BlockRenderDispatcher blockRenderDispatcher, OutlineBufferSource outlineBufferSource, CallbackInfo ci) {
72+
@Inject(method = "renderBlockSubmits", at = @At("RETURN"))
73+
private void onReturnRender(SubmitNodeCollection nodeCollection, MultiBufferSource.BufferSource bufferSource, BlockRenderDispatcher blockRenderDispatcher, OutlineBufferSource outlineBufferSource, boolean translucent, CallbackInfo ci) {
7474
DelegatingBlockMultiBufferSourceImpl blockMultiBufferSource = new DelegatingBlockMultiBufferSourceImpl();
7575

7676
for (ExtendedBlockSubmit submit : ((SubmitNodeCollectionExtension) nodeCollection).fabric_getExtendedBlockSubmits()) {

‎fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/ItemFeatureRendererMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ abstract class ItemFeatureRendererMixin {
4444
@Unique
4545
private final ItemRenderContext itemRenderContext = new ItemRenderContext();
4646

47-
@Inject(method = "render", at = @At("RETURN"))
47+
@Inject(method = "renderSolid", at = @At("RETURN"))
4848
private void onReturnRender(SubmitNodeCollection nodeCollection, MultiBufferSource.BufferSource bufferSource, OutlineBufferSource outlineBufferSource, CallbackInfo ci) {
4949
for (MeshItemSubmit itemSubmit : ((AccessSubmitNodeCollection) nodeCollection).fabric_getMeshItemSubmits()) {
5050
poseStack.pushPose();

‎fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/LevelRendererMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private void beforeDebugRender(CallbackInfo ci) {
142142
LevelRenderEvents.BEFORE_DEBUG_RENDER.invoker().beforeDebugRender(renderContext);
143143
}
144144

145-
@Inject(method = "lambda$addMainPass$0", at = @At(value = "INVOKE_STRING", target = "Lnet/minecraft/util/profiling/ProfilerFiller;push(Ljava/lang/String;)V", args = "ldc=translucent"))
145+
@Inject(method = "lambda$addMainPass$0", at = @At(value = "INVOKE_STRING", target = "Lnet/minecraft/util/profiling/ProfilerFiller;push(Ljava/lang/String;)V", args = "ldc=translucentTerrain"))
146146
private void beforeTranslucentRender(CallbackInfo ci) {
147147
LevelRenderEvents.BEFORE_TRANSLUCENT.invoker().beforeTranslucent(renderContext);
148148
}

‎fabric-transitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.accesswidener‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ transitive-accessible method net/minecraft/world/level/block/SnowyDirtBlock <ini
228228
transitive-accessible method net/minecraft/world/level/block/SpawnerBlock <init> (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V
229229
transitive-accessible method net/minecraft/world/level/block/SpongeBlock <init> (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V
230230
transitive-accessible method net/minecraft/world/level/block/StairBlock <init> (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V
231-
transitive-accessible method net/minecraft/world/level/block/StemBlock <init> (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/tags/TagKey;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V
231+
transitive-accessible method net/minecraft/world/level/block/StemBlock <init> (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/tags/TagKey;Lnet/minecraft/tags/TagKey;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V
232232
transitive-accessible method net/minecraft/world/level/block/StructureBlock <init> (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V
233233
transitive-accessible method net/minecraft/world/level/block/StructureVoidBlock <init> (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V
234234
transitive-accessible method net/minecraft/world/level/block/SugarCaneBlock <init> (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V

‎gradle.properties‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx2560M
22
org.gradle.parallel=true
33
org.gradle.configuration-cache=false
44

5-
version=0.142.0
6-
minecraft_version=26.1-snapshot-3
5+
version=0.142.1
6+
minecraft_version=26.1-snapshot-4
77
loader_version=0.18.4
88
installer_version=1.0.1
99

@@ -21,7 +21,7 @@ fabric-command-api-v2-version=3.0.0
2121
fabric-content-registries-v0-version=11.0.3
2222
fabric-crash-report-info-v1-version=1.0.0
2323
fabric-data-attachment-api-v1-version=2.0.4
24-
fabric-data-generation-api-v1-version=24.0.4
24+
fabric-data-generation-api-v1-version=24.0.5
2525
fabric-dimensions-v1-version=5.0.0
2626
fabric-entity-events-v1-version=4.1.1
2727
fabric-events-interaction-v0-version=5.1.2
@@ -33,16 +33,16 @@ fabric-key-mapping-api-v1-version=2.0.0
3333
fabric-lifecycle-events-v1-version=4.0.2
3434
fabric-loot-api-v3-version=3.0.3
3535
fabric-message-api-v1-version=7.0.0
36-
fabric-model-loading-api-v1-version=7.0.4
36+
fabric-model-loading-api-v1-version=7.0.5
3737
fabric-networking-api-v1-version=6.1.0
3838
fabric-object-builder-api-v1-version=23.0.3
3939
fabric-particles-v1-version=5.0.4
4040
fabric-recipe-api-v1-version=9.0.3
4141
fabric-registry-sync-v0-version=7.0.3
42-
fabric-renderer-api-v1-version=10.0.0
43-
fabric-renderer-indigo-version=6.0.5
42+
fabric-renderer-api-v1-version=10.0.1
43+
fabric-renderer-indigo-version=6.0.6
4444
fabric-rendering-fluids-v1-version=4.0.0
45-
fabric-rendering-v1-version=18.0.0
45+
fabric-rendering-v1-version=18.0.1
4646
fabric-resource-conditions-api-v1-version=6.0.1
4747
fabric-resource-loader-v0-version=3.3.9
4848
fabric-resource-loader-v1-version=2.0.2
@@ -52,5 +52,5 @@ fabric-serialization-api-v1-version=2.0.0
5252
fabric-sound-api-v1-version=2.0.1
5353
fabric-tag-api-v1-version=2.0.2
5454
fabric-transfer-api-v1-version=7.0.3
55-
fabric-transitive-access-wideners-v1-version=8.0.1
55+
fabric-transitive-access-wideners-v1-version=8.0.2
5656
fabric-convention-tags-v2-version=4.1.0

0 commit comments

Comments
 (0)