Skip to content

Commit

Permalink
Reformat and apply an editorconfig file.
Browse files Browse the repository at this point in the history
  • Loading branch information
Rover656 committed Jul 15, 2024
1 parent 82716ac commit 9835048
Show file tree
Hide file tree
Showing 29 changed files with 754 additions and 81 deletions.
690 changes: 690 additions & 0 deletions .editorconfig

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/java/com/enderio/regilite/Regilite.java
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public void addMenus(Collection<DeferredHolder<MenuType<?>, ? extends MenuType<?
public void addCreative(BuildCreativeModeTabContentsEvent event) {
for (DeferredHolder<Item, ? extends Item> item : getItems()) {
if (item instanceof RegiliteItem) {
Consumer<CreativeModeTab.Output> outputConsumer = ((RegiliteItem<Item>) item).getTab().get(event.getTabKey());
Consumer<CreativeModeTab.Output> outputConsumer = ((RegiliteItem<Item>)item).getTab().get(event.getTabKey());
if (outputConsumer != null) {
outputConsumer.accept(event);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ protected void generate() {
continue;
}

BiConsumer<RegiliteBlockLootProvider, Block> lootTable = ((RegiliteBlock<Block>) block).getLootTable();
BiConsumer<RegiliteBlockLootProvider, Block> lootTable = ((RegiliteBlock<Block>)block).getLootTable();
if (lootTable != null) {
lootTable.accept(this, block.get());
}
Expand All @@ -55,7 +55,7 @@ public void generate(BiConsumer<ResourceKey<LootTable>, LootTable.Builder> pGene
this.generate();
Set<ResourceKey<LootTable>> set = new HashSet<>();

for(DeferredHolder<Block, ? extends Block> block : registered) {
for (DeferredHolder<Block, ? extends Block> block : registered) {
if (block.get().isEnabled(this.enabledFeatures)) {
var lootTableResourceKey = block.get().getLootTable();
if (lootTableResourceKey != BuiltInLootTables.EMPTY && set.add(lootTableResourceKey)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package com.enderio.regilite.data;

import com.enderio.regilite.holder.RegiliteBlock;
import com.enderio.regilite.registry.BlockRegistry;
import net.minecraft.data.PackOutput;
import net.minecraft.world.level.block.Block;
import net.neoforged.neoforge.client.model.generators.BlockStateProvider;
Expand All @@ -28,7 +27,7 @@ public RegiliteBlockStateProvider(PackOutput output, String modid, ExistingFileH
protected void registerStatesAndModels() {
for (DeferredHolder<Block, ? extends Block> block : registered) {
if (block instanceof RegiliteBlock) {
BiConsumer<BlockStateProvider, DataGenContext<Block, Block>> blockstate = ((RegiliteBlock<Block>) block).getBlockStateProvider();
BiConsumer<BlockStateProvider, DataGenContext<Block, Block>> blockstate = ((RegiliteBlock<Block>)block).getBlockStateProvider();
if (blockstate != null) {
blockstate.accept(this, new DataGenContext<>(block.getKey().location(), block::get));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@
import net.neoforged.neoforge.common.data.ExistingFileHelper;
import net.neoforged.neoforge.data.event.GatherDataEvent;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public RegiliteItemModelProvider(PackOutput output, String modid, ExistingFileHe
protected void registerModels() {
for (DeferredHolder<Item, ? extends Item> item : registered) {
if (item instanceof RegiliteItem) {
var modelProvider = ((RegiliteItem<Item>) item).getModelProvider();
var modelProvider = ((RegiliteItem<Item>)item).getModelProvider();
if (modelProvider != null) {
modelProvider.accept(this, new DataGenContext<>(item.getKey().location(), item::get));
}
Expand All @@ -53,14 +53,14 @@ public ItemModelBuilder basicBlock(Item item) {

public ItemModelBuilder basicBlock(ResourceLocation item) {
return getBuilder(item.toString())
.parent(new ModelFile.UncheckedModelFile(ResourceLocation.fromNamespaceAndPath(
item.getNamespace(), "block/" + item.getPath())));
.parent(new ModelFile.UncheckedModelFile(ResourceLocation.fromNamespaceAndPath(
item.getNamespace(), "block/" + item.getPath())));
}

public ItemModelBuilder basicItem(Item item, ResourceLocation texture) {
return getBuilder(BuiltInRegistries.ITEM.getKey(item).toString())
.parent(new ModelFile.UncheckedModelFile("item/generated"))
.texture("layer0", texture);
.parent(new ModelFile.UncheckedModelFile("item/generated"))
.texture("layer0", texture);
}

public ItemModelBuilder handheld(Item item) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ public void add(Map<Supplier<String>, String> entries) {
@Override
protected void addTranslations() {
for (Map.Entry<Supplier<String>, String> entry : langEntries.entrySet()) {
if (!entry.getValue().isEmpty())
if (!entry.getValue().isEmpty()) {
this.add(entry.getKey().get(), entry.getValue());
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public RegiliteTagProvider(PackOutput output, ResourceKey<? extends Registry<T>>
protected void addTags(HolderLookup.Provider lookupProvider) {
for (DeferredHolder<T, ? extends T> entry : registered) {
if (entry instanceof ITagagble) {
Set<TagKey<T>> tag = ((ITagagble<T>) entry).getTags();
Set<TagKey<T>> tag = ((ITagagble<T>)entry).getTags();

if (tag != null) {
tag.forEach(t -> tag(t).add(entry.get()));
Expand All @@ -58,7 +58,7 @@ public FluidTagProvider(PackOutput output, ResourceKey<Registry<Fluid>> key, Fun
protected void addTags(HolderLookup.Provider lookupProvider) {
for (DeferredHolder<FluidType, ? extends FluidType> entry : registered) {
if (entry instanceof RegiliteFluid<? extends FluidType> fluidtype) {
Set<TagKey<Fluid>> tag = ((ITagagble<Fluid>) entry).getTags();
Set<TagKey<Fluid>> tag = ((ITagagble<Fluid>)entry).getTags();

if (tag != null) {
tag.forEach(t -> tag(t).add(fluidtype.getSource()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import com.enderio.regilite.Regilite;
import com.enderio.regilite.holder.RegiliteBlockEntity;
import com.enderio.regilite.registry.BlockEntityRegistry;
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;

public class BlockEntityCapabilityEvents {
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/com/enderio/regilite/events/ColorEvents.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import com.enderio.regilite.Regilite;
import com.enderio.regilite.holder.RegiliteBlock;
import com.enderio.regilite.holder.RegiliteItem;
import com.enderio.regilite.registry.ItemRegistry;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent;
Expand All @@ -27,9 +26,10 @@ public Items(Regilite regilite) {
public void registerItemColor(RegisterColorHandlersEvent.Item event) {
for (DeferredHolder<Item, ? extends Item> item : regilite.getItems()) {
if (item instanceof RegiliteItem) {
var colorSupplier = ((RegiliteItem<Item>) item).getColorSupplier();
if (colorSupplier != null)
var colorSupplier = ((RegiliteItem<Item>)item).getColorSupplier();
if (colorSupplier != null) {
event.register(colorSupplier.get().get(), item.get());
}
}
}
}
Expand All @@ -46,9 +46,10 @@ public Blocks(Regilite regilite) {
public void registerBlockColor(RegisterColorHandlersEvent.Block event) {
for (DeferredHolder<Block, ? extends Block> block : regilite.getBlock()) {
if (block instanceof RegiliteBlock) {
var colorSupplier = ((RegiliteBlock<Block>) block).getColorSupplier();
if (colorSupplier != null)
var colorSupplier = ((RegiliteBlock<Block>)block).getColorSupplier();
if (colorSupplier != null) {
event.register(colorSupplier.get().get(), block.get());
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import com.enderio.regilite.Regilite;
import com.enderio.regilite.holder.RegiliteItem;
import com.enderio.regilite.registry.ItemRegistry;
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;

public class ItemCapabilityEvents {
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/com/enderio/regilite/events/ScreenEvents.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@

import com.enderio.regilite.Regilite;
import com.enderio.regilite.holder.RegiliteMenu;
import com.enderio.regilite.registry.MenuRegistry;
import net.minecraft.client.gui.screens.MenuScreens;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.MenuType;
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
import net.neoforged.neoforge.registries.DeferredHolder;

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/enderio/regilite/holder/RegiliteBlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

import com.enderio.regilite.Regilite;
import com.enderio.regilite.data.DataGenContext;
import com.enderio.regilite.data.RegiliteBlockLootProvider;
import com.enderio.regilite.registry.ITagagble;
import com.enderio.regilite.registry.ItemRegistry;
import com.enderio.regilite.data.RegiliteBlockLootProvider;
import com.enderio.regilite.utils.DefaultTranslationUtility;
import net.minecraft.client.color.block.BlockColor;
import net.minecraft.resources.ResourceKey;
Expand Down Expand Up @@ -38,6 +38,7 @@ public class RegiliteBlock<T extends Block> extends DeferredBlock<T> implements
private BiConsumer<BlockStateProvider, DataGenContext<Block, T>> blockStateProvider = (prov, ctx) -> prov.simpleBlock(ctx.get());
@Nullable
private Supplier<Supplier<BlockColor>> colorSupplier;

protected RegiliteBlock(ResourceKey<Block> key, Regilite regilite) {
super(key);
this.regilite = regilite;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;

Expand Down
18 changes: 12 additions & 6 deletions src/main/java/com/enderio/regilite/holder/RegiliteFluid.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ public RegiliteFluid<T> createFluid(DeferredRegister<Fluid> register, Consumer<B
}

public RegiliteFluid<T> createFluid(DeferredRegister<Fluid> register) {
return this.createFluid(register, properties1 -> {});
return this.createFluid(register, properties1 -> {
});
}

public BaseFlowingFluid.Source getSource() {
Expand All @@ -79,15 +80,17 @@ public LiquidBlock getBlock() {
// region Block

public RegiliteFluid<T> withBlock(BlockRegistry registry, BlockBehaviour.Properties properties) {
return withBlock(registry, f -> new LiquidBlock(f.get(), properties), b -> {});
return withBlock(registry, f -> new LiquidBlock(f.get(), properties), b -> {
});
}

public RegiliteFluid<T> withBlock(BlockRegistry registry, BlockBehaviour.Properties properties, Consumer<RegiliteBlock<? extends LiquidBlock>> blockConfigure) {
return withBlock(registry, f -> new LiquidBlock(f.get(), properties), blockConfigure);
}

public RegiliteFluid<T> withBlock(BlockRegistry registry, Function<Supplier<BaseFlowingFluid.Flowing>, ? extends LiquidBlock> supplier) {
return withBlock(registry, supplier, b -> {});
return withBlock(registry, supplier, b -> {
});
}

public RegiliteFluid<T> withBlock(BlockRegistry registry, Function<Supplier<BaseFlowingFluid.Flowing>, ? extends LiquidBlock> supplier, Consumer<RegiliteBlock<? extends LiquidBlock>> blockConfigure) {
Expand All @@ -101,19 +104,22 @@ public RegiliteFluid<T> withBlock(BlockRegistry registry, Function<Supplier<Base
// region Bucket Item

public RegiliteFluid<T> withBucket(ItemRegistry registry) {
return withCustomBucket(registry, f -> new BucketItem(f.get(), new Item.Properties().stacksTo(1)), i -> {});
return withCustomBucket(registry, f -> new BucketItem(f.get(), new Item.Properties().stacksTo(1)), i -> {
});
}

public RegiliteFluid<T> withBucket(ItemRegistry registry, Consumer<RegiliteItem<BucketItem>> itemConfigure) {
return withCustomBucket(registry, f -> new BucketItem(f.get(), new Item.Properties().stacksTo(1)), itemConfigure);
}

public RegiliteFluid<T> withBucket(ItemRegistry registry, Item.Properties properties) {
return withCustomBucket(registry, f -> new BucketItem(f.get(), properties), i -> {});
return withCustomBucket(registry, f -> new BucketItem(f.get(), properties), i -> {
});
}

public <I extends BucketItem> RegiliteFluid<T> withCustomBucket(ItemRegistry registry, Function<Supplier<BaseFlowingFluid.Source>, I> supplier) {
return withCustomBucket(registry, supplier, i -> {});
return withCustomBucket(registry, supplier, i -> {
});
}

public <I extends BucketItem> RegiliteFluid<T> withCustomBucket(ItemRegistry registry, Function<Supplier<BaseFlowingFluid.Source>, I> supplier, Consumer<RegiliteItem<I>> itemConfigure) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public interface RegiliteHolder<T extends RegiliteHolder<T>> {
/**
* Mutate this object using the provided applicator.
* This can be used to collect common combinations of modifications together to reduce repetition.
*
* @param applicator An applicator that will modify the object.
* @return The object.
*/
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/enderio/regilite/holder/RegiliteItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@

import com.enderio.regilite.Regilite;
import com.enderio.regilite.data.DataGenContext;
import com.enderio.regilite.registry.ITagagble;
import com.enderio.regilite.data.RegiliteItemModelProvider;
import com.enderio.regilite.registry.ITagagble;
import com.enderio.regilite.utils.DefaultTranslationUtility;
import net.minecraft.client.color.item.ItemColor;
import net.minecraft.resources.ResourceKey;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.*;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.neoforged.neoforge.capabilities.ICapabilityProvider;
import net.neoforged.neoforge.capabilities.ItemCapability;
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private <T extends BlockEntity> RegiliteBlockEntity<T> registerBlockEntity(Strin
//TODO steam mess, can this be cleaner?
@SafeVarargs
public final <T extends BlockEntity> RegiliteBlockEntity<T> registerBlockEntity(String name, BlockEntityType.BlockEntitySupplier<T> sup, Supplier<? extends Block>... blocks) {
return this.registerBlockEntity(name, () -> BlockEntityType.Builder.of(sup, Arrays.stream(blocks).map(Supplier::get).toList().toArray(new Block[] {})).build(null));
return this.registerBlockEntity(name, () -> BlockEntityType.Builder.of(sup, Arrays.stream(blocks).map(Supplier::get).toList().toArray(new Block[]{})).build(null));
}

public <T extends BlockEntity> RegiliteBlockEntity<T> registerBlockEntity(String name, Supplier<BlockEntityType<T>> supplier) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,16 @@

import com.enderio.regilite.Regilite;
import com.enderio.regilite.holder.RegiliteBlock;
import com.enderio.regilite.holder.RegiliteFluid;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.LiquidBlock;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.material.FlowingFluid;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.fluids.FluidType;
import net.neoforged.neoforge.registries.DeferredBlock;
import net.neoforged.neoforge.registries.DeferredHolder;
import net.neoforged.neoforge.registries.DeferredRegister;

import java.util.Objects;
import java.util.function.Function;
import java.util.function.Supplier;

Expand All @@ -44,7 +39,7 @@ protected BlockRegistry(Regilite regilite) {
@SuppressWarnings("unchecked")
@Override
public <B extends Block> RegiliteBlock<B> register(String name, Function<ResourceLocation, ? extends B> func) {
return ((RegiliteBlock<B>) super.register(name, func));
return ((RegiliteBlock<B>)super.register(name, func));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.util.function.Function;
import java.util.function.Supplier;

public class FluidRegistry extends DeferredRegister<FluidType>{
public class FluidRegistry extends DeferredRegister<FluidType> {

private final Regilite regilite;

Expand All @@ -35,7 +35,7 @@ public static FluidRegistry create(Regilite regilite) {

@Override
public <I extends FluidType> RegiliteFluid<I> register(String name, Function<ResourceLocation, ? extends I> func) {
return (RegiliteFluid<I>) super.register(name, func);
return (RegiliteFluid<I>)super.register(name, func);
}

@Override
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/enderio/regilite/registry/ITagagble.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@

package com.enderio.regilite.registry;

import com.enderio.regilite.holder.RegiliteEntity;
import net.minecraft.tags.TagKey;
import net.minecraft.world.entity.EntityType;

import java.util.Set;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,14 @@

import com.enderio.regilite.Regilite;
import com.enderio.regilite.holder.RegiliteBlock;
import com.enderio.regilite.holder.RegiliteFluid;
import com.enderio.regilite.holder.RegiliteItem;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.BucketItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.fluids.FluidType;
import net.neoforged.neoforge.registries.DeferredItem;
import net.neoforged.neoforge.registries.DeferredRegister;

Expand Down Expand Up @@ -45,7 +42,7 @@ protected ItemRegistry(Regilite regilite) {
@SuppressWarnings("unchecked")
@Override
public <I extends Item> RegiliteItem<I> register(String name, Function<ResourceLocation, ? extends I> func) {
return (RegiliteItem<I>) super.register(name, func);
return (RegiliteItem<I>)super.register(name, func);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package com.enderio.regilite.examplemod;

import com.enderio.regilite.examplemod.exampleclasses.ExampleBlockentity;
import com.enderio.regilite.registry.BlockEntityRegistry;
import com.enderio.regilite.holder.RegiliteBlockEntity;
import com.enderio.regilite.registry.BlockEntityRegistry;
import net.neoforged.bus.api.IEventBus;

public class BlockEntities {
Expand Down
Loading

0 comments on commit 9835048

Please sign in to comment.