Skip to content

Commit 2282d58

Browse files
committed
Move around and comment
1 parent b9e6d46 commit 2282d58

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleMaterial.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,11 @@ public Builder cardinalLightingMode(CardinalLightingMode value) {
289289
return this;
290290
}
291291

292+
public Builder ambientOcclusion(boolean ambientOcclusion) {
293+
this.ambientOcclusion = ambientOcclusion;
294+
return this;
295+
}
296+
292297
@Override
293298
public MaterialShaders shaders() {
294299
return shaders;
@@ -364,18 +369,13 @@ public CardinalLightingMode cardinalLightingMode() {
364369
return cardinalLightingMode;
365370
}
366371

367-
public SimpleMaterial build() {
368-
return new SimpleMaterial(this);
369-
}
370-
371-
public Builder ambientOcclusion(boolean ambientOcclusion) {
372-
this.ambientOcclusion = ambientOcclusion;
373-
return this;
374-
}
375-
376372
@Override
377373
public boolean ambientOcclusion() {
378374
return ambientOcclusion;
379375
}
376+
377+
public SimpleMaterial build() {
378+
return new SimpleMaterial(this);
379+
}
380380
}
381381
}

common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BlockModelBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ public BlockModelBuilder materialFunc(@Nullable BiFunction<RenderType, Boolean,
5353
return this;
5454
}
5555

56-
public abstract SimpleModel build();
57-
5856
public BlockModelBuilder materialFunc(@Nullable BlockMaterialFunction materialFunc) {
5957
this.materialFunc = materialFunc;
6058
return this;
6159
}
60+
61+
public abstract SimpleModel build();
6262
}

fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBufferer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public static SimpleModel bufferModel(BakedModel model, BlockPos pos, BlockAndTi
4242

4343
RenderType defaultLayer = ItemBlockRenderTypes.getChunkRenderType(state);
4444
boolean useAo = Minecraft.useAmbientOcclusion();
45+
// See ModelBlockRenderer#tesselateBlock
4546
boolean defaultAo = useAo && state.getLightEmission() == 0 && model.useAmbientOcclusion();
4647
model = emitters.prepareForModel(model, defaultLayer, useAo, defaultAo);
4748

@@ -103,6 +104,8 @@ public static SimpleModel bufferBlocks(Iterator<BlockPos> posIterator, BlockAndT
103104
BakedModel model = renderDispatcher.getBlockModel(state);
104105

105106
RenderType defaultLayer = ItemBlockRenderTypes.getChunkRenderType(state);
107+
108+
// See ModelBlockRenderer#tesselateBlock
106109
boolean defaultAo = useAo && state.getLightEmission() == 0 && model.useAmbientOcclusion();
107110
model = emitters.prepareForModel(model, defaultLayer, useAo, defaultAo);
108111

forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBufferer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public static SimpleModel bufferModel(BakedModel model, BlockPos pos, BlockAndTi
5050
random.setSeed(seed);
5151
ChunkRenderTypeSet renderTypes = model.getRenderTypes(state, random, modelData);
5252

53+
// See ModelBlockRenderer#tesselateBlock
5354
boolean defaultAo = Minecraft.useAmbientOcclusion() && state.getLightEmission(level, pos) == 0;
5455

5556
for (RenderType renderType : renderTypes) {
@@ -117,6 +118,7 @@ public static SimpleModel bufferBlocks(Iterator<BlockPos> posIterator, BlockAndT
117118
random.setSeed(seed);
118119
ChunkRenderTypeSet renderTypes = model.getRenderTypes(state, random, modelData);
119120

121+
// See ModelBlockRenderer#tesselateBlock
120122
boolean defaultAo = useAo && state.getLightEmission(level, pos) == 0;
121123

122124
for (RenderType renderType : renderTypes) {

0 commit comments

Comments
 (0)