diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 2f4e70d36..43a9ea221 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -360,6 +360,8 @@ "tfg.tooltip.food_trait.refrigerating": "§bRefrigerating", "tfg.tooltip.foodtrait.freeze_dried": "Cryodesiccated", "tfg.tooltip.extraterrestrial_farming": "§4Temperature:§r An oxygenated environment provides 15°C", + "entity.tfg.moon_rabbit.male": "Moon Rabbit", + "entity.tfg.moon_rabbit.female": "Moon Rabbit", "tfg.tooltip.moon_rabbit_variant.pink": "Pink Fur", "tfg.tooltip.moon_rabbit_variant.white": "White Fur", "tfg.tooltip.moon_rabbit_variant.grey": "Stony Fur", diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/cyan.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/cyan.png new file mode 100644 index 000000000..fd63d0dda Binary files /dev/null and b/kubejs/assets/tfg/textures/entity/moon_rabbit/cyan.png differ diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/female.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/female.png deleted file mode 100644 index 6f649f851..000000000 Binary files a/kubejs/assets/tfg/textures/entity/moon_rabbit/female.png and /dev/null differ diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/grey.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/grey.png new file mode 100644 index 000000000..7dce9f917 Binary files /dev/null and b/kubejs/assets/tfg/textures/entity/moon_rabbit/grey.png differ diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/male.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/male.png deleted file mode 100644 index 6f649f851..000000000 Binary files a/kubejs/assets/tfg/textures/entity/moon_rabbit/male.png and /dev/null differ diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/pink.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/pink.png new file mode 100644 index 000000000..cf867f278 Binary files /dev/null and b/kubejs/assets/tfg/textures/entity/moon_rabbit/pink.png differ diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/purple.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/purple.png new file mode 100644 index 000000000..26c652cfc Binary files /dev/null and b/kubejs/assets/tfg/textures/entity/moon_rabbit/purple.png differ diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/sofu.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/sofu.png new file mode 100644 index 000000000..e66eeaf00 Binary files /dev/null and b/kubejs/assets/tfg/textures/entity/moon_rabbit/sofu.png differ diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/white.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/white.png new file mode 100644 index 000000000..441d061af Binary files /dev/null and b/kubejs/assets/tfg/textures/entity/moon_rabbit/white.png differ diff --git a/kubejs/data/minecraft/loot_tables/entities/rabbit.json b/kubejs/data/tfg/loot_tables/entities/moon_rabbit.json similarity index 100% rename from kubejs/data/minecraft/loot_tables/entities/rabbit.json rename to kubejs/data/tfg/loot_tables/entities/moon_rabbit.json diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json index 10ad638d6..69bb528f2 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json @@ -56,7 +56,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00005, + "creature_spawn_probability": 0.00006, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, @@ -68,10 +68,10 @@ "axolotls": [], "creature": [ { - "type": "minecraft:rabbit", + "type": "tfg:moon_rabbit", "maxCount": 4, "minCount": 2, - "weight": 50 + "weight": 100 }, { "type": "species:birt", diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json index f30e6d6d3..a968bbf0a 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json @@ -54,7 +54,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00005, + "creature_spawn_probability": 0.00006, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, @@ -66,10 +66,10 @@ "axolotls": [], "creature": [ { - "type": "minecraft:rabbit", + "type": "tfg:moon_rabbit", "maxCount": 4, "minCount": 2, - "weight": 10 + "weight": 50 }, { "type": "species:birt", diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json index b2f4b7b65..3382f9f91 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json @@ -54,7 +54,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00005, + "creature_spawn_probability": 0.00006, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, @@ -66,7 +66,7 @@ "axolotls": [], "creature": [ { - "type": "minecraft:rabbit", + "type": "tfg:moon_rabbit", "maxCount": 4, "minCount": 2, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json index 75224d972..3666e5740 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json @@ -54,7 +54,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00005, + "creature_spawn_probability": 0.00006, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, @@ -66,7 +66,7 @@ "axolotls": [], "creature": [ { - "type": "minecraft:rabbit", + "type": "tfg:moon_rabbit", "maxCount": 4, "minCount": 2, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json index 652494db2..3c7acce18 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json @@ -54,7 +54,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00008, + "creature_spawn_probability": 0.0001, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, @@ -66,16 +66,16 @@ "axolotls": [], "creature": [ { - "type": "minecraft:rabbit", + "type": "tfg:moon_rabbit", "maxCount": 4, "minCount": 2, "weight": 100 }, { "type": "species:birt", - "maxCount": 3, - "minCount": 2, - "weight": 20 + "maxCount": 2, + "minCount": 1, + "weight": 10 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json index bae9a915a..3a1531fe5 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json @@ -63,7 +63,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.00008, + "creature_spawn_probability": 0.0001, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, @@ -75,7 +75,7 @@ "axolotls": [], "creature": [ { - "type": "minecraft:rabbit", + "type": "tfg:moon_rabbit", "maxCount": 4, "minCount": 2, "weight": 100 diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 59cf49c9b..047964c9c 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -203,7 +203,7 @@ const registerAdAstraEntityTypeTags = (event) => { // moon const MOON_ENTITIES = [ 'tfc:rat', - 'minecraft:rabbit', + 'tfg:moon_rabbit', 'minecraft:enderman', 'minecraft:shulker', 'minecraft:shulker_bullet', diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index ba232d06f..0fb018dee 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -127,5 +127,5 @@ const registerTFGFoodData = (event) => { const registerTFGFauna = (event) => { - event.fauna(climate => { }, fauna => { fauna.chance(0) }, 'tfg:moon_rabbit') + //event.fauna(climate => { }, fauna => { fauna.chance(0) }, 'tfg:moon_rabbit') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/entity_types.js b/kubejs/startup_scripts/tfg/entity_types.js index 930a6b1b2..1b0bbb218 100644 --- a/kubejs/startup_scripts/tfg/entity_types.js +++ b/kubejs/startup_scripts/tfg/entity_types.js @@ -2,24 +2,24 @@ function registerTFGEntityTypes(event) { - event.create('tfg:moon_rabbit', 'tfc:mammal') - .withFaunaDefinition('on_ground', 'world_surface_wg') - .foodTag('tfc:rabbit_food') - .sized(1, 1) - .modelSize(1, 1) - .updateInterval(3) - .setDeathSound("minecraft:entity.rabbit.death") - .setAmbientSound("minecraft:entity.rabbit.ambient") - .setHurtSound(context => "minecraft:entity.rabbit.hurt") - .canJump(true) - .setBlockJumpFactor(entity => 0.42) - // these are the same as tfc rabbits - .configs(config => { - config.gestationDays(19) - config.daysToAdult(80) - config.childCount(6) - config.uses(40) - config.maxFamiliarity(0.35) - config.eatsRottenFood(true) - }) + //event.create('tfg:moon_rabbit', 'tfc:mammal') + // .withFaunaDefinition('on_ground', 'world_surface_wg') + // .foodTag('tfc:rabbit_food') + // .sized(1, 1) + // .modelSize(1, 1) + // .updateInterval(3) + // .setDeathSound("minecraft:entity.rabbit.death") + // .setAmbientSound("minecraft:entity.rabbit.ambient") + // .setHurtSound(context => "minecraft:entity.rabbit.hurt") + // .canJump(true) + // .setBlockJumpFactor(entity => 0.42) + // // these are the same as tfc rabbits + // .configs(config => { + // config.gestationDays(19) + // config.daysToAdult(80) + // config.childCount(6) + // config.uses(40) + // config.maxFamiliarity(0.35) + // config.eatsRottenFood(true) + // }) } \ No newline at end of file