Skip to content

Commit

Permalink
New Enchantments and more
Browse files Browse the repository at this point in the history
  • Loading branch information
Tigereye504 committed Apr 8, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 2204792 commit a3e595d
Showing 48 changed files with 396 additions and 319 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.11.2

# Mod Properties
mod_version = 2.9.2.pre1
mod_version = 2.10.0
maven_group = net.tigereye.chestcavity
archives_base_name = chestcavity

1 change: 1 addition & 0 deletions src/main/java/net/tigereye/chestcavity/ChestCavity.java
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@ public void onInitialize() {
AutoConfig.register(CCConfig.class, GsonConfigSerializer::new);
config = AutoConfig.getConfigHolder(CCConfig.class).getConfig();
CCItems.register();
CCEnchantments.register();
CCListeners.register();
CCRecipes.register();
CCStatusEffects.register();
Original file line number Diff line number Diff line change
@@ -33,12 +33,7 @@ public ChestCavityInventory(int size,ChestCavityInstance instance) {
}

public void readTags(ListTag tags) {
//int j;
//for(j = 0; j < this.size(); ++j) {
// this.setStack(j, ItemStack.EMPTY);
//}
clear();

for(int j = 0; j < tags.size(); ++j) {
CompoundTag compoundTag = tags.getCompound(j);
int k = compoundTag.getByte("Slot") & 255;
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.tigereye.chestcavity.chestcavities.types;

import net.minecraft.entity.EquipmentSlot;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
@@ -9,6 +10,7 @@
import net.tigereye.chestcavity.ChestCavity;
import net.tigereye.chestcavity.chestcavities.ChestCavityType;
import net.tigereye.chestcavity.chestcavities.instance.ChestCavityInstance;
import net.tigereye.chestcavity.registration.CCOrganScores;
import net.tigereye.chestcavity.util.ChestCavityUtil;
import net.tigereye.chestcavity.chestcavities.ChestCavityInventory;

@@ -112,7 +114,13 @@ public void setOrganCompatibility(ChestCavityInstance instance){
public float getHeartBleedCap(){return Float.MAX_VALUE;}

@Override
public boolean isOpenable(ChestCavityInstance instance){return true;}
public boolean isOpenable(ChestCavityInstance instance){
boolean weakEnough = instance.owner.getHealth() <= ChestCavity.config.CHEST_OPENER_ABSOLUTE_HEALTH_THRESHOLD
|| instance.owner.getHealth() <= instance.owner.getMaxHealth()*ChestCavity.config.CHEST_OPENER_FRACTIONAL_HEALTH_THRESHOLD;
boolean chestVulnerable = instance.owner.getEquippedStack(EquipmentSlot.CHEST).isEmpty();
boolean easeOfAccess = instance.getOrganScore(CCOrganScores.EASE_OF_ACCESS) > 0;
return chestVulnerable && (easeOfAccess || weakEnough);
}

@Override
public void onDeath(ChestCavityInstance cc) {
Original file line number Diff line number Diff line change
@@ -110,15 +110,7 @@ public void generateGuaranteedOrganDrops(Random random, int looting, List<ItemSt
organPile.add(CCItems.DRAGON_SPINE);
organPile.add(CCItems.DRAGON_SPLEEN);
int rolls = 3 + random.nextInt(2+looting) + random.nextInt(2+looting);
for (int i = 0; i < rolls; i++) {
int roll = random.nextInt(organPile.size());
int count = 1;
Item rolledItem = organPile.get(roll);
if (rolledItem.getMaxCount() > 1) {
count += random.nextInt(rolledItem.getMaxCount());
}
loot.add(new ItemStack(organPile.remove(roll), count));
}
ChestCavityUtil.drawOrgansFromPile(organPile,rolls,random,loot);
}

@Override
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
import net.tigereye.chestcavity.chestcavities.ChestCavityType;
import net.tigereye.chestcavity.registration.CCItems;
import net.tigereye.chestcavity.registration.CCOrganScores;
import net.tigereye.chestcavity.util.ChestCavityUtil;

import java.util.LinkedList;
import java.util.List;
@@ -74,15 +75,7 @@ public void generateRareOrganDrops(Random random, int looting, List<ItemStack> l
organPile.add(CCItems.ANIMAL_SPLEEN);
organPile.add(CCItems.VOLATILE_STOMACH);
int rolls = 1 + random.nextInt(3) + random.nextInt(3);
for (int i = 0; i < rolls; i++){
int roll = random.nextInt(organPile.size());
int count = 1;
Item rolledItem = organPile.get(roll);
if(rolledItem.getMaxCount() > 1){
count += random.nextInt(rolledItem.getMaxCount());
}
loot.add(new ItemStack(organPile.remove(roll),count));
}
ChestCavityUtil.drawOrgansFromPile(organPile,rolls,random,loot);
}

}
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
import net.tigereye.chestcavity.chestcavities.ChestCavityInventory;
import net.tigereye.chestcavity.chestcavities.ChestCavityType;
import net.tigereye.chestcavity.registration.CCItems;
import net.tigereye.chestcavity.util.ChestCavityUtil;

import java.util.LinkedList;
import java.util.List;
@@ -66,15 +67,7 @@ public void generateRareOrganDrops(Random random, int looting, List<ItemStack> l
organPile.add(CCItems.SHULKER_SPLEEN);
organPile.add(CCItems.ANIMAL_STOMACH);
int rolls = 1 + random.nextInt(3) + random.nextInt(3);
for (int i = 0; i < rolls; i++){
int roll = random.nextInt(organPile.size());
int count = 1;
Item rolledItem = organPile.get(roll);
if(rolledItem.getMaxCount() > 1){
count += random.nextInt(rolledItem.getMaxCount());
}
loot.add(new ItemStack(organPile.remove(roll),count));
}
ChestCavityUtil.drawOrgansFromPile(organPile,rolls,random,loot);
}

}
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
import net.tigereye.chestcavity.chestcavities.ChestCavityType;
import net.tigereye.chestcavity.chestcavities.types.BaseChestCavity;
import net.tigereye.chestcavity.registration.CCItems;
import net.tigereye.chestcavity.util.ChestCavityUtil;

import java.util.LinkedList;
import java.util.List;
@@ -67,15 +68,7 @@ public void generateRareOrganDrops(Random random, int looting, List<ItemStack> l
organPile.add(CCItems.ANIMAL_SPLEEN);
organPile.add(CCItems.CARNIVORE_STOMACH);
int rolls = 1 + random.nextInt(3) + random.nextInt(3);
for (int i = 0; i < rolls; i++){
int roll = random.nextInt(organPile.size());
int count = 1;
Item rolledItem = organPile.get(roll);
if(rolledItem.getMaxCount() > 1){
count += random.nextInt(rolledItem.getMaxCount());
}
loot.add(new ItemStack(organPile.remove(roll),count));
}
ChestCavityUtil.drawOrgansFromPile(organPile,rolls,random,loot);
}

}
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
import net.tigereye.chestcavity.chestcavities.ChestCavityType;
import net.tigereye.chestcavity.chestcavities.types.BaseChestCavity;
import net.tigereye.chestcavity.registration.CCItems;
import net.tigereye.chestcavity.util.ChestCavityUtil;

import java.util.LinkedList;
import java.util.List;
@@ -67,15 +68,7 @@ public void generateRareOrganDrops(Random random, int looting, List<ItemStack> l
organPile.add(CCItems.ANIMAL_SPLEEN);
organPile.add(CCItems.CARNIVORE_STOMACH);
int rolls = 1 + random.nextInt(3) + random.nextInt(3);
for (int i = 0; i < rolls; i++){
int roll = random.nextInt(organPile.size());
int count = 1;
Item rolledItem = organPile.get(roll);
if(rolledItem.getMaxCount() > 1){
count += random.nextInt(rolledItem.getMaxCount());
}
loot.add(new ItemStack(organPile.remove(roll),count));
}
ChestCavityUtil.drawOrgansFromPile(organPile,rolls,random,loot);
}

}
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
import net.tigereye.chestcavity.chestcavities.ChestCavityType;
import net.tigereye.chestcavity.chestcavities.types.BaseChestCavity;
import net.tigereye.chestcavity.registration.CCItems;
import net.tigereye.chestcavity.util.ChestCavityUtil;

import java.util.LinkedList;
import java.util.List;
@@ -67,15 +68,7 @@ public void generateRareOrganDrops(Random random, int looting, List<ItemStack> l
organPile.add(CCItems.ANIMAL_SPLEEN);
organPile.add(CCItems.HERBIVORE_STOMACH);
int rolls = 1 + random.nextInt(3) + random.nextInt(3);
for (int i = 0; i < rolls; i++){
int roll = random.nextInt(organPile.size());
int count = 1;
Item rolledItem = organPile.get(roll);
if(rolledItem.getMaxCount() > 1){
count += random.nextInt(rolledItem.getMaxCount());
}
loot.add(new ItemStack(organPile.remove(roll),count));
}
ChestCavityUtil.drawOrgansFromPile(organPile,rolls,random,loot);
}

}
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
import net.tigereye.chestcavity.chestcavities.ChestCavityType;
import net.tigereye.chestcavity.chestcavities.types.BaseChestCavity;
import net.tigereye.chestcavity.registration.CCItems;
import net.tigereye.chestcavity.util.ChestCavityUtil;

import java.util.LinkedList;
import java.util.List;
@@ -67,15 +68,7 @@ public void generateRareOrganDrops(Random random, int looting, List<ItemStack> l
organPile.add(CCItems.ANIMAL_SPLEEN);
organPile.add(CCItems.ANIMAL_STOMACH);
int rolls = 1 + random.nextInt(3) + random.nextInt(3);
for (int i = 0; i < rolls; i++){
int roll = random.nextInt(organPile.size());
int count = 1;
Item rolledItem = organPile.get(roll);
if(rolledItem.getMaxCount() > 1){
count += random.nextInt(rolledItem.getMaxCount());
}
loot.add(new ItemStack(organPile.remove(roll),count));
}
ChestCavityUtil.drawOrgansFromPile(organPile,rolls,random,loot);
}

}
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
import net.tigereye.chestcavity.chestcavities.ChestCavityType;
import net.tigereye.chestcavity.chestcavities.types.BaseChestCavity;
import net.tigereye.chestcavity.registration.CCItems;
import net.tigereye.chestcavity.util.ChestCavityUtil;

import java.util.LinkedList;
import java.util.List;
@@ -68,15 +69,7 @@ public void generateRareOrganDrops(Random random, int looting, List<ItemStack> l
organPile.add(CCItems.HERBIVORE_STOMACH);
organPile.add(CCItems.HERBIVORE_RUMEN);
int rolls = 1 + random.nextInt(3) + random.nextInt(3);
for (int i = 0; i < rolls; i++){
int roll = random.nextInt(organPile.size());
int count = 1;
Item rolledItem = organPile.get(roll);
if(rolledItem.getMaxCount() > 1){
count += random.nextInt(rolledItem.getMaxCount());
}
loot.add(new ItemStack(organPile.remove(roll),count));
}
ChestCavityUtil.drawOrgansFromPile(organPile,rolls,random,loot);
}

}
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
import net.tigereye.chestcavity.chestcavities.ChestCavityType;
import net.tigereye.chestcavity.chestcavities.types.BaseChestCavity;
import net.tigereye.chestcavity.registration.CCItems;
import net.tigereye.chestcavity.util.ChestCavityUtil;

import java.util.LinkedList;
import java.util.List;
@@ -67,15 +68,7 @@ public void generateRareOrganDrops(Random random, int looting, List<ItemStack> l
organPile.add(CCItems.ANIMAL_SPLEEN);
organPile.add(CCItems.ANIMAL_STOMACH);
int rolls = 1 + random.nextInt(3) + random.nextInt(3);
for (int i = 0; i < rolls; i++){
int roll = random.nextInt(organPile.size());
int count = 1;
Item rolledItem = organPile.get(roll);
if(rolledItem.getMaxCount() > 1){
count += random.nextInt(rolledItem.getMaxCount());
}
loot.add(new ItemStack(organPile.remove(roll),count));
}
ChestCavityUtil.drawOrgansFromPile(organPile,rolls,random,loot);
}

}
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
import net.tigereye.chestcavity.chestcavities.ChestCavityType;
import net.tigereye.chestcavity.chestcavities.types.BaseChestCavity;
import net.tigereye.chestcavity.registration.CCItems;
import net.tigereye.chestcavity.util.ChestCavityUtil;

import java.util.LinkedList;
import java.util.List;
@@ -68,15 +69,7 @@ public void generateRareOrganDrops(Random random, int looting, List<ItemStack> l
organPile.add(CCItems.SMALL_ANIMAL_STOMACH);
organPile.add(CCItems.VENOM_GLAND);
int rolls = 1 + random.nextInt(3) + random.nextInt(3);
for (int i = 0; i < rolls; i++){
int roll = random.nextInt(organPile.size());
int count = 1;
Item rolledItem = organPile.get(roll);
if(rolledItem.getMaxCount() > 1){
count += random.nextInt(rolledItem.getMaxCount());
}
loot.add(new ItemStack(organPile.remove(roll),count));
}
ChestCavityUtil.drawOrgansFromPile(organPile,rolls,random,loot);
}

}
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
import net.tigereye.chestcavity.chestcavities.ChestCavityType;
import net.tigereye.chestcavity.chestcavities.types.BaseChestCavity;
import net.tigereye.chestcavity.registration.CCItems;
import net.tigereye.chestcavity.util.ChestCavityUtil;

import java.util.LinkedList;
import java.util.List;
@@ -67,15 +68,7 @@ public void generateRareOrganDrops(Random random, int looting, List<ItemStack> l
organPile.add(CCItems.SMALL_ANIMAL_SPLEEN);
organPile.add(CCItems.SMALL_HERBIVORE_STOMACH);
int rolls = 1 + random.nextInt(3) + random.nextInt(3);
for (int i = 0; i < rolls; i++){
int roll = random.nextInt(organPile.size());
int count = 1;
Item rolledItem = organPile.get(roll);
if(rolledItem.getMaxCount() > 1){
count += random.nextInt(rolledItem.getMaxCount());
}
loot.add(new ItemStack(organPile.remove(roll),count));
}
ChestCavityUtil.drawOrgansFromPile(organPile,rolls,random,loot);
}

}
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
import net.tigereye.chestcavity.chestcavities.ChestCavityType;
import net.tigereye.chestcavity.chestcavities.types.BaseChestCavity;
import net.tigereye.chestcavity.registration.CCItems;
import net.tigereye.chestcavity.util.ChestCavityUtil;

import java.util.LinkedList;
import java.util.List;
@@ -68,15 +69,7 @@ public void generateRareOrganDrops(Random random, int looting, List<ItemStack> l
organPile.add(CCItems.HERBIVORE_INTESTINE);
organPile.add(CCItems.HERBIVORE_INTESTINE);
int rolls = 1 + random.nextInt(3) + random.nextInt(3);
for (int i = 0; i < rolls; i++){
int roll = random.nextInt(organPile.size());
int count = 1;
Item rolledItem = organPile.get(roll);
if(rolledItem.getMaxCount() > 1){
count += random.nextInt(rolledItem.getMaxCount());
}
loot.add(new ItemStack(organPile.remove(roll),count));
}
ChestCavityUtil.drawOrgansFromPile(organPile,rolls,random,loot);
}

}
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
import net.tigereye.chestcavity.chestcavities.ChestCavityType;
import net.tigereye.chestcavity.chestcavities.types.BaseChestCavity;
import net.tigereye.chestcavity.registration.CCItems;
import net.tigereye.chestcavity.util.ChestCavityUtil;

import java.util.LinkedList;
import java.util.List;
@@ -67,15 +68,7 @@ public void generateRareOrganDrops(Random random, int looting, List<ItemStack> l
organPile.add(CCItems.SMALL_ANIMAL_SPLEEN);
organPile.add(CCItems.SMALL_CARNIVORE_STOMACH);
int rolls = 1 + random.nextInt(3) + random.nextInt(3);
for (int i = 0; i < rolls; i++){
int roll = random.nextInt(organPile.size());
int count = 1;
Item rolledItem = organPile.get(roll);
if(rolledItem.getMaxCount() > 1){
count += random.nextInt(rolledItem.getMaxCount());
}
loot.add(new ItemStack(organPile.remove(roll),count));
}
ChestCavityUtil.drawOrgansFromPile(organPile,rolls,random,loot);
}

}
Loading

0 comments on commit a3e595d

Please sign in to comment.