MinecraftMods/Thresholds
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix crash and infinite loop related to vaults

Browse source
This commit is contained in:
Zontreck 2022-10-07 21:52:27 -07:00
parent d44ffa6342
commit a298bf07f6
6 changed files with 13 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -3,7 +3,7 @@
org.gradle.jvmargs=-Xmx8G
org.gradle.daemon=false
my_version=1.3.3.1
my_version=1.3.3.2
mc_version=1.19.2
forge_version=43.1.32

14
src/main/java/dev/zontreck/otemod/implementation/VaultMenu.java
View file

@ -67,13 +67,21 @@ public class VaultMenu extends AbstractContainerMenu
public ItemStack quickMoveStack(Player play, int index) {
ItemStack ret = ItemStack.EMPTY;
final Slot slot = getSlot(index);
boolean moveStack = false;
if(slot.hasItem()){
final ItemStack item = slot.getItem();
ret = item.copy();
if(index<27)
if(index<54)
{
if(!moveItemStackTo(item, 54, this.slots.size(), true)) return ItemStack.EMPTY;
}else if(!moveItemStackTo(item, 0, 54, false));
moveStack=moveItemStackTo(item, 54, this.slots.size(), true);
if(!moveStack) return ItemStack.EMPTY;
}else {
moveStack = moveItemStackTo(item, 0, 54, false);
if(!moveStack)return ItemStack.EMPTY;
}
if(item.isEmpty()){
slot.set(ItemStack.EMPTY);

6
src/main/java/dev/zontreck/otemod/implementation/VaultScreen.java
View file

@ -54,10 +54,4 @@ public class VaultScreen extends AbstractContainerScreen <VaultMenu>
RenderSystem.setShaderTexture(0, TEXTURE);
blit(stack, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight);
}
@Override
protected void renderLabels (PoseStack stack, int mouseX, int mouseY)
{
}
}

5
src/main/java/dev/zontreck/otemod/integrations/JEI.java
View file

@ -1,10 +1,5 @@
package dev.zontreck.otemod.integrations;
import dev.zontreck.otemod.OTEMod;
//import mezz.jei.api.IModPlugin;
//import mezz.jei.api.JeiPlugin;
import net.minecraft.resources.ResourceLocation;
//@JeiPlugin
public class JEI
{

22
src/main/java/dev/zontreck/otemod/ore/Modifier.java
View file

@ -1,38 +1,16 @@
package dev.zontreck.otemod.ore;
import java.util.List;
import java.util.Map;
import com.google.gson.JsonElement;
import com.mojang.serialization.Codec;
import com.mojang.serialization.JsonOps;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import cpw.mods.modlauncher.api.ITransformationService.Resource;
import dev.zontreck.otemod.OTEMod;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderSet;
import net.minecraft.core.Registry;
import net.minecraft.core.RegistryAccess;
import net.minecraft.core.HolderSet.Named;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.worldgen.features.NetherFeatures;
import net.minecraft.data.worldgen.features.OreFeatures;
import net.minecraft.resources.RegistryOps;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.BiomeTags;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.biome.Biome.Precipitation;
import net.minecraft.world.level.levelgen.GenerationStep.Decoration;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.placement.BiomeFilter;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.common.data.JsonCodecProvider;
import net.minecraftforge.common.world.BiomeModifier;
import net.minecraftforge.common.world.ModifiableBiomeInfo.BiomeInfo.Builder;
import net.minecraftforge.common.world.ForgeBiomeModifiers.AddFeaturesBiomeModifier;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;

2
src/main/resources/META-INF/mods.toml
View file

@ -19,7 +19,7 @@ modId="otemod" #mandatory
# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
# see the associated build.gradle script for how to populate this completely automatically during a build
version="1.3.3.1" #mandatory
version="1.3.3.2" #mandatory
# A display name for the mod
displayName="OTEMod Resources" #mandatory
# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/