robaertschi/EnvironmentTech
1
0
Fork 0
mirror of https://github.com/RoBaertschi/EnvironmentTech.git synced 2025-04-19 23:03:28 +00:00
Code Issues Packages Projects 1 Releases Wiki Activity

Use ET.java instead of EnvironmentTech.java for constants

Browse Source
This commit is contained in:
Robin Bärtschi 2024-06-28 08:07:33 +02:00
parent 61224ca47c
commit 370724bb37
24 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/robaertschi/environmenttech/Config.java
View File

@ -11,9 +11,11 @@ import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.fml.event.config.ModConfigEvent;
import net.neoforged.neoforge.common.ModConfigSpec;
import static robaertschi.environmenttech.ET.MODID;
// An example config class. This is not required, but it's a good idea to have one to keep your config organized.
// Demonstrates how to use Neo's config APIs
@EventBusSubscriber(modid = EnvironmentTech.MODID, bus = EventBusSubscriber.Bus.MOD)
@EventBusSubscriber(modid = MODID, bus = EventBusSubscriber.Bus.MOD)
public class Config
{
private static final ModConfigSpec.Builder BUILDER = new ModConfigSpec.Builder();

6
src/main/java/robaertschi/environmenttech/ET.java
View File

@ -1,3 +1,9 @@
/*
* EnvironmentTech Copyright (C) 2024 Robin Bärtschi
* This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code.
* This is free software, and you are welcome to redistribute it
* under certain conditions; read the LICENSE file at the root of the source code for details.
*/
package robaertschi.environmenttech;
import net.minecraft.resources.ResourceLocation;

9
src/main/java/robaertschi/environmenttech/EnvironmentTech.java
View File

@ -15,8 +15,6 @@ import net.neoforged.neoforge.common.NeoForge;
import net.neoforged.neoforge.event.RegisterCommandsEvent;
import org.slf4j.Logger;
import net.minecraft.resources.ResourceLocation;
import com.mojang.logging.LogUtils;
import robaertschi.environmenttech.command.EnvironmenttechCommand;
@ -30,19 +28,16 @@ import robaertschi.environmenttech.level.block.entity.ETBlockEntities;
import robaertschi.environmenttech.level.item.ETItems;
import robaertschi.environmenttech.level.particle.ETParticles;
import robaertschi.environmenttech.menu.ETMenus;
import static robaertschi.environmenttech.ET.MODID;
@Mod(ET.MODID)
@Mod(MODID)
public class EnvironmentTech
{
public static final Logger LOGGER = LogUtils.getLogger();
public static ResourceLocation id(String name) {
return ResourceLocation.fromNamespaceAndPath(MODID, name);
}
// The constructor for the mod class is the first code that is run when your mod is loaded.
// FML will recognize some parameter types like IEventBus or ModContainer and pass them in automatically.
public EnvironmentTech(IEventBus modEventBus, ModContainer modContainer)

4
src/main/java/robaertschi/environmenttech/client/ETClient.java
View File

@ -13,7 +13,7 @@ import net.neoforged.neoforge.client.event.*;
import net.minecraft.client.renderer.item.ItemProperties;
import robaertschi.environmenttech.EnvironmentTech;
import robaertschi.environmenttech.ET;
import robaertschi.environmenttech.client.particle.EnvParticleProvider;
import robaertschi.environmenttech.client.screen.EnvCollectorScreen;
import robaertschi.environmenttech.data.components.ETComponents;
@ -31,7 +31,7 @@ public class ETClient {
public static void clientSetup(FMLClientSetupEvent event) {
event.enqueueWork(() -> ItemProperties.register(
ETItems.ENV_DETECTOR_ITEM.get(),
EnvironmentTech.id("filled"),
ET.id("filled"),
(pStack, pLevel, pEntity, pSeed) -> pStack.getOrDefault(ETComponents.FILLED_COMPONENT, new FilledComponent(0)).filled()
));
}

4
src/main/java/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java
View File

@ -14,12 +14,12 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Inventory;
import robaertschi.environmenttech.EnvironmentTech;
import robaertschi.environmenttech.ET;
import robaertschi.environmenttech.client.renderer.EnvStorageRenderer;
import robaertschi.environmenttech.menu.EnvCollectorMenu;
public class EnvCollectorScreen extends AbstractContainerScreen<EnvCollectorMenu> {
public static final ResourceLocation GUI = EnvironmentTech.id("textures/gui/container/env_collector.png");
public static final ResourceLocation GUI = ET.id("textures/gui/container/env_collector.png");
private EnvStorageRenderer storageRenderer;
public EnvCollectorScreen(EnvCollectorMenu pMenu, Inventory pPlayerInventory, Component pTitle) {

4
src/main/java/robaertschi/environmenttech/client/screen/ProgressArrowUtils.java
View File

@ -8,10 +8,10 @@ package robaertschi.environmenttech.client.screen;
import net.minecraft.resources.ResourceLocation;
import robaertschi.environmenttech.EnvironmentTech;
import robaertschi.environmenttech.ET;
public class ProgressArrowUtils {
public static final ResourceLocation SPRITE = EnvironmentTech.id("textures/gui/sprites/component/progress_arrow.png");
public static final ResourceLocation SPRITE = ET.id("textures/gui/sprites/component/progress_arrow.png");
public static int getScaledProgress(int progress, int maxProgress) {
int progressArrowSize = 24; // This is the height in pixels of your arrow

4
src/main/java/robaertschi/environmenttech/compat/jei/JeiCompatPlugin.java
View File

@ -22,7 +22,7 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.item.ItemStack;
import robaertschi.environmenttech.EnvironmentTech;
import robaertschi.environmenttech.ET;
import robaertschi.environmenttech.data.recipes.ETRecipes;
import robaertschi.environmenttech.level.block.ETBlocks;
import robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity;
@ -35,7 +35,7 @@ import robaertschi.environmenttech.menu.EnvCollectorMenu;
public class JeiCompatPlugin implements IModPlugin {
@Override
public @NotNull ResourceLocation getPluginUid() {
return EnvironmentTech.id("jei_default");
return ET.id("jei_default");
}
@Override

3
src/main/java/robaertschi/environmenttech/compat/top/TopCompat.java
View File

@ -20,6 +20,7 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
import robaertschi.environmenttech.ET;
import robaertschi.environmenttech.EnvironmentTech;
import robaertschi.environmenttech.client.renderer.EnvStorageRenderer;
import robaertschi.environmenttech.data.capabilities.ETCapabilities;
@ -47,7 +48,7 @@ public class TopCompat {
@Override
public ResourceLocation getID() {
return EnvironmentTech.id("default");
return ET.id("default");
}
@Override

4
src/main/java/robaertschi/environmenttech/data/attachments/ETAttachments.java
View File

@ -15,10 +15,10 @@ import net.neoforged.neoforge.registries.NeoForgeRegistries;
import com.mojang.serialization.Codec;
import robaertschi.environmenttech.EnvironmentTech;
import static robaertschi.environmenttech.ET.MODID;
public class ETAttachments {
private static final DeferredRegister<AttachmentType<?>> ATTACHMENT_TYPES = DeferredRegister.create(NeoForgeRegistries.ATTACHMENT_TYPES, EnvironmentTech.MODID);
private static final DeferredRegister<AttachmentType<?>> ATTACHMENT_TYPES = DeferredRegister.create(NeoForgeRegistries.ATTACHMENT_TYPES, MODID);
public static final Supplier<AttachmentType<Long>> ENV = ATTACHMENT_TYPES.register(
"env", () -> AttachmentType.builder(() -> 0L).serialize(Codec.LONG).build()

4
src/main/java/robaertschi/environmenttech/data/capabilities/ETCapabilities.java
View File

@ -13,12 +13,12 @@ import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
import net.minecraft.core.Direction;
import robaertschi.environmenttech.EnvironmentTech;
import robaertschi.environmenttech.ET;
import robaertschi.environmenttech.level.block.entity.ETBlockEntities;
public class ETCapabilities {
public static final BlockCapability<IEnvStorage, EnvType> ENV_STORAGE_BLOCK =
BlockCapability.create(EnvironmentTech.id("env_storage"),
BlockCapability.create(ET.id("env_storage"),
IEnvStorage.class,
EnvType.class
);

4
src/main/java/robaertschi/environmenttech/data/components/ETComponents.java
View File

@ -12,10 +12,10 @@ import net.neoforged.neoforge.registries.DeferredRegister;
import net.minecraft.core.component.DataComponentType;
import robaertschi.environmenttech.EnvironmentTech;
import static robaertschi.environmenttech.ET.MODID;
public class ETComponents {
public static final DeferredRegister.DataComponents DATA_COMPONENTS = DeferredRegister.createDataComponents(EnvironmentTech.MODID);
public static final DeferredRegister.DataComponents DATA_COMPONENTS = DeferredRegister.createDataComponents(MODID);
public static final DeferredHolder<DataComponentType<?>, DataComponentType<FilledComponent>> FILLED_COMPONENT = DATA_COMPONENTS.registerComponentType("filled_component",
filledComponentBuilder -> filledComponentBuilder.persistent(FilledComponent.CODEC).networkSynchronized(FilledComponent.STREAM_CODEC)

2
src/main/java/robaertschi/environmenttech/data/recipes/ETRecipes.java
View File

@ -14,7 +14,7 @@ import net.minecraft.core.registries.Registries;
import net.minecraft.world.item.crafting.RecipeSerializer;
import net.minecraft.world.item.crafting.RecipeType;
import static robaertschi.environmenttech.EnvironmentTech.MODID;
import static robaertschi.environmenttech.ET.MODID;
public class ETRecipes {
public static final DeferredRegister<RecipeType<?>> RECIPE_TYPES = DeferredRegister.create(Registries.RECIPE_TYPE, MODID);

2
src/main/java/robaertschi/environmenttech/datagen/ETBlockStateProvider.java
View File

@ -14,7 +14,7 @@ import net.minecraft.data.PackOutput;
import robaertschi.environmenttech.level.block.ETBlocks;
import static robaertschi.environmenttech.EnvironmentTech.MODID;
import static robaertschi.environmenttech.ET.MODID;
public class ETBlockStateProvider extends BlockStateProvider {
public ETBlockStateProvider(PackOutput output, ExistingFileHelper exFileHelper) {

2
src/main/java/robaertschi/environmenttech/datagen/ETDatagen.java
View File

@ -17,7 +17,7 @@ import net.minecraft.core.HolderLookup;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.PackOutput;
import static robaertschi.environmenttech.EnvironmentTech.MODID;
import static robaertschi.environmenttech.ET.MODID;
@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = MODID)
public class ETDatagen {

6
src/main/java/robaertschi/environmenttech/datagen/ETItemModelProvider.java
View File

@ -14,12 +14,12 @@ import net.neoforged.neoforge.common.data.ExistingFileHelper;
import net.minecraft.data.PackOutput;
import net.minecraft.resources.ResourceLocation;
import robaertschi.environmenttech.EnvironmentTech;
import robaertschi.environmenttech.ET;
import robaertschi.environmenttech.level.block.ETBlocks;
import robaertschi.environmenttech.level.item.ETItems;
import robaertschi.environmenttech.level.item.EnvDetectorItem;
import static robaertschi.environmenttech.EnvironmentTech.MODID;
import static robaertschi.environmenttech.ET.MODID;
public class ETItemModelProvider extends ItemModelProvider {
public ETItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
@ -44,7 +44,7 @@ public class ETItemModelProvider extends ItemModelProvider {
ItemModelBuilder sub_item_builder = getBuilder("env_detector_" + i);
sub_item_builder.parent(new ModelFile.ExistingModelFile(ResourceLocation.fromNamespaceAndPath("minecraft", "item/generated"), existingFileHelper));
sub_item_builder.texture("layer0", modLoc("item/env_detector_" + i));
builder.override().predicate(EnvironmentTech.id("filled"), i).model(sub_item_builder);
builder.override().predicate(ET.id("filled"), i).model(sub_item_builder);
}
}

8
src/main/java/robaertschi/environmenttech/datagen/ETRecipeProvider.java
View File

@ -23,7 +23,7 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.Ingredient;
import robaertschi.environmenttech.EnvironmentTech;
import robaertschi.environmenttech.ET;
import robaertschi.environmenttech.data.recipes.EnvCollectorRecipe;
import robaertschi.environmenttech.level.item.ETItems;
@ -52,7 +52,7 @@ public class ETRecipeProvider extends RecipeProvider {
.pattern("ggg")
.unlockedBy("iron_ingot", InventoryChangeTrigger.TriggerInstance.hasItems(ItemPredicate.Builder.item().of(Tags.Items.INGOTS_IRON).build()))
.unlockedBy("glass_pain", InventoryChangeTrigger.TriggerInstance.hasItems(ItemPredicate.Builder.item().of(Tags.Items.GLASS_PANES).build()))
.save(recipeOutput, EnvironmentTech.id("glass_tank"));
.save(recipeOutput, ET.id("glass_tank"));
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ETItems.ENV_COLLECTOR_BLOCK_ITEM)
.define('p', Items.OAK_PLANKS)
@ -64,7 +64,7 @@ public class ETRecipeProvider extends RecipeProvider {
.unlockedBy("oak_plank", InventoryChangeTrigger.TriggerInstance.hasItems(Items.OAK_PLANKS))
.unlockedBy("oak_log", InventoryChangeTrigger.TriggerInstance.hasItems(Items.OAK_LOG))
.unlockedBy("hopper", InventoryChangeTrigger.TriggerInstance.hasItems(Items.HOPPER))
.save(recipeOutput, EnvironmentTech.id("env_collector_block_item"));
.save(recipeOutput, ET.id("env_collector_block_item"));
ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ETItems.ENV_DETECTOR_ITEM)
.define('t', ETItems.GLASS_TANK)
@ -76,6 +76,6 @@ public class ETRecipeProvider extends RecipeProvider {
.unlockedBy("glass_tank", InventoryChangeTrigger.TriggerInstance.hasItems(ETItems.GLASS_TANK))
.unlockedBy("hopper", InventoryChangeTrigger.TriggerInstance.hasItems(Items.HOPPER))
.unlockedBy("stick", InventoryChangeTrigger.TriggerInstance.hasItems(ItemPredicate.Builder.item().of(Tags.Items.RODS_WOODEN).build()))
.save(recipeOutput, EnvironmentTech.id("env_detector_item"));
.save(recipeOutput, ET.id("env_detector_item"));
}
}

4
src/main/java/robaertschi/environmenttech/level/ETChunkEvents.java
View File

@ -16,10 +16,10 @@ import net.minecraft.world.level.chunk.LevelChunk;
import net.minecraft.world.level.chunk.status.ChunkStatus;
import robaertschi.environmenttech.Config;
import robaertschi.environmenttech.EnvironmentTech;
import robaertschi.environmenttech.ET;
import robaertschi.environmenttech.data.attachments.ETAttachments;
@EventBusSubscriber(modid = EnvironmentTech.MODID)
@EventBusSubscriber(modid = ET.MODID)
@Slf4j(topic = "EnvironmentTech/ChunkData")
public class ETChunkEvents {
@SubscribeEvent()

2
src/main/java/robaertschi/environmenttech/level/block/ETBlocks.java
View File

@ -12,7 +12,7 @@ import net.neoforged.neoforge.registries.DeferredRegister;
import net.minecraft.world.level.block.state.BlockBehaviour;
import static robaertschi.environmenttech.EnvironmentTech.MODID;
import static robaertschi.environmenttech.ET.MODID;
public class ETBlocks {
// Create a Deferred Register to hold Blocks which will all be registered under the "environmenttech" namespace

2
src/main/java/robaertschi/environmenttech/level/block/entity/ETBlockEntities.java
View File

@ -15,7 +15,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
import robaertschi.environmenttech.level.block.ETBlocks;
import static robaertschi.environmenttech.EnvironmentTech.MODID;
import static robaertschi.environmenttech.ET.MODID;
@SuppressWarnings("DataFlowIssue")
public class ETBlockEntities {

3
src/main/java/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java
View File

@ -49,7 +49,8 @@ import robaertschi.environmenttech.data.recipes.ETRecipes;
import robaertschi.environmenttech.data.recipes.EnvCollectorRecipe;
import robaertschi.environmenttech.menu.EnvCollectorMenu;
import static robaertschi.environmenttech.EnvironmentTech.MODID;
import static robaertschi.environmenttech.ET.MODID;
public class EnvCollectorBlockEntity extends BlockEntity implements MenuProvider, ITickableBlockEntity, TOPInfoProvider {
public static final int SLOT_INPUT = 0;

2
src/main/java/robaertschi/environmenttech/level/block/entity/EnvDistributorBlockEntity.java
View File

@ -24,7 +24,7 @@ import robaertschi.environmenttech.data.attachments.ETAttachments;
import robaertschi.environmenttech.data.capabilities.EnvStorage;
import robaertschi.environmenttech.data.capabilities.EnvType;
import static robaertschi.environmenttech.EnvironmentTech.MODID;
import static robaertschi.environmenttech.ET.MODID;
@Getter
@ParametersAreNonnullByDefault

2
src/main/java/robaertschi/environmenttech/level/item/ETItems.java
View File

@ -22,7 +22,7 @@ import net.minecraft.world.item.component.CustomModelData;
import robaertschi.environmenttech.level.block.ETBlocks;
import static robaertschi.environmenttech.EnvironmentTech.MODID;
import static robaertschi.environmenttech.ET.MODID;
public class ETItems {
public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(MODID);

2
src/main/java/robaertschi/environmenttech/level/particle/ETParticles.java
View File

@ -14,7 +14,7 @@ import net.minecraft.core.particles.ParticleType;
import net.minecraft.core.particles.SimpleParticleType;
import net.minecraft.core.registries.BuiltInRegistries;
import static robaertschi.environmenttech.EnvironmentTech.MODID;
import static robaertschi.environmenttech.ET.MODID;
public class ETParticles {
public static final DeferredRegister<ParticleType<?>> PARTICLES = DeferredRegister.create(BuiltInRegistries.PARTICLE_TYPE, MODID);

2
src/main/java/robaertschi/environmenttech/menu/ETMenus.java
View File

@ -14,7 +14,7 @@ import net.neoforged.neoforge.registries.DeferredRegister;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.inventory.MenuType;
import static robaertschi.environmenttech.EnvironmentTech.MODID;
import static robaertschi.environmenttech.ET.MODID;
public class ETMenus {
public static final DeferredRegister<MenuType<?>> MENUS = DeferredRegister.create(BuiltInRegistries.MENU, MODID);