Skip to content

Commit

Permalink
Dismantle the foundation package.
Browse files Browse the repository at this point in the history
- Now everything goes to their module
  • Loading branch information
yuesha-yc committed Dec 6, 2024
1 parent ba1b07a commit 1aaf3ed
Show file tree
Hide file tree
Showing 47 changed files with 67 additions and 80 deletions.
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ or more precisely game mechanics and systems. It is divided by
subtopics, such as `agriculture`, `town`, `steamenergy`. If you
want to add a new game mechanic, this is the place to put it.
(maybe we should name as `mechanics` instead of `content`?)
- `foundation`: The foundation package contains the foundation
of the game, such as the worldgen, effects, loots, models, recipes, etc.
These are stuff not packaged by topic, but by functionality.
- `infrastructure`: The infrastructure package contains the
infrastructure of the game, such as commands, data, gen, config.
- `compat`: Compatibility for other mods.
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/teammoeg/frostedheart/FHClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import com.teammoeg.frostedheart.content.steamenergy.HeatStatScreen;
import com.teammoeg.frostedheart.content.steamenergy.sauna.SaunaScreen;
import com.teammoeg.frostedheart.content.trade.gui.TradeScreen;
import com.teammoeg.frostedheart.foundation.model.DynamicModelSetup;
import dev.ftb.mods.ftblibrary.ui.BaseScreen;
import dev.ftb.mods.ftblibrary.ui.MenuScreenWrapper;
import net.minecraft.client.gui.screens.MenuScreens;
Expand Down Expand Up @@ -70,7 +69,7 @@ public static void init() {
IEventBus forge = MinecraftForge.EVENT_BUS;

LOGGER.info(CLIENT_INIT, "Initializing client");
DynamicModelSetup.setup();
FHDynamicModels.setup();
KGlyphProvider.addListener();

LOGGER.info(CLIENT_INIT, "Registering client forge event listeners");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
*
*/

package com.teammoeg.frostedheart.foundation.model;
package com.teammoeg.frostedheart;

import com.teammoeg.frostedheart.FHMain;
import com.teammoeg.frostedheart.content.climate.heatdevice.generator.t1.T1GeneratorRenderer;
import com.teammoeg.frostedheart.content.climate.heatdevice.generator.t2.T2GeneratorRenderer;
import com.teammoeg.frostedheart.content.research.blocks.MechCalcRenderer;
import com.teammoeg.frostedheart.base.model.DynamicBlockModelReference;

public class DynamicModelSetup {
public class FHDynamicModels {
public static void setup() {
T1GeneratorRenderer.FUEL = DynamicBlockModelReference.getModelCached(FHMain.MODID, "block/multiblocks/generator_fuel.obj");
T2GeneratorRenderer.FUEL = DynamicBlockModelReference.getModelCached(FHMain.MODID, "block/multiblocks/generator_t2_fuel.obj" );
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 @@ -28,10 +28,9 @@
import com.teammoeg.frostedheart.compat.CuriosCompat;
import com.teammoeg.frostedheart.compat.ftbq.FHRewardTypes;
import com.teammoeg.frostedheart.compat.tetra.TetraCompat;
import com.teammoeg.frostedheart.foundation.tooltips.BlockTempStats;
import com.teammoeg.frostedheart.foundation.tooltips.EquipmentTempStats;
import com.teammoeg.frostedheart.foundation.tooltips.FHTooltips;
import com.teammoeg.frostedheart.foundation.tooltips.FoodTempStats;
import com.teammoeg.frostedheart.content.climate.tooltips.BlockTempStats;
import com.teammoeg.frostedheart.content.climate.tooltips.EquipmentTempStats;
import com.teammoeg.frostedheart.content.climate.tooltips.FoodTempStats;
import com.teammoeg.frostedheart.infrastructure.data.FHRecipeReloadListener;
import com.teammoeg.frostedheart.infrastructure.gen.FHRegistrate;
import com.teammoeg.frostedheart.compat.ftbteams.FTBTeamsEvents;
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/teammoeg/frostedheart/FHRecipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
import com.teammoeg.frostedheart.content.incubator.IncubateRecipe;
import com.teammoeg.frostedheart.content.health.recipe.NutritionRecipe;
import com.teammoeg.frostedheart.content.water.recipe.WaterLevelAndEffectRecipe;
import com.teammoeg.frostedheart.foundation.recipes.CampfireDefrostRecipe;
import com.teammoeg.frostedheart.foundation.recipes.DismantleInnerRecipe;
import com.teammoeg.frostedheart.foundation.recipes.InspireRecipe;
import com.teammoeg.frostedheart.foundation.recipes.InstallInnerRecipe;
import com.teammoeg.frostedheart.foundation.recipes.ModifyDamageRecipe;
import com.teammoeg.frostedheart.foundation.recipes.ResearchPaperRecipe;
import com.teammoeg.frostedheart.foundation.recipes.ShapelessCopyDataRecipe;
import com.teammoeg.frostedheart.foundation.recipes.SmokingDefrostRecipe;
import com.teammoeg.frostedheart.content.climate.recipe.CampfireDefrostRecipe;
import com.teammoeg.frostedheart.content.climate.recipe.DismantleInnerRecipe;
import com.teammoeg.frostedheart.content.research.recipe.InspireRecipe;
import com.teammoeg.frostedheart.content.climate.recipe.InstallInnerRecipe;
import com.teammoeg.frostedheart.content.utility.recipe.ModifyDamageRecipe;
import com.teammoeg.frostedheart.content.research.recipe.ResearchPaperRecipe;
import com.teammoeg.frostedheart.content.utility.recipe.ShapelessCopyDataRecipe;
import com.teammoeg.frostedheart.content.climate.recipe.SmokingDefrostRecipe;
import com.teammoeg.frostedheart.content.steamenergy.charger.ChargerRecipe;
import com.teammoeg.frostedheart.content.steamenergy.sauna.SaunaRecipe;
import com.teammoeg.frostedheart.content.trade.policy.TradePolicy;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@
*
*/

package com.teammoeg.frostedheart.foundation.tooltips;
package com.teammoeg.frostedheart;

import com.simibubi.create.foundation.item.TooltipModifier;
import com.teammoeg.frostedheart.FHMain;
import com.teammoeg.frostedheart.FHTags;
import com.teammoeg.frostedheart.compat.jei.JEICompat;
import com.teammoeg.frostedheart.foundation.recipes.InspireRecipe;
import com.teammoeg.frostedheart.content.research.recipe.InspireRecipe;
import com.teammoeg.frostedheart.util.FHUtils;
import com.teammoeg.frostedheart.util.lang.Lang;
import com.teammoeg.frostedheart.util.RegistryUtils;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.model;
package com.teammoeg.frostedheart.base.model;

import java.util.Collections;
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.model;
package com.teammoeg.frostedheart.base.model;

import java.util.function.Function;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
import com.teammoeg.frostedheart.content.incubator.IncubateRecipe;
import com.teammoeg.frostedheart.content.incubator.IncubatorT1Screen;
import com.teammoeg.frostedheart.content.incubator.IncubatorT2Screen;
import com.teammoeg.frostedheart.foundation.recipes.CampfireDefrostRecipe;
import com.teammoeg.frostedheart.foundation.recipes.InstallInnerRecipe;
import com.teammoeg.frostedheart.foundation.recipes.ModifyDamageRecipe;
import com.teammoeg.frostedheart.foundation.recipes.SmokingDefrostRecipe;
import com.teammoeg.frostedheart.content.climate.recipe.CampfireDefrostRecipe;
import com.teammoeg.frostedheart.content.climate.recipe.InstallInnerRecipe;
import com.teammoeg.frostedheart.content.utility.recipe.ModifyDamageRecipe;
import com.teammoeg.frostedheart.content.climate.recipe.SmokingDefrostRecipe;
import com.teammoeg.frostedheart.content.research.FHResearch;
import com.teammoeg.frostedheart.content.research.ResearchListeners;
import com.teammoeg.frostedheart.content.research.api.ClientResearchDataAPI;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import com.simibubi.create.compat.jei.DoubleItemIcon;
import com.teammoeg.frostedheart.FHItems;
import com.teammoeg.frostedheart.FHMain;
import com.teammoeg.frostedheart.foundation.recipes.CampfireDefrostRecipe;
import com.teammoeg.frostedheart.content.climate.recipe.CampfireDefrostRecipe;
import com.teammoeg.frostedheart.util.lang.Lang;

import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import com.teammoeg.frostedheart.FHItems;
import com.teammoeg.frostedheart.FHMain;
import com.teammoeg.frostedheart.compat.jei.StaticBlock;
import com.teammoeg.frostedheart.foundation.recipes.CampfireDefrostRecipe;
import com.teammoeg.frostedheart.content.climate.recipe.CampfireDefrostRecipe;
import com.teammoeg.frostedheart.util.lang.Lang;

import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import com.simibubi.create.compat.jei.DoubleItemIcon;
import com.teammoeg.frostedheart.FHItems;
import com.teammoeg.frostedheart.FHMain;
import com.teammoeg.frostedheart.foundation.recipes.SmokingDefrostRecipe;
import com.teammoeg.frostedheart.content.climate.recipe.SmokingDefrostRecipe;
import com.teammoeg.frostedheart.util.lang.Lang;

import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package com.teammoeg.frostedheart.compat.jei.extension;

import java.util.Arrays;
import com.teammoeg.frostedheart.foundation.recipes.ModifyDamageRecipe;
import com.teammoeg.frostedheart.content.utility.recipe.ModifyDamageRecipe;

import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
import mezz.jei.api.gui.ingredient.ICraftingGridHelper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.util.Arrays;
import java.util.List;

import com.teammoeg.frostedheart.foundation.recipes.InstallInnerRecipe;
import com.teammoeg.frostedheart.content.climate.recipe.InstallInnerRecipe;
import com.teammoeg.frostedheart.util.RegistryUtils;

import blusunrize.immersiveengineering.common.util.ItemNBTHelper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.util.stream.Collectors;

import com.teammoeg.frostedheart.FHMain;
import com.teammoeg.frostedheart.foundation.recipes.ShapelessCopyDataRecipe;
import com.teammoeg.frostedheart.content.utility.recipe.ShapelessCopyDataRecipe;

import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
import mezz.jei.api.gui.ingredient.ICraftingGridHelper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@
import com.teammoeg.frostedheart.content.climate.food.FoodTemperatureHandler;
import com.teammoeg.frostedheart.content.climate.player.PlayerTemperatureData;
import com.teammoeg.frostedheart.content.climate.player.TemperatureUpdate;
import com.teammoeg.frostedheart.content.health.dailykitchen.DailyKitchen;
import com.teammoeg.frostedheart.content.research.insight.InsightHandler;
import com.teammoeg.frostedheart.content.research.inspire.EnergyCore;
import com.teammoeg.frostedheart.content.utility.DeathInventoryData;
import com.teammoeg.frostedheart.content.utility.transportation.MovementModificationHandler;
import com.teammoeg.frostedheart.infrastructure.command.HeatAdjustCommand;
import com.teammoeg.frostedheart.infrastructure.command.ClimateCommand;
import com.teammoeg.frostedheart.content.agriculture.FHBerryBushBlock;
Expand All @@ -57,7 +52,7 @@
import com.teammoeg.frostedheart.infrastructure.data.FHDataManager;
import com.teammoeg.frostedheart.infrastructure.data.FHDataManager.DataType;
import com.teammoeg.frostedheart.infrastructure.config.FHConfig;
import com.teammoeg.frostedheart.foundation.recipes.InstallInnerRecipe;
import com.teammoeg.frostedheart.content.climate.recipe.InstallInnerRecipe;
import com.teammoeg.frostedheart.util.FHUtils;
import com.teammoeg.frostedheart.util.lang.Lang;
import com.teammoeg.frostedheart.content.climate.player.EquipmentSlotType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.List;

import com.mojang.blaze3d.vertex.PoseStack;
import com.teammoeg.frostedheart.foundation.model.DynamicBlockModelReference;
import com.teammoeg.frostedheart.base.model.DynamicBlockModelReference;
import com.teammoeg.frostedheart.content.climate.heatdevice.generator.GeneratorData;
import com.teammoeg.frostedheart.util.client.FHGuiHelper;

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

import com.mojang.blaze3d.vertex.PoseStack;
import com.teammoeg.frostedheart.foundation.model.DynamicBlockModelReference;
import com.teammoeg.frostedheart.base.model.DynamicBlockModelReference;
import com.teammoeg.frostedheart.content.climate.heatdevice.generator.GeneratorData;
import com.teammoeg.frostedheart.util.client.FHGuiHelper;

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

package com.teammoeg.frostedheart.foundation.model;
package com.teammoeg.frostedheart.content.climate.model;

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

package com.teammoeg.frostedheart.foundation.model;
package com.teammoeg.frostedheart.content.climate.model;

import javax.annotation.Nullable;

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

package com.teammoeg.frostedheart.foundation.model;
package com.teammoeg.frostedheart.content.climate.model;

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.particles;
package com.teammoeg.frostedheart.content.climate.particle;

import com.mojang.blaze3d.vertex.VertexConsumer;

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

package com.teammoeg.frostedheart.foundation.particles;
package com.teammoeg.frostedheart.content.climate.particle;

import com.mojang.blaze3d.vertex.VertexConsumer;

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

package com.teammoeg.frostedheart.foundation.particles;
package com.teammoeg.frostedheart.content.climate.particle;

import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.particle.Particle;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.particles;
package com.teammoeg.frostedheart.content.climate.particle;

import net.minecraft.client.particle.SpriteSet;
import net.minecraft.client.particle.ParticleProvider;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.particles;
package com.teammoeg.frostedheart.content.climate.particle;

import net.minecraft.client.particle.*;
import net.minecraft.client.multiplayer.ClientLevel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.recipes;
package com.teammoeg.frostedheart.content.climate.recipe;

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

package com.teammoeg.frostedheart.foundation.recipes;
package com.teammoeg.frostedheart.content.climate.recipe;

import javax.annotation.Nullable;

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

package com.teammoeg.frostedheart.foundation.recipes;
package com.teammoeg.frostedheart.content.climate.recipe;

import javax.annotation.Nullable;

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

package com.teammoeg.frostedheart.foundation.recipes;
package com.teammoeg.frostedheart.content.climate.recipe;

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

package com.teammoeg.frostedheart.foundation.recipes;
package com.teammoeg.frostedheart.content.climate.recipe;

import java.util.Random;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.teammoeg.frostedheart.foundation.tooltips;
package com.teammoeg.frostedheart.content.climate.tooltips;

import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.item.TooltipModifier;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.teammoeg.frostedheart.foundation.tooltips;
package com.teammoeg.frostedheart.content.climate.tooltips;

import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.item.TooltipModifier;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.teammoeg.frostedheart.foundation.tooltips;
package com.teammoeg.frostedheart.content.climate.tooltips;

import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.item.TooltipModifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,10 @@
import com.teammoeg.frostedheart.base.team.SpecialDataTypes;
import com.teammoeg.frostedheart.base.team.TeamDataClosure;
import com.teammoeg.frostedheart.base.team.TeamDataHolder;
import com.teammoeg.frostedheart.foundation.recipes.InspireRecipe;
import com.teammoeg.frostedheart.content.research.recipe.InspireRecipe;
import com.teammoeg.frostedheart.content.research.api.ClientResearchDataAPI;
import com.teammoeg.frostedheart.content.research.api.ResearchDataAPI;
import com.teammoeg.frostedheart.content.research.blocks.RubbingTool;
import com.teammoeg.frostedheart.content.research.data.ResearchData;
import com.teammoeg.frostedheart.content.research.data.TeamResearchData;
import com.teammoeg.frostedheart.content.research.inspire.EnergyCore;
import com.teammoeg.frostedheart.content.research.research.Research;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.util.Random;

import com.teammoeg.frostedheart.FHBlockEntityTypes;
import com.teammoeg.frostedheart.foundation.recipes.ResearchPaperRecipe;
import com.teammoeg.frostedheart.content.research.recipe.ResearchPaperRecipe;
import com.teammoeg.frostedheart.content.research.ResearchListeners;
import com.teammoeg.frostedheart.content.research.gui.drawdesk.DrawDeskContainer;
import com.teammoeg.frostedheart.content.research.gui.drawdesk.game.CardPos;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import com.mojang.blaze3d.vertex.PoseStack;
import com.teammoeg.frostedheart.FHBlocks;
import com.teammoeg.frostedheart.foundation.model.DynamicBlockModelReference;
import com.teammoeg.frostedheart.base.model.DynamicBlockModelReference;

import blusunrize.immersiveengineering.api.IEProperties.VisibilityList;
import blusunrize.immersiveengineering.client.models.obj.callback.DynamicSubmodelCallbacks;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

package com.teammoeg.frostedheart.foundation.recipes;
package com.teammoeg.frostedheart.content.research.recipe;

import com.google.gson.JsonObject;

Expand Down
Loading

0 comments on commit 1aaf3ed

Please sign in to comment.