Skip to content

Commit ae7aa6f

Browse files
committed
Pixie gone
1 parent f09291f commit ae7aa6f

File tree

188 files changed

+1
-5562
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+1
-5562
lines changed

src/generated/resources/data/iceandfire/advancements/recipes/food/ambrosia.json

-35
This file was deleted.

src/generated/resources/data/iceandfire/forge/biome_modifier/iaf_features.json

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"iceandfire:fire_dragon_cave",
88
"iceandfire:ice_dragon_cave",
99
"iceandfire:lightning_dragon_cave",
10-
"iceandfire:pixie_village",
1110
"iceandfire:siren_island",
1211
"iceandfire:hydra_cave",
1312
"iceandfire:spawn_dragon_skeleton_lightning",

src/generated/resources/data/iceandfire/recipes/ambrosia.json

-15
This file was deleted.

src/generated/resources/data/iceandfire/tags/banner_pattern/pattern_item/eye.json

-5
This file was deleted.

src/generated/resources/data/iceandfire/tags/banner_pattern/pattern_item/fae.json

-5
This file was deleted.

src/generated/resources/data/iceandfire/tags/items/heal_pixie.json

-5
This file was deleted.

src/generated/resources/data/iceandfire/tags/items/tame_pixie.json

-5
This file was deleted.

src/generated/resources/data/iceandfire/worldgen/configured_feature/pixie_village.json

-4
This file was deleted.

src/generated/resources/data/iceandfire/worldgen/placed_feature/pixie_village.json

-12
This file was deleted.

src/main/java/com/github/alexthe666/iceandfire/IafConfig.java

-6
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ public class IafConfig {
3939
public static int dragonTargetSearchLength = 128;
4040
public static int dragonWanderFromHomeDistance = 40;
4141
public static int dragonHungerTickRate = 3000;
42-
public static int spawnPixiesChance = 60;
43-
public static int pixieVillageSize = 5;
44-
public static boolean pixiesStealItems = true;
4542
public static double sirenMaxHealth = 50D;
4643
public static boolean sirenShader = true;
4744
public static int sirenMaxSingTime = 12000;
@@ -157,9 +154,6 @@ public static void bakeServer(final ModConfig config) {
157154
dragonTargetSearchLength = ConfigHolder.SERVER.dragonTargetSearchLength.get();
158155
dragonWanderFromHomeDistance = ConfigHolder.SERVER.dragonWanderFromHomeDistance.get();
159156
dragonHungerTickRate = ConfigHolder.SERVER.dragonHungerTickRate.get();
160-
spawnPixiesChance = ConfigHolder.SERVER.spawnPixiesChance.get();
161-
pixieVillageSize = ConfigHolder.SERVER.pixieVillageSize.get();
162-
pixiesStealItems = ConfigHolder.SERVER.pixiesStealItems.get();
163157
sirenMaxHealth = ConfigHolder.SERVER.sirenMaxHealth.get();
164158
sirenShader = ConfigHolder.SERVER.sirenShader.get();
165159
sirenMaxSingTime = ConfigHolder.SERVER.sirenMaxSingTime.get();

src/main/java/com/github/alexthe666/iceandfire/IceAndFire.java

-3
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@ private void setup(final FMLCommonSetupEvent event) {
142142
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageSirenSong.class, MessageSirenSong::write, MessageSirenSong::read, MessageHandler.handle(MessageSirenSong.Handler::handle));
143143
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageSpawnParticleAt.class, MessageSpawnParticleAt::write, MessageSpawnParticleAt::read, MessageHandler.handle(MessageSpawnParticleAt.Handler::handle));
144144
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageStartRidingMob.class, MessageStartRidingMob::write, MessageStartRidingMob::read, MessageHandler.handle(MessageStartRidingMob.Handler::handle));
145-
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdatePixieHouse.class, MessageUpdatePixieHouse::write, MessageUpdatePixieHouse::read, MessageHandler.handle(MessageUpdatePixieHouse.Handler::handle));
146-
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdatePixieHouseModel.class, MessageUpdatePixieHouseModel::write, MessageUpdatePixieHouseModel::read, MessageHandler.handle(MessageUpdatePixieHouseModel.Handler::handle));
147-
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdatePixieJar.class, MessageUpdatePixieJar::write, MessageUpdatePixieJar::read, MessageHandler.handle(MessageUpdatePixieJar.Handler::handle));
148145
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdatePodium.class, MessageUpdatePodium::write, MessageUpdatePodium::read, MessageHandler.handle(MessageUpdatePodium.Handler::handle));
149146
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdateDragonforge.class, MessageUpdateDragonforge::write, MessageUpdateDragonforge::read, MessageHandler.handle(MessageUpdateDragonforge.Handler::handle));
150147
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdateLectern.class, MessageUpdateLectern::write, MessageUpdateLectern::read, MessageHandler.handle(MessageUpdateLectern.Handler::handle));

src/main/java/com/github/alexthe666/iceandfire/block/BlockJar.java

-143
This file was deleted.

src/main/java/com/github/alexthe666/iceandfire/block/BlockPixieHouse.java

-113
This file was deleted.

0 commit comments

Comments
 (0)