Skip to content

Commit a8e5a05

Browse files
NegaNoteNegaNote
committed
Ran spotless
1 parent 23e4b33 commit a8e5a05

File tree

6 files changed

+56
-35
lines changed

6 files changed

+56
-35
lines changed

‎src/main/java/net/neganote/gtutilities/GregTechUtilities.java‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
99
import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate;
1010
import com.gregtechceu.gtceu.common.data.GTCreativeModeTabs;
11-
import com.tterrag.registrate.util.entry.RegistryEntry;
11+
1212
import net.minecraft.client.Minecraft;
1313
import net.minecraft.resources.ResourceLocation;
1414
import net.minecraft.world.item.CreativeModeTab;
@@ -21,21 +21,27 @@
2121
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
2222
import net.neganote.gtutilities.common.item.UtilItems;
2323
import net.neganote.gtutilities.common.machine.UtilMachines;
24+
25+
import com.tterrag.registrate.util.entry.RegistryEntry;
2426
import org.apache.logging.log4j.LogManager;
2527
import org.apache.logging.log4j.Logger;
2628

2729
@Mod(GregTechUtilities.MOD_ID)
2830
public class GregTechUtilities {
31+
2932
public static final String MOD_ID = "gtutils";
3033
public static final Logger LOGGER = LogManager.getLogger();
3134
public static GTRegistrate REGISTRATE = GTRegistrate.create(GregTechUtilities.MOD_ID);
3235

33-
public static RegistryEntry<CreativeModeTab> UTIL_CREATIVE_TAB = REGISTRATE.defaultCreativeTab(GregTechUtilities.MOD_ID,
34-
builder -> builder
35-
.displayItems(new GTCreativeModeTabs.RegistrateDisplayItemsGenerator(GregTechUtilities.MOD_ID, REGISTRATE))
36-
.title(REGISTRATE.addLang("itemGroup", GregTechUtilities.id("creative_tab"), "GregTech Utilities"))
37-
.icon(UtilItems.OMNITOOL::asStack)
38-
.build())
36+
public static RegistryEntry<CreativeModeTab> UTIL_CREATIVE_TAB = REGISTRATE
37+
.defaultCreativeTab(GregTechUtilities.MOD_ID,
38+
builder -> builder
39+
.displayItems(new GTCreativeModeTabs.RegistrateDisplayItemsGenerator(
40+
GregTechUtilities.MOD_ID, REGISTRATE))
41+
.title(REGISTRATE.addLang("itemGroup", GregTechUtilities.id("creative_tab"),
42+
"GregTech Utilities"))
43+
.icon(UtilItems.OMNITOOL::asStack)
44+
.build())
3945
.register();
4046

4147
public GregTechUtilities() {
@@ -50,14 +56,10 @@ public GregTechUtilities() {
5056
modEventBus.addGenericListener(GTRecipeType.class, this::registerRecipeTypes);
5157
modEventBus.addGenericListener(MachineDefinition.class, this::registerMachines);
5258

53-
54-
5559
// Most other events are fired on Forge's bus.
5660
// If we want to use annotations to register event listeners,
5761
// we need to register our object like this!
5862
MinecraftForge.EVENT_BUS.register(this);
59-
60-
6163
}
6264

6365
public static void init() {
@@ -87,16 +89,16 @@ private void addMaterialRegistries(MaterialRegistryEvent event) {
8789

8890
// As well as this.
8991
private void addMaterials(MaterialEvent event) {
90-
//CustomMaterials.init();
92+
// CustomMaterials.init();
9193
}
9294

9395
// This is optional, though.
9496
private void modifyMaterials(PostMaterialEvent event) {
95-
//CustomMaterials.modify();
97+
// CustomMaterials.modify();
9698
}
9799

98100
private void registerRecipeTypes(GTCEuAPI.RegisterEvent<ResourceLocation, GTRecipeType> event) {
99-
//CustomRecipeTypes.init();
101+
// CustomRecipeTypes.init();
100102
}
101103

102104
private void registerMachines(GTCEuAPI.RegisterEvent<ResourceLocation, MachineDefinition> event) {

‎src/main/java/net/neganote/gtutilities/GregTechUtilitiesGTAddon.java‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
import com.gregtechceu.gtceu.api.addon.GTAddon;
44
import com.gregtechceu.gtceu.api.addon.IGTAddon;
55
import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate;
6+
67
import net.minecraft.data.recipes.FinishedRecipe;
78

89
import java.util.function.Consumer;
910

1011
@SuppressWarnings("unused")
1112
@GTAddon
1213
public class GregTechUtilitiesGTAddon implements IGTAddon {
14+
1315
@Override
1416
public GTRegistrate getRegistrate() {
1517
return GregTechUtilities.REGISTRATE;
1618
}
1719

1820
@Override
19-
public void initializeAddon() {
20-
21-
}
21+
public void initializeAddon() {}
2222

2323
@Override
2424
public String addonModId() {
@@ -27,23 +27,25 @@ public String addonModId() {
2727

2828
@Override
2929
public void registerTagPrefixes() {
30-
//CustomTagPrefixes.init();
30+
// CustomTagPrefixes.init();
3131
}
3232

3333
@Override
3434
public void addRecipes(Consumer<FinishedRecipe> provider) {
35-
//CustomRecipes.init(provider);
35+
// CustomRecipes.init(provider);
3636
}
37-
37+
3838
// If you have custom ingredient types, uncomment this & change to match your capability.
3939
// KubeJS WILL REMOVE YOUR RECIPES IF THESE ARE NOT REGISTERED.
4040
/*
41-
public static final ContentJS<Double> PRESSURE_IN = new ContentJS<>(NumberComponent.ANY_DOUBLE, GregitasRecipeCapabilities.PRESSURE, false);
42-
public static final ContentJS<Double> PRESSURE_OUT = new ContentJS<>(NumberComponent.ANY_DOUBLE, GregitasRecipeCapabilities.PRESSURE, true);
43-
44-
@Override
45-
public void registerRecipeKeys(KJSRecipeKeyEvent event) {
46-
event.registerKey(CustomRecipeCapabilities.PRESSURE, Pair.of(PRESSURE_IN, PRESSURE_OUT));
47-
}
48-
*/
41+
* public static final ContentJS<Double> PRESSURE_IN = new ContentJS<>(NumberComponent.ANY_DOUBLE,
42+
* GregitasRecipeCapabilities.PRESSURE, false);
43+
* public static final ContentJS<Double> PRESSURE_OUT = new ContentJS<>(NumberComponent.ANY_DOUBLE,
44+
* GregitasRecipeCapabilities.PRESSURE, true);
45+
*
46+
* @Override
47+
* public void registerRecipeKeys(KJSRecipeKeyEvent event) {
48+
* event.registerKey(CustomRecipeCapabilities.PRESSURE, Pair.of(PRESSURE_IN, PRESSURE_OUT));
49+
* }
50+
*/
4951
}

‎src/main/java/net/neganote/gtutilities/common/item/OmniToolItem.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper;
55
import com.gregtechceu.gtceu.api.item.ComponentItem;
66
import com.gregtechceu.gtceu.utils.FormattingUtil;
7+
78
import net.minecraft.ChatFormatting;
89
import net.minecraft.core.BlockPos;
910
import net.minecraft.network.chat.Component;
@@ -13,14 +14,17 @@
1314
import net.minecraft.world.item.TooltipFlag;
1415
import net.minecraft.world.level.Level;
1516
import net.minecraft.world.level.block.state.BlockState;
17+
1618
import org.jetbrains.annotations.NotNull;
1719
import org.jetbrains.annotations.Nullable;
1820

1921
import java.util.List;
2022
import java.util.Objects;
2123

2224
public class OmniToolItem extends ComponentItem {
25+
2326
protected int tier;
27+
2428
protected OmniToolItem(Properties properties, int tier) {
2529
super(properties);
2630
this.tier = tier;
@@ -44,7 +48,8 @@ public float getDestroySpeed(ItemStack pStack, BlockState pState) {
4448
}
4549

4650
@Override
47-
public boolean mineBlock(@NotNull ItemStack pStack, @NotNull Level pLevel, @NotNull BlockState pState, @NotNull BlockPos pPos, @NotNull LivingEntity pMiningEntity) {
51+
public boolean mineBlock(@NotNull ItemStack pStack, @NotNull Level pLevel, @NotNull BlockState pState,
52+
@NotNull BlockPos pPos, @NotNull LivingEntity pMiningEntity) {
4853
super.mineBlock(pStack, pLevel, pState, pPos, pMiningEntity);
4954

5055
var electricItem = Objects.requireNonNull(GTCapabilityHelper.getElectricItem(pStack));
@@ -59,7 +64,8 @@ public boolean mineBlock(@NotNull ItemStack pStack, @NotNull Level pLevel, @NotN
5964
}
6065

6166
@Override
62-
public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, @NotNull List<Component> tooltipComponents, @NotNull TooltipFlag isAdvanced) {
67+
public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level,
68+
@NotNull List<Component> tooltipComponents, @NotNull TooltipFlag isAdvanced) {
6369
var electricItem = Objects.requireNonNull(GTCapabilityHelper.getElectricItem(stack));
6470
long charge = electricItem.getCharge();
6571
long maxCharge = electricItem.getMaxCharge();

‎src/main/java/net/neganote/gtutilities/common/item/PrecisionBreakBehavior.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
import com.gregtechceu.gtceu.api.GTValues;
44
import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper;
55
import com.gregtechceu.gtceu.api.item.component.IInteractionItem;
6+
67
import net.minecraft.core.BlockPos;
78
import net.minecraft.world.InteractionResult;
89
import net.minecraft.world.item.context.UseOnContext;
910
import net.minecraft.world.level.Level;
1011
import net.minecraft.world.level.block.state.BlockState;
1112

1213
public class PrecisionBreakBehavior implements IInteractionItem {
14+
1315
public int tier;
16+
1417
public PrecisionBreakBehavior(int tier) {
1518
this.tier = tier;
1619
}

‎src/main/java/net/neganote/gtutilities/common/item/UtilItems.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
package net.neganote.gtutilities.common.item;
22

3-
43
import com.gregtechceu.gtceu.api.GTValues;
54
import com.gregtechceu.gtceu.api.item.IComponentItem;
65
import com.gregtechceu.gtceu.api.item.component.ElectricStats;
76
import com.gregtechceu.gtceu.api.item.component.IItemComponent;
7+
8+
import net.neganote.gtutilities.GregTechUtilities;
9+
810
import com.tterrag.registrate.util.entry.ItemEntry;
911
import com.tterrag.registrate.util.nullness.NonNullConsumer;
10-
import net.neganote.gtutilities.GregTechUtilities;
12+
1113
import static net.neganote.gtutilities.GregTechUtilities.REGISTRATE;
1214

1315
public class UtilItems {
16+
1417
static {
1518
REGISTRATE.creativeModeTab(() -> GregTechUtilities.UTIL_CREATIVE_TAB);
1619
}
1720

1821
@SuppressWarnings("unused")
19-
public static ItemEntry<OmniToolItem> OMNITOOL = REGISTRATE.item("omnitool", (p) -> OmniToolItem.create(p, GTValues.IV))
22+
public static ItemEntry<OmniToolItem> OMNITOOL = REGISTRATE
23+
.item("omnitool", (p) -> OmniToolItem.create(p, GTValues.IV))
2024
.lang("Omnitool")
2125
.defaultModel()
2226
.properties(p -> p.stacksTo(1).durability(0))

‎src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility;
88
import com.gregtechceu.gtceu.client.renderer.machine.MaintenanceHatchPartRenderer;
99
import com.gregtechceu.gtceu.common.machine.multiblock.part.CleaningMaintenanceHatchPartMachine;
10+
1011
import net.minecraft.ChatFormatting;
1112
import net.minecraft.network.chat.Component;
1213
import net.neganote.gtutilities.GregTechUtilities;
@@ -31,9 +32,12 @@ public class UtilMachines {
3132
Component.translatable("gtceu.machine.maintenance_hatch_cleanroom_auto.tooltip.1"))
3233
.tooltipBuilder((stack, tooltips) -> {
3334
tooltips.add(Component.literal(" ").append(Component
34-
.translatable(CleanroomType.STERILE_CLEANROOM.getTranslationKey()).withStyle(ChatFormatting.GREEN)));
35+
.translatable(CleanroomType.STERILE_CLEANROOM.getTranslationKey())
36+
.withStyle(ChatFormatting.GREEN)));
3537
})
36-
.renderer(() -> new MaintenanceHatchPartRenderer(GTValues.UHV, GregTechUtilities.id("block/machine/part/maintenance.sterile_cleaning"))) // Tier can always be changed later
38+
.renderer(() -> new MaintenanceHatchPartRenderer(GTValues.UHV,
39+
GregTechUtilities.id("block/machine/part/maintenance.sterile_cleaning"))) // Tier can always be
40+
// changed later
3741
.register();
3842

3943
public static void init() {}

0 commit comments

Comments
 (0)