Skip to content

Commit

Permalink
Moving this to my PC
Browse files Browse the repository at this point in the history
  • Loading branch information
Alastors committed Jun 11, 2023
1 parent 28cf889 commit d949920
Show file tree
Hide file tree
Showing 385 changed files with 7,493 additions and 1,581 deletions.
Binary file added .DS_Store
Binary file not shown.
Binary file added .gradle/8.1.1/checksums/checksums.lock
Binary file not shown.
Binary file not shown.
Empty file.
Binary file not shown.
Binary file not shown.
Binary file added .gradle/8.1.1/fileChanges/last-build.bin
Binary file not shown.
Binary file added .gradle/8.1.1/fileHashes/fileHashes.bin
Binary file not shown.
Binary file added .gradle/8.1.1/fileHashes/fileHashes.lock
Binary file not shown.
Binary file added .gradle/8.1.1/fileHashes/resourceHashesCache.bin
Binary file not shown.
Empty file added .gradle/8.1.1/gc.properties
Empty file.
Binary file added .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
2 changes: 2 additions & 0 deletions .gradle/buildOutputCleanup/cache.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Sat Jun 10 21:37:09 EDT 2023
gradle.version=8.1.1
Binary file added .gradle/buildOutputCleanup/outputFiles.bin
Binary file not shown.
Binary file added .gradle/file-system.probe
Binary file not shown.
Empty file added .gradle/vcs-1/gc.properties
Empty file.
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified build/.DS_Store
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified build/classes/java/main/botanicthaumaturgy/main/ClientProxy.class
Binary file not shown.
Binary file modified build/classes/java/main/botanicthaumaturgy/main/Config.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions build/generated/sources/injectTags.resources
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
#Sat Jun 10 21:20:34 EDT 2023
#Sat Jun 10 23:22:00 EDT 2023
replacements.GRADLETOKEN_MODNAME=Botanic Thaumaturgy
replacements.GRADLETOKEN_VERSION=28cf889.dirty
files.0=VersionInfo.java
replacements.GRADLETOKEN_VERSION=0.2.4.dirty
replacements.GRADLETOKEN_MODID=botanicthaumaturgy
replacements.GRADLETOKEN_MODNAME=Botanic Thaumaturgy
Binary file modified build/libs/.DS_Store
Binary file not shown.
Binary file removed build/libs/botanicthaumaturgy-0.2.4.dirty.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed build/libs/thaumicinsurgence-0.2.4.dirty-dev.jar
Binary file not shown.
Binary file not shown.
39 changes: 39 additions & 0 deletions build/resources/main/assets/botanicthaumaturgy/lang/en_US.lang
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
language.name=English
language.region=US
language.code=en_US

# Miscellaneous strings
# -- Updater strings. Please try to keep these to one line if possible.
thaumicinsurgence.versioning.newVersion=A new version of Thaumic Insurgence is available: %s
thaumicinsurgence.versioning.critical=Magic Bees has a critical update ready: %s - Please update!
thaumicinsurgence.versioning.clickDownload=Click to open the Download page. Hover for update info.
thaumicinsurgence.config.category.general=General
thaumicinsurgence.config.category.general.tooltip=General mod configs
thaumicinsurgence.config.category.debug=Debug
thaumicinsurgence.config.category.debug.tooltip=Options to enable debugging and/or informational messages
thaumicinsurgence.config.category.modules=Modules
thaumicinsurgence.config.category.modules.tooltip=Options to enable or disable integration
tc.research_category.BOTANICTHAUMATURGY=Botanic Thaumaturgy



tc.research_name.BT_ThaumicInterfacer=Druids's Lens
tc.research_text.BT_ThaumicInterfacer=Looking through the dews of life

ThaumicInterfacer.1=I'm not sure where I found this design. It looks like an early attempt at making or modifying a thaumometer, hence my working name for it. The device seems to show something, but not what a properly made one does. It seems like the work of someone tinkering with infusion, given its method of creation and its reaction to runic matrices. Probably just a curiosity, for the average thaumaturge not tinkering with the innate fundamentals of infusion. This likely won't help you on your journey young thaumaturge.


#Tiles

#Items
tile.infusionIntercepter.name=Infusion Intercepter

item.ItemAlastorsWand.name=Alastor's Second Wand


item.ItemBotanicInterfacer.name=Druid's Lens



itemGroup.Botanic Thaumaturgy=Botanic Thaumaturgy

60 changes: 0 additions & 60 deletions build/resources/main/assets/thaumicinsurgence/lang/en_US.lang

This file was deleted.

Binary file modified build/rfg/mclauncher-1.7.10.jar
Binary file not shown.
Binary file modified build/rfg/recompiled_minecraft-1.7.10.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
/**
* This class was created by <Vazkii>. It's distributed as part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jan 26, 2014, 12:22:58 AM (GMT)]
*/
package botanicthaumaturgy.block;

import java.util.ArrayList;
import java.util.List;

import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;

import botanicthaumaturgy.main.utils.TabBotanicThaumaturgy;
import botanicthaumaturgy.tileentity.TileBigPool;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.wand.IWandHUD;
import vazkii.botania.api.wand.IWandable;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.lib.LibRenderIDs;
import vazkii.botania.common.achievement.ICraftAchievement;
import vazkii.botania.common.achievement.ModAchievements;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.mana.BlockPool;
import vazkii.botania.common.lexicon.LexiconData;

public class BlockBigPool extends BlockPool implements IWandHUD, IWandable, ILexiconable, ICraftAchievement {

boolean lastFragile = false;

public static IIcon manaIcon;

public BlockBigPool() {
setHardness(2.0F);
setResistance(10.0F);
setStepSound(soundTypeStone);
setBlockName("bigPool");
setBlockBounds(0F, 0F, 0F, 1F, 0.5F, 1F);
this.setCreativeTab(TabBotanicThaumaturgy.tabBotanicThaumaturgy);

BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE);
}

@Override
protected boolean shouldRegisterInNameSet() {
return false;
}

@Override
public Block setBlockName(String par1Str) {
return null;
}

@Override
public void registerBlockIcons(IIconRegister par1IconRegister) {
manaIcon = IconHelper.forName(par1IconRegister, "manaWater");
}

@Override
public int damageDropped(int meta) {
return meta;
}

@Override
public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) {
TileBigPool pool = (TileBigPool) par1World.getTileEntity(par2, par3, par4);
lastFragile = pool.fragile;
super.breakBlock(par1World, par2, par3, par4, par5, par6);
}

@Override
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
ArrayList<ItemStack> drops = new ArrayList();

if (!lastFragile) drops.add(new ItemStack(this, 1, metadata));

return drops;
}

@Override
public void getSubBlocks(Item par1, CreativeTabs par2, List par3) {
par3.add(new ItemStack(par1, 1, 0));
}

@Override
public TileEntity createNewTileEntity(World world, int meta) {
return new TileBigPool();
}

@Override
public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) {
if (par5Entity instanceof EntityItem) {
TileBigPool tile = (TileBigPool) par1World.getTileEntity(par2, par3, par4);
if (tile.collideEntityItem((EntityItem) par5Entity))
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par1World, par2, par3, par4);
}
}

@Override
public void addCollisionBoxesToList(World p_149743_1_, int p_149743_2_, int p_149743_3_, int p_149743_4_,
AxisAlignedBB p_149743_5_, List p_149743_6_, Entity p_149743_7_) {
float f = 1F / 16F;
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, f, 1.0F);
super.addCollisionBoxesToList(
p_149743_1_,
p_149743_2_,
p_149743_3_,
p_149743_4_,
p_149743_5_,
p_149743_6_,
p_149743_7_);
setBlockBounds(0.0F, 0.0F, 0.0F, f, 0.5F, 1.0F);
super.addCollisionBoxesToList(
p_149743_1_,
p_149743_2_,
p_149743_3_,
p_149743_4_,
p_149743_5_,
p_149743_6_,
p_149743_7_);
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, f);
super.addCollisionBoxesToList(
p_149743_1_,
p_149743_2_,
p_149743_3_,
p_149743_4_,
p_149743_5_,
p_149743_6_,
p_149743_7_);
setBlockBounds(1.0F - f, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F);
super.addCollisionBoxesToList(
p_149743_1_,
p_149743_2_,
p_149743_3_,
p_149743_4_,
p_149743_5_,
p_149743_6_,
p_149743_7_);
setBlockBounds(0.0F, 0.0F, 1.0F - f, 1.0F, 0.5F, 1.0F);
super.addCollisionBoxesToList(
p_149743_1_,
p_149743_2_,
p_149743_3_,
p_149743_4_,
p_149743_5_,
p_149743_6_,
p_149743_7_);
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F);
}

@Override
public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) {
return side == ForgeDirection.DOWN;
}

@Override
public boolean isOpaqueCube() {
return false;
}

@Override
public boolean renderAsNormalBlock() {
return false;
}

@Override
public IIcon getIcon(int par1, int par2) {
return ModBlocks.livingrock.getIcon(par1, 0);
}

@Override
public int getRenderType() {
return LibRenderIDs.idPool;
}

@Override
public boolean hasComparatorInputOverride() {
return true;
}

@Override
public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) {
TileBigPool pool = (TileBigPool) par1World.getTileEntity(par2, par3, par4);
int val = (int) ((double) pool.getCurrentMana() / (double) pool.manaCap * 15.0);
if (pool.getCurrentMana() > 0) val = Math.max(val, 1);

return val;
}

@Override
public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) {
((TileBigPool) world.getTileEntity(x, y, z)).renderHUD(mc, res);
}

@Override
public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) {
((TileBigPool) world.getTileEntity(x, y, z)).onWanded(player, stack);
return true;
}

@Override
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
return world.getBlockMetadata(x, y, z) == 3 ? LexiconData.rainbowRod : LexiconData.pool;
}

@Override
public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix) {
return ModAchievements.manaPoolPickup;
}
}
Loading

0 comments on commit d949920

Please sign in to comment.