MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compiling version (some features are currently disabled and need a rewrite)

Browse source
This commit is contained in:
Frank 2022-10-25 17:19:22 +02:00
parent b1f4173ce4
commit f8bcba4d3a
48 changed files with 488 additions and 506 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/betterx/bclib/client/gui/screens/WorldSetupScreen.java
View file

@ -255,7 +255,7 @@ public class WorldSetupScreen extends LayoutScreen {
createWorldScreen
.worldGenSettingsComponent
.settings()
.worldGenSettings()
.selectedDimensions()
.dimensions()
)
)));
@ -269,11 +269,11 @@ public class WorldSetupScreen extends LayoutScreen {
ChunkGenerator chunkGenerator
) {
createWorldScreen.worldGenSettingsComponent.updateSettings(
(registryAccess, worldGenSettings) -> LevelGenUtil.replaceGenerator(
(registryAccess, worldDimensions) -> LevelGenUtil.replaceGenerator(
dimensionKey,
dimensionTypeKey,
registryAccess,
worldGenSettings,
worldDimensions,
chunkGenerator
)
);

87
src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java
View file

@ -1,16 +1,12 @@
package org.betterx.bclib.client.models;
import org.betterx.bclib.api.v2.ModIntegrationAPI;
import org.betterx.bclib.client.render.EmissiveTextureInfo;
import org.betterx.bclib.interfaces.BlockModelProvider;
import org.betterx.bclib.interfaces.ItemModelProvider;
import org.betterx.bclib.models.RecordItemModelProvider;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.renderer.block.BlockModelShaper;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.client.renderer.block.model.multipart.MultiPart;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.core.Registry;
@ -21,12 +17,8 @@ import net.minecraft.world.level.block.state.BlockState;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
public class CustomModelBakery {
private final Map<ResourceLocation, UnbakedModel> models = Maps.newConcurrentMap();
@ -114,43 +106,44 @@ public class CustomModelBakery {
BlockModel model = provider.getItemModel(modelLocation);
models.put(modelLocation, model);
}
public static void loadEmissiveModels(Map<ResourceLocation, UnbakedModel> unbakedCache) {
if (!ModIntegrationAPI.hasCanvas()) {
return;
}
Map<ResourceLocation, UnbakedModel> cacheCopy = new HashMap<>(unbakedCache);
Set<Pair<String, String>> strings = Sets.newConcurrentHashSet();
Registry.BLOCK.keySet().forEach(blockID -> {
Block block = Registry.BLOCK.get(blockID);
ImmutableList<BlockState> states = block.getStateDefinition().getPossibleStates();
boolean addBlock = false;
for (BlockState state : states) {
ResourceLocation stateID = BlockModelShaper.stateToModelLocation(blockID, state);
UnbakedModel model = cacheCopy.get(stateID);
if (model == null) {
continue;
}
Collection<Material> materials = model.getMaterials(cacheCopy::get, strings);
if (materials == null) {
continue;
}
for (Material material : materials) {
if (EmissiveTextureInfo.isEmissiveTexture(material.texture())) {
addBlock = true;
break;
}
}
if (addBlock) {
break;
}
}
if (addBlock) {
EmissiveTextureInfo.addBlock(blockID);
}
});
}
//TODO: 1.19.3 Handled differently now
// public static void loadEmissiveModels(Map<ResourceLocation, UnbakedModel> unbakedCache) {
// if (!ModIntegrationAPI.hasCanvas()) {
// return;
// }
//
// Map<ResourceLocation, UnbakedModel> cacheCopy = new HashMap<>(unbakedCache);
// Set<Pair<String, String>> strings = Sets.newConcurrentHashSet();
// Registry.BLOCK.keySet().forEach(blockID -> {
// Block block = Registry.BLOCK.get(blockID);
// ImmutableList<BlockState> states = block.getStateDefinition().getPossibleStates();
// boolean addBlock = false;
//
// for (BlockState state : states) {
// ResourceLocation stateID = BlockModelShaper.stateToModelLocation(blockID, state);
// UnbakedModel model = cacheCopy.get(stateID);
// if (model == null) {
// continue;
// }
// Collection<Material> materials = model.getMaterials(cacheCopy::get, strings);
// if (materials == null) {
// continue;
// }
// for (Material material : materials) {
// if (EmissiveTextureInfo.isEmissiveTexture(material.texture())) {
// addBlock = true;
// break;
// }
// }
// if (addBlock) {
// break;
// }
// }
//
// if (addBlock) {
// EmissiveTextureInfo.addBlock(blockID);
// }
// });
// }
}

9
src/main/java/org/betterx/bclib/client/models/OBJBlockModel.java
View file

@ -4,7 +4,6 @@ import org.betterx.bclib.BCLib;
import org.betterx.bclib.util.BlocksHelper;
import org.betterx.bclib.util.MHelper;
import com.mojang.datafixers.util.Pair;
import com.mojang.math.Vector3f;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.BakedQuad;
@ -86,17 +85,13 @@ public class OBJBlockModel implements UnbakedModel, BakedModel {
}
@Override
public Collection<Material> getMaterials(
Function<ResourceLocation, UnbakedModel> function,
Set<Pair<String, String>> set
) {
return materials;
public void resolveParents(Function<ResourceLocation, UnbakedModel> function) {
}
@Nullable
@Override
public BakedModel bake(
ModelBakery modelBakery,
ModelBaker modelBakery,
Function<Material, TextureAtlasSprite> textureGetter,
ModelState modelState,
ResourceLocation resourceLocation