mirror of
https://github.com/wisplite/crystalline-sky.git
synced 2026-10-30 13:32:18 -05:00
Multiloader IV
client setup ported
This commit is contained in:
techno-sam
+37
-33
@@ -1,18 +1,15 @@
|
||||
package io.github.slimeistdev.crystalline_sky;
|
||||
|
||||
import com.mojang.blaze3d.platform.InputConstants;
|
||||
import io.github.slimeistdev.crystalline_sky.annotation.multiloader.MultiLoaderEvent;
|
||||
import io.github.slimeistdev.crystalline_sky.mixin_ducks.client.DebugRenderer_Duck;
|
||||
import io.github.slimeistdev.crystalline_sky.registry.CrystallineBlocks;
|
||||
import io.github.slimeistdev.crystalline_sky.multiloader.ClientPlatformHelper;
|
||||
import io.github.slimeistdev.crystalline_sky.registry.CrystallineItems;
|
||||
import io.github.slimeistdev.crystalline_sky.registry.client.CrystallineRenderTypes;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.client.KeyMapping;
|
||||
import net.minecraft.client.renderer.item.ItemProperties;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.network.chat.CommonComponents;
|
||||
import net.minecraft.network.chat.Component;
|
||||
@@ -21,37 +18,44 @@ import net.minecraft.world.item.component.BlockItemStateProperties;
|
||||
import net.minecraft.world.level.block.LightBlock;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
public class CrystallineSkyClient {
|
||||
private static final KeyMapping KEY_TOGGLE_DEBUG = new KeyMapping(
|
||||
"crystalline_sky.key.toggle_weeping_sky_debug",
|
||||
InputConstants.Type.KEYSYM,
|
||||
GLFW.GLFW_KEY_UNKNOWN,
|
||||
"crystalline_sky.category.crystalline_sky"
|
||||
);
|
||||
|
||||
public static void init() {
|
||||
BlockRenderLayerMap.INSTANCE.putBlock(CrystallineBlocks.SKY, CrystallineRenderTypes.SKY);
|
||||
BlockRenderLayerMap.INSTANCE.putBlock(CrystallineBlocks.WEEPING_SKY, CrystallineRenderTypes.SKY);
|
||||
|
||||
var weepingSkyKeybind = KeyBindingHelper.registerKeyBinding(new KeyMapping(
|
||||
"crystalline_sky.key.toggle_weeping_sky_debug",
|
||||
InputConstants.Type.KEYSYM,
|
||||
GLFW.GLFW_KEY_UNKNOWN,
|
||||
"crystalline_sky.category.crystalline_sky"
|
||||
));
|
||||
|
||||
ClientTickEvents.END_CLIENT_TICK.register(client -> {
|
||||
while (weepingSkyKeybind.consumeClick()) {
|
||||
int mode = ((DebugRenderer_Duck) client.debugRenderer).crystalline_sky$toggleWeepingSky();
|
||||
|
||||
Component message = getDebugMessage(ChatFormatting.YELLOW,
|
||||
Component.translatable("message.crystalline_sky.weeping_sky_debug." + mode)
|
||||
);
|
||||
|
||||
client.gui.getChat().addMessage(message);
|
||||
}
|
||||
});
|
||||
|
||||
ItemProperties.register(CrystallineItems.SKY_LIGHT, ResourceLocation.withDefaultNamespace("level"),
|
||||
ClientPlatformHelper.registerItemProperty(
|
||||
CrystallineItems.SKY_LIGHT,
|
||||
ResourceLocation.withDefaultNamespace("level"),
|
||||
(stack, world, entity, seed) -> {
|
||||
BlockItemStateProperties blockStateComponent = stack.getOrDefault(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY);
|
||||
Integer integer = blockStateComponent.get(LightBlock.LEVEL);
|
||||
return integer != null ? integer / 16.0F : 1.0F;
|
||||
});
|
||||
BlockItemStateProperties state = stack.getOrDefault(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY);
|
||||
Integer level = state.get(LightBlock.LEVEL);
|
||||
return level != null ? level / 16.0F : 1.0F;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
public static void registerKeybindings(Consumer<KeyMapping> registrar) {
|
||||
registrar.accept(KEY_TOGGLE_DEBUG);
|
||||
}
|
||||
|
||||
@MultiLoaderEvent
|
||||
public static void onEndTick(Minecraft mc) {
|
||||
while (KEY_TOGGLE_DEBUG.consumeClick()) {
|
||||
int mode = ((DebugRenderer_Duck) mc.debugRenderer).crystalline_sky$toggleWeepingSky();
|
||||
|
||||
Component message = getDebugMessage(ChatFormatting.YELLOW,
|
||||
Component.translatable("message.crystalline_sky.weeping_sky_debug." + mode)
|
||||
);
|
||||
|
||||
mc.gui.getChat().addMessage(message);
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("SameParameterValue")
|
||||
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
/*
|
||||
* Steam 'n' Rails
|
||||
* Copyright (c) 2022-2025 The Railways Team
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.github.slimeistdev.crystalline_sky.annotation.multiloader;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* Used to mark methods that are called via abstracted loader-specific events.
|
||||
* <p>
|
||||
* Meant purely for documentation and does not exist at compile-time or runtime.
|
||||
*/
|
||||
@Target(ElementType.METHOD)
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
public @interface MultiLoaderEvent { }
|
||||
-18
@@ -1,18 +0,0 @@
|
||||
package io.github.slimeistdev.crystalline_sky.datagen;
|
||||
|
||||
import io.github.slimeistdev.crystalline_sky.datagen.providers.CrystallineSkyBlockTagProvider;
|
||||
import io.github.slimeistdev.crystalline_sky.datagen.providers.CrystallineSkyLootProvider;
|
||||
import io.github.slimeistdev.crystalline_sky.datagen.providers.CrystallineSkyModelProvider;
|
||||
import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
|
||||
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
|
||||
|
||||
public class CrystallineSkyDataGenerator implements DataGeneratorEntrypoint {
|
||||
@Override
|
||||
public void onInitializeDataGenerator(FabricDataGenerator gen) {
|
||||
FabricDataGenerator.Pack pack = gen.createPack();
|
||||
|
||||
pack.addProvider(CrystallineSkyModelProvider::new);
|
||||
pack.addProvider(CrystallineSkyLootProvider::new);
|
||||
pack.addProvider(CrystallineSkyBlockTagProvider::new);
|
||||
}
|
||||
}
|
||||
-31
@@ -1,31 +0,0 @@
|
||||
package io.github.slimeistdev.crystalline_sky.datagen.providers;
|
||||
|
||||
import io.github.slimeistdev.crystalline_sky.CrystallineSky;
|
||||
import io.github.slimeistdev.crystalline_sky.registry.CrystallineBlocks;
|
||||
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
|
||||
import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.minecraft.tags.TagKey;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public class CrystallineSkyBlockTagProvider extends FabricTagProvider.BlockTagProvider {
|
||||
public CrystallineSkyBlockTagProvider(FabricDataOutput output, CompletableFuture<HolderLookup.Provider> registriesFuture) {
|
||||
super(output, registriesFuture);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void addTags(HolderLookup.Provider wrapperLookup) {
|
||||
getOrCreateTagBuilder(TagKey.create(Registries.BLOCK, CrystallineSky.id("sky_light_emitters")))
|
||||
.add(CrystallineBlocks.SKY)
|
||||
.add(CrystallineBlocks.SKY_LIGHT)
|
||||
.add(CrystallineBlocks.WEEPING_SKY)
|
||||
.add(CrystallineBlocks.WEEPING_SKY_LIGHT);
|
||||
|
||||
getOrCreateTagBuilder(BlockTags.CRYSTAL_SOUND_BLOCKS)
|
||||
.add(CrystallineBlocks.SKY)
|
||||
.add(CrystallineBlocks.WEEPING_SKY);
|
||||
}
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
package io.github.slimeistdev.crystalline_sky.datagen.providers;
|
||||
|
||||
import io.github.slimeistdev.crystalline_sky.registry.CrystallineBlocks;
|
||||
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
|
||||
import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public class CrystallineSkyLootProvider extends FabricBlockLootTableProvider {
|
||||
public CrystallineSkyLootProvider(FabricDataOutput dataOutput, CompletableFuture<HolderLookup.Provider> registryLookup) {
|
||||
super(dataOutput, registryLookup);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generate() {
|
||||
dropWhenSilkTouch(CrystallineBlocks.SKY);
|
||||
dropWhenSilkTouch(CrystallineBlocks.WEEPING_SKY);
|
||||
}
|
||||
}
|
||||
-93
@@ -1,93 +0,0 @@
|
||||
package io.github.slimeistdev.crystalline_sky.datagen.providers;
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
import io.github.slimeistdev.crystalline_sky.registry.CrystallineBlocks;
|
||||
import io.github.slimeistdev.crystalline_sky.registry.CrystallineItems;
|
||||
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
|
||||
import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.data.models.BlockModelGenerators;
|
||||
import net.minecraft.data.models.blockstates.Variant;
|
||||
import net.minecraft.data.models.blockstates.PropertyDispatch;
|
||||
import net.minecraft.data.models.ItemModelGenerators;
|
||||
import net.minecraft.data.models.model.ModelLocationUtils;
|
||||
import net.minecraft.data.models.model.ModelTemplates;
|
||||
import net.minecraft.data.models.model.TextureMapping;
|
||||
import net.minecraft.data.models.blockstates.VariantProperties;
|
||||
import net.minecraft.data.models.blockstates.MultiVariantGenerator;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
@SuppressWarnings("SameParameterValue")
|
||||
public class CrystallineSkyModelProvider extends FabricModelProvider {
|
||||
public CrystallineSkyModelProvider(FabricDataOutput output) {
|
||||
super(output);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateBlockStateModels(BlockModelGenerators gen) {
|
||||
registerSkyBlock(gen, CrystallineBlocks.SKY);
|
||||
registerSkyBlock(gen, CrystallineBlocks.WEEPING_SKY);
|
||||
registerSkyLightBlock(gen, CrystallineBlocks.SKY_LIGHT, CrystallineItems.SKY_LIGHT);
|
||||
|
||||
gen.createAirLikeBlock(CrystallineBlocks.WEEPING_SKY_LIGHT, CrystallineItems.WEEPING_SKY_LIGHT);
|
||||
gen.createSimpleFlatItemModel(CrystallineItems.WEEPING_SKY_LIGHT);
|
||||
}
|
||||
|
||||
private void registerSkyBlock(BlockModelGenerators gen, Block block) {
|
||||
gen.createTrivialCube(block);
|
||||
gen.createSimpleFlatItemModel(block);
|
||||
}
|
||||
|
||||
private void registerSkyLightBlock(BlockModelGenerators gen, Block block, Item item) {
|
||||
gen.skipAutoItemBlock(block);
|
||||
PropertyDispatch.C1<Integer> singleProperty = PropertyDispatch.property(BlockStateProperties.LEVEL);
|
||||
|
||||
for (int level = 0; level <= 15; level++) {
|
||||
String suffix = String.format(Locale.ROOT, "_%02d", level);
|
||||
ResourceLocation texture = TextureMapping.getItemTexture(item, suffix);
|
||||
|
||||
singleProperty.select(level, Variant.variant().with(
|
||||
VariantProperties.MODEL,
|
||||
ModelTemplates.PARTICLE_ONLY.createWithSuffix(block, suffix, TextureMapping.particle(texture), gen.modelOutput))
|
||||
);
|
||||
ModelTemplates.FLAT_ITEM.create(
|
||||
ModelLocationUtils.getModelLocation(item, suffix),
|
||||
TextureMapping.layer0(texture),
|
||||
gen.modelOutput
|
||||
);
|
||||
}
|
||||
|
||||
ModelTemplates.FLAT_ITEM.create(
|
||||
ModelLocationUtils.getModelLocation(item),
|
||||
TextureMapping.layer0(item),
|
||||
gen.modelOutput,
|
||||
(id, textures) -> {
|
||||
JsonObject base = ModelTemplates.FLAT_ITEM.createBaseTemplate(id, textures);
|
||||
var overrides = new JsonArray();
|
||||
for (int level = 0; level <= 15; level++) {
|
||||
JsonObject override = new JsonObject();
|
||||
|
||||
JsonObject predicate = new JsonObject();
|
||||
predicate.addProperty("level", level / 16f);
|
||||
override.add("predicate", predicate);
|
||||
|
||||
String suffix = String.format(Locale.ROOT, "_%02d", level);
|
||||
ResourceLocation model = TextureMapping.getItemTexture(item, suffix);
|
||||
override.addProperty("model", model.toString());
|
||||
|
||||
overrides.add(override);
|
||||
}
|
||||
base.add("overrides", overrides);
|
||||
return base;
|
||||
});
|
||||
gen.blockStateOutput.accept(MultiVariantGenerator.multiVariant(block).with(singleProperty));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateItemModels(ItemModelGenerators gen) {}
|
||||
}
|
||||
-25
@@ -1,25 +0,0 @@
|
||||
package io.github.slimeistdev.crystalline_sky.mixin.client;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import io.github.slimeistdev.crystalline_sky.mixin_ducks.client.RenderType_Duck;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Mutable;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
@Mixin(RenderType.class)
|
||||
public class RenderTypeMixin implements RenderType_Duck {
|
||||
@Shadow
|
||||
@Final
|
||||
@Mutable
|
||||
private static ImmutableList<RenderType> CHUNK_BUFFER_LAYERS;
|
||||
|
||||
@Override
|
||||
public void crystalline_sky$markAsBlockLayer() {
|
||||
CHUNK_BUFFER_LAYERS = ImmutableList.<RenderType>builder()
|
||||
.addAll(CHUNK_BUFFER_LAYERS)
|
||||
.add((RenderType) (Object) this)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package io.github.slimeistdev.crystalline_sky.multiloader;
|
||||
|
||||
import dev.architectury.injectables.annotations.ExpectPlatform;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.minecraft.client.renderer.item.ClampedItemPropertyFunction;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.item.Item;
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
public class ClientPlatformHelper {
|
||||
@ExpectPlatform
|
||||
public static void registerItemProperty(Item item, ResourceLocation name, ClampedItemPropertyFunction property) {
|
||||
throw new AssertionError();
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,6 @@
|
||||
"client.DebugRendererMixin",
|
||||
"client.RenderTargetMixin",
|
||||
"client.GameRendererMixin",
|
||||
"client.RenderTypeMixin",
|
||||
"client.LevelRenderer_NoSodium_Mixin",
|
||||
"client.LevelRendererMixin",
|
||||
"client.compat.axiom.ChunkRenderOverrider_AxiomChunkOverrideLayerMixin",
|
||||
|
||||
Reference in New Issue
Block a user