Skip to content

Commit

Permalink
Refactor event packages 4
Browse files Browse the repository at this point in the history
  • Loading branch information
yuesha-yc committed Dec 6, 2024
1 parent e925431 commit ba1b07a
Show file tree
Hide file tree
Showing 64 changed files with 92 additions and 130 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@

import com.google.common.collect.ImmutableSet;
import com.simibubi.create.content.kinetics.base.HalfShaftInstance;
import com.simibubi.create.content.kinetics.base.HorizontalHalfShaftInstance;
import com.teammoeg.frostedheart.foundation.renderer.HalfShaftRenderer;
import com.teammoeg.frostedheart.content.steamenergy.steamcore.HalfShaftRenderer;
import com.teammoeg.frostedheart.content.decoration.RelicChestTileEntity;
import com.teammoeg.frostedheart.content.incubator.HeatIncubatorTileEntity;
import com.teammoeg.frostedheart.content.incubator.IncubatorTileEntity;
Expand All @@ -49,7 +48,6 @@
import com.teammoeg.frostedheart.content.utility.incinerator.OilBurnerTileEntity;
import com.tterrag.registrate.util.entry.BlockEntityEntry;

import com.tterrag.registrate.util.entry.BlockEntry;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/teammoeg/frostedheart/FHBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import com.teammoeg.frostedheart.content.town.warehouse.WarehouseBlock;
import com.teammoeg.frostedheart.content.utility.incinerator.GasVentBlock;
import com.teammoeg.frostedheart.content.utility.incinerator.OilBurnerBlock;
import com.teammoeg.frostedheart.foundation.loot.FHLootGen;
import com.teammoeg.frostedheart.infrastructure.gen.FHLootGen;
import com.teammoeg.frostedheart.infrastructure.gen.FHBlockStateGen;
import com.tterrag.registrate.providers.loot.RegistrateBlockLootTables;
import com.tterrag.registrate.util.entry.BlockEntry;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/teammoeg/frostedheart/FHEntityTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import com.teammoeg.frostedheart.content.town.resident.WanderingRefugee;
import com.teammoeg.frostedheart.content.utility.SpearEntity;
import com.teammoeg.frostedheart.foundation.world.entities.CuriosityEntity;
import com.teammoeg.frostedheart.content.world.entities.CuriosityEntity;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.MobCategory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
*
*/

package com.teammoeg.frostedheart.foundation.loot;
package com.teammoeg.frostedheart;

import com.mojang.serialization.Codec;
import com.teammoeg.frostedheart.FHMain;

import com.teammoeg.frostedheart.content.loot.*;
import com.teammoeg.frostedheart.foundation.loot.*;
import net.minecraft.core.registries.Registries;
import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType;
import net.minecraftforge.common.loot.IGlobalLootModifier;
Expand All @@ -35,7 +36,7 @@ public class FHLoot {
LM_REGISTRY.register("remove_loot", () -> RemoveLootModifier.CODEC);
LM_REGISTRY.register("replace_loot", () -> ReplaceLootModifier.CODEC);
LM_REGISTRY.register("dechant", () -> DechantLootModifier.CODEC);
LM_REGISTRY.register("damage",()->ApplyDamageLootModifier.CODEC);
LM_REGISTRY.register("damage",()-> ApplyDamageLootModifier.CODEC);
LM_REGISTRY.register("add_loot",()-> AddLootModifier.CODEC);
TemperatureLootCondition.TYPE = LC_REGISTRY.register("temperature",()->new LootItemConditionType(new TemperatureLootCondition.Serializer()));
TagLootCondition.TYPE = LC_REGISTRY.register("block_tag",()-> new LootItemConditionType(new TagLootCondition.Serializer()));
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/teammoeg/frostedheart/FHMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,9 @@
import com.teammoeg.frostedheart.infrastructure.gen.FHRegistrate;
import com.teammoeg.frostedheart.compat.ftbteams.FTBTeamsEvents;
import com.teammoeg.frostedheart.infrastructure.config.FHConfig;
import com.teammoeg.frostedheart.foundation.loot.FHLoot;
import com.teammoeg.frostedheart.foundation.world.FHBiomeModifiers;
import com.teammoeg.frostedheart.foundation.world.FHBiomes;
import com.teammoeg.frostedheart.foundation.world.FHFeatures;
import com.teammoeg.frostedheart.content.world.FHBiomeModifiers;
import com.teammoeg.frostedheart.content.world.FHBiomes;
import com.teammoeg.frostedheart.content.world.FHFeatures;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.GameRules;
import net.minecraft.world.level.GameRules.IntegerValue;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/teammoeg/frostedheart/FHMobEffects.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@

import java.util.function.Supplier;

import com.teammoeg.frostedheart.foundation.effects.AnemiaEffect;
import com.teammoeg.frostedheart.foundation.effects.BaseEffect;
import com.teammoeg.frostedheart.foundation.effects.HyperthermiaEffect;
import com.teammoeg.frostedheart.foundation.effects.HypothermiaEffect;
import com.teammoeg.frostedheart.foundation.effects.IonEffect;
import com.teammoeg.frostedheart.foundation.effects.SaunaEffect;
import com.teammoeg.frostedheart.content.health.effect.AnemiaEffect;
import com.teammoeg.frostedheart.base.effect.BaseEffect;
import com.teammoeg.frostedheart.content.climate.effect.HyperthermiaEffect;
import com.teammoeg.frostedheart.content.climate.effect.HypothermiaEffect;
import com.teammoeg.frostedheart.content.health.effect.IonEffect;
import com.teammoeg.frostedheart.content.steamenergy.sauna.SaunaEffect;

import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffectCategory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.shaders;
package com.teammoeg.frostedheart;

import com.lowdragmc.lowdraglib.client.shader.Shaders;
import com.lowdragmc.lowdraglib.client.shader.management.Shader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
*
*/

package com.teammoeg.frostedheart.foundation.hud;
package com.teammoeg.frostedheart;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;

import com.teammoeg.frostedheart.FHMobEffects;
import com.teammoeg.frostedheart.content.research.data.TeamResearchData;
import com.teammoeg.frostedheart.content.water.capability.WaterLevelCapability;
import com.teammoeg.frostedheart.mixin.client.BossHealthOverlayAccess;
Expand All @@ -37,7 +36,6 @@
import com.mojang.blaze3d.vertex.Tesselator;
import com.mojang.blaze3d.vertex.VertexFormat.Mode;
import com.teammoeg.frostedheart.infrastructure.config.FHConfig;
import com.teammoeg.frostedheart.FHMain;
import com.teammoeg.frostedheart.content.climate.ClientClimateData;
import com.teammoeg.frostedheart.content.climate.TemperatureFrame;
import com.teammoeg.frostedheart.content.climate.TemperatureFrame.FrameType;
Expand All @@ -47,7 +45,6 @@
import com.teammoeg.frostedheart.content.scenario.client.ClientScene;
import com.teammoeg.frostedheart.util.client.UV.Transition;

import dev.ftb.mods.ftblibrary.icon.Color4I;
import dev.ftb.mods.ftblibrary.ui.GuiHelper;
import net.minecraft.client.AttackIndicatorStatus;
import net.minecraft.client.Minecraft;
Expand All @@ -56,7 +53,6 @@
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.FluidTags;
import net.minecraft.util.FastColor;
import net.minecraft.util.Mth;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.effects;
package com.teammoeg.frostedheart.base.effect;

import java.util.List;

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

package com.teammoeg.frostedheart.foundation.effects;
package com.teammoeg.frostedheart.content.climate.effect;

import java.util.List;

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

package com.teammoeg.frostedheart.foundation.effects;
package com.teammoeg.frostedheart.content.climate.effect;

import java.util.List;

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

import com.lowdragmc.lowdraglib.LDLib;
import com.teammoeg.frostedheart.base.network.FHMessage;
import com.teammoeg.frostedheart.foundation.renderer.InfraredViewRenderer;
import com.teammoeg.frostedheart.content.climate.render.InfraredViewRenderer;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.level.ChunkPos;
import net.minecraftforge.network.NetworkEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.lowdragmc.lowdraglib.LDLib;
import com.mojang.blaze3d.systems.RenderSystem;
import com.teammoeg.frostedheart.base.network.FHMessage;
import com.teammoeg.frostedheart.foundation.renderer.InfraredViewRenderer;
import com.teammoeg.frostedheart.content.climate.render.InfraredViewRenderer;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.level.ChunkPos;
import net.minecraftforge.network.NetworkEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package com.teammoeg.frostedheart.content.climate.heatdevice.chunkheatdata;

import com.teammoeg.frostedheart.foundation.renderer.InfraredViewRenderer;
import com.teammoeg.frostedheart.content.climate.render.InfraredViewRenderer;
import net.minecraft.core.BlockPos;

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

package com.teammoeg.frostedheart.content.climate.client;
package com.teammoeg.frostedheart.content.climate.render;

import java.util.Random;

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

package com.teammoeg.frostedheart.content.climate.client;
package com.teammoeg.frostedheart.content.climate.render;

import com.teammoeg.frostedheart.FHMain;
import com.teammoeg.frostedheart.infrastructure.config.FHConfig;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.renderer;
package com.teammoeg.frostedheart.content.climate.render;

import javax.annotation.ParametersAreNonnullByDefault;

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

package com.teammoeg.frostedheart.foundation.renderer;
package com.teammoeg.frostedheart.content.climate.render;

import com.lowdragmc.lowdraglib.LDLib;
import com.lowdragmc.lowdraglib.client.shader.management.ShaderManager;
Expand All @@ -28,7 +28,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import com.teammoeg.frostedheart.infrastructure.config.FHConfig;
import com.teammoeg.frostedheart.FHNetwork;
import com.teammoeg.frostedheart.foundation.shaders.FHShaders;
import com.teammoeg.frostedheart.FHShaders;
import com.teammoeg.frostedheart.content.climate.heatdevice.chunkheatdata.FHRequestInfraredViewDataSyncPacket;
import com.teammoeg.frostedheart.mixin.oculus.IrisRenderingPipelineAccess;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.effects;
package com.teammoeg.frostedheart.content.health.effect;

import java.util.List;

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

package com.teammoeg.frostedheart.foundation.effects;
package com.teammoeg.frostedheart.content.health.effect;

import java.util.List;

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

package com.teammoeg.frostedheart.foundation.loot;
package com.teammoeg.frostedheart.content.loot;

import javax.annotation.Nonnull;

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

package com.teammoeg.frostedheart.foundation.loot;
package com.teammoeg.frostedheart.content.loot;

import org.jetbrains.annotations.NotNull;

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

package com.teammoeg.frostedheart.foundation.loot;
package com.teammoeg.frostedheart.content.loot;

import javax.annotation.Nonnull;

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

package com.teammoeg.frostedheart.foundation.loot;
package com.teammoeg.frostedheart.content.loot;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.loot;
package com.teammoeg.frostedheart.content.loot;

import java.util.Collection;
import java.util.HashSet;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.loot;
package com.teammoeg.frostedheart.content.loot;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.loot;
package com.teammoeg.frostedheart.content.loot;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.loot;
package com.teammoeg.frostedheart.content.loot;

import javax.annotation.Nonnull;

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

package com.teammoeg.frostedheart.foundation.loot;
package com.teammoeg.frostedheart.content.loot;

import java.util.function.BiPredicate;

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

package com.teammoeg.frostedheart.foundation.loot;
package com.teammoeg.frostedheart.content.loot;

import javax.annotation.Nonnull;

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

package com.teammoeg.frostedheart.foundation.effects;
package com.teammoeg.frostedheart.content.steamenergy.sauna;


import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.renderer;
package com.teammoeg.frostedheart.content.steamenergy.steamcore;

import com.simibubi.create.AllPartialModels;
import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.teammoeg.frostedheart.content.tips.client.TipElement;
import com.teammoeg.frostedheart.content.tips.client.hud.TipHUD;
import com.teammoeg.frostedheart.foundation.gui.DebugScreen;
import com.teammoeg.frostedheart.content.waypoint.gui.DebugScreen;
import com.teammoeg.frostedheart.util.lang.Lang;
import net.minecraft.client.Minecraft;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import com.mojang.blaze3d.platform.InputConstants;
import com.teammoeg.frostedheart.FHMain;
import com.teammoeg.frostedheart.foundation.gui.DebugScreen;
import com.teammoeg.frostedheart.foundation.gui.widget.IconButton;
import com.teammoeg.frostedheart.content.waypoint.gui.DebugScreen;
import com.teammoeg.frostedheart.content.waypoint.gui.widget.IconButton;
import com.teammoeg.frostedheart.infrastructure.config.FHConfig;
import com.teammoeg.frostedheart.content.tips.client.TipElement;
import com.teammoeg.frostedheart.content.tips.client.gui.EmptyScreen;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.teammoeg.frostedheart.content.tips.TipDisplayManager;
import com.teammoeg.frostedheart.content.tips.TipLockManager;
import com.teammoeg.frostedheart.content.tips.client.TipElement;
import com.teammoeg.frostedheart.foundation.gui.widget.IconButton;
import com.teammoeg.frostedheart.content.waypoint.gui.widget.IconButton;
import com.teammoeg.frostedheart.util.lang.Lang;
import com.teammoeg.frostedheart.util.client.*;
import net.minecraft.client.gui.GuiGraphics;
Expand Down
Loading

0 comments on commit ba1b07a

Please sign in to comment.