Skip to content

Commit c841346

Browse files
KryptonCaptainKryptonCaptain
committed
Added Frost Condenser
Restored an unimplemented device which generates snowballs Uncommented a bunch of intermod aspect assignment Removed the [WG] tag from research Updated default supported clusters and gem affinities
1 parent 606b0cd commit c841346

File tree

14 files changed

+408
-228
lines changed

14 files changed

+408
-228
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildscript {
1717

1818
apply plugin: 'forge'
1919

20-
version = "1.2.8"
20+
version = "1.2.9"
2121
group= "blusunrize"
2222
archivesBaseName = "WitchingGadgets-1.7.10"
2323

‎src/main/java/witchinggadgets/client/render/BlockRenderWoodenDevice.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import witchinggadgets.common.blocks.tiles.TileEntityCobbleGen;
1616
import witchinggadgets.common.blocks.tiles.TileEntityCuttingTable;
1717
import witchinggadgets.common.blocks.tiles.TileEntityLabelLibrary;
18+
import witchinggadgets.common.blocks.tiles.TileEntitySnowGen;
1819
import witchinggadgets.common.blocks.tiles.TileEntitySpinningWheel;
1920
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
2021
import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -37,6 +38,9 @@ public void renderInventoryBlock(Block block, int metadata, int modelID, RenderB
3738
}
3839
if(metadata == 1)
3940
{
41+
GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
42+
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
43+
TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileEntitySnowGen(), 0.0D, 0.0D, 0.0D, 0.0F);
4044
}
4145
if(metadata == 2)
4246
{
@@ -76,8 +80,8 @@ public void renderInventoryBlock(Block block, int metadata, int modelID, RenderB
7680
@Override
7781
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer)
7882
{
79-
if(world.getBlockMetadata(x, y, z)==1)
80-
{
83+
if(world.getBlockMetadata(x, y, z)==1) {
84+
/*
8185
renderer.setOverrideBlockTexture(ConfigBlocks.blockWoodenDevice.getIcon(0,0));
8286
renderer.setRenderBounds(0, 0, 0, 1, .1875, 1);
8387
renderer.renderStandardBlock(block, x, y, z);
@@ -93,11 +97,11 @@ public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block b
9397
renderer.renderStandardBlock(block, x, y, z);
9498
renderer.setRenderBounds(.8125, .25, .1875, 1, .3125, .8125);
9599
renderer.renderStandardBlock(block, x, y, z);
96-
100+
*/
97101
renderer.setOverrideBlockTexture(Blocks.water.getIcon(0, 0));
98-
renderer.setRenderBounds(.1875, .25, .1875, .8125, .3125, .8125);
102+
renderer.setRenderBounds(.1875, .25, .1875, .8125, .32, .8125);
99103
renderer.renderStandardBlock(block, x, y, z);
100-
104+
/*
101105
renderer.setOverrideBlockTexture(ConfigBlocks.blockCosmeticSolid.getIcon(2,9));
102106
renderer.setRenderBounds(0, .3125, 0, .1875, 1, .1875);
103107
renderer.renderStandardBlock(block, x, y, z);
@@ -120,7 +124,7 @@ public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block b
120124
121125
renderer.setRenderBounds(0, .9375, 0, 1, .9375, 1);
122126
renderer.renderStandardBlock(block, x, y, z);
123-
127+
*/
124128
renderer.clearOverrideBlockTexture();
125129
}
126130
if(world.getBlockMetadata(x, y, z)==4)

‎src/main/java/witchinggadgets/client/render/TileRenderCobbleGen.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,21 @@ else if(tile.facing.equals(ForgeDirection.DOWN))
8585
renderPixelBlock(tes, 0.375, 0.375,-0.125, 0.625, 0.625, 0, 0.859375,0.65625,0.8984375,0.71875);
8686
renderPixelBlock(tes, 0.375, 0.375,-0.125, 0.625, 0.625,-0.125, 0.828125,0.875,0.8671875,0.953125);
8787
}
88-
88+
89+
double slowTick = tick/4;
90+
double loopTick = slowTick*1.65;
91+
double inc = 1.0/512.0;
92+
GL11.glEnable(3042);
93+
GL11.glBlendFunc(770, 771);
94+
ClientUtilities.bindTexture("textures/blocks/lava_flow.png");
95+
renderPixelBlock(tes, 0.1875, 0.3125, 0.375, 0.3125, 0.8125, 0.625, .375,(loopTick*inc),.625,((loopTick+8)*inc));
96+
97+
ClientUtilities.bindTexture("textures/blocks/water_flow.png");
98+
renderPixelBlock(tes, 0.6875, 0.3125, 0.375, 0.8125, 0.8125, 0.625, .375,(loopTick*inc),.625,((loopTick+8)*inc));
99+
GL11.glDisable(3042);
100+
89101
if(tile.getWorldObj()==null || tile.getWorldObj().getBlockPowerInput(tile.xCoord, tile.yCoord, tile.zCoord)<=0 && !tile.getWorldObj().isBlockIndirectlyGettingPowered(tile.xCoord, tile.yCoord, tile.zCoord))
90102
{
91-
double slowTick = tick/4;
92-
double loopTick = slowTick*1.65;
93-
double inc = 1.0/512.0;
94-
GL11.glEnable(3042);
95-
GL11.glBlendFunc(770, 771);
96-
ClientUtilities.bindTexture("textures/blocks/lava_flow.png");
97-
renderPixelBlock(tes, 0.1875, 0.3125, 0.375, 0.3125, 0.8125, 0.625, .375,(loopTick*inc),.625,((loopTick+8)*inc));
98-
99-
ClientUtilities.bindTexture("textures/blocks/water_flow.png");
100-
renderPixelBlock(tes, 0.6875, 0.3125, 0.375, 0.8125, 0.8125, 0.625, .375,(loopTick*inc),.625,((loopTick+8)*inc));
101-
GL11.glDisable(3042);
102-
103103
ClientUtilities.bindTexture("textures/blocks/cobblestone.png");
104104
if(tick>32)
105105
renderPixelBlock(tes, 0.3125, 0.3125, 0.3125, 0.6875, 0.6875, 0.6875, 0,0,1,1);

‎src/main/java/witchinggadgets/client/render/TileRenderSnowGen.java‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public class TileRenderSnowGen extends TileEntitySpecialRenderer
1414
{
1515
public void renderTileEntityAt(TileEntitySnowGen tile, double x, double y, double z, float f)
1616
{
17+
/*//Old code
1718
GL11.glPushMatrix();
1819
1920
Tessellator tes = Tessellator.instance;
@@ -71,6 +72,119 @@ else if(tile.facing.equals(ForgeDirection.DOWN))
7172
GL11.glDisable(3042);
7273
GL11.glEnable(GL11.GL_LIGHTING);
7374
75+
GL11.glPopMatrix();
76+
*/
77+
78+
GL11.glPushMatrix();
79+
80+
Tessellator tes = Tessellator.instance;
81+
GL11.glDisable(GL11.GL_LIGHTING);
82+
// GL11.glDisable(GL12.GL_RESCALE_NORMAL);
83+
int tick = tile.tick;
84+
GL11.glTranslatef((float)x, (float)y, (float)z);
85+
86+
switch(tile.facing)
87+
{
88+
case NORTH:
89+
break;
90+
case SOUTH:
91+
GL11.glRotatef(180, 0, 1, 0);
92+
GL11.glTranslatef(-1, 0, -1);
93+
break;
94+
case EAST:
95+
GL11.glRotatef(270, 0, 1, 0);
96+
GL11.glTranslatef(0, 0, -1);
97+
break;
98+
case WEST:
99+
GL11.glRotatef(90, 0, 1, 0);
100+
GL11.glTranslatef(-1, 0, 0);
101+
break;
102+
default:
103+
break;
104+
}
105+
106+
ClientUtilities.bindTexture("thaumcraft:textures/blocks/woodplain.png");
107+
TileRenderCobbleGen.renderPixelBlock(tes, 0, 0, 0, 1, 0.1875, 1,0,0,1,0.1875);
108+
TileRenderCobbleGen.renderPixelBlock(tes, 0.0625, 0.1875, 0.0625, 0.9375, 0.3125, 0.9375,0,0,1,0.125);
109+
TileRenderCobbleGen.renderPixelBlock(tes, 0, 0.8125, 0, 1, 0.9375, 1,0,0,1,0.1875);
110+
111+
ClientUtilities.bindTexture("thaumcraft:textures/blocks/arcane_stone.png");
112+
TileRenderCobbleGen.renderPixelBlock(tes, 0, 1, 0, 1, 1, 1,0,0,1,1);
113+
TileRenderCobbleGen.renderPixelBlock(tes, 0, 0.9375, 0, 1, 0.999, 1,0,0,0.125,0.125);
114+
TileRenderCobbleGen.renderPixelBlock(tes, 0.0625, 0.3125, 0.0625, 0.9375, 0.3125, 0.9375,0.0625,0.0625,0.9375,0.9375);
115+
TileRenderCobbleGen.renderPixelBlock(tes, 0, 0.8125, 0, 1, 0.8125, 1,0,0,1,1);
116+
ClientUtilities.bindTexture("thaumcraft:textures/blocks/pedestal_top.png");
117+
TileRenderCobbleGen.renderPixelBlock(tes, 0, 0.1875, 0, 0.125, 0.8125, 0.125,0,0,0.125,1);
118+
TileRenderCobbleGen.renderPixelBlock(tes, 0, 0.1875, 0.875, 0.125, 0.8125, 1,0,0,0.125,1);
119+
TileRenderCobbleGen.renderPixelBlock(tes, 0.875, 0.1875, 0, 1, 0.8125, 0.125,0,0,0.125,1);
120+
TileRenderCobbleGen.renderPixelBlock(tes, 0.875, 0.1875, 0.875, 1, 0.8125, 1,0,0,0.125,1);
121+
122+
if(!tile.facing.equals(ForgeDirection.UP) && !tile.facing.equals(ForgeDirection.DOWN))
123+
ClientUtilities.bindTexture("thaumcraft:textures/blocks/liftertop.png");
124+
else
125+
ClientUtilities.bindTexture("thaumcraft:textures/blocks/lifterside.png");
126+
TileRenderCobbleGen.renderPixelBlock(tes, 0.125, 0.125, 0.0624, 0.875, 0.875, 0.0625, 0.125,0.125,0.875,0.875);
127+
ClientUtilities.bindTexture("thaumcraft:textures/blocks/lifterside.png");
128+
TileRenderCobbleGen.renderPixelBlock(tes, 0.125, 0.125, 0.9375, 0.875, 0.875, 0.9376, 0.125,0.125,0.875,0.875);
129+
TileRenderCobbleGen.renderPixelBlock(tes, 0.9375, 0.125, 0.125, 0.9376, 0.625, 0.875, 0.125,0.125,0.875,0.625);
130+
TileRenderCobbleGen.renderPixelBlock(tes, 0.0624, 0.125, 0.125, 0.0625, 0.625, 0.875, 0.125,0.125,0.875,0.625);
131+
132+
ClientUtilities.bindTexture("thaumcraft:textures/models/Bore.png");
133+
if(tile.facing.equals(ForgeDirection.UP))
134+
{
135+
TileRenderCobbleGen.renderPixelBlock(tes, 0.375, 1, 0.375, 0.625, 1.125, 0.625, 0.859375,0.65625,0.8984375,0.71875);
136+
TileRenderCobbleGen.renderPixelBlock(tes, 0.375, 1.125, 0.375, 0.625, 1.125, 0.625, 0.828125,0.875,0.8671875,0.953125);
137+
}
138+
else if(tile.facing.equals(ForgeDirection.DOWN))
139+
{
140+
TileRenderCobbleGen.renderPixelBlock(tes, 0.375,-0.125, 0.375, 0.625, 0, 0.625, 0.859375,0.65625,0.8984375,0.71875);
141+
TileRenderCobbleGen.renderPixelBlock(tes, 0.375,-0.125, 0.375, 0.625,-0.125, 0.625, 0.828125,0.875,0.8671875,0.953125);
142+
}
143+
else
144+
{
145+
TileRenderCobbleGen.renderPixelBlock(tes, 0.4075, 0.4075, 0, 0.5925, 0.5925, 0.0624, 0.859375,0.65625,0.8984375,0.71875);
146+
TileRenderCobbleGen.renderPixelBlock(tes, 0.375, 0.375,-0.125, 0.625, 0.625, 0, 0.859375,0.65625,0.8984375,0.71875);
147+
TileRenderCobbleGen.renderPixelBlock(tes, 0.375, 0.375,-0.125, 0.625, 0.625,-0.125, 0.828125,0.875,0.8671875,0.953125);
148+
}
149+
150+
151+
GL11.glDisable(GL11.GL_LIGHTING);
152+
GL11.glEnable(3042);
153+
GL11.glBlendFunc(770, 771);
154+
ClientUtilities.bindTexture("textures/blocks/ice.png");
155+
TileRenderCobbleGen.renderPixelBlock(tes, 0.1875, 0.25, 0.1875, 0.375, 0.5, 0.375, 0,0,1,1);
156+
TileRenderCobbleGen.renderPixelBlock(tes, 0.375, 0.25, 0.1875, 0.625, 0.5625, 0.4375, 0,0,1,1);
157+
TileRenderCobbleGen.renderPixelBlock(tes, 0.15625, 0.25, 0.5, 0.4375, 0.5625, 0.8125, 0,0,1,1);
158+
TileRenderCobbleGen.renderPixelBlock(tes, 0.5, 0.25, 0.5625, 0.75, 0.375, 0.875, 0,0,1,1);
159+
TileRenderCobbleGen.renderPixelBlock(tes, 0.65625, 0.25, 0.3125, 0.8125, 0.75, 0.5, 0,0,1,1);
160+
GL11.glDisable(3042);
161+
GL11.glEnable(GL11.GL_LIGHTING);
162+
/*
163+
GL11.glEnable(3042);
164+
GL11.glBlendFunc(770, 771);
165+
ClientUtilities.bindTexture("textures/blocks/ice.png"); //ex lava_flow
166+
//TileRenderCobbleGen.renderPixelBlock(tes, 0.1875, 0.3125, 0.375, 0.3125, 0.8125, 0.625, .375,(loopTick*inc),.625,((loopTick+8)*inc));
167+
TileRenderCobbleGen.renderPixelBlock(tes, 0.1875, 0.3125, 0.375, 0.3125, 0.8125, 0.625, 0,0,1,1);
168+
169+
//ClientUtilities.bindTexture("textures/blocks/water_flow.png");
170+
//TileRenderCobbleGen.renderPixelBlock(tes, 0.6875, 0.3125, 0.375, 0.8125, 0.8125, 0.625, .375,(loopTick*inc),.625,((loopTick+8)*inc));
171+
TileRenderCobbleGen.renderPixelBlock(tes, 0.6875, 0.3125, 0.375, 0.8125, 0.8125, 0.625, 0,0,1,1);
172+
GL11.glDisable(3042);
173+
*/
174+
if(tile.getWorldObj()==null || tile.getWorldObj().getBlockPowerInput(tile.xCoord, tile.yCoord, tile.zCoord)<=0 && !tile.getWorldObj().isBlockIndirectlyGettingPowered(tile.xCoord, tile.yCoord, tile.zCoord))
175+
{
176+
double slowTick = tick/4;
177+
double loopTick = slowTick*1.65;
178+
double inc = 1.0/512.0;
179+
180+
181+
ClientUtilities.bindTexture("textures/blocks/snow.png");
182+
if(tick>32)
183+
TileRenderCobbleGen.renderPixelBlock(tes, 0.3125, 0.3125, 0.3125, 0.6875, 0.6875, 0.6875, 0,0,1,1);
184+
}
185+
186+
GL11.glEnable(GL11.GL_LIGHTING);
187+
74188
GL11.glPopMatrix();
75189
}
76190

‎src/main/java/witchinggadgets/common/WGConfig.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@ public class WGConfig
1919
public static int smelteryResultForClusters;
2020

2121
public static boolean coremod_allowBootsRepair;
22-
2322
public static boolean coremod_allowEnchantModifications;
23+
public static boolean coremod_allowPotionApplicationMod;
24+
public static boolean coremod_allowFocusPouchActive;
2425

2526
public static Block[] coremod_worldgenValidBase_HilltopStones;
2627
public static Block[] coremod_worldgenValidBase_EldritchRing;
2728

2829
public static int cloakAnimationMode;
2930
public static float radialSpeed;
30-
public static boolean coremod_allowPotionApplicationMod;
31-
public static boolean coremod_allowFocusPouchActive;
3231

3332
//new
3433
public static boolean modulePrimal;
@@ -51,6 +50,8 @@ public class WGConfig
5150
public static boolean soulboundGalacticraft;
5251

5352
public static boolean moduleGemcutting;
53+
public static boolean allowDropsFromMachinery;
54+
5455

5556

5657
static Configuration config;
@@ -87,13 +88,13 @@ public static void loadConfig(FMLPreInitializationEvent event)
8788
cloakAnimationMode = config.get("Other Options", "Cloak Animation Mode", 2, "0 = no animation, 1 = rotate cloak when legs move, 2 = stretch cloak when legs move").getInt();
8889
coremod_allowFocusPouchActive = config.get("Other Options", "Allow FocusPouch active ability", true, "Dis-/enable the IActiveAbiltiy on the FocusPouch. With this enabled, TGs active ability menu will allow you to open the pouch.").getBoolean(true);
8990

90-
coremod_allowBootsRepair = config.get("Other Options", "[Coremod] Enable repairing the Boots of the Traveller with leather", true, "Dis-/enable repairing the Boots of the Traveller with leather").getBoolean(true);
91+
coremod_allowBootsRepair = config.get("Other Options", "Enable repairing the Boots of the Traveller with leather", true, "Dis-/enable repairing the Boots of the Traveller with leather").getBoolean(true);
9192

9293
//coin
93-
coremod_allowEnchantModifications = config.get("Other Options", "[Coremod] Enable the modification of looting and fortune modifications with the Ring of the Covetous Coin", true, "Dis-/enable the modification of looting and fortune modifications with the Ring of the Covetous Coin").getBoolean(true);
94+
coremod_allowEnchantModifications = config.get("Other Options", "Enable the modification of looting and fortune modifications with the Ring of the Covetous Coin", true, "Dis-/enable the modification of looting and fortune modifications with the Ring of the Covetous Coin").getBoolean(true);
9495

9596
//primal
96-
coremod_allowPotionApplicationMod = config.get("Other Options", "[Coremod] Allow modifications to newly applied PotionEffects", true, "Dis-/enable the modification of newly applied PotionEffects. (Primordial Armor affects newly applied Warp Effects)").getBoolean(true);
97+
coremod_allowPotionApplicationMod = config.get("Other Options", "Allow modifications to newly applied PotionEffects", true, "Dis-/enable the modification of newly applied PotionEffects. (Primordial Armor affects newly applied Warp Effects)").getBoolean(true);
9798

9899
//new
99100
modulePrimal = config.get("Modules", "Enable Primordial gear and weapons", true,
@@ -134,6 +135,10 @@ public static void loadConfig(FMLPreInitializationEvent event)
134135
"Dis-/enable the gem table, and other crystal things")
135136
.getBoolean(true);
136137

138+
allowDropsFromMachinery = config.get("Drop Items from Generators", "Other Options", true,
139+
"Whether the cobble and snow gen can drop items or just output into inventories. Should be disabled on MP servers with chunkloading")
140+
.getBoolean(true);
141+
137142

138143
//enchants
139144
soulboundBaubles = config.get("Enchantments", "Soul Tether handles Baubles inventory", true,

0 commit comments

Comments
 (0)