Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
454b8ec01d | ||
|
|
cedf1df78a | ||
|
|
60497771fc | ||
|
|
472ce59ae0 |
@@ -8,11 +8,11 @@ org.gradle.jvmargs=-Xmx1G
|
||||
loader_version=0.11.3
|
||||
|
||||
# Mod Properties
|
||||
mod_version = 0.2.3
|
||||
mod_version = 0.2.6
|
||||
maven_group = eu.midnightdust
|
||||
archives_base_name = midnightlib
|
||||
|
||||
# Dependencies
|
||||
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
||||
fabric_version=0.34.8+1.17
|
||||
mod_menu_version = 2.0.0-mnd
|
||||
mod_menu_version = 2.0.2
|
||||
|
||||
@@ -10,10 +10,13 @@ import eu.midnightdust.lib.config.MidnightConfig;
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityModelLayerRegistry;
|
||||
|
||||
import java.util.Calendar;
|
||||
|
||||
@SuppressWarnings({"deprecation", "UnstableApiUsage"})
|
||||
public class MidnightLibClient implements ClientModInitializer {
|
||||
|
||||
public static final String MOD_ID = "midnightlib";
|
||||
public static Event EVENT = Event.NONE;
|
||||
|
||||
@Override
|
||||
public void onInitializeClient() {
|
||||
@@ -24,8 +27,18 @@ public class MidnightLibClient implements ClientModInitializer {
|
||||
EntityModelLayerRegistry.registerModelLayer(ChristmasHatFeatureRenderer.CHRISTMAS_HAT_MODEL_LAYER, ChristmasHatFeatureRenderer::getTexturedModelData);
|
||||
EntityModelLayerRegistry.registerModelLayer(TinyPotatoFeatureRenderer.TINY_POTATO_MODEL_LAYER, TinyPotatoFeatureRenderer::getTexturedModelData);
|
||||
EntityModelLayerRegistry.registerModelLayer(WitchHatFeatureRenderer.WITCH_HAT_MODEL_LAYER, WitchHatFeatureRenderer::getTexturedModelData);
|
||||
if (MidnightLibConfig.special_hats) {
|
||||
HatLoader.init();
|
||||
}
|
||||
if (MidnightLibConfig.special_hats) HatLoader.init();
|
||||
if (MidnightLibConfig.event_hats) EVENT = getEvent();
|
||||
}
|
||||
private Event getEvent() {
|
||||
if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.APRIL && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) <= 4) return Event.EASTER;
|
||||
if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.OCTOBER && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) >= 30) return Event.HALLOWEEN;
|
||||
if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.DECEMBER && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) == 10) return Event.FABRIC;
|
||||
if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.DECEMBER && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) >= 23 && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) <= 26) return Event.CHRISTMAS;
|
||||
return Event.NONE;
|
||||
}
|
||||
|
||||
public enum Event {
|
||||
NONE, EASTER, HALLOWEEN, FABRIC, CHRISTMAS
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,8 @@ public class MidnightLibConfig extends MidnightConfig {
|
||||
public static boolean config_screen_list = !FabricLoader.getInstance().isModLoaded("modmenu");
|
||||
@Entry // Change the style of the title in MidnightConfig
|
||||
public static TitleStyle titleStyle = MidnightConfig.useTooltipForTitle ? TitleStyle.TOOLTIP : TitleStyle.TEXT;
|
||||
@Entry // Change the texture of the background in MidnightConfig
|
||||
public static String background_texture = "minecraft:textures/block/deepslate.png";
|
||||
@Comment public static Comment midnighthats_description;
|
||||
@Entry // Enable or disable event hats
|
||||
public static boolean event_hats = true;
|
||||
|
||||
23
src/main/java/eu/midnightdust/core/mixin/MixinEntryListWidget.java
Executable file
@@ -0,0 +1,23 @@
|
||||
package eu.midnightdust.core.mixin;
|
||||
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import eu.midnightdust.core.config.MidnightLibConfig;
|
||||
import net.minecraft.client.gui.widget.EntryListWidget;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.util.Identifier;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
@Mixin(EntryListWidget.class)
|
||||
public abstract class MixinEntryListWidget {
|
||||
|
||||
@Inject(at = @At(value = "INVOKE",target = "Lcom/mojang/blaze3d/systems/RenderSystem;setShaderTexture(ILnet/minecraft/util/Identifier;)V",shift = At.Shift.AFTER), method = "render", cancellable = true)
|
||||
private void custom_background(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
|
||||
if (!MidnightLibConfig.background_texture.equals("") && this.getClass().toString().toLowerCase(Locale.ROOT).contains("midnight"))
|
||||
RenderSystem.setShaderTexture(0, Identifier.tryParse(MidnightLibConfig.background_texture));
|
||||
}
|
||||
}
|
||||
@@ -29,6 +29,7 @@ public class MidnightConfigOverviewScreen extends Screen {
|
||||
this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).openScreen(parent)));
|
||||
|
||||
this.list = new MidnightOverviewListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
|
||||
if (this.client != null && this.client.world != null) this.list.setRenderBackground(false);
|
||||
this.addSelectableChild(this.list);
|
||||
MidnightConfig.configClass.forEach((modid, configClass) -> {
|
||||
list.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, new TranslatableText(modid +".midnightconfig.title"), (button) -> {
|
||||
|
||||
@@ -6,7 +6,6 @@ import eu.midnightdust.hats.web.HatLoader;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.minecraft.client.model.TexturedModelData;
|
||||
import net.minecraft.client.network.AbstractClientPlayerEntity;
|
||||
import net.minecraft.client.render.OverlayTexture;
|
||||
import net.minecraft.client.render.RenderLayer;
|
||||
import net.minecraft.client.render.VertexConsumer;
|
||||
@@ -19,7 +18,6 @@ import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.UUID;
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
@@ -42,32 +40,24 @@ public class BunnyEarsFeatureRenderer<T extends LivingEntity, M extends EntityMo
|
||||
}
|
||||
|
||||
public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l) {
|
||||
{
|
||||
AbstractClientPlayerEntity abstractClientPlayerEntity = (AbstractClientPlayerEntity)livingEntity;
|
||||
Identifier hat_type;
|
||||
if (livingEntity != null) {
|
||||
UUID uuid = livingEntity.getUuid();
|
||||
Identifier hat_type = getHat(uuid);
|
||||
|
||||
if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.APRIL && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) <= 4) {
|
||||
if (MidnightLibConfig.event_hats) {
|
||||
hat_type = RABBIT;
|
||||
}
|
||||
else hat_type = DEACTIVATED;
|
||||
}else {
|
||||
hat_type = DEACTIVATED;
|
||||
}
|
||||
} else {
|
||||
hat_type = DEACTIVATED;
|
||||
}
|
||||
|
||||
if (!(hat_type == DEACTIVATED) && !HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && !abstractClientPlayerEntity.getUuid().equals(MOTSCHEN)) {
|
||||
matrixStack.push();
|
||||
|
||||
((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
|
||||
VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false);
|
||||
this.bunnyEars.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
|
||||
|
||||
matrixStack.pop();
|
||||
}
|
||||
if (!(hat_type == DEACTIVATED) && !HatLoader.PLAYER_HATS.containsKey(uuid) && !uuid.equals(MOTSCHEN)) {
|
||||
matrixStack.push();
|
||||
((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
|
||||
VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false);
|
||||
this.bunnyEars.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
|
||||
matrixStack.pop();
|
||||
}
|
||||
}
|
||||
private Identifier getHat(UUID uuid) {
|
||||
if (MidnightLibConfig.event_hats && MidnightLibClient.EVENT.equals(MidnightLibClient.Event.EASTER))
|
||||
return RABBIT;
|
||||
else if (HatLoader.PLAYER_HATS.containsKey(uuid) && HatLoader.PLAYER_HATS.get(uuid).getHatType().contains("bunny"))
|
||||
return RABBIT;
|
||||
|
||||
return DEACTIVATED;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@ import eu.midnightdust.hats.web.HatLoader;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.minecraft.client.model.TexturedModelData;
|
||||
import net.minecraft.client.network.AbstractClientPlayerEntity;
|
||||
import net.minecraft.client.render.OverlayTexture;
|
||||
import net.minecraft.client.render.RenderLayer;
|
||||
import net.minecraft.client.render.VertexConsumer;
|
||||
@@ -22,7 +21,6 @@ import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.UUID;
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
@@ -45,31 +43,22 @@ public class ChristmasHatFeatureRenderer<T extends LivingEntity, M extends Entit
|
||||
}
|
||||
|
||||
public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l) {
|
||||
{
|
||||
AbstractClientPlayerEntity abstractClientPlayerEntity = (AbstractClientPlayerEntity)livingEntity;
|
||||
Identifier hat_type;
|
||||
if (livingEntity != null) {
|
||||
if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.DECEMBER && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) >= 23 && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) <= 26) {
|
||||
if (MidnightLibConfig.event_hats) {
|
||||
hat_type = CHRISTMAS;
|
||||
}
|
||||
else hat_type = DEACTIVATED;
|
||||
}else {
|
||||
hat_type = DEACTIVATED;
|
||||
}
|
||||
} else {
|
||||
hat_type = DEACTIVATED;
|
||||
}
|
||||
UUID uuid = livingEntity.getUuid();
|
||||
Identifier hat_type = getHat();
|
||||
|
||||
if (!(hat_type == DEACTIVATED) && !HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && !abstractClientPlayerEntity.getUuid().equals(MOTSCHEN)) {
|
||||
matrixStack.push();
|
||||
if (!(hat_type == DEACTIVATED) && !HatLoader.PLAYER_HATS.containsKey(uuid) && !uuid.equals(MOTSCHEN)) {
|
||||
matrixStack.push();
|
||||
|
||||
((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
|
||||
VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false);
|
||||
this.christmasHat.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
|
||||
((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
|
||||
VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false);
|
||||
this.christmasHat.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
|
||||
|
||||
matrixStack.pop();
|
||||
}
|
||||
matrixStack.pop();
|
||||
}
|
||||
}
|
||||
private Identifier getHat() {
|
||||
if (MidnightLibConfig.event_hats && MidnightLibClient.EVENT.equals(MidnightLibClient.Event.CHRISTMAS))
|
||||
return CHRISTMAS;
|
||||
return DEACTIVATED;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@ import eu.midnightdust.hats.web.HatLoader;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.minecraft.client.model.TexturedModelData;
|
||||
import net.minecraft.client.network.AbstractClientPlayerEntity;
|
||||
import net.minecraft.client.render.OverlayTexture;
|
||||
import net.minecraft.client.render.RenderLayer;
|
||||
import net.minecraft.client.render.VertexConsumer;
|
||||
@@ -22,7 +21,6 @@ import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.UUID;
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
@@ -45,31 +43,24 @@ public class TinyPotatoFeatureRenderer<T extends LivingEntity, M extends EntityM
|
||||
}
|
||||
|
||||
public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l) {
|
||||
{
|
||||
AbstractClientPlayerEntity abstractClientPlayerEntity = (AbstractClientPlayerEntity)livingEntity;
|
||||
Identifier hat_type;
|
||||
if (livingEntity != null) {
|
||||
if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.DECEMBER && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) == 10) {
|
||||
if (MidnightLibConfig.event_hats) {
|
||||
hat_type = TATER;
|
||||
}
|
||||
else hat_type = DEACTIVATED;
|
||||
}else {
|
||||
hat_type = DEACTIVATED;
|
||||
}
|
||||
} else {
|
||||
hat_type = DEACTIVATED;
|
||||
}
|
||||
UUID uuid = livingEntity.getUuid();
|
||||
Identifier hat_type = getHat(uuid);
|
||||
|
||||
if (!(hat_type == DEACTIVATED) && !HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && !abstractClientPlayerEntity.getUuid().equals(MOTSCHEN)) {
|
||||
matrixStack.push();
|
||||
if (!(hat_type == DEACTIVATED) && !HatLoader.PLAYER_HATS.containsKey(uuid) && !uuid.equals(MOTSCHEN)) {
|
||||
matrixStack.push();
|
||||
|
||||
((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
|
||||
VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false);
|
||||
this.tinyPotato.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
|
||||
((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
|
||||
VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false);
|
||||
this.tinyPotato.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
|
||||
|
||||
matrixStack.pop();
|
||||
}
|
||||
matrixStack.pop();
|
||||
}
|
||||
}
|
||||
private Identifier getHat(UUID uuid) {
|
||||
if (MidnightLibConfig.event_hats && MidnightLibClient.EVENT.equals(MidnightLibClient.Event.FABRIC))
|
||||
return TATER;
|
||||
else if (HatLoader.PLAYER_HATS.containsKey(uuid) && HatLoader.PLAYER_HATS.get(uuid).getHatType().contains("tater"))
|
||||
return TATER;
|
||||
return DEACTIVATED;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package eu.midnightdust.hats.web;
|
||||
|
||||
import com.google.common.reflect.TypeToken;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import org.apache.logging.log4j.Level;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
@@ -15,13 +17,13 @@ import java.net.URL;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
import static net.minecraft.datafixer.fix.BlockEntitySignTextStrictJsonFix.GSON;
|
||||
|
||||
public class HatLoader {
|
||||
public static final Logger logger = LogManager.getLogger("MidnightLib");
|
||||
private final static String HATS_URL = "https://raw.githubusercontent.com/TeamMidnightDust/MidnightHats/master/hats.json";
|
||||
public static final Type HAT_TYPE = new TypeToken<Map<UUID, PlayerHatData>>(){}.getType();
|
||||
public static Map<UUID, PlayerHatData> PLAYER_HATS;
|
||||
private static final Gson GSON = new GsonBuilder().create();
|
||||
|
||||
|
||||
public static void init() {
|
||||
CompletableFuture.supplyAsync(() -> {
|
||||
|
||||
@@ -6,7 +6,6 @@ import eu.midnightdust.hats.web.HatLoader;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.minecraft.client.model.TexturedModelData;
|
||||
import net.minecraft.client.network.AbstractClientPlayerEntity;
|
||||
import net.minecraft.client.render.OverlayTexture;
|
||||
import net.minecraft.client.render.RenderLayer;
|
||||
import net.minecraft.client.render.VertexConsumer;
|
||||
@@ -22,7 +21,6 @@ import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.UUID;
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
@@ -51,38 +49,32 @@ public class WitchHatFeatureRenderer<T extends LivingEntity, M extends EntityMod
|
||||
}
|
||||
|
||||
public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l) {
|
||||
{
|
||||
Identifier hat_type = DEACTIVATED;
|
||||
if (livingEntity instanceof AbstractClientPlayerEntity abstractClientPlayerEntity) {
|
||||
Identifier hat_type = getHat(livingEntity.getUuid());
|
||||
|
||||
if (abstractClientPlayerEntity.getUuid().equals(MOTSCHEN)) {
|
||||
hat_type = MOTSCHEN_SKIN;
|
||||
} else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("contributer")) {
|
||||
hat_type = CONTRIBUTER_SKIN;
|
||||
} else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("friend")) {
|
||||
hat_type = FRIEND_SKIN;
|
||||
} else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("donator")) {
|
||||
hat_type = DONATOR_SKIN;
|
||||
} else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("social")) {
|
||||
hat_type = SOCIAL_SKIN;
|
||||
} else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("pride")) {
|
||||
hat_type = PRIDE_SKIN;
|
||||
} else if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.OCTOBER && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) >= 30) {
|
||||
if (MidnightLibConfig.event_hats) {
|
||||
hat_type = WITCH;
|
||||
}
|
||||
}
|
||||
if (!(hat_type == DEACTIVATED)) {
|
||||
matrixStack.push();
|
||||
|
||||
if (!(hat_type == DEACTIVATED)) {
|
||||
matrixStack.push();
|
||||
((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
|
||||
VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false);
|
||||
this.witchHat.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
|
||||
|
||||
((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
|
||||
VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false);
|
||||
this.witchHat.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
|
||||
|
||||
matrixStack.pop();
|
||||
}
|
||||
}
|
||||
matrixStack.pop();
|
||||
}
|
||||
}
|
||||
private Identifier getHat(UUID uuid) {
|
||||
if (uuid.equals(MOTSCHEN)) {
|
||||
return MOTSCHEN_SKIN;
|
||||
} else if (HatLoader.PLAYER_HATS.containsKey(uuid)) {
|
||||
if (HatLoader.PLAYER_HATS.get(uuid).getHatType().contains("contributer")) return CONTRIBUTER_SKIN;
|
||||
else if (HatLoader.PLAYER_HATS.get(uuid).getHatType().contains("friend")) return FRIEND_SKIN;
|
||||
else if (HatLoader.PLAYER_HATS.get(uuid).getHatType().contains("donator")) return DONATOR_SKIN;
|
||||
else if (HatLoader.PLAYER_HATS.get(uuid).getHatType().contains("social")) return SOCIAL_SKIN;
|
||||
else if (HatLoader.PLAYER_HATS.get(uuid).getHatType().contains("pride")) return PRIDE_SKIN;
|
||||
} else if (MidnightLibClient.EVENT.equals(MidnightLibClient.Event.HALLOWEEN)) {
|
||||
if (MidnightLibConfig.event_hats) {
|
||||
return WITCH;
|
||||
}
|
||||
}
|
||||
return DEACTIVATED;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,23 +8,20 @@ import net.minecraft.entity.LivingEntity;
|
||||
|
||||
public class WitchHatModel<T extends LivingEntity> extends SinglePartEntityModel<T> {
|
||||
private final ModelPart headwear;
|
||||
private final ModelPart bone;
|
||||
private final ModelPart bone2;
|
||||
private final ModelPart bone3;
|
||||
|
||||
public WitchHatModel(ModelPart root) {
|
||||
headwear = root;
|
||||
root.setPivot(5.0F, -9.0F, -5.0F);
|
||||
|
||||
bone = headwear.getChild("bone");
|
||||
ModelPart bone = headwear.getChild("bone");
|
||||
bone.setPivot(-8.5F, -0.1F, 1.5F);
|
||||
setRotationAngle(bone, -0.0524F, 0.0F, 0.0349F);
|
||||
|
||||
bone2 = bone.getChild("bone2");
|
||||
ModelPart bone2 = bone.getChild("bone2");
|
||||
bone2.setPivot(1.5F, -4.0F, 1.5F);
|
||||
setRotationAngle(bone2, -0.1222F, 0.0F, 0.0698F);
|
||||
|
||||
bone3 = bone2.getChild("bone3");
|
||||
ModelPart bone3 = bone2.getChild("bone3");
|
||||
bone3.setPivot(1.5F, -4.0F, 1.5F);
|
||||
setRotationAngle(bone3, -0.2618F, 0.0F, 0.1047F);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package eu.midnightdust.lib.config;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
|
||||
import com.terraformersmc.modmenu.api.ModMenuApi;
|
||||
import eu.midnightdust.core.config.MidnightLibConfig;
|
||||
|
||||
@@ -14,13 +14,21 @@ import net.minecraft.client.gui.Element;
|
||||
import net.minecraft.client.gui.Selectable;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.screen.ScreenTexts;
|
||||
import net.minecraft.client.gui.widget.*;
|
||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||
import net.minecraft.client.gui.widget.ClickableWidget;
|
||||
import net.minecraft.client.gui.widget.ElementListWidget;
|
||||
import net.minecraft.client.gui.widget.TextFieldWidget;
|
||||
import net.minecraft.client.resource.language.I18n;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.text.*;
|
||||
import net.minecraft.text.LiteralText;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import net.minecraft.util.Formatting;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.nio.file.Files;
|
||||
@@ -31,28 +39,36 @@ import java.util.function.Function;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
// MidnightConfig v1.0.3
|
||||
// Single class config library - feel free to copy!
|
||||
// Changelog:
|
||||
// - 1.0.3:
|
||||
// - Text field length is now configurable
|
||||
// - Better separation of client and server
|
||||
// - 1.0.2:
|
||||
// - Update to 21w20a
|
||||
// - 1.0.1:
|
||||
// - Fixed buttons not working in fullscreen
|
||||
// - 1.0.0:
|
||||
// - The config screen no longer shows the entries of all instances of MidnightConfig
|
||||
// - Compatible with servers!
|
||||
// - Scrollable!
|
||||
// - Comment support!
|
||||
// - Fresh New Design
|
||||
/* MidnightConfig v1.0.6
|
||||
Single class config library - feel free to copy!
|
||||
Changelog:
|
||||
- 1.0.6:
|
||||
- Abstract & Allow super ticks
|
||||
- 1.0.5:
|
||||
- Custom lang keys
|
||||
- Transparent list background when in game
|
||||
- 1.0.4:
|
||||
- Number field length is now configurable
|
||||
- Fixed number fields being empty
|
||||
- 1.0.3:
|
||||
- Text field length is now configurable
|
||||
- Better separation of client and server
|
||||
- 1.0.2:
|
||||
- Update to 21w20a
|
||||
- 1.0.1:
|
||||
- Fixed buttons not working in fullscreen
|
||||
- 1.0.0:
|
||||
- The config screen no longer shows the entries of all instances of MidnightConfig
|
||||
- Compatible with servers!
|
||||
- Scrollable!
|
||||
- Comment support!
|
||||
- Fresh New Design */
|
||||
|
||||
/** Based on https://github.com/Minenash/TinyConfig
|
||||
* Credits to Minenash */
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public class MidnightConfig {
|
||||
public abstract class MidnightConfig {
|
||||
public static boolean useTooltipForTitle = true; // Render title as tooltip or as simple text
|
||||
|
||||
private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)");
|
||||
@@ -71,6 +87,7 @@ public class MidnightConfig {
|
||||
String tempValue;
|
||||
boolean inLimits = true;
|
||||
String id;
|
||||
TranslatableText name;
|
||||
}
|
||||
|
||||
public static final Map<String,Class<?>> configClass = new HashMap<>();
|
||||
@@ -111,14 +128,14 @@ public class MidnightConfig {
|
||||
info.field = field;
|
||||
info.id = modid;
|
||||
|
||||
if (e != null)
|
||||
if (e != null) {
|
||||
if (!e.name().equals("")) info.name = new TranslatableText(e.name());
|
||||
if (type == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true);
|
||||
else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(), false);
|
||||
else if (type == String.class) {
|
||||
info.max = e.max() == Double.MAX_VALUE ? Integer.MAX_VALUE : (int) e.max();
|
||||
textField(info, String::length, null, Math.min(e.min(), 0), Math.max(e.max(), 1), true);
|
||||
}
|
||||
else if (type == boolean.class) {
|
||||
} else if (type == boolean.class) {
|
||||
Function<Object, Text> func = value -> new LiteralText((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
|
||||
info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
|
||||
info.value = !(Boolean) info.value;
|
||||
@@ -133,6 +150,7 @@ public class MidnightConfig {
|
||||
button.setMessage(func.apply(info.value));
|
||||
}, func);
|
||||
}
|
||||
}
|
||||
entries.add(info);
|
||||
}
|
||||
|
||||
@@ -197,6 +215,7 @@ public class MidnightConfig {
|
||||
// Real Time config update //
|
||||
@Override
|
||||
public void tick() {
|
||||
super.tick();
|
||||
for (EntryInfo info : entries)
|
||||
try { info.field.set(null, info.value); }
|
||||
catch (IllegalAccessException ignored) {}
|
||||
@@ -234,10 +253,11 @@ public class MidnightConfig {
|
||||
}));
|
||||
|
||||
this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
|
||||
if (this.client != null && this.client.world != null) this.list.setRenderBackground(false);
|
||||
this.addSelectableChild(this.list);
|
||||
for (EntryInfo info : entries) {
|
||||
if (info.id.equals(modid)) {
|
||||
TranslatableText name = new TranslatableText(translationPrefix + info.field.getName());
|
||||
TranslatableText name = Objects.requireNonNullElseGet(info.name, () -> new TranslatableText(translationPrefix + info.field.getName()));
|
||||
ButtonWidget resetButton = new ButtonWidget(width - 155, 0, 40, 20, new LiteralText("Reset").formatted(Formatting.RED), (button -> {
|
||||
info.value = info.defaultValue;
|
||||
info.tempValue = info.value.toString();
|
||||
@@ -249,11 +269,10 @@ public class MidnightConfig {
|
||||
if (info.widget instanceof Map.Entry) {
|
||||
Map.Entry<ButtonWidget.PressAction, Function<Object, Text>> widget = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) info.widget;
|
||||
if (info.field.getType().isEnum()) widget.setValue(value -> new TranslatableText(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
|
||||
this.list.addButton(new ButtonWidget(width - 110, 0, info.width, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton,name);
|
||||
this.list.addButton(new ButtonWidget(width - 110, 0,100, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton,name);
|
||||
} else if (info.widget != null) {
|
||||
TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 110, 0, info.width, 20, null);
|
||||
|
||||
widget.setMaxLength(info.max);
|
||||
TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 110, 0, 100, 20, null);
|
||||
widget.setMaxLength(info.width);
|
||||
widget.setText(info.tempValue);
|
||||
Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
|
||||
widget.setTextPredicate(processor);
|
||||
@@ -297,7 +316,7 @@ public class MidnightConfig {
|
||||
}
|
||||
}
|
||||
@Environment(EnvType.CLIENT)
|
||||
public static class MidnightConfigListWidget extends ElementListWidget<MidnightConfig.ButtonEntry> {
|
||||
public static class MidnightConfigListWidget extends ElementListWidget<ButtonEntry> {
|
||||
TextRenderer textRenderer;
|
||||
|
||||
public MidnightConfigListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l, int m) {
|
||||
@@ -368,6 +387,7 @@ public class MidnightConfig {
|
||||
int width() default 100;
|
||||
double min() default Double.MIN_NORMAL;
|
||||
double max() default Double.MAX_VALUE;
|
||||
String name() default "";
|
||||
}
|
||||
@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ public class MidnightConfigExample extends MidnightConfig {
|
||||
@Entry public static int fabric = 16777215; // Example for a int option
|
||||
@Entry public static double world = 1.4D; // Example for a double option
|
||||
@Entry public static boolean showInfo = true; // Example for a boolean option
|
||||
@Entry public static String name = "Hi"; // Example for a string option
|
||||
@Entry public static String name = "Hi"; // Example for a string option
|
||||
@Entry public static TestEnum testEnum = TestEnum.FABRIC; // Example for a enum option
|
||||
public static enum TestEnum { // Enums allow the user to cycle through predefined options
|
||||
QUILT, FABRIC
|
||||
|
||||
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 4.6 KiB |
18
src/main/resources/assets/midnightlib/lang/de_de.json
Executable file
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"midnightlib.overview.title":"MidnightConfig Übersicht",
|
||||
"midnightlib.midnightconfig.title":"MidnightLib Konfiguration",
|
||||
"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
|
||||
"midnightlib.midnightconfig.config_screen_list":"Konfigurationsliste aktivieren",
|
||||
"midnightlib.midnightconfig.titleStyle":"Aussehen der Konfigurationsbildschirmtitel",
|
||||
"midnightlib.midnightconfig.background_texture":"Textur der Konfigurationsbildschirmhintergründe",
|
||||
"midnightlib.midnightconfig.titleStyle.tooltip":"§cBenötigt Neustart!",
|
||||
"midnightlib.midnightconfig.enum.TitleStyle.TEXT":"Text",
|
||||
"midnightlib.midnightconfig.enum.TitleStyle.TOOLTIP":"Tooltip",
|
||||
"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",
|
||||
"midnightlib.midnightconfig.event_hats":"Event Hüte",
|
||||
"midnightlib.midnightconfig.special_hats":"Besondere Hüte",
|
||||
"midnightlib.modrinth":"Modrinth",
|
||||
"midnightlib.curseforge":"CurseForge",
|
||||
"modmenu.descriptionTranslation.midnightlib": "Bibliothek für Mods von Team MidnightDust.\nBesitzt eine Konfigurationsschnittstelle, oft benutzten Code, und kosmetische Gegenstände.",
|
||||
"modmenu.summaryTranslation.midnightlib": "Bibliothek für Mods von Team MidnightDust."
|
||||
}
|
||||
@@ -7,6 +7,7 @@
|
||||
"midnightlib.midnightconfig.titleStyle.tooltip":"§cRequires restart!",
|
||||
"midnightlib.midnightconfig.enum.TitleStyle.TEXT":"Text",
|
||||
"midnightlib.midnightconfig.enum.TitleStyle.TOOLTIP":"Tooltip",
|
||||
"midnightlib.midnightconfig.background_texture":"Texture of config screen backgrounds",
|
||||
"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",
|
||||
"midnightlib.midnightconfig.event_hats":"Enable Event Hats",
|
||||
"midnightlib.midnightconfig.special_hats":"Enable Special Hats",
|
||||
|
||||
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 619 B |
|
Before Width: | Height: | Size: 629 B After Width: | Height: | Size: 319 B |
|
Before Width: | Height: | Size: 621 B After Width: | Height: | Size: 319 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 497 B |
|
Before Width: | Height: | Size: 622 B After Width: | Height: | Size: 320 B |
|
Before Width: | Height: | Size: 639 B After Width: | Height: | Size: 378 B |
@@ -40,7 +40,7 @@
|
||||
"custom": {
|
||||
"modmenu": {
|
||||
"links": {
|
||||
"modmenu.discord": "https://discord.gg/jAGnWYHm3r",
|
||||
"modmenu.discord": "https://discord.midnightdust.eu/",
|
||||
"modmenu.website": "https://www.midnightdust.eu/"
|
||||
},
|
||||
"badges": [ "library" ]
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
"package": "eu.midnightdust.core.mixin",
|
||||
"compatibilityLevel": "JAVA_16",
|
||||
"client": [
|
||||
"MixinOptionsScreen"
|
||||
"MixinOptionsScreen",
|
||||
"MixinEntryListWidget"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
|
||||