Repo-Mirror/Iris-Pack-EarthWorld
9
0
Fork 0
mirror of https://github.com/IrisDimensions/earthworld.git synced 2025-12-19 14:59:24 +00:00
Code Issues Releases Activity

Big whoops

Browse Source 
Uploaded the wrong changes
This commit is contained in:
RePixelatedMC
2024-12-31 22:44:27 +01:00
parent 82d671f0cf
commit d933f1a86f
32 changed files with 80 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
biomes/temperate/longtree-forest-extended.json
View File

@@ -383,7 +383,7 @@
"particleAltY": -0.33885,
"particleAltZ": 0.301,
"chance": 3,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 12,
"interval": 550,
"particleCount": 3

2
biomes/temperate/longtree-forest.json
View File

@@ -384,7 +384,7 @@
"particleAltY": -0.33885,
"particleAltZ": 0.301,
"chance": 3,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 12,
"interval": 550,
"particleCount": 3

2
biomes/temperate/wilds-extended.json
View File

@@ -182,7 +182,7 @@
"effects": [{
"interval": 250,
"chance": 5,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 2,
"particleAltY": 0.2,
"particleCount": 5

2
biomes/temperate/wilds.json
View File

@@ -185,7 +185,7 @@
"effects": [{
"interval": 250,
"chance": 5,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 2,
"particleAltY": 0.2,
"particleCount": 5

2
biomes/tropical/bamboo-forest.json
View File

@@ -329,7 +329,7 @@
"particleAltY": -0.33885,
"particleAltZ": 0.301,
"chance": 1,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 12,
"interval": 550,
"particleCount": 0

2
biomes/tropical/beach-bamboo.json
View File

@@ -159,7 +159,7 @@
"particleAltY": -0.33885,
"particleAltZ": 0.301,
"chance": 1,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 12,
"interval": 550,
"particleCount": 0

2
biomes/tropical/beach.json
View File

@@ -92,7 +92,7 @@
"particleAltY": -0.33885,
"particleAltZ": 0.301,
"chance": 1,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 12,
"interval": 550,
"particleCount": 0

2
biomes/tropical/island-beach.json
View File

@@ -97,7 +97,7 @@
"particleAltY": -0.33885,
"particleAltZ": 0.301,
"chance": 1,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 12,
"interval": 550,
"particleCount": 0

2
biomes/tropical/jungle-denmyre.json
View File

@@ -176,7 +176,7 @@
"particleAltY": -0.33885,
"particleAltZ": 0.301,
"chance": 1,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 12,
"interval": 550,
"particleCount": 0

2
biomes/tropical/rainforest-hills.json
View File

@@ -280,7 +280,7 @@
"particleAltY": -0.33885,
"particleAltZ": 0.301,
"chance": 1,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 12,
"interval": 550,
"particleCount": 0

2
biomes/tropical/rainforest-island.json
View File

@@ -272,7 +272,7 @@
"particleAltY": -0.33885,
"particleAltZ": 0.301,
"chance": 1,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 12,
"interval": 550,
"particleCount": 0

2
biomes/tropical/rainforest-wicked-child.json
View File

@@ -268,7 +268,7 @@
"particleAltY": -0.33885,
"particleAltZ": 0.301,
"chance": 1,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 12,
"interval": 550,
"particleCount": 3

2
biomes/tropical/rainforest-wicked.json
View File

@@ -272,7 +272,7 @@
"particleAltY": -0.33885,
"particleAltZ": 0.301,
"chance": 1,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 12,
"interval": 550,
"particleCount": 0

2
biomes/tropical/rainforest.json
View File

@@ -284,7 +284,7 @@
"particleAltY": -0.33885,
"particleAltZ": 0.301,
"chance": 3,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 12,
"interval": 550,
"particleCount": 3

2
biomes/tropical/wilds.json
View File

@@ -309,7 +309,7 @@
"effects": [{
"interval": 250,
"chance": 5,
"particleEffect": "TOTEM",
"particleEffect": "TOTEM_OF_UNDYING",
"particleOffset": 2,
"particleAltY": 0.2,
"particleCount": 5

10
dimensions/overworld.json
View File

@@ -1,5 +1,5 @@
{
"version": 3910,
"version": 31000,
"name": "Overworld",
"environment": "NORMAL",
"dimensionAngleDeg": 69,
@@ -57,7 +57,11 @@
}
}
},
<<<<<<< Updated upstream
"regionZoom": 8.15,
=======
"regionZoom": 16.15,
>>>>>>> Stashed changes
"regions": [
"frozen",
"hot",
@@ -584,6 +588,7 @@
"stronghold": "stronghold",
"strongholdJumpDistance": 670,
"maxStrongholds": 27,
<<<<<<< Updated upstream
"decorate": true,
"loot": {
"mode": "ADD",
@@ -593,4 +598,7 @@
"global-treasure"
]
}
=======
"decorate": true
>>>>>>> Stashed changes
}

8
entities/unique/amenhotep.json
View File

@@ -11,7 +11,7 @@
"particleCount": 100
},
"attributes": [{
"attribute": "GENERIC_ARMOR",
"attribute": "ARMOR",
"maxAmount": 100,
"minAmount": 100,
"operation": "ADD_NUMBER"
@@ -79,7 +79,7 @@
}
],
"attributes": [{
"attribute": "GENERIC_LUCK",
"attribute": "LUCK",
"maxAmount": 5,
"minAmount": 3,
"chance": 1,
@@ -111,7 +111,7 @@
}
],
"attributes": [{
"attribute": "GENERIC_MAX_HEALTH",
"attribute": "MAX_HEALTH",
"maxAmount": 5,
"minAmount": 3,
"chance": 1,
@@ -143,7 +143,7 @@
}
],
"attributes": [{
"attribute": "GENERIC_KNOCKBACK_RESISTANCE",
"attribute": "KNOCKBACK_RESISTANCE",
"maxAmount": 5,
"minAmount": 3,
"chance": 1,

4
entities/unique/brian.json
View File

@@ -10,14 +10,14 @@
},
"attributes": [
{
"attribute": "GENERIC_ARMOR",
"attribute": "ARMOR",
"maxAmount": 5,
"minAmount": 3,
"operation": "ADD_NUMBER",
"name": "5head"
},
{
"attribute": "GENERIC_MAX_HEALTH",
"attribute": "MAX_HEALTH",
"maxAmount": 21,
"minAmount": 19,
"operation": "ADD_NUMBER",

5
jigsaw-pieces/pillager-outpost/watchtower.json
View File

@@ -89,6 +89,11 @@
"placementOptions": {
"mode": "CENTER_STILT",
"smartBore": true,
"vanillaLoot": [
{
"name": "minecraft:chests/pillager_outpost"
}
],
"markers": [{
"emptyAbove": true,
"maximumMarkers": 4,

35
jigsaw-pieces/pillager-outpost/watchtower_overgrown.json
View File

@@ -5,7 +5,9 @@
"name": "",
"targetName": "*",
"innerConnector": false,
"pools": ["pillager-outpost/features-overgrown"],
"pools": [
"pillager-outpost/features-overgrown"
],
"keepEntity": false,
"entityCount": 1,
"position": {
@@ -19,7 +21,9 @@
"name": "",
"targetName": "*",
"innerConnector": true,
"pools": ["pillager-outpost/features-overgrown"],
"pools": [
"pillager-outpost/features-overgrown"
],
"keepEntity": false,
"entityCount": 1,
"position": {
@@ -33,7 +37,9 @@
"name": "",
"targetName": "*",
"innerConnector": false,
"pools": ["pillager-outpost/features-overgrown"],
"pools": [
"pillager-outpost/features-overgrown"
],
"keepEntity": false,
"entityCount": 1,
"position": {
@@ -47,7 +53,9 @@
"name": "",
"targetName": "*",
"innerConnector": false,
"pools": ["pillager-outpost/features-overgrown"],
"pools": [
"pillager-outpost/features-overgrown"
],
"keepEntity": false,
"entityCount": 1,
"position": {
@@ -61,7 +69,9 @@
"name": "",
"targetName": "*",
"innerConnector": false,
"pools": ["pillager-outpost/features-overgrown"],
"pools": [
"pillager-outpost/features-overgrown"
],
"keepEntity": false,
"entityCount": 1,
"position": {
@@ -75,7 +85,9 @@
"name": "",
"targetName": "*",
"innerConnector": false,
"pools": ["pillager-outpost/features-overgrown"],
"pools": [
"pillager-outpost/features-overgrown"
],
"keepEntity": false,
"entityCount": 1,
"position": {
@@ -86,8 +98,13 @@
"direction": "WEST_NEGATIVE_X"
}
],
"placementOptions":{
"mode": "CENTER_STILT",
"smartBore": true
"placementOptions": {
"vanillaLoot": [
{
"name": "minecraft:chests/pillager_outpost"
}
],
"mode": "CENTER_STILT",
"smartBore": true
}
}

8
loot/cold/treasure.json
View File

@@ -90,21 +90,21 @@
],
"attributes": [
{
"attribute": "GENERIC_LUCK",
"attribute": "LUCK",
"operation": "ADD_NUMBER",
"maxAmount": 0.1,
"minAmount": 0.07,
"name": "LUCK"
},
{
"attribute": "GENERIC_ARMOR",
"attribute": "ARMOR",
"operation": "ADD_NUMBER",
"maxAmount": 4,
"minAmount": 2,
"name": "RRM"
},
{
"attribute": "GENERIC_MAX_HEALTH",
"attribute": "MAX_HEALTH",
"operation": "ADD_NUMBER",
"maxAmount": 4,
"minAmount": 2,
@@ -115,7 +115,7 @@
"HIDE_ATTRIBUTES",
"HIDE_ENCHANTS",
"HIDE_PLACED_ON",
"HIDE_POTION_EFFECTS"
"HIDE_ATTRIBUTES"
],
"slotTypes": "STORAGE"
}

10
loot/ocean/clutter.json
View File

@@ -53,21 +53,21 @@
],
"attributes": [
{
"attribute": "GENERIC_MOVEMENT_SPEED",
"attribute": "MOVEMENT_SPEED",
"operation": "MULTIPLY_SCALAR_1",
"maxAmount": -0.15,
"minAmount": -0.25,
"name": "SLOW"
},
{
"attribute": "GENERIC_KNOCKBACK_RESISTANCE",
"attribute": "KNOCKBACK_RESISTANCE",
"maxAmount": 3.25,
"minAmount": 0.85,
"name": "THICC",
"operation": "MULTIPLY_SCALAR_1"
},
{
"attribute": "GENERIC_MAX_HEALTH",
"attribute": "MAX_HEALTH",
"operation": "ADD_NUMBER",
"maxAmount": 7,
"name": "HP",
@@ -126,11 +126,11 @@
"HIDE_UNBREAKABLE",
"HIDE_DESTROYS",
"HIDE_ENCHANTS",
"HIDE_POTION_EFFECTS",
"HIDE_ATTRIBUTES",
"HIDE_ATTRIBUTES"
],
"attributes": [{
"attribute": "GENERIC_ATTACK_DAMAGE",
"attribute": "ATTACK_DAMAGE",
"operation": "ADD_NUMBER",
"maxAmount": 5,
"minAmount": 3,

2
loot/tropical/treasure.json
View File

@@ -33,7 +33,7 @@
"slottypes": "STORAGE"
},
{
"type": "scute",
"type": "turtle_scute",
"maxamount": 3,
"minAmount": 2,
"rarity": 2,

9
regions/forests.json
View File

@@ -131,12 +131,5 @@
"shoreHeightMin": 1,
"shoreHeightMax": 5.2,
"shoreHeightZoom": 1.14,
"riverThickness": 0.025,
"loot": {
"mode": "REPLACE",
"tables": [
"temperate/clutter",
"temperate/food"
]
}
"riverThickness": 0.025
}

6
regions/frozen.json
View File

@@ -161,9 +161,5 @@
]
},
"shoreHeightZoom": 1.14,
"riverThickness": 0.006,
"loot": {
"mode": "REPLACE",
"tables": ["frozen/clutter", "frozen/food", "snow/clutter"]
}
"riverThickness": 0.006
}

6
regions/hot.json
View File

@@ -209,9 +209,5 @@
},
"shoreHeightMin": 3.2,
"shoreHeightMax": 6.2,
"shoreHeightZoom": 1.14,
"loot": {
"mode": "REPLACE",
"tables": ["hot/food", "hot/treasure"]
}
"shoreHeightZoom": 1.14
}

6
regions/mushroom.json
View File

@@ -114,9 +114,5 @@
"style": {"style": "STATIC"}
}
}]},
"shoreHeightZoom": 1.14,
"loot": {
"mode": "REPLACE",
"tables": ["mushroom/clutter", "mushroom/food"]
}
"shoreHeightZoom": 1.14
}

6
regions/swamp.json
View File

@@ -116,9 +116,5 @@
{"block": "minecraft:grass"},
{"block": "minecraft:tall_grass"}
]
}],
"loot": {
"mode": "REPLACE",
"tables": ["swamp/clutter", "swamp/food"]
}
}]
}

9
regions/temperate.json
View File

@@ -180,12 +180,5 @@
"shoreHeightMin": 1,
"shoreHeightMax": 5.2,
"shoreHeightZoom": 1.14,
"riverThickness": 0.025,
"loot": {
"mode": "REPLACE",
"tables": [
"temperate/clutter",
"temperate/food"
]
}
"riverThickness": 0.025
}

5
regions/terralost.json
View File

@@ -9,11 +9,6 @@
"terralost/alpine-grove",
"terralost/alpine-highlands"
],
"loot": {
"mode": "ADD",
"multiplier": 1,
"tables": ["tropical/dungeon"]
},
"landBiomeZoom": 3,
"shoreBiomes": ["tundra/shore/beach"],
"seaBiomes": ["mountain/sea/river"],

6
regions/tropical.json
View File

@@ -160,9 +160,5 @@
"landBiomeZoom": 5.5,
"shoreHeightMin": 3.2,
"shoreHeightMax": 9.2,
"shoreHeightZoom": 2.14,
"loot": {
"mode": "REPLACE",
"tables": ["tropical/treasure","tropical/food","tropical/dungeon"]
}
"shoreHeightZoom": 2.14
}

6
regions/tundra.json
View File

@@ -141,9 +141,5 @@
]
},
"shoreHeightZoom": 1.14,
"riverThickness": 0.025,
"loot": {
"mode": "REPLACE",
"tables": ["cold/food","cold/treasure","snow/clutter"]
}
"riverThickness": 0.025
}