Skip to content

Commit 8deb65e

Browse files
committed
Way too much again :3
1 parent 1ef53ea commit 8deb65e

29 files changed

Lines changed: 95 additions & 111 deletions

.gitignore

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
1-
# eclipse
2-
bin
3-
*.launch
4-
.settings
5-
.metadata
6-
.classpath
7-
.project
1+
### Windows ###
2+
desktop.ini
83

9-
# idea
10-
out
11-
*.ipr
12-
*.iws
13-
*.iml
14-
.idea
4+
### macOS ###
5+
.DS_Store
156

16-
# gradle
17-
build
7+
### Gradle ###
188
.gradle
9+
build
10+
11+
### IntelliJ IDEA ###
12+
.idea/*
13+
!.idea/fileColors.xml
14+
!.idea/scopes/
15+
!.idea/scopes/*
1916

20-
# other
21-
eclipse
17+
### Project ###
2218
run
23-
*.log

.idea/fileColors.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/scopes/Gradle.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/scopes/Qodana.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
}
1111

1212
group = "dev.redstudio"
13-
version = "0.8-Dev-17" // Versioning must follow Ragnarök versioning convention: https://github.com/Red-Studio-Ragnarok/Commons/blob/main/Ragnar%C3%B6k%20Versioning%20Convention.md
13+
version = "0.8-Dev-18" // Versioning must follow Ragnarök versioning convention: https://github.com/Red-Studio-Ragnarok/Commons/blob/main/Ragnar%C3%B6k%20Versioning%20Convention.md
1414

1515
val id = "fbp"
1616
val plugin = "${project.group}.${id}.asm.FBPPlugin"
@@ -145,6 +145,10 @@ tasks {
145145
}
146146

147147
archiveBaseName.set(archiveBaseName.get().replace(" ", "-"))
148+
149+
from({
150+
configurations.runtimeClasspath.get().filter { it.name.contains("MatrixUtil") || it.name.contains("MemoryUtil") }.map { if (it.isDirectory) it else zipTree(it) }
151+
})
148152
}
149153

150154
withType<JavaCompile>{

src/main/java/dev/redstudio/fbp/FBP.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,9 @@
1919
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
2020

2121
import java.io.File;
22-
import java.util.ArrayList;
23-
import java.util.List;
24-
import java.util.SplittableRandom;
22+
import java.util.*;
2523

26-
import static dev.redstudio.fbp.ProjectConstants.ID;
27-
import static dev.redstudio.fbp.ProjectConstants.NAME;
28-
import static dev.redstudio.fbp.ProjectConstants.VERSION;
24+
import static dev.redstudio.fbp.ProjectConstants.*;
2925

3026
// /$$$$$$$$ /$$ /$$$$$$$ /$$ /$$ /$$$$$$$ /$$ /$$ /$$
3127
// | $$_____/ |__/ | $$__ $$| $$ | $$ | $$__ $$ | $$ |__/ | $$

src/main/java/dev/redstudio/fbp/asm/FBPPlugin.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
44
import zone.rong.mixinbooter.IEarlyMixinLoader;
55

6-
import java.util.Collections;
7-
import java.util.List;
8-
import java.util.Map;
6+
import java.util.*;
97

108
@IFMLLoadingPlugin.TransformerExclusions("io.redstudioragnarok.fbp.asm")
119
public class FBPPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {

src/main/java/dev/redstudio/fbp/block/AnimationDummyBlock.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,9 @@
1515
import net.minecraft.init.Blocks;
1616
import net.minecraft.item.Item;
1717
import net.minecraft.item.ItemStack;
18-
import net.minecraft.util.EnumBlockRenderType;
19-
import net.minecraft.util.EnumFacing;
20-
import net.minecraft.util.EnumHand;
21-
import net.minecraft.util.ResourceLocation;
22-
import net.minecraft.util.math.AxisAlignedBB;
23-
import net.minecraft.util.math.BlockPos;
24-
import net.minecraft.util.math.RayTraceResult;
25-
import net.minecraft.world.Explosion;
26-
import net.minecraft.world.IBlockAccess;
27-
import net.minecraft.world.World;
18+
import net.minecraft.util.*;
19+
import net.minecraft.util.math.*;
20+
import net.minecraft.world.*;
2821

2922
import javax.annotation.Nullable;
3023
import java.util.List;

src/main/java/dev/redstudio/fbp/gui/BasePage.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package dev.redstudio.fbp.gui;
22

33
import dev.redstudio.fbp.FBP;
4-
import dev.redstudio.fbp.gui.elements.Button;
54
import dev.redstudio.fbp.gui.elements.*;
6-
import dev.redstudio.fbp.gui.pages.Page0;
7-
import dev.redstudio.fbp.gui.pages.PageExperiments;
8-
import dev.redstudio.fbp.gui.pages.PageSettings;
5+
import dev.redstudio.fbp.gui.elements.Button;
6+
import dev.redstudio.fbp.gui.pages.*;
97
import dev.redstudio.fbp.handlers.ConfigHandler;
10-
import io.redstudioragnarok.redcore.utils.MathUtil;
8+
import dev.redstudio.redcore.math.MathUtil;
119
import net.minecraft.client.gui.GuiButton;
1210
import net.minecraft.client.gui.GuiScreen;
1311
import net.minecraft.client.resources.I18n;
@@ -22,9 +20,7 @@
2220
import static dev.redstudio.fbp.ProjectConstants.NAME;
2321
import static dev.redstudio.fbp.ProjectConstants.VERSION;
2422
import static dev.redstudio.fbp.gui.GuiConfirmation.Action.DefaultConfig;
25-
import static dev.redstudio.fbp.gui.elements.Button.ButtonSize.large;
26-
import static dev.redstudio.fbp.gui.elements.Button.ButtonSize.medium;
27-
import static dev.redstudio.fbp.gui.elements.Button.ButtonSize.small;
23+
import static dev.redstudio.fbp.gui.elements.Button.ButtonSize.*;
2824

2925
public abstract class BasePage extends GuiBase {
3026

src/main/java/dev/redstudio/fbp/gui/GuiBlacklist.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,15 @@
77
import dev.redstudio.fbp.handlers.KeyInputHandler;
88
import dev.redstudio.fbp.keys.KeyBindings;
99
import dev.redstudio.fbp.models.ModelHelper;
10-
import io.redstudioragnarok.redcore.utils.MathUtil;
10+
import dev.redstudio.redcore.math.ClampUtil;
1111
import net.minecraft.block.Block;
1212
import net.minecraft.block.BlockDoublePlant;
1313
import net.minecraft.block.state.IBlockState;
1414
import net.minecraft.client.audio.PositionedSoundRecord;
1515
import net.minecraft.client.renderer.GlStateManager;
1616
import net.minecraft.client.resources.I18n;
1717
import net.minecraft.init.SoundEvents;
18-
import net.minecraft.item.Item;
19-
import net.minecraft.item.ItemBlock;
20-
import net.minecraft.item.ItemStack;
18+
import net.minecraft.item.*;
2119
import net.minecraft.util.ResourceLocation;
2220
import net.minecraft.util.math.BlockPos;
2321
import net.minecraft.util.math.RayTraceResult;
@@ -113,7 +111,7 @@ public void drawScreen(final int mouseXIn, final int mouseYIn, final float parti
113111
drawBackground(mouseXIn, mouseYIn);
114112

115113
final int optionRadius = 30;
116-
mouseX = (int) MathUtil.clampMinFirst(mouseXIn, animation.x + optionRadius, particle.x + optionRadius);
114+
mouseX = ClampUtil.clampMinFirst(mouseXIn, animation.x + optionRadius, particle.x + optionRadius);
117115
mouseY = middleY + 35;
118116

119117
// Draw the title

0 commit comments

Comments
 (0)