Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PVP Leaderboard #3 #35

Merged
merged 78 commits into from
May 5, 2024
Merged

PVP Leaderboard #3 #35

merged 78 commits into from
May 5, 2024

Conversation

Houstonruss
Copy link
Contributor

Dev to master merger.

Houstonruss and others added 30 commits February 28, 2024 02:05
Timer is inversely related to strength. 15->0s, 1->14s.
add steam furnace sfx
add boiler vent sfx
# Conflicts:
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java
Todo: more dust from large fuels
* less iron more copper
* lower vein weight
* higher vein density

> Iron vein now has... Iron.
* swapped brown limonite for iron.

> Small coal, iron, zinc, and copper are now *all* in the y 30-70 range so you can find them mining for most ores.
* Adjusted coal weight to compensate for depth

> Change zinc and tin material color so they are different.
gc/gs bee variant removal
remove old maint hatch recipe
metal mixture 2.0
extruder ingot to rod recipes (2x rods -> 1x long rod)
extruder ingot to rod recipes (1x speed -> 1.75x)
nerf water recipe in cutter
buff lubricant recipe times in cutter
4x lube qty. req. for cutter recipes.
long rod -> rod cutter recipe speed buff
botn365 and others added 27 commits April 16, 2024 19:52
# Conflicts:
#	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
fix orevein debug spam; you need to use debugWorldGen=true to see it now.
make drill torch placement more reliable
get rid of code where thunder can explode machines
make thermal centrifuge and ore washer a bit faster
Copy link
Contributor

@botn365 botn365 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Evaluate trycaches? Should keep them?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto.

@@ -1623,7 +1645,8 @@ public static List<ItemStack> getRecipeOutputsBuffered(ItemStack... aRecipe) {
* Gives you a list of the Outputs from a Crafting Recipe
* If you have multiple Mods, which add Bronze Armor for example
*/
public static List<ItemStack> getRecipeOutputs(List<IRecipe> aList, boolean aDeleteFromList, ItemStack... aRecipe) {
@SneakyThrows
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want sneaky throws here?

@@ -507,6 +509,14 @@ public void run() {
if (tChunk != null) {
tChunk.isModified = true;

if (debugWorldGen && usedOreMix == null) {
for (val player : this.mWorld.playerEntities) {
val message = String.format("No orevein selected for chunk: %s", tChunk.getChunkCoordIntPair());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure this does not spam log in release!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I FIXED THIS
AND I CONFIRMED IT WORK
[divine code]

@@ -179,7 +179,8 @@ protected void doEntityStuff() {
disX /= disMag;
disY /= disMag;
disZ /= disMag;
blockDensity = pubWorld.getBlockDensity(expVec, entity.boundingBox);
// blockDensity = pubWorld.getBlockDensity(expVec, entity.boundingBox);
blockDensity = 1.0 / 2.0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, does this ignore block hardness??

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Who did this?

@Houstonruss Houstonruss merged commit 3f1d8be into master May 5, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants