Skip to content

Commit

Permalink
1.21.1 - Shared - Fixing zip file names
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian-Wuest committed Oct 2, 2024
1 parent 85653c4 commit 27cf1db
Show file tree
Hide file tree
Showing 125 changed files with 96 additions and 96 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static void ScanShape(StructureScannerConfig config, ServerPlayer playerE
config.blockPos,
cornerPos,
otherCorner,
"..\\src\\main\\resources\\assets\\prefab\\structures\\" + config.structureZipName + ".zip",
"..\\..\\Shared\\src\\resources\\assets\\prefab\\structures\\" + config.structureZipName + ".gz",
clearedSpace,
playerFacing,
false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ protected void ConfigurationSpecificBuildStructure(Player player, ServerLevel wo
*/
public enum HouseStyle {
MANOR(0, GuiLangKeys.ADVANCED_HOUSE_MANOR, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_advanced_manor.png"),
"assets/prefab/structures/house_advanced_manor.zip"),
"assets/prefab/structures/house_advanced_manor.gz"),
WORKSHOP(1, GuiLangKeys.ADVANCED_HOUSE_WORKSHOP, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_advanced_workshop.png"),
"assets/prefab/structures/house_advanced_workshop.zip"),
"assets/prefab/structures/house_advanced_workshop.gz"),
ESTATE(2, GuiLangKeys.ADVANCED_HOUSE_ESTATE, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_advanced_estate.png"),
"assets/prefab/structures/house_advanced_estate.zip");
"assets/prefab/structures/house_advanced_estate.gz");

private final int value;
private final String displayName;
Expand Down
30 changes: 15 additions & 15 deletions Shared/src/com/prefab/structures/config/HouseConfiguration.java
Original file line number Diff line number Diff line change
Expand Up @@ -201,53 +201,53 @@ public enum HouseStyle {
0,
GuiLangKeys.HOUSE_BASIC_DISPLAY,
ResourceLocation.tryBuild("prefab", "textures/gui/house_basic.png"),
"assets/prefab/structures/house_basic.zip"),
"assets/prefab/structures/house_basic.gz"),
RANCH(1, GuiLangKeys.HOUSE_RANCH_DISPLAY, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_ranch.png"),
"assets/prefab/structures/house_ranch.zip"),
"assets/prefab/structures/house_ranch.gz"),
LOFT(2, GuiLangKeys.HOUSE_LOFT_DISPLAY, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_loft.png"),
"assets/prefab/structures/house_loft.zip"),
"assets/prefab/structures/house_loft.gz"),
HOBBIT(3, GuiLangKeys.HOUSE_HOBBIT_DISPLAY, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_hobbit.png"),
"assets/prefab/structures/house_hobbit.zip"),
"assets/prefab/structures/house_hobbit.gz"),
DESERT(4, GuiLangKeys.HOUSE_DESERT_DISPLAY, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_desert.png"),
"assets/prefab/structures/house_desert.zip"),
"assets/prefab/structures/house_desert.gz"),
SNOWY(5, GuiLangKeys.HOUSE_SNOWY_DISPLAY, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_snowy.png"),
"assets/prefab/structures/house_snow.zip"),
"assets/prefab/structures/house_snow.gz"),
DESERT2(6,
GuiLangKeys.HOUSE_DESERT_DISPLAY2,
ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_desert_2.png"),
"assets/prefab/structures/house_desert_2.zip"),
"assets/prefab/structures/house_desert_2.gz"),
SUBAQUATIC(7,
GuiLangKeys.HOUSE_SUBAQUATIC_DISPLAY,
ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_subaquatic.png"),
"assets/prefab/structures/house_sub_aqua.zip"),
"assets/prefab/structures/house_sub_aqua.gz"),
MODERN(8,
GuiLangKeys.HOUSE_MODERN_DISPLAY,
ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_modern.png"),
"assets/prefab/structures/house_modern.zip"),
"assets/prefab/structures/house_modern.gz"),
CAMPSITE(9,
GuiLangKeys.HOUSE_CAMPING_DISPLAY,
ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_campsite.png"),
"assets/prefab/structures/house_campsite.zip"),
"assets/prefab/structures/house_campsite.gz"),
IZBA(10,
GuiLangKeys.HOUSE_IZBA_DISPLAY,
ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_izba.png"),
"assets/prefab/structures/house_izba.zip"),
"assets/prefab/structures/house_izba.gz"),
TOWER(11,
GuiLangKeys.HOUSE_TOWER_DISPLAY,
ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_tower.png"),
"assets/prefab/structures/house_tower.zip"),
"assets/prefab/structures/house_tower.gz"),
CABIN(12,
GuiLangKeys.HOUSE_CABIN_DISPLAY,
ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_cabin.png"),
"assets/prefab/structures/house_cabin.zip"),
"assets/prefab/structures/house_cabin.gz"),
TREE(13,
GuiLangKeys.HOUSE_TREE_HOUSE_DISPLAY,
ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_tree.png"),
"assets/prefab/structures/house_tree.zip"),
"assets/prefab/structures/house_tree.gz"),
MUSHROOM(14,
GuiLangKeys.HOUSE_MUSHROOM_HOUSE_DISPLAY,
ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_mushroom.png"),
"assets/prefab/structures/house_mushroom.zip");
"assets/prefab/structures/house_mushroom.gz");

private final int value;
private final String displayName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,29 +138,29 @@ protected void ConfigurationSpecificBuildStructure(Player player, ServerLevel wo
*/
public enum HouseStyle {
SPRUCE_HOME(0, GuiLangKeys.IMPROVED_HOUSE_SPRUCE, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_improved_spruce.png"),
"assets/prefab/structures/house_improved_spruce.zip"),
"assets/prefab/structures/house_improved_spruce.gz"),
ACACIA_HOME(1, GuiLangKeys.IMPROVED_HOUSE_ACACIA, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_improved_acacia.png"),
"assets/prefab/structures/house_improved_acacia.zip"),
"assets/prefab/structures/house_improved_acacia.gz"),
EARTHEN_HOME(2, GuiLangKeys.IMPROVED_EARTHEN_HOME, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_improved_earthen.png"),
"assets/prefab/structures/house_improved_earthen.zip"),
"assets/prefab/structures/house_improved_earthen.gz"),
JUNGLE_TREE_HOME(3, GuiLangKeys.IMPROVED_JUNGLE_HOME, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_improved_jungle.png"),
"assets/prefab/structures/house_improved_jungle.zip"),
"assets/prefab/structures/house_improved_jungle.gz"),
NETHER_HOME(4, GuiLangKeys.IMPROVED_NETHER_HOME, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_improved_nether.png"),
"assets/prefab/structures/house_improved_nether.zip"),
"assets/prefab/structures/house_improved_nether.gz"),
MOUNTAIN_HOME(5, GuiLangKeys.IMPROVED_MOUNTAIN_HOME, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_improved_mountain.png"),
"assets/prefab/structures/house_improved_mountain.zip"),
"assets/prefab/structures/house_improved_mountain.gz"),
ACACIA_HOME2(6, GuiLangKeys.IMPROVED_HOUSE_ACACIA_2, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_improved_acacia_2.png"),
"assets/prefab/structures/house_improved_acacia_2.zip"),
"assets/prefab/structures/house_improved_acacia_2.gz"),
MODERN_HOME(7, GuiLangKeys.IMPROVED_HOUSE_MODERN, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_improved_modern.png"),
"assets/prefab/structures/house_improved_modern.zip"),
"assets/prefab/structures/house_improved_modern.gz"),
CRIMSON_HOME(8, GuiLangKeys.IMPROVED_HOUSE_CRIMSON, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_improved_crimson.png"),
"assets/prefab/structures/house_improved_crimson.zip"),
"assets/prefab/structures/house_improved_crimson.gz"),
TOWER_HOME(9, GuiLangKeys.IMPROVED_HOUSE_TOWER, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_improved_tower.png"),
"assets/prefab/structures/house_improved_tower.zip"),
"assets/prefab/structures/house_improved_tower.gz"),
HOBBIT_HOME(10, GuiLangKeys.IMPROVED_HOUSE_HOBBIT, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_improved_hobbit.png"),
"assets/prefab/structures/house_improved_hobbit.zip"),
"assets/prefab/structures/house_improved_hobbit.gz"),
COTTAGE_HOME(11, GuiLangKeys.IMPROVED_HOUSE_COTTAGE, ResourceLocation.tryBuild(PrefabBase.MODID, "textures/gui/house_improved_cottage.png"),
"assets/prefab/structures/house_improved_cottage.zip");
"assets/prefab/structures/house_improved_cottage.gz");

private final int value;
private final String displayName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public class AquaBaseImprovedOptions extends BaseOption {
public static AquaBaseImprovedOptions Default = new AquaBaseImprovedOptions(
"item.prefab.aqua_base_improved",
"assets/prefab/structures/aqua_base_improved.zip",
"assets/prefab/structures/aqua_base_improved.gz",
"textures/gui/aqua_base_improved.png",
false,
false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public class AquaBaseOptions extends BaseOption {
public static AquaBaseOptions Default = new AquaBaseOptions(
"item.prefab.aqua_base",
"assets/prefab/structures/aqua_base.zip",
"assets/prefab/structures/aqua_base.gz",
"textures/gui/aqua_base.png",
false,
false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public class DefenseBunkerOptions extends BaseOption {
public static DefenseBunkerOptions Default = new DefenseBunkerOptions(
"item.prefab.defense.bunker",
"assets/prefab/structures/defense_bunker.zip",
"assets/prefab/structures/defense_bunker.gz",
"textures/gui/defense_bunker.png",
false,
false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public class EnderGatewayOptions extends BaseOption {
public static EnderGatewayOptions Default = new EnderGatewayOptions(
"item.prefab.ender_gateway",
"assets/prefab/structures/ender_gateway.zip",
"assets/prefab/structures/ender_gateway.gz",
"textures/gui/ender_gateway.png",
false,
false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,56 +4,56 @@ public class FarmAdvancedOptions extends BaseOption {

public static FarmAdvancedOptions AutomatedBambooFarm = new FarmAdvancedOptions(
"prefab.gui.farm.advanced.bamboo",
"assets/prefab/structures/automated_bamboo_farm.zip",
"assets/prefab/structures/automated_bamboo_farm.gz",
"textures/gui/automated_bamboo_farm.png",
false,
true);

public static FarmAdvancedOptions AutomatedMelonFarm = new FarmAdvancedOptions(
"prefab.gui.farm.advanced.melon",
"assets/prefab/structures/automated_melon_farm.zip",
"assets/prefab/structures/automated_melon_farm.gz",
"textures/gui/automated_melon_farm.png",
false,
true);

public static FarmAdvancedOptions Barn = new FarmAdvancedOptions(
"prefab.gui.farm.advanced.barn",
"assets/prefab/structures/barn_advanced.zip",
"assets/prefab/structures/barn_advanced.gz",
"textures/gui/barn_advanced.png",
false,
false);

public static FarmAdvancedOptions GreenHouse = new FarmAdvancedOptions(
"prefab.gui.farm.advanced.green_house",
"assets/prefab/structures/green_house_advanced.zip",
"assets/prefab/structures/green_house_advanced.gz",
"textures/gui/green_house_advanced.png",
false,
false);

public static FarmAdvancedOptions LargeHorseStable = new FarmAdvancedOptions(
"prefab.gui.farm.advanced.horse",
"assets/prefab/structures/horse_stable_advanced.zip",
"assets/prefab/structures/horse_stable_advanced.gz",
"textures/gui/horse_stable_advanced.png",
false,
false);

public static FarmAdvancedOptions MonsterMasher = new FarmAdvancedOptions(
"prefab.gui.farm.advanced.monster",
"assets/prefab/structures/monster_masher.zip",
"assets/prefab/structures/monster_masher.gz",
"textures/gui/monster_masher.png",
false,
false);

public static FarmAdvancedOptions ProduceFarm = new FarmAdvancedOptions(
"prefab.gui.farm.advanced.produce",
"assets/prefab/structures/produce_farm.zip",
"assets/prefab/structures/produce_farm.gz",
"textures/gui/produce_farm.png",
false,
true);

public static FarmAdvancedOptions TreeFarm = new FarmAdvancedOptions(
"prefab.gui.farm.advanced.tree",
"assets/prefab/structures/tree_farm.zip",
"assets/prefab/structures/tree_farm.gz",
"textures/gui/tree_farm.png",
false,
false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,56 +4,56 @@
public class FarmImprovedOptions extends BaseOption{
public static FarmImprovedOptions AutomatedChickenCoop = new FarmImprovedOptions(
"prefab.gui.farm.improved.chicken",
"assets/prefab/structures/chicken_coop_improved.zip",
"assets/prefab/structures/chicken_coop_improved.gz",
"textures/gui/chicken_coop_improved.png",
false,
false);

public static FarmImprovedOptions AutomatedFarm = new FarmImprovedOptions(
"prefab.gui.farm.improved.automated",
"assets/prefab/structures/automated_farm.zip",
"assets/prefab/structures/automated_farm.gz",
"textures/gui/automated_farm.png",
false,
false);

public static FarmImprovedOptions FishPond = new FarmImprovedOptions(
"prefab.gui.farm.improved.fish",
"assets/prefab/structures/fish_pond.zip",
"assets/prefab/structures/fish_pond.gz",
"textures/gui/fish_pond.png",
false,
false);

public static FarmImprovedOptions BeeFarm = new FarmImprovedOptions(
"prefab.gui.farm.improved.bee",
"assets/prefab/structures/bee_farm.zip",
"assets/prefab/structures/bee_farm.gz",
"textures/gui/bee_farm.png",
false,
false);

public static FarmImprovedOptions SugarCaneFarm = new FarmImprovedOptions(
"prefab.gui.farm.improved.sugar_cane",
"assets/prefab/structures/sugar_cane_farm.zip",
"assets/prefab/structures/sugar_cane_farm.gz",
"textures/gui/sugar_cane_farm.png",
false,
true);

public static FarmImprovedOptions MushroomFarm = new FarmImprovedOptions(
"prefab.gui.farm.mushroom",
"assets/prefab/structures/mushroom_farm.zip",
"assets/prefab/structures/mushroom_farm.gz",
"textures/gui/mushroom_farm.png",
false,
false);

public static FarmImprovedOptions Barn = new FarmImprovedOptions(
"prefab.gui.farm.advanced.barn",
"assets/prefab/structures/barn_improved.zip",
"assets/prefab/structures/barn_improved.gz",
"textures/gui/barn_improved.png",
false,
false);

public static FarmImprovedOptions GreenHouse = new FarmImprovedOptions(
"prefab.gui.farm.advanced.green_house",
"assets/prefab/structures/green_house_improved.zip",
"assets/prefab/structures/green_house_improved.gz",
"textures/gui/green_house.png",
false,
false);
Expand Down
16 changes: 8 additions & 8 deletions Shared/src/com/prefab/structures/config/enums/FarmOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,56 @@
public class FarmOptions extends BaseOption {
public static FarmOptions BeefFarm = new FarmOptions(
"prefab.gui.farm.beef",
"assets/prefab/structures/beef_farm.zip",
"assets/prefab/structures/beef_farm.gz",
"textures/gui/beef_farm.png",
false,
false);

public static FarmOptions BerryFarm = new FarmOptions(
"prefab.gui.farm.berry",
"assets/prefab/structures/berry_farm.zip",
"assets/prefab/structures/berry_farm.gz",
"textures/gui/berry_farm.png",
false,
false);

public static FarmOptions CactusFarm = new FarmOptions(
"prefab.gui.farm.cactus",
"assets/prefab/structures/cactus_farm.zip",
"assets/prefab/structures/cactus_farm.gz",
"textures/gui/cactus_farm.png",
false,
true);

public static FarmOptions ChickenCoop = new FarmOptions(
"prefab.gui.farm.chicken",
"assets/prefab/structures/chicken_coop.zip",
"assets/prefab/structures/chicken_coop.gz",
"textures/gui/chicken_coop.png",
false,
false);

public static FarmOptions HorseStable = new FarmOptions(
"prefab.gui.farm.horse",
"assets/prefab/structures/horse_stable.zip",
"assets/prefab/structures/horse_stable.gz",
"textures/gui/horse_stable.png",
false,
false);

public static FarmOptions ElevatedFarm = new FarmOptions(
"prefab.gui.farm.elevated",
"assets/prefab/structures/elevated_farm.zip",
"assets/prefab/structures/elevated_farm.gz",
"textures/gui/elevated_farm.png",
false,
false);

public static FarmOptions MultiLevelFarm = new FarmOptions(
"prefab.gui.farm.multi_level",
"assets/prefab/structures/multi_level_farm.zip",
"assets/prefab/structures/multi_level_farm.gz",
"textures/gui/multi_level_farm.png",
false,
false);

public static FarmOptions RabbitHutch = new FarmOptions(
"prefab.gui.farm.rabbit",
"assets/prefab/structures/rabbit_hutch.zip",
"assets/prefab/structures/rabbit_hutch.gz",
"textures/gui/rabbit_hutch.png",
false,
false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public class GrassyPlainOptions extends BaseOption {
public static GrassyPlainOptions Default = new GrassyPlainOptions(
"item.prefab.grassy_plain",
"assets/prefab/structures/grassy_plain.zip",
"assets/prefab/structures/grassy_plain.gz",
"textures/gui/grassy_plain.png",
false,
false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public class JailOptions extends BaseOption {
public static JailOptions Default = new JailOptions(
"item.prefab.jail",
"assets/prefab/structures/jail.zip",
"assets/prefab/structures/jail.gz",
"textures/gui/jail.png",
false,
false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public class MachineryTowerOptions extends BaseOption {
public static MachineryTowerOptions Default = new MachineryTowerOptions(
"item.prefab.machinery.tower",
"assets/prefab/structures/machinery_tower.zip",
"assets/prefab/structures/machinery_tower.gz",
"textures/gui/machinery_tower.png",
false,
true);
Expand Down
Loading

0 comments on commit 27cf1db

Please sign in to comment.