Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.11-SNAPSHOT'
id 'net.fabricmc.fabric-loom-remap' version '1.14-SNAPSHOT'
id 'java-library'
id 'maven-publish'
}
Expand Down
2 changes: 1 addition & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Find your version by looking for the file for your mod-loader:
Special thanks to the Entropy Contributors: bl4ckscor3, Kanawanagasaki and slicedlime! <3

Available versions:
- Minecraft 1.21.8
- Minecraft 1.21.8, 1.21.10

### Added

Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://fabricmc.net/develop/
minecraft_version=1.21.8
parchment_minecraft_version=1.21.8
parchment_mappings_version=2025.07.18
loader_version=0.16.14
minecraft_version=1.21.10
parchment_minecraft_version=1.21.10
parchment_mappings_version=2025.10.12
loader_version=0.18.4
# Mod Properties
mod_version=1.15+mc1.21.8
mod_version=1.15+mc1.21.10
maven_group=me.juancarloscp52
archives_base_name=Entropy
# Dependencies
fabric_version=0.129.0+1.21.8
fabric_version=0.138.4+1.21.10

modmenu_version=15.0.0-beta.3
modmenu_version=16.0.0-rc.2
pircbotx_version=2.3.1
slf4j_version=1.7.36
jda_version=5.6.1
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 1 addition & 4 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
pluginManagement {
repositories {
jcenter()
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public void render(GuiGraphics drawContext, DeltaTracker tickCounter) {

Minecraft client = Minecraft.getInstance();

if (client.getDebugOverlay().showDebugScreen())
if (client.debugEntries.isF3Visible())
return;

double time = timerDuration - eventCountDown;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import net.minecraft.client.particle.Particle;
import net.minecraft.client.particle.ParticleProvider;
import net.minecraft.client.particle.SpriteSet;
import net.minecraft.util.RandomSource;

public class ConstantColorDustParticle extends DustParticleBase<ConstantColorDustParticleOptions>{
protected ConstantColorDustParticle(ClientLevel world, double x, double y, double z, double velocityX, double velocityY, double velocityZ, ConstantColorDustParticleOptions parameters, SpriteSet spriteProvider) {
Expand All @@ -28,7 +29,8 @@ public Factory(FabricSpriteProvider spriteProvider) {
this.spriteProvider = spriteProvider;
}

public Particle createParticle(ConstantColorDustParticleOptions dustParticleEffect, ClientLevel clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
@Override
public Particle createParticle(ConstantColorDustParticleOptions dustParticleEffect, ClientLevel clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ, RandomSource random) {
return new ConstantColorDustParticle(clientWorld, x, y, z, velocityX, velocityY, velocityZ, dustParticleEffect, spriteProvider);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@
import net.minecraft.client.gui.components.CycleButton;
import net.minecraft.client.gui.components.EditBox;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.input.MouseButtonEvent;
import net.minecraft.client.input.MouseButtonInfo;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import org.lwjgl.glfw.GLFW;

import java.util.ArrayList;

Expand All @@ -46,9 +49,9 @@ public EntropyEventConfigurationScreen(Screen parent) {
this.parent = parent;
}

@Override
protected void init() {
list = addRenderableWidget(new EntropyEventListWidget(Minecraft.getInstance(), this.width, this.height - 65 - 30, 0, 65, 25));
list.addAllFromRegistry();
this.addWidget(list);
// Done button
Button done = Button.builder(CommonComponents.GUI_DONE, button -> onDone()).pos(this.width / 2 - 100, this.height - 26).width(200).build();
Expand Down Expand Up @@ -77,16 +80,18 @@ protected void init() {
this.addRenderableWidget(filterEvents);
}

@Override
public void render(GuiGraphics drawContext, int mouseX, int mouseY, float delta) {
super.render(drawContext, mouseX, mouseY, delta);
drawContext.drawString(font, this.title, this.width / 2 - font.width(this.title) / 2, 12, 0xFFE0E0E0);
EntropyConfigurationScreen.drawLogo(drawContext);
}

public boolean mouseReleased(double mouseX, double mouseY, int button) {
if (super.mouseReleased(mouseX, mouseY, button)) {
@Override
public boolean mouseReleased(MouseButtonEvent event) {
if (super.mouseReleased(event)) {
return true;
} else return this.list.mouseReleased(mouseX, mouseY, button);
} else return this.list.mouseReleased(event);
}

private void onDone() {
Expand All @@ -100,17 +105,19 @@ private void onDone() {
}

private void onCheckAll() {
MouseButtonInfo info = new MouseButtonInfo(GLFW.GLFW_MOUSE_BUTTON_LEFT, 0);
this.list.children().forEach(buttonEntry -> {
if (buttonEntry.checkbox.visible && !buttonEntry.checkbox.selected() && buttonEntry.eventInfo.typeReference().value().isEnabled()) {
buttonEntry.checkbox.onPress();
buttonEntry.checkbox.onPress(info);
}
});
}

private void onUncheckAll() {
MouseButtonInfo info = new MouseButtonInfo(GLFW.GLFW_MOUSE_BUTTON_LEFT, 0);
this.list.children().forEach(buttonEntry -> {
if (buttonEntry.checkbox.visible && buttonEntry.checkbox.selected() && buttonEntry.eventInfo.typeReference().value().isEnabled()) {
buttonEntry.checkbox.onPress();
buttonEntry.checkbox.onPress(info);
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public TwitchTab() {
token = new EditBox(font, 200, 20, Component.translatable("entropy.options.integrations.twitch.OAuthToken"));
token.setMaxLength(64);
token.setValue(settings.twitch.token);
token.setFormatter((s, integer) -> FormattedCharSequence.forward("*".repeat(s.length()), Style.EMPTY));
token.addFormatter((s, integer) -> FormattedCharSequence.forward("*".repeat(s.length()), Style.EMPTY));
rowHelper.addChild(
CommonLayouts.labeledElement(font, token, Component.translatable("entropy.options.integrations.twitch.OAuthToken")),
rowHelper.newCellSettings().alignHorizontallyCenter()
Expand Down Expand Up @@ -219,7 +219,7 @@ public DiscordTab() {
token = new EditBox(font, 200, 20, Component.translatable("entropy.options.integrations.discord.token"));
token.setMaxLength(128);
token.setValue(settings.discord.token);
token.setFormatter((s, integer) -> FormattedCharSequence.forward("*".repeat(s.length()), Style.EMPTY));
token.addFormatter((s, integer) -> FormattedCharSequence.forward("*".repeat(s.length()), Style.EMPTY));
rowHelper.addChild(
CommonLayouts.labeledElement(font, token, Component.translatable("entropy.options.integrations.discord.token")),
rowHelper.newCellSettings().alignHorizontallyCenter()
Expand Down Expand Up @@ -266,7 +266,7 @@ public YouTubeTab() {
secret = new EditBox(font, 200, 20, Component.translatable("entropy.options.integrations.youtube.secret"));
secret.setMaxLength(64);
secret.setValue(settings.youtube.secret);
secret.setFormatter((s, integer) -> FormattedCharSequence.forward("*".repeat(s.length()), Style.EMPTY));
secret.addFormatter((s, integer) -> FormattedCharSequence.forward("*".repeat(s.length()), Style.EMPTY));
rowHelper.addChild(
CommonLayouts.labeledElement(font, secret, Component.translatable("entropy.options.integrations.youtube.secret")),
rowHelper.newCellSettings().alignHorizontallyCenter()
Expand Down
Loading