Skip to content

Commit d1f950b

Browse files
RealTheBeastBossRealTheBeastBoss
committed
Version 1.4.2
- Added Forge tags for more mod compatibility. - Changed Wood Changer Valuables tag to implement Forge Tags. - Modified Enchantment code to work with the Ancient Tomes from Quark.
1 parent e053873 commit d1f950b

File tree

30 files changed

+157
-32
lines changed

30 files changed

+157
-32
lines changed

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ apply plugin: 'org.parchmentmc.librarian.forgegradle'
1616
apply plugin: 'eclipse'
1717
apply plugin: 'maven-publish'
1818

19-
version = '1.4.1-1.18.1'
19+
version = '1.4.2-1.18.1'
2020
group = 'com.tbb.tbbmod' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
2121
archivesBaseName = 'tbbmod'
2222

‎src/main/java/com/tbb/tbbmod/enchantment/BeastBossKickEnchantment.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ public void doPostHurt(LivingEntity pUser, Entity pAttacker, int pLevel) {
4242
chance = 0.9667f; // 3.33% Chance ()
4343
} else if (pLevel == 3) {
4444
chance = 0.95f; // 5% Chance (1 in 20)
45-
} else {
45+
} else if (pLevel == 4) {
4646
chance = 0.9f; // 10% Chance (1 in 10)
47+
} else {
48+
chance = 0.8f; // 20% Chance (1 in 5) This is here because there is a mod that can increase the maximum enchant level by one.
4749
}
4850
if (new Random().nextFloat() >= chance) {
4951
enemy.move(MoverType.PLAYER, new Vec3(0, 15, 0));

‎src/main/java/com/tbb/tbbmod/enchantment/MLGBucketEnchantment.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ public static void onFall(LivingDamageEvent source) {
6969
case 6:
7070
chance = 0.25f; // 75% chance (1 in 1.25)
7171
break;
72+
default:
73+
chance = 0.2f; // 80% chance (1 in 1.2) This is in case the enchant level gets increases to 7 by a mod
74+
break;
7275
}
7376
if (new Random().nextFloat() >= chance) {
7477
source.setCanceled(true);

‎src/main/java/com/tbb/tbbmod/enchantment/WitherHoeEnchantment.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void doPostAttack(LivingEntity pAttacker, Entity pTarget, int pLevel) {
4343
if (!pAttacker.getLevel().isClientSide()) {
4444
LivingEntity enemy = ((LivingEntity) pTarget);
4545
float chance = 0f;
46-
int duration = 0;
46+
int duration = 0; // The effect duration in ticks
4747
switch (pLevel) { // Enchantment Level
4848
case 1:
4949
chance = 0.8f; // 20% chance (1 in 5)
@@ -57,6 +57,10 @@ public void doPostAttack(LivingEntity pAttacker, Entity pTarget, int pLevel) {
5757
chance = 0.6667f; // 33.33% chance (1 in 3)
5858
duration = 20 * 20; // 20 seconds
5959
break;
60+
default: // This is in case Quark increases the enchant level
61+
chance = 0.5f; // 50% chance (1 in 2)
62+
duration = 25 * 20; // 25 seconds
63+
break;
6064
}
6165
if (new Random().nextFloat() >= chance) {
6266
enemy.addEffect(new MobEffectInstance(MobEffects.WITHER, duration));

‎src/main/resources/META-INF/mods.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ displayName="TheBeastBoss' Mod" #mandatory
2525
# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
2626
#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
2727
# A URL for the "homepage" for this mod, displayed in the mod UI
28-
#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
28+
displayURL="https://github.com/RealTheBeastBoss/TBBMod" #optional
2929
# A file name (in the root of the mod JAR) containing a logo for display
3030
logoFile="tbbmod.png" #optional
3131
# A text field displayed in the mod UI

‎src/main/resources/assets/tbbmod/lang/en_us.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"item.tbbmod.strong_beastbossanium_leggings": "BeastBossanium Leggings",
6969
"item.tbbmod.strong_beastbossanium_helmet": "BeastBossanium Helmet",
7070
"block.tbbmod.diamond_converter": "Diamond Converter",
71-
"enchantment.tbbmod.mlg_bucket.desc": "Makes your boots have a chance to MLG Bucket for you. (Doesn't work in the end)",
71+
"enchantment.tbbmod.mlg_bucket.desc": "Makes your boots have a chance to MLG Bucket for you. (Doesn't work in the nether)",
7272
"enchantment.tbbmod.beastboss_kick.desc": "Gives the wearer a chance to kick their attacker 15 blocks in the air",
7373
"enchantment.tbbmod.wither_hoe.desc": "Has a chance to inflict the Wither effect for a certain length when used to attack"
7474
}

‎src/main/resources/data/forge/tags/blocks/fence_gates/wooden.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:beastboss_fence_gate"
5+
]
6+
}

‎src/main/resources/data/forge/tags/blocks/fences/wooden.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:beastboss_fence"
5+
]
6+
}

‎src/main/resources/data/forge/tags/blocks/ore_rates/singular.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:beastbossanium_ore",
5+
"tbbmod:deepslate_beastbossanium_ore"
6+
]
7+
}

‎src/main/resources/data/forge/tags/blocks/ores.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"#forge:ores/beastbossanium"
5+
]
6+
}

‎src/main/resources/data/forge/tags/blocks/ores/beastbossanium.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:beastbossanium_ore",
5+
"tbbmod:deepslate_beastbossanium_ore"
6+
]
7+
}

‎src/main/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:deepslate_beastbossanium_ore"
5+
]
6+
}

‎src/main/resources/data/forge/tags/blocks/ores_in_ground/stone.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:beastbossanium_ore"
5+
]
6+
}

‎src/main/resources/data/forge/tags/blocks/storage_blocks.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"#forge:storage_blocks/beastbossanium"
5+
]
6+
}

‎src/main/resources/data/forge/tags/blocks/storage_blocks/beastbossanium.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:beastbossanium_block",
5+
"tbbmod:raw_beastbossanium_block"
6+
]
7+
}

‎src/main/resources/data/forge/tags/blocks/wood_changer_valuables.json

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,10 @@
11
{
22
"replace": false,
33
"values": [
4-
"tbbmod:deepslate_beastbossanium_ore",
5-
"tbbmod:beastbossanium_ore",
6-
"minecraft:coal_ore",
7-
"minecraft:deepslate_coal_ore",
8-
"minecraft:iron_ore",
9-
"minecraft:deepslate_iron_ore",
10-
"minecraft:redstone_ore",
11-
"minecraft:deepslate_redstone_ore",
12-
"minecraft:raw_iron_block",
13-
"minecraft:copper_ore",
14-
"minecraft:deepslate_copper_ore",
15-
"minecraft:raw_copper_block",
4+
"#forge:ores",
5+
"#forge:chests",
6+
"#forge:storage_blocks",
167
"minecraft:spawner",
17-
"minecraft:gold_ore",
18-
"minecraft:deepslate_gold_ore",
19-
"minecraft:diamond_ore",
20-
"minecraft:deepslate_diamond_ore",
21-
"minecraft:nether_gold_ore",
22-
"minecraft:ancient_debris",
23-
"minecraft:nether_quartz_ore",
24-
"minecraft:gilded_blackstone",
25-
"minecraft:lapis_ore",
26-
"minecraft:deepslate_lapis_ore",
27-
"minecraft:chest",
28-
"minecraft:emerald_ore",
29-
"minecraft:deepslate_emerald_ore"
8+
"minecraft:gilded_blackstone"
309
]
3110
}

‎src/main/resources/data/forge/tags/items/fence_gates/wooden.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:beastboss_fence_gate"
5+
]
6+
}

‎src/main/resources/data/forge/tags/items/fences/wooden.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:beastboss_fence"
5+
]
6+
}

‎src/main/resources/data/forge/tags/items/ingots.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"#forge:ingots/beastbossanium"
5+
]
6+
}

‎src/main/resources/data/forge/tags/items/ingots/beastbossanium.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:beastbossanium_ingot"
5+
]
6+
}

‎src/main/resources/data/forge/tags/items/ore_rates/singular.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:beastbossanium_ore",
5+
"tbbmod:deepslate_beastbossanium_ore"
6+
]
7+
}

‎src/main/resources/data/forge/tags/items/ores.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"#forge:ores/beastbossanium"
5+
]
6+
}

‎src/main/resources/data/forge/tags/items/ores/beastbossanium.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:beastbossanium_ore",
5+
"tbbmod:deepslate_beastbossanium_ore"
6+
]
7+
}

‎src/main/resources/data/forge/tags/items/ores_in_ground/deepslate.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:deepslate_beastbossanium_ore"
5+
]
6+
}

‎src/main/resources/data/forge/tags/items/ores_in_ground/stone.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:beastbossanium_ore"
5+
]
6+
}

‎src/main/resources/data/forge/tags/items/raw_materials.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"#forge:raw_materials/beastbossanium"
5+
]
6+
}

‎src/main/resources/data/forge/tags/items/raw_materials/beastbossanium.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:raw_beastbossanium_chunk"
5+
]
6+
}

‎src/main/resources/data/forge/tags/items/storage_blocks.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"#forge:storage_blocks/beastbossanium"
5+
]
6+
}

‎src/main/resources/data/forge/tags/items/storage_blocks/beastbossanium.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"tbbmod:beastbossanium_block",
5+
"tbbmod:raw_beastbossanium_block"
6+
]
7+
}

‎src/main/resources/data/minecraft/tags/blocks/beacon_base_blocks.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"replace": false,
33
"values": [
4-
"tbbmod:beastbossanium_block",
5-
"tbbmod:raw_beastbossanium_block"
4+
"#forge:storage_blocks/beastbossanium"
65
]
76
}

0 commit comments

Comments
 (0)